From: liangzhenying <867174124@qq.com>
Date: Fri, 30 Aug 2024 02:57:30 +0000 (+0800)
Subject: 修复富瑞坤蓝牙语音错误bug
X-Git-Tag: 千寻适配d9~26
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=588620eb2a4be48e233e7307ee19fcf27345e4c1;p=mirrors%2FMouseSdk-MacOS.git

修复富瑞坤蓝牙语音错误bug
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist
index 4a800f4..e51693c 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>AiMouseSdk copy.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 		<key>AiMouseSdk.xcscheme_^#shared#^_</key>
 		<dict>
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 6bbde2f..1b93513 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -207,7 +207,7 @@
     _authState = AiMouseAuthState_Success;
     [self.connectManager resetTimeOut];
     
-    [self showLog:[NSString stringWithFormat:@"[receive][Ai] %@",data]];
+    [self showLog:[NSString stringWithFormat:@"[receive][Voice] %@",data]];
     
 //    if (self.authState != AiMouseAuthState_Success){
 //        [self showLog:@"设备还未鉴权！！！"];
diff --git a/MouseSdk/AiMouseSdk/Manager/BleManager.m b/MouseSdk/AiMouseSdk/Manager/BleManager.m
index fd732e3..24ee7b1 100644
--- a/MouseSdk/AiMouseSdk/Manager/BleManager.m
+++ b/MouseSdk/AiMouseSdk/Manager/BleManager.m
@@ -181,7 +181,9 @@
             }
         }
     }
-    [self.centralManager cancelPeripheralConnection:self.curentPeripheral];
+    if(self.curentPeripheral != nil){
+        [self.centralManager cancelPeripheralConnection:self.curentPeripheral];
+    }
 }
 #pragma mark - public
 - (void)startScan{
diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index 85b0469..50c340a 100644
--- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
+++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
@@ -130,7 +130,7 @@
             [ws.tlwSdk sendAiDataToSdk:data];
         }
         else{
-            [ws.frkSdk sendDeviceDataToSdk:data];
+            [ws.frkSdk sendAiDataToSdk:data];
         }
     };
     
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 6c28db9..bcf5503 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ