dpi参数修改

diff --git a/Document/Mouse_Dongle通信协议_v1.3.docx b/Document/Mouse_Dongle通信协议_v1.3.docx
new file mode 100644 (file)
index 0000000..f0b8c74
Binary files /dev/null and "b/Document/Mouse_Dongle\351\200\232\344\277\241\345\215\217\350\256\256_v1.3.docx" differ

diff --git a/Document/语音鼠标蓝牙通信接口v2.0.2.docx b/Document/语音鼠标蓝牙通信接口v2.0.2.docx
new file mode 100644 (file)
index 0000000..ea635a2
Binary files /dev/null and "b/Document/\350\257\255\351\237\263\351\274\240\346\240\207\350\223\235\347\211\231\351\200\232\344\277\241\346\216\245\345\217\243v2.0.2.docx" differ

diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index 39aada2..fde7184 100644 (file)
--- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
+++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
@@ -223,10 +223,10 @@
 - (void)setCPI:(NSInteger)value completation:(void (^)(BOOL isSuccess,NSError *error))finished{
     if (self.productType == AiMouseProductType_tlw) {
         NSDictionary *dict = @{
-            @"800":@"1",
-            @"1200":@"2",
-            @"1800":@"3",
-            @"2400":@"4"
+            @"800":@"0",
+            @"1200":@"1",
+            @"1600":@"2",
+            @"2400":@"3",
         };
         
         if (dict[[NSString stringWithFormat:@"%ld",value]]) {
@@ -235,7 +235,7 @@
         }
         else{
             [self showLog:[NSString stringWithFormat:@"CPI值设置错误 %ld",value]];
-            finished(false,[NSError errorWithDomain:@"AiMouse SDK Error" code:AiMouseErrorCode_unknown userInfo:@{@"NSLocalizedDescriptionKey":@"CPI值设置错误"}]);
+            [self.tlwSdk setDPI:0 completation:finished];
         }
     }
     else{
@@ -575,7 +575,7 @@
     if (self.aiMouseAddLogCallBack) {
         self.aiMouseAddLogCallBack(log);
     }
-    NSLog(@"[AiMouseSdk]%@",log);
+//    NSLog(@"[AiMouseSdk]%@",log);
 }
 
 - (void)finishRecored:(NSData *)data{

diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
index 49017f3..d5ab773 100644 (file)
--- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
@@ -292,17 +292,17 @@
     __weak typeof(self) ws = self;
     [self getDeviceInfo:^(TlwDeviceInfo *deviceInfo, NSError *error) {
         if(deviceInfo != nil){
-            NSString *CPI_list = @"800,1200,1800,2400";// 1-4,800 1200 1800 2400
-            NSString *cpi = @"1";
+            NSString *CPI_list = @"800,1200,1600,2400";// 0-3,800 1200 1600 2400
+            NSString *cpi = @"0";
             
-            if ([CPI_list componentsSeparatedByString:@","].count > deviceInfo.DPI - 1) {
-                cpi = [[CPI_list componentsSeparatedByString:@","] objectAtIndex:deviceInfo.DPI - 1];
+            if ([CPI_list componentsSeparatedByString:@","].count - 1 >= deviceInfo.DPI) {
+                cpi = [[CPI_list componentsSeparatedByString:@","] objectAtIndex:deviceInfo.DPI];
             }
             
             AiMouseDeviceInfo *info = [[AiMouseDeviceInfo alloc] init];
             info.battery_power = [NSString stringWithFormat:@"%d",deviceInfo.batteryValue] ;
             info.version = [NSString stringWithFormat:@"%d",deviceInfo.version];
-            info.CPI_list = CPI_list;// 1-4,800 1200 1800 2400
+            info.CPI_list = CPI_list;
             info.CPI = cpi;
             ws.fullInfo = info;
             

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index a19dbeb..9f0e1a7 100644 (file)
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ