From: liangzhenying <867174124@qq.com>
Date: Sun, 1 Sep 2024 04:19:17 +0000 (+0800)
Subject: 修复无法富瑞坤连接失败的问题
X-Git-Tag: 千寻适配d9~20
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=504321f11e71307ab09bab2f08e7c4b1dd3da34d;p=mirrors%2FMouseSdk-MacOS.git

修复无法富瑞坤连接失败的问题
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 2a37e21..706a801 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -249,15 +249,16 @@
 #pragma mark - deviceInfoManager
 -(void)sendDeviceDataToSdk:(NSData *)data{
     if (data.length == 0 || (data.length == 6 && [[AiMouseTools dataToHexString:data] hasSuffix:@"f77f"])) {
+        [self showLog:[NSString stringWithFormat:@"[receive][info] %@",data]];
         [self showLog:@"收到异常数据！！！"];
-        [self switchConnect:self.connectType isConnected:false];
+//        [self switchConnect:self.connectType isConnected:false];
         return;
     }
     _authState = AiMouseAuthState_Success;
     [self showLog:[NSString stringWithFormat:@"[receive][info] %@",data]];
     if (self.connected == false) {
         if([AiMouseTools dataToHexString:data].length < 10){
-            [self switchConnect:AiMouseConnectType_hid isConnected:false ];
+//            [self switchConnect:AiMouseConnectType_hid isConnected:false ];
             if (self.delegate && [self.delegate respondsToSelector:@selector(aiMouseHidDataError)]) [self.delegate aiMouseHidDataError];
             return;
         }
@@ -292,7 +293,15 @@
     }];
 }
 - (void)getDeviceInfo:(void (^)(AiMouseDeviceInfo *deviceInfo,NSError *error))complete{
-    [self.deviceInfoManager getDeviceInfo:complete];
+    
+    __weak typeof(self) ws = self;
+    [self.deviceInfoManager getDeviceInfo:^(AiMouseDeviceInfo * _Nonnull deviceInfo, NSError * _Nonnull error) {
+        complete(deviceInfo,error);
+        if (error != nil) {
+            [ws switchConnect:ws.connectType isConnected:false];
+        }
+    }];
+
 }
 - (void)getRSSI:(void (^)(NSString *value,NSError *error))complete{
     [self.deviceInfoManager getRSSI:complete];
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 22d11df..843f3b1 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ