富瑞坤接口调试

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 777154a..7c282ad 100644 (file)
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/MouseSdk/MouseSdk/Ble/BleManager.m b/MouseSdk/MouseSdk/Ble/BleManager.m
index 8e74ed6..d9e1747 100644 (file)
--- a/MouseSdk/MouseSdk/Ble/BleManager.m
+++ b/MouseSdk/MouseSdk/Ble/BleManager.m
@@ -473,7 +473,7 @@
     [self performSelector:@selector(autoConnectDevice) withObject:nil afterDelay:10];
 }
 - (void)showLog:(NSString *)log{
-    NSLog(@"%@",log);
+//    NSLog(@"%@",log);
 }
 
 //将录音数据保存

diff --git a/MouseSdk/MouseSdk/Ble/HidManager.m b/MouseSdk/MouseSdk/Ble/HidManager.m
index 32de6e7..5680d1f 100644 (file)
--- a/MouseSdk/MouseSdk/Ble/HidManager.m
+++ b/MouseSdk/MouseSdk/Ble/HidManager.m
@@ -357,7 +357,7 @@ static void hidReceiveData(void* context, IOReturn result, void* sender, IOHIDRe
 }
 
 - (void)showLog:(NSString *)log{
-    NSLog(@"%@",log);
+//    NSLog(@"%@",log);
 }
 
 /// 实际到数据长度

diff --git a/MouseSdk/MouseSdk/FrkVC.m b/MouseSdk/MouseSdk/FrkVC.m
index 47ee21c..1d32bd2 100644 (file)
--- a/MouseSdk/MouseSdk/FrkVC.m
+++ b/MouseSdk/MouseSdk/FrkVC.m
@@ -70,6 +70,15 @@
         btn.state = 1;
         [self.view addSubview:btn];
     }
+    {
+        NSButton *btn = [[NSButton alloc]initWithFrame:NSMakeRect(50, self.view.bounds.size.height - 280, 100, 45)];
+        btn.bordered = true;
+        btn.title = @"更多指令";
+        [btn setTarget:self];
+        [btn setAction:@selector(moreAction:)];
+        btn.state = 1;
+        [self.view addSubview:btn];
+    }
     {
         NSTextField *label = [[NSTextField alloc] initWithFrame:CGRectMake(180, self.view.bounds.size.height - 80, 300, 35)];
         label.editable = NO;
@@ -164,7 +173,57 @@
 //        [ws connectStateDidChange:type connectState:isConnected];
 //    };
     
-    NSLog(@"当前连接类型 = %ld",[manager getCurrentConnectType]);
+    [manager begainMonitorAiMouseConnectStateDidChange:@"VMouse" callBack:^(int connectType, BOOL connected) {
+        [ws connectStateDidChange:connectType connectState:connected];
+    }];
 }
 
+- (void)moreAction:(NSButton *)sender {
+    NSMenu *popupMenu = [[NSMenu alloc] initWithTitle:@"Popup Menu"];
+    NSMenuItem *item1 = [[NSMenuItem alloc] initWithTitle:@"语音开启" action:@selector(voiceStart:) keyEquivalent:@"1"];
+    NSMenuItem *item2 = [[NSMenuItem alloc] initWithTitle:@"语音停止" action:@selector(voiceStop:) keyEquivalent:@"2"];
+    NSMenuItem *item3 = [[NSMenuItem alloc] initWithTitle:@"设置DPI" action:@selector(setDPI:) keyEquivalent:@"3"];
+    NSMenuItem *item4 = [[NSMenuItem alloc] initWithTitle:@"鼠标状态查询" action:@selector(searchState:) keyEquivalent:@"3"];
+
+    [popupMenu addItem:item1];
+    [popupMenu addItem:item2];
+    [popupMenu addItem:item3];
+    [popupMenu addItem:item4];
+
+    NSPoint buttonLocation = [sender convertPoint:NSZeroPoint toView:self.view];
+    [popupMenu popUpMenuPositioningItem:nil atLocation:buttonLocation inView:self.view];
+}
+
+- (void)voiceStart:(NSMenuItem*)sender {
+    [[DeviceManger shared] openRecord:^(BOOL isSuccess, NSError * _Nonnull error) {
+        
+    }];
+}
+- (void)voiceStop:(NSMenuItem*)sender {
+    [[DeviceManger shared] closeRecord:^(BOOL isSuccess, NSError * _Nonnull error) {
+        
+    }];
+}
+- (void)setDPI:(NSMenuItem*)sender {
+    [[DeviceManger shared] setCPI:2 completation:^(BOOL isSuccess, NSError * _Nonnull error) {
+        
+    }];
+}
+- (void)searchState:(NSMenuItem*)sender {
+    [[DeviceManger shared] getDeviceInfo:^(AiMouseDeviceInfo *deviceInfo, NSError *error) {
+        if (deviceInfo) {
+            NSString *info = deviceInfo.description;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.deviceInfoLabel.stringValue = info;
+            });
+        }
+        else{
+            NSString *info = [NSString stringWithFormat:@"error == %@",error.description];
+            NSLog(@"%@",info);
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.deviceInfoLabel.stringValue = info;
+            });
+        }
+    }];
+}
 @end