From: liangzhenying <867174124@qq.com>
Date: Tue, 3 Dec 2024 08:40:27 +0000 (+0800)
Subject: 电池电量、版本异常优化
X-Git-Tag: 威鼠泰凌微电池电量版本优化~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=865891afb8f40342cfe68d93406583f8f3c61a63;p=mirrors%2FMouseSdk-MacOS.git

电池电量、版本异常优化
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index ec17664..6327f55 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -186,7 +186,12 @@
 - (void)getCmdCallBack:(NSDictionary *)dict{
     if (dict[@"battery_power"]) {
         self.deviceInfo.battery_power = dict[@"battery_power"];
-        [self sendDeviceInfoCmd:@{kCmd_Key:@"get_CPI"}];
+        if([self.deviceInfo.battery_power isKindOfClass:[NSString class]] && self.deviceInfo.battery_power.intValue >= 0 && self.deviceInfo.battery_power.intValue <= 100){
+            [self sendDeviceInfoCmd:@{kCmd_Key:@"get_CPI"}];
+        }
+        else{
+            [self sendDeviceInfoCmd:@{kCmd_Key:@"get_battery_power"}];
+        }
     }
     else if(dict[@"CPI"]) {
         self.deviceInfo.CPI = dict[@"CPI"];
@@ -203,7 +208,12 @@
             return;
         }
         self.deviceInfo.version = dict[@"version"];
-        [self sendDeviceInfoCmd:@{kCmd_Key:@"get_brand"}];
+        if([self.deviceInfo.version isKindOfClass:[NSString class]] && [self.deviceInfo.version componentsSeparatedByString:@"."].count > 1){
+            [self sendDeviceInfoCmd:@{kCmd_Key:@"get_brand"}];
+        }
+        else{
+            [self sendDeviceInfoCmd:@{kCmd_Key:@"get_version"}];
+        }
     }
     else if(dict[@"brand"]) {
         self.deviceInfo.brand = dict[@"brand"];
diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index d6322d5..132b60b 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_v2024120301";
+        NSString *version = @"MouseSdk_v2024120302";
         NSLog(@"[AiMouseSdk] %@",version);
         [self showLog:version];;
         [self setupSDK];
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index ba56219..a3dccd6 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ