From: liangzhenying <867174124@qq.com>
Date: Mon, 3 Jun 2024 03:26:14 +0000 (+0800)
Subject: 如果正在请求设备信息，则忽略版本信息
X-Git-Tag: 千寻适配d9~60
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=2c0446755a8fc897a65e992f18750b16b8ecb59b;p=mirrors%2FMouseSdk-MacOS.git

如果正在请求设备信息，则忽略版本信息
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.h b/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.h
index 6145256..66f48b9 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.h
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.h
@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 增加超时
 - (void)addTimeOut;
+
+- (void)disConnected;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.m
index e1b31e3..ef4bae1 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiConnectManager.m
@@ -52,6 +52,11 @@
     }
 }
 
+- (void)disConnected{
+    [self showLog:@"设备断开连接！！！"];
+    [self.delegate aiConnectManager:self connectStateDidChange:false];
+    self.connecteState = 2;
+}
 #pragma mark - timer
 - (void)addSendTimer{
     dispatch_async(dispatch_queue_create("timeoutQueue", DISPATCH_QUEUE_SERIAL), ^{
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index 0e19044..045fe46 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -187,7 +187,7 @@
         [self sendDeviceInfoCmd:@{kCmd_Key:@"get_version"}];
     }
     else if(dict[@"version"]) {
-        if(self.getVersionBlock){
+        if(self.getVersionBlock && self.deviceInfoBlock == nil){
             self.getVersionBlock(dict[@"version"], nil);
             self.getVersionBlock = nil;
             return;
@@ -265,6 +265,9 @@
 
 /// 获取版本
 - (void)getVersion:(void (^)(NSString *version,NSError *error))finished{
+    if(self.deviceInfoBlock){
+        return;
+    }
     self.getVersionBlock  = finished;
     [self sendDeviceInfoCmd:@{kCmd_Key:@"get_version"}];
 }
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 2e6f269..a501d16 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -64,7 +64,7 @@
 }
 
 -(NSString *)version{
-    return @"1.0.22";
+    return @"1.0.23";
 }
 
 -(AiDeviceInfoManager *)deviceInfoManager{
@@ -139,16 +139,20 @@
     _logLevel = level;
 }
 - (void)switchConnect:(AiMouseConnectType)type{
+    if(type != _connectType && self.connected){
+        [self.connectManager disConnected];
+    }
     _connectType = type;
     [self showLog:type == AiMouseConnectType_bluetooth?@"sdk切换到蓝牙模式":@"sdk切换到usb模式"];
     
+
     if (type == AiMouseConnectType_hid) {
         [self.recordManager checkPermissions];
     }
 }
 //开始鉴权
 - (void)startAuthentication:(void (^)(AiMouseAuthState))complete{
-    [self showLog:@"获取设备信息"];
+//    [self showLog:@"获取设备信息"];
 //    _authState = AiMouseAuthState_Unknow;
     self.authBlock = complete;
     __block typeof(self) ws = self;
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 492e895..b45de7d 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ