From: liangzhenying <867174124@qq.com> Date: Tue, 3 Dec 2024 09:27:25 +0000 (+0800) Subject: 威鼠泰凌微电池电量,版本优化 X-Git-Tag: 威鼠泰凌微电池电量版本优化^0 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6a793478078c45632e98808c0578bf8ab0e627d8;p=mirrors%2FMouseSdk-MacOS.git 威鼠泰凌微电池电量,版本优化 --- diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m index 132b60b..d646e61 100644 --- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m +++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m @@ -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]; diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h index 5e18c7d..4888b3a 100644 --- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h +++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h @@ -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 diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m index 099c255..ba115f3 100644 --- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m +++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m @@ -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 @@ -333,7 +333,7 @@ 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; @@ -523,20 +523,22 @@ } 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; @@ -654,20 +656,22 @@ } 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; diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index a3dccd6..edb1587 100644 Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ