泰凌微获取设备信息brand修改

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj
index f2235e3..f9e5424 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj
@@ -993,15 +993,15 @@
                        isa = PBXGroup;
                        children = (
                                18862A182C8064E300D3564D /* DeviceManger.h */,
+                               18862A1D2C8064E300D3564D /* DeviceManger.m */,
+                               18862A212C8064E300D3564D /* HidManager.h */,
                                18862A192C8064E300D3564D /* HidManager.m */,
-                               18862A1A2C8064E300D3564D /* TimerManager.h */,
                                18862A1C2C8064E300D3564D /* BleManager.h */,
-                               18862A1D2C8064E300D3564D /* DeviceManger.m */,
                                18862A1E2C8064E300D3564D /* BleManager.m */,
+                               18862A1A2C8064E300D3564D /* TimerManager.h */,
+                               18862A202C8064E300D3564D /* TimerManager.m */,
                                18862A1F2C8064E300D3564D /* DeviceManager2.m */,
                                18862A1B2C8064E300D3564D /* DeviceManager2.h */,
-                               18862A202C8064E300D3564D /* TimerManager.m */,
-                               18862A212C8064E300D3564D /* HidManager.h */,
                        );
                        path = Manager;
                        sourceTree = "<group>";

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 2e65051..6bbde2f 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -70,7 +70,7 @@
 }
 
 -(NSString *)version{
-    return @"1.0.32";
+    return @"1.0.33";
 }
 
 -(AiDeviceInfoManager *)deviceInfoManager{

diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
index 22e2277..98439c2 100644 (file)
--- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
@@ -60,7 +60,7 @@
 }
 
 -(NSString *)version{
-    return @"1.0.0";
+    return @"1.0.1";
 }
 
 -(TlwAudioManager *)audioManager{
@@ -359,10 +359,10 @@
         case 0x22:
         {
             //            220210 48584D33303030313031E6FCFF68D7D000
-            NSString *code = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(2, 1)]];
-            NSString *brand = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(3, 6)] encoding:NSUTF8StringEncoding];
-            NSString *batch = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(9, 2)]];
-            NSString *sn = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(11, 6)]];
+            NSString *code = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(3, 2)] encoding:NSUTF8StringEncoding];
+            NSString *brand = [self getBrand:[data subdataWithRange:NSMakeRange(5, 6)]];
+            NSString *batch = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(11, 2)]];
+            NSString *sn = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(13, 6)]];
             TlwSnInfo *info = [[TlwSnInfo alloc] init];
             info.code = code;
             info.brand = brand;
@@ -475,10 +475,10 @@
             //            05FFF1FEC022 1048584D33303030313031E6FCFF68D7D0EF00000000000000000000000000000000000000000000000000000000000000000000000000000000
             //            220210 48584D33303030313031E6FCFF68D7D000
             data = [data subdataWithRange:NSMakeRange(4, data.length - 4)];
-            NSString *code = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(2, 1)]];
-            NSString *brand = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(3, 6)] encoding:NSUTF8StringEncoding];
-            NSString *batch = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(9, 2)]];
-            NSString *sn = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(11, 6)]];
+            NSString *code = [[NSString alloc] initWithData:[data subdataWithRange:NSMakeRange(3, 2)] encoding:NSUTF8StringEncoding];
+            NSString *brand = [self getBrand:[data subdataWithRange:NSMakeRange(5, 6)]];
+            NSString *batch = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(11, 2)]];
+            NSString *sn = [TlwTools dataToHexString:[data subdataWithRange:NSMakeRange(13, 6)]];
             TlwSnInfo *info = [[TlwSnInfo alloc] init];
             info.code = code;
             info.brand = brand;
@@ -566,5 +566,17 @@
 -(void)TlwConnectManager:(TlwConnectManager *)manager outputLog:(NSString *)log{
     [self showLog:log];
 }
+
+- (NSString *)getBrand:(NSData *)data{
+    NSMutableString *mText = [[NSMutableString alloc] init];
+    NSString *text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    for (NSInteger i = 0; i < text.length;i++) {
+        if ([[text substringWithRange:NSMakeRange(i, 1)] isEqual:@"0"]) {
+            return [text substringWithRange:NSMakeRange(0, i)];
+        }
+    }
+    
+    return text;
+}
 @end
 

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 683b39f..4786c58 100644 (file)
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ