From: liangzhenying <867174124@qq.com>
Date: Fri, 31 May 2024 09:01:26 +0000 (+0800)
Subject: 如果请求的指令前面有还未执行完的，则延迟1s后执行
X-Git-Tag: 千寻适配d9~61
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1d30352d02f3051c5746437b8fc101406f91774b;p=mirrors%2FMouseSdk-MacOS.git

如果请求的指令前面有还未执行完的，则延迟1s后执行
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index c3ae28f..0e19044 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -244,8 +244,11 @@
 
 - (void)getDeviceInfo:(void (^)(AiMouseDeviceInfo *deviceInfo,NSError *error))complete{
     if(self.sender){
-        complete(nil,[NSError errorWithDomain:@"AiMouse SDK Error" code:AiMouseErrorCode_busy userInfo:@{@"NSLocalizedDescriptionKey":@"有命令正在执行中..."}]);
+//        complete(nil,[NSError errorWithDomain:@"AiMouse SDK Error" code:AiMouseErrorCode_busy userInfo:@{@"NSLocalizedDescriptionKey":@"有命令正在执行中..."}]);
         [self showLog:@"有命令正在执行中..."];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self getDeviceInfo:complete];
+        });
         return;
     }
     self.deviceInfo = [[AiMouseDeviceInfo alloc] init];
@@ -447,6 +450,9 @@
 - (void)sendDeviceInfoCmd:(NSDictionary *)dict{
     if(self.sender){
         [self showLog:@"有命令正在执行中.."];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self sendDeviceInfoCmd:dict];
+        });
         return;
     }
     self.sender = [[AiSender alloc] initWithCmd:dict];
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index cc79486..2e6f269 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -64,7 +64,7 @@
 }
 
 -(NSString *)version{
-    return @"1.0.21";
+    return @"1.0.22";
 }
 
 -(AiDeviceInfoManager *)deviceInfoManager{
@@ -334,9 +334,11 @@
 - (void)authResult:(BOOL)isSuccess{
     _authState = isSuccess ? AiMouseAuthState_Success:AiMouseAuthState_Failure;
     [self showLog:isSuccess?@"鉴权成功":@"鉴权失败"];
-    if(self.authBlock) self.authBlock(_authState);
-    
     [self.deviceInfoManager setAuthStateToDevice:isSuccess];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if(self.authBlock) self.authBlock(self->_authState);
+    });
 }
 - (void)showLog:(NSString *)log{
     if (self.delegate) {
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 06b8c83..492e895 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ