From: liangzhenying <867174124@qq.com>
Date: Tue, 3 Dec 2024 01:51:32 +0000 (+0800)
Subject: 获取设备信息新增返回产品类型
X-Git-Tag: 威鼠泰凌微电池电量版本优化~3
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6cc8a4d656b0d4acbc9d5f200987e053191ad5ed;p=mirrors%2FMouseSdk-MacOS.git

获取设备信息新增返回产品类型
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index 988ead4..ec17664 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -262,6 +262,7 @@
         return;
     }
     self.deviceInfo = [[AiMouseDeviceInfo alloc] init];
+    self.deviceInfo.type = 0;
     self.deviceInfoBlock = complete;
     [self sendDeviceInfoCmd:@{kCmd_Key:@"get_battery_power"}];
 }
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
index f5da3e7..e0ff37e 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
@@ -8,6 +8,8 @@
 #import <Foundation/Foundation.h>
 
 @interface AiMouseDeviceInfo : NSObject
+@property (nonatomic, assign) int type;/// 产品类型，0鼠标，1键盘
+
 @property (nonatomic, strong) NSString *battery_power;/// 电池百分百电量,0-100
 @property (nonatomic, strong) NSString *CPI;/// CPI值
 @property (nonatomic, strong) NSString *CPI_list;/// 可设置的CPI参数列表
diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 0134e32..b95a2e4 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -28,7 +28,7 @@
 -(NSString *)description{
 //    NSString *info = [NSString stringWithFormat:@"\n battery_power = %@\n CPI = %@\n CPI_list = %@\n version = %@\n brand = %@\n sn = %@\n mac = %@\n productKey = %@\n secretKey = %@\n deviceSecret = %@ \n record_mode = %@ \n mouse_mode = %@ \n url = %@ \n urlActive = %@ ",self.battery_power,self.CPI,self.CPI_list,self.version,self.brand,self.sn,self.mac,self.productKey,self.secretKey,self.deviceSecret,self.record_mode,self.mouse_mode,self.url,self.urlActive];
     
-    NSString *info = [NSString stringWithFormat:@"\n battery_power = %@\n CPI = %@\n CPI_list = %@\n version = %@\n brand = %@\n sn = %@\n mac = %@\n productKey = %@\n secretKey = %@\n deviceSecret = %@ ",self.battery_power,self.CPI,self.CPI_list,self.version,self.brand,self.sn,self.mac,self.productKey,self.secretKey,self.deviceSecret];
+    NSString *info = [NSString stringWithFormat:@"\n type = %d \n battery_power = %@\n CPI = %@\n CPI_list = %@\n version = %@\n brand = %@\n sn = %@\n mac = %@\n productKey = %@\n secretKey = %@\n deviceSecret = %@ ",self.type,self.battery_power,self.CPI,self.CPI_list,self.version,self.brand,self.sn,self.mac,self.productKey,self.secretKey,self.deviceSecret];
     return info;
 }
 @end
diff --git a/MouseSdk/AiMouseSdk/Keyboard/KeyboardSdk.m b/MouseSdk/AiMouseSdk/Keyboard/KeyboardSdk.m
index a5c96ca..9f05824 100644
--- a/MouseSdk/AiMouseSdk/Keyboard/KeyboardSdk.m
+++ b/MouseSdk/AiMouseSdk/Keyboard/KeyboardSdk.m
@@ -121,6 +121,7 @@
     self.getDeviceInfoCallBack = finished;
     
     self.deviceInfo = [[AiMouseDeviceInfo alloc] init];
+    self.deviceInfo.type = 1;
     self.deviceInfo.battery_power = @"0";
     self.deviceInfo.CPI = @"1200";
     self.deviceInfo.CPI_list = @"1200,1600,2400,4800";
diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
index 582374f..c68ab58 100644
--- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
+++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m
@@ -45,7 +45,7 @@
 - (instancetype)init{
     self = [super init];
     if (self) {
-        NSString *version = @"MouseSdk_v2024112003";
+        NSString *version = @"MouseSdk_v2024112004";
         NSLog(@"[AiMouseSdk] %@",version);
         [self showLog:version];;
         [self setupSDK];
diff --git a/MouseSdk/AiMouseSdk/NMouseSdk/NMouseSdk.m b/MouseSdk/AiMouseSdk/NMouseSdk/NMouseSdk.m
index dcbdf1d..256b66e 100644
--- a/MouseSdk/AiMouseSdk/NMouseSdk/NMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/NMouseSdk/NMouseSdk.m
@@ -136,6 +136,7 @@
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
     self.getDeviceInfoCallBack = finished;
     self.deviceInfo = [[AiMouseDeviceInfo alloc] init];
+    self.deviceInfo.type = 0;
     self.deviceInfo.battery_power = @"0";
     self.deviceInfo.CPI = @"1200";
     self.deviceInfo.CPI_list = @"1200,1600,2400,4800";
diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
index 606835a..099c255 100644
--- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m
@@ -331,6 +331,7 @@
             }
             
             AiMouseDeviceInfo *info = [[AiMouseDeviceInfo alloc] init];
+            info.type = 0;
             info.battery_power = [NSString stringWithFormat:@"%d",deviceInfo.batteryValue] ;
             info.version = [NSString stringWithFormat:@"%d",deviceInfo.version];
             info.CPI_list = CPI_list;
diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index e949bf7..83cf893 100644
Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ