From: liangzhenying <867174124@qq.com>
Date: Fri, 30 Aug 2024 08:18:49 +0000 (+0800)
Subject: 拔掉usb，停掉录音
X-Git-Tag: 千寻适配d9~24
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d3a16ced161727c2dea3f2e876643c04497fa75f;p=mirrors%2FMouseSdk-MacOS.git

拔掉usb，停掉录音
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
index 7d7a338..70217c7 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
@@ -67,13 +67,13 @@ typedef NS_ENUM(NSInteger,AiMouseAuthState) {
 /// - Parameter data: pcm格式语音数据
 - (void)aiMouseSendRecordData:(NSData *)data;
 
-@optional
+/// hid数据异常，需要重新开启监听usb设备
+- (void)aiMouseHidDataError;
+
 /// 输出sdk日志
 /// - Parameter log: 日志
 - (void)aiMouseAddLog:(NSString *)log;
 
-/// hid数据异常，需要重新开启监听usb设备
-- (void)hidDataError;
 @end
 
 @interface AiMouse : NSObject
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index f0eb309..e91609e 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -164,9 +164,8 @@
     _logLevel = level;
 }
 - (void)didDisconnect{
-    [self showLog:@"系统断开连接"];
     [self stopRecord:true];
-    [self.connectManager disConnected];
+//    [self.connectManager disConnected];
     
 }
 - (void)switchConnect:(AiMouseConnectType)type isConnected:(BOOL)isConneted{
@@ -181,6 +180,7 @@
     }
     else{
         if (self.connected) {
+            [self stopRecord:true];
             _connected = false;
             [self aiConnectManager:self.connectManager connectStateDidChange:false];
         }
@@ -263,7 +263,8 @@
     [self showLog:[NSString stringWithFormat:@"[receive][info] %@",data]];
     if (self.connected == false) {
         if([AiMouseTools dataToHexString:data].length < 10){
-            if (self.delegate && [self.delegate respondsToSelector:@selector(hidDataError)]) [self.delegate hidDataError];
+            [self switchConnect:AiMouseConnectType_hid isConnected:false ];
+            if (self.delegate && [self.delegate respondsToSelector:@selector(aiMouseHidDataError)]) [self.delegate aiMouseHidDataError];
             return;
         }
     }
diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index 04064e2..af81c90 100644
--- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
+++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
@@ -87,11 +87,14 @@
             }
         }
         else{
-            if (ws.ble.productType == AiMouseProductType_tlw) {
+            if (ws.hid.productType == AiMouseProductType_tlw) {
                 [ws.tlwSdk switchConnect:AiMouseConnectType_hid isConnected:false];
+                [ws.tlwSdk didDisconnect];
             }
             else{
                 [ws.frkSdk switchConnect:AiMouseConnectType_hid isConnected:false];
+                [ws.frkSdk didDisconnect];
+
             }
         }
     };
@@ -504,6 +507,11 @@
         self.recordingCallBack( [data base64EncodedStringWithOptions:0]);
     }
 }
+/// hid错误
+-(void)tlwHidDataError{
+    [self.hid open];
+}
+
 /// 输出日志
 - (void)tlwMouseAddLog:(NSString *)log {
     if (self.aiMouseAddLogCallBack) {
@@ -593,7 +601,7 @@
 }
 
 /// hid数据异常，需要重新开启监听usb设备
-- (void)hidDataError{
+- (void)aiMouseHidDataError{
     [self.hid open];
 }
 #pragma mark - other
diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h
index 621daf4..edf87de 100644
--- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h
+++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h
@@ -52,7 +52,9 @@ typedef NS_ENUM(NSInteger,TlwMouseLogLevel) {
 /// - Parameter data: pcm格式语音数据
 - (void)tlwMouseSendRecordData:(NSData *)data;
 
-@optional
+/// hid数据异常，需要重新开启监听usb设备
+- (void)tlwHidDataError;
+
 /// 输出sdk日志
 /// - Parameter log: 日志
 - (void)tlwMouseAddLog:(NSString *)log;
diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
index 2c96889..2fd756c 100644
--- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
@@ -103,9 +103,8 @@
 }
 - (void)didDisconnect{
     _connected = false;
-    [self showLog:@"系统断开连接"];
     [self stopRecord];
-    [self.connectManager disConnected];
+//    [self.connectManager disConnected];
 }
 
 - (void)switchConnect:(AiMouseConnectType)type isConnected:(BOOL)isConneted{
@@ -119,6 +118,7 @@
             }
         }
         else{
+            [self stopRecord];
             if (self.connected) {
                 _connected = false;
                 [self TlwConnectManager:self.connectManager connectStateDidChange:false];
@@ -385,6 +385,8 @@
     //    0x05fff1fec09f0114ef
     if(data.length < 7 ){
         [self showLog:@"收到异常数据"];
+        [self switchConnect:AiMouseConnectType_hid isConnected:false ];
+        [self.delegate tlwHidDataError];
         return;
     }
     uint8 type;
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 64fee59..33c219b 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ