新增设置品牌接口

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.h b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.h
index e610018..bf2f082 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.h
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.h
@@ -26,6 +26,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// - Parameter completation: 信号强度回调
 - (void)getRSSI:(void (^)(NSString *value,NSError *error))complete;
 
+/// 设置品牌名称
+/// - Parameters:
+///   - value: 品牌名称
+///   - finished: 设置结果回调
+- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished;
 
 /// 设置cpi
 /// - Parameters:

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
index 045fe46..5e54c91 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiDeviceInfoManager.m
@@ -18,6 +18,7 @@
 #define kSetAuthState_Key @"set_activated_dtate"
 #define kSetDeviceSecret_Key @"set_deviceSecret"
 
+#define kSetBrand_Key @"set_brand"
 #define kSetCPI_Key @"set_CPI"
 #define kSetUrl_Key @"set_official_url"
 #define kSetUrlActive_Key @"set_official_url_switch"
@@ -36,6 +37,7 @@
 @property (nonatomic, strong) void (^authBlock)(AiMouseAuthState state);
 @property (nonatomic, strong) AiCmdFinishBlock setDsBlock;
 
+@property (nonatomic, strong) void (^setBrandBlock)(BOOL isSuccess,NSError *error);
 @property (nonatomic, strong) void (^setCPIBlock)(BOOL isSuccess,NSError *error);
 @property (nonatomic, strong) void (^setUrlBlock)(BOOL isSuccess,NSError *error);
 @property (nonatomic, strong) void (^setUrlActiveBlock)(BOOL isSuccess,NSError *error);
@@ -107,6 +109,10 @@
             self.setCPIBlock(true, nil);
             return;
         }
+        if ([sender.sendDict objectForKey:kSetBrand_Key]) {
+            self.setBrandBlock(true, nil);
+            return;
+        }
         if([sender.sendDict objectForKey:kSetDeviceSecret_Key]){
             self.setDsBlock(true);
             return;
@@ -142,6 +148,10 @@
             self.setCPIBlock(false, err);
             return;
         }
+        if ([sender.sendDict objectForKey:kSetBrand_Key]) {
+            self.setBrandBlock(false, err);
+            return;
+        }
         if ([sender.sendDict objectForKey:kSetDeviceSecret_Key]){
             self.setDsBlock(false);
             return;
@@ -271,6 +281,10 @@
     self.getVersionBlock  = finished;
     [self sendDeviceInfoCmd:@{kCmd_Key:@"get_version"}];
 }
+- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished{
+    self.setBrandBlock = finished;
+    [self sendDeviceInfoCmd:@{kCmd_Key:kSetCmd_Value,kSetBrand_Key:brand}];
+}
 - (void)setCPI:(NSInteger)value completation:(void (^)(BOOL isSuccess,NSError *error))finished{
     self.setCPIBlock = finished;
     [self sendDeviceInfoCmd:@{kCmd_Key:kSetCmd_Value,kSetCPI_Key:[NSString stringWithFormat:@"%ld",value]}];
@@ -382,6 +396,10 @@
         self.setCPIBlock(false, err);
         return;
     }
+    if ([sender.sendDict objectForKey:kSetBrand_Key]) {
+        self.setBrandBlock(false, err);
+        return;
+    }
     if ([sender.sendDict objectForKey:kSetDeviceSecret_Key]){
         self.setDsBlock(false);
         return;

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
index ce5bbd0..f2d528b 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.h
@@ -116,6 +116,12 @@ typedef NS_ENUM(NSInteger,AiMouseAuthState) {
 /// - Parameter completation: 信号强度回调,如果获取成功，则value有值，否则为nil
 - (void)getRSSI:(void (^)(NSString *value,NSError *error))complete;
 
+/// 设置品牌名称
+/// - Parameters:
+///   - value: 品牌名称
+///   - finished: 设置结果回调
+- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished;
+
 /// 设置CPI
 /// - Parameters:
 ///   - value: AiMouseDeviceInfo 中可以设置的值CPI_list

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
index 1785a8a..e60f767 100644 (file)
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/AiMouseSdk.m
@@ -255,6 +255,9 @@
 - (void)getRSSI:(void (^)(NSString *value,NSError *error))complete{
     [self.deviceInfoManager getRSSI:complete];
 }
+- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished{
+    [self.deviceInfoManager setBrand:brand completation:finished];
+}
 - (void)setCPI:(NSInteger)value completation:(void (^)(BOOL isSuccess,NSError *error))finished{
     [self.deviceInfoManager setCPI:value completation:finished];
 }

diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate
index 22813d7..3c65619 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/HidManager.m b/MouseSdk/MouseSdk/HidManager.m
index 80f344f..2828240 100644 (file)
--- a/MouseSdk/MouseSdk/HidManager.m
+++ b/MouseSdk/MouseSdk/HidManager.m
@@ -135,9 +135,9 @@ static void hidReceiveData(void* context, IOReturn result, void* sender, IOHIDRe
 /// 设备信息数据回调，需要将此数据通过设备信息特征转发给蓝牙设备
 /// - Parameter data: 数据
 -(void)aiMouseSendDeviceInfoData:(NSData *)data{
-    if([AiMouse shared].connected){
+//    if([AiMouse shared].connected){
         [self sendData:data toDevice:self.deviceInfoCha];
-    }
+//    }
    
 }