威鼠泰凌微电池电量,版本优化 AudioMaxLen 威鼠泰凌微电池电量版本优化
authorliangzhenying <867174124@qq.com>
Tue, 3 Dec 2024 09:27:25 +0000 (17:27 +0800)
committerliangzhenying <867174124@qq.com>
Tue, 3 Dec 2024 09:27:25 +0000 (17:27 +0800)
MouseSdk/AiMouseSdk/Manager/DeviceManger.m
MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h
MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate

index 132b60b..d646e61 100644 (file)
@@ -45,7 +45,7 @@
 - (instancetype)init{
     self = [super init];
     if (self) {
-        NSString *version = @"MouseSdk_v2024120302";
+        NSString *version = @"MouseSdk_v2024120303";
         NSLog(@"[AiMouseSdk] %@",version);
         [self showLog:version];;
         [self setupSDK];
index 5e18c7d..4888b3a 100644 (file)
@@ -10,7 +10,7 @@
 
 @interface TlwDeviceInfo : NSObject
 @property (nonatomic, assign) int DPI;/// DPI值 数值1 ~ 4 (分别对应1200,1600,2400,4800)
-@property (nonatomic, assign) int version;///软件版本
+@property (nonatomic, strong) NSString *version;///软件版本
 @property (nonatomic, assign) int batteryState;/// 电池状态
 @property (nonatomic, assign) int batteryValue;/// 电池百分百电量,0-100
 @end
index 099c255..ba115f3 100644 (file)
@@ -12,7 +12,7 @@
 
 @implementation TlwDeviceInfo
 -(NSString *)description{
-    NSString *info = [NSString stringWithFormat:@"version = %d DPI = %d batteryState = %d batteryValue = %d",self.version,self.DPI,self.batteryState,self.batteryValue];
+    NSString *info = [NSString stringWithFormat:@"version = %@ DPI = %d batteryState = %d batteryValue = %d",self.version,self.DPI,self.batteryState,self.batteryValue];
     return info;
 }
 @end
             AiMouseDeviceInfo *info = [[AiMouseDeviceInfo alloc] init];
             info.type = 0;
             info.battery_power = [NSString stringWithFormat:@"%d",deviceInfo.batteryValue] ;
-            info.version = [NSString stringWithFormat:@"%d",deviceInfo.version];
+            info.version = [NSString stringWithFormat:@"%@",deviceInfo.version];
             info.CPI_list = CPI_list;
             info.CPI = dpiValue;
             ws.fullInfo = info;
         }
         case 0x9c:
         { //鼠标状态查询回复
-            uint16_t version;
-            [[data subdataWithRange:NSMakeRange(3, 2)] getBytes:&version length:2];
+            uint8_t version1;
+            [[data subdataWithRange:NSMakeRange(3, 1)] getBytes:&version1 length:1];
+            uint8_t version2;
+            [[data subdataWithRange:NSMakeRange(4, 1)] getBytes:&version2 length:1];
             
             uint16_t DPI;
             [[data subdataWithRange:NSMakeRange(5, 2)] getBytes:&DPI length:2];
             
-            uint16_t batteryState;
+            uint8_t batteryState;
             [[data subdataWithRange:NSMakeRange(7, 1)] getBytes:&batteryState length:1];
             
-            uint16_t batteryValue;
+            uint8_t batteryValue;
             [[data subdataWithRange:NSMakeRange(8, 1)] getBytes:&batteryValue length:1];
             
             TlwDeviceInfo *info = [[TlwDeviceInfo alloc] init];
-            info.version = version;
+            info.version = [NSString stringWithFormat:@"%d.%d",version2,version1];
             info.DPI = DPI;
             info.batteryState = batteryState;
             info.batteryValue = batteryValue;
         }
         case 0x9c:
         { //鼠标状态查询回复
-            uint16_t version;
-            [[data subdataWithRange:NSMakeRange(7, 2)] getBytes:&version length:2];
+            uint8_t version1;
+            [[data subdataWithRange:NSMakeRange(7, 1)] getBytes:&version1 length:1];
+            uint8_t version2;
+            [[data subdataWithRange:NSMakeRange(8, 1)] getBytes:&version2 length:1];
             
             uint16_t DPI;
             [[data subdataWithRange:NSMakeRange(9, 2)] getBytes:&DPI length:2];
             
-            uint16_t batteryState;
+            uint8_t batteryState;
             [[data subdataWithRange:NSMakeRange(11, 1)] getBytes:&batteryState length:1];
             
-            uint16_t batteryValue;
+            uint8_t batteryValue;
             [[data subdataWithRange:NSMakeRange(12, 1)] getBytes:&batteryValue length:1];
             
             TlwDeviceInfo *info = [[TlwDeviceInfo alloc] init];
-            info.version = version;
+            info.version = [NSString stringWithFormat:@"%d.%d",version2,version1];
             info.DPI = DPI;
             info.batteryState = batteryState;
             info.batteryValue = batteryValue;
index a3dccd6..edb1587 100644 (file)
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ