成功获取到设备信息后再给app回调鉴权成功

diff --git a/Demo/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate b/Demo/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate
index f5bef6d..61667c4 100644 (file)
Binary files a/Demo/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate and b/Demo/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/Demo/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist b/Demo/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
index aeb998b..dab8f62 100644 (file)
--- a/Demo/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Demo/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
                <key>Masonry.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>1</integer>
+                       <integer>2</integer>
                </dict>
                <key>Pods-MouseSdk.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>2</integer>
+                       <integer>1</integer>
                </dict>
        </dict>
 </dict>

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
index 64bd978..27157b9 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
                <key>AiMouseSdk copy.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>2</integer>
+                       <integer>4</integer>
                </dict>
                <key>AiMouseSdk.xcscheme_^#shared#^_</key>
                <dict>

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index 2cce84d..cc8fd6c 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -83,7 +83,7 @@
             [self showLog:@"deviceSecret未设置"];
             [self.deviceInfo setValue:nil forKey:@"deviceSecret"];
             if(self.deviceInfoBlock){
-                [self showLog:self.deviceInfo.description];
+//                [self showLog:self.deviceInfo.description];
                 self.deviceInfoBlock(self.deviceInfo, nil);
                 self.deviceInfoBlock= nil;
             }
@@ -239,7 +239,7 @@
     else if(dict[@"deviceSecret"]) {
         [self.deviceInfo setValue:dict[@"deviceSecret"] forKey:@"deviceSecret"];
         if(self.deviceInfoBlock){
-            [self showLog:self.deviceInfo.description];
+//            [self showLog:self.deviceInfo.description];
             self.deviceInfoBlock(self.deviceInfo, nil);
             self.deviceInfoBlock= nil;
         }

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index fb64d88..8aaa0dd 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -37,7 +37,7 @@
 @end
 
 @interface AiMouse()
-
+@property (nonatomic, strong) NSMutableData *voiceData;
 @property (nonatomic, strong) ByteDanceSdk *byteSdk;
 @property (nonatomic, strong) AiAudioManager *audioManager;
 @property (nonatomic, strong) AiRecordManager *recordManager;
@@ -60,6 +60,7 @@
 -(instancetype)init{
     if (self = [super init]) {
         _connectType =  AiMouseConnectType_bluetooth;
+        self.voiceData = [[NSMutableData alloc] init];
         [self.recordManager checkPermissions];
         
         if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
@@ -78,8 +79,8 @@
         __weak typeof(self) ws = self;
         _deviceInfoManager.sendToBleBlock = ^(NSData * _Nonnull data) {
             if (ws.delegate) {
-                [ws showLog:[NSString stringWithFormat:@"[send][info][json] %@",[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]]];
-                [ws showLog:[NSString stringWithFormat:@"[send][info][byte] %@",[AiMouseTools dataToHexString:data]]];
+                [ws showLog:[NSString stringWithFormat:@"[send][info]%@",[[NSString alloc]initWithData:data encoding:NSUTF8StringEncoding]]];
+                [ws showLog:[NSString stringWithFormat:@"[send][info]%@",[AiMouseTools dataToHexString:data]]];
                 [ws.delegate aiMouseSendDeviceInfoData:data];
             }
         };
@@ -133,16 +134,26 @@
         if (type == AiMouseConnectType_hid ) {
             [self.recordManager checkPermissions];
         }
-        if([self.delegate respondsToSelector:@selector(aiMouseConnectStateDidChange:)]) [self.delegate aiMouseConnectStateDidChange:self.connected];
         
-        if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
-            [self.byteSdk startAuth:^(ByteDanceInfo *info) {
-                if(self.delegate) [self.delegate aiMouseAuthenticationResult:AiMouseAuthState_Success];
-            }];
-        }
-        else{
-            if(self.delegate) [self.delegate aiMouseAuthenticationResult:AiMouseAuthState_Success];
-        }
+        __weak typeof(self) ws = self;
+        [self.deviceInfoManager getDeviceInfo:^(AiMouseDeviceInfo * _Nonnull deviceInfo, NSError * _Nonnull error) {
+            if (error != nil) {
+                [ws switchConnect:ws.connectType isConnected:false];
+                return;
+            }
+            if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
+                [self.byteSdk startAuth:^(ByteDanceInfo *info) {
+                    deviceInfo.byteAuthInfo = info;
+                    [ws showLog:deviceInfo.description];
+                    if([self.delegate respondsToSelector:@selector(aiMouseConnectStateDidChange:)]) [self.delegate aiMouseConnectStateDidChange:self.connected];
+                    if(self.delegate) [self.delegate aiMouseAuthenticationResult:AiMouseAuthState_Success];
+                }];
+            }
+            else{
+                if([ws.delegate respondsToSelector:@selector(aiMouseConnectStateDidChange:)]) [ws.delegate aiMouseConnectStateDidChange:ws.connected];
+                if(ws.delegate) [ws.delegate aiMouseAuthenticationResult:AiMouseAuthState_Success];
+            }            
+        }];
     }
     else{
         if (self.connected) {
@@ -194,6 +205,7 @@
     }
 }
 
+
 #pragma mark - deviceInfoManager
 -(void)sendDeviceDataToSdk:(NSData *)data{
     if (data.length == 0 || (data.length == 6 && [[AiMouseTools dataToHexString:data] hasSuffix:@"f77f"])) {
@@ -201,8 +213,8 @@
         [self showLog:@"收到异常数据！！！"];
         return;
     }
-    [self showLog:[NSString stringWithFormat:@"[receive][info][json] %@",[AiMouseTools dataToHexString:data]]];
-    [self showLog:[NSString stringWithFormat:@"[receive][info][byte] %@",[AiMouseTools dataToUtf8String:data]]];
+    [self showLog:[NSString stringWithFormat:@"[receive][info] %@",[AiMouseTools dataToHexString:data]]];
+    [self showLog:[NSString stringWithFormat:@"[receive][info] %@",[AiMouseTools dataToUtf8String:data]]];
 
     
     if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
@@ -223,8 +235,9 @@
     
     __weak typeof(self) ws = self;
     [self.deviceInfoManager getDeviceInfo:^(AiMouseDeviceInfo * _Nonnull deviceInfo, NSError * _Nonnull error) {
-        if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
+        if (deviceInfo && ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4)) {
             deviceInfo.byteAuthInfo = ws.byteSdk.info;
+            [ws showLog:deviceInfo.description];
         }
         complete(deviceInfo,error);
         if (error != nil) {
@@ -310,7 +323,16 @@
 #pragma mark - other
 - (void)sendRecordData:(NSData *)data{
 //    [self showLog:[NSString stringWithFormat:@"[audio] %@",data]];
-    if (self.delegate)  [self.delegate aiMouseSendRecordData:data];
+    if ([DeviceManger shared].appType == 2 || [DeviceManger shared].appType == 4) {
+        [self.voiceData appendData:data];
+        if (self.voiceData.length > 5000) {
+            if (self.delegate)  [self.delegate aiMouseSendRecordData:self.voiceData];
+            self.voiceData = [[NSMutableData alloc] init];
+        }
+    }
+    else{
+        if (self.delegate)  [self.delegate aiMouseSendRecordData:data];
+    }
 }
 - (void)sendCmdData:(NSData *)data{
     [self showLog:[NSString stringWithFormat:@"[send] %@",data]];
@@ -334,6 +356,7 @@
 - (void)startRecord{
 //    [self showLog:@"开始录音"];
     [self.recordManager start];
+    self.voiceData = [[NSMutableData alloc] init];
 }
 
 - (void)stopRecord:(BOOL)sendCmd{
@@ -348,7 +371,7 @@
 
 
 - (void)sendToBle:(NSData *)data{
-    [self showLog:[NSString stringWithFormat:@"[send][info][byte] %@",[AiMouseTools dataToHexString:data]]];
+    [self showLog:[NSString stringWithFormat:@"[send][info] %@",[AiMouseTools dataToHexString:data]]];
     if (self.delegate) {
         [self.delegate aiMouseSendDeviceInfoData:data];
     };

diff --git a/MouseSdk/AiMouseSdk/ByteDance/ByteDanceSdk.m b/MouseSdk/AiMouseSdk/ByteDance/ByteDanceSdk.m
index 34b33bf..1d436d9 100644 (file)
--- a/MouseSdk/AiMouseSdk/ByteDance/ByteDanceSdk.m
+++ b/MouseSdk/AiMouseSdk/ByteDance/ByteDanceSdk.m
@@ -35,7 +35,8 @@
 - (void)initSdk{
     [[LogManager shared] addLog:@"开始初始化"];
     stb_app_printf_str_register(cus_printf_str);
-    NSString *appId = @"tis_test";
+//    NSString *appId = @"tis_test";
+    NSString *appId = @"app_10dyx2ai21r2qkar";
     int code = stb_app_init([appId UTF8String]);
     stb_app_event_callback_register(cust_event_callback_func);
     stb_app_send_data_to_device_register(cus_hal_send_data2device);
@@ -46,9 +47,6 @@
     self.byteDanceAuthInfoCallback = complete;
     self.info = [[ByteDanceInfo alloc] init];
     stb_app_start_identify();
-//        [self sendCmdToBle:@{@"cmd":@"set_config",
-//                                  @"set_VMouse_MAC":@"C0:34:56:78:AB:6D"
-//                                }];
 }
 
 - (void)sendToSdk:(NSData *)data{
@@ -193,19 +191,21 @@ static void cust_event_callback_func(uint32_t type,uint8_t *report, uint32_t dat
 
 int32_t STB_STDCALL cus_hal_send_data2device(uint8_t* data, uint32_t len)
 {
-    
-//    dispatch_async(dispatch_get_main_queue(), ^{
+//    if ([[AiMouseTools dataToHexString_placeholder:[[NSData alloc] initWithBytes:data length:len]] hasPrefix:@"07"]) {
+//        NSData *data = [AiMouseTools hexStringToData:@"2D2424073137333532303432363434313624242D0A"];
+//        [[AiMouse shared] sendToBle:data];
+//        return 0;
+//    }
         NSData *cmdData = [[NSData alloc] initWithBytes:data length:len];
         [[LogManager shared] addLog:[NSString stringWithFormat:@"send_data2device = %@",[AiMouseTools dataToHexString_placeholder:cmdData]]];
         NSMutableData *fullData = [[NSMutableData alloc] init];
         
         uint8_t head[] = { 0x2d, 0x24, 0x24};
-        uint8_t tail[] = {0x24, 0x24,0x2d};
+        uint8_t tail[] = {0x24, 0x24,0x2d,0x0a};
         [fullData appendBytes:&head length:3];
         [fullData appendData:cmdData];
         [fullData appendBytes:&tail length:3];
         [[AiMouse shared] sendToBle:fullData];
-//    });
     return 0;
 }
 

diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index 729411f..515307e 100644 (file)
--- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
+++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
@@ -59,7 +59,7 @@
 - (void)initSdk:(int)appType{
     _appType = appType;
     
-    NSString *version = @"MouseSdk_v2024122601";
+    NSString *version = @"MouseSdk_v2024122602";
     NSLog(@"[AiMouseSdk] %@",version);
     NSLog(@"[AiMouseSdk] %d",appType);
     [self showLog:version];

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate
index fe3057a..56de63c 100644 (file)
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 6f99efd..11b513f 100644 (file)
--- a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/yaozuopan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -20,5 +20,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "29B61A37-1C91-4041-B4D4-6808C309F66F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "510"
+            endingLineNumber = "510"
+            landmarkName = "-sendCmdToBle:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

diff --git a/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist b/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
index 8988d3e..c230d1a 100644 (file)
--- a/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/MouseSdk/Pods/Pods.xcodeproj/xcuserdata/yaozuopan.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
                <key>Masonry.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>4</integer>
+                       <integer>2</integer>
                </dict>
                <key>Pods-MouseSdk.xcscheme_^#shared#^_</key>
                <dict>