From: liangzhenying <867174124@qq.com> Date: Fri, 30 Aug 2024 08:57:07 +0000 (+0800) Subject: 代码整理 X-Git-Tag: 千寻适配d9~23 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=d261e6133942443467b2254ef48b12cfb08df5bb;p=mirrors%2FMouseSdk-MacOS.git 代码整理 --- diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj index f9e5424..80bc4e4 100644 --- a/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj +++ b/MouseSdk/AiMouseSdk/AiMouseSdk.xcodeproj/project.pbxproj @@ -188,11 +188,9 @@ 18862A222C8064E300D3564D /* DeviceManger.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A182C8064E300D3564D /* DeviceManger.h */; settings = {ATTRIBUTES = (Public, ); }; }; 18862A232C8064E300D3564D /* HidManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A192C8064E300D3564D /* HidManager.m */; }; 18862A242C8064E300D3564D /* TimerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A1A2C8064E300D3564D /* TimerManager.h */; }; - 18862A252C8064E300D3564D /* DeviceManager2.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A1B2C8064E300D3564D /* DeviceManager2.h */; }; 18862A262C8064E300D3564D /* BleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A1C2C8064E300D3564D /* BleManager.h */; }; 18862A272C8064E300D3564D /* DeviceManger.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A1D2C8064E300D3564D /* DeviceManger.m */; }; 18862A282C8064E300D3564D /* BleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A1E2C8064E300D3564D /* BleManager.m */; }; - 18862A292C8064E300D3564D /* DeviceManager2.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A1F2C8064E300D3564D /* DeviceManager2.m */; }; 18862A2A2C8064E300D3564D /* TimerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A202C8064E300D3564D /* TimerManager.m */; }; 18862A2B2C8064E300D3564D /* HidManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A212C8064E300D3564D /* HidManager.h */; }; 18862B0C2C806BD900D3564D /* avdct.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C742BD8FC4E008558E8 /* avdct.h */; }; @@ -251,7 +249,6 @@ 18862B412C806BD900D3564D /* swresample.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C7B2BD8FC4E008558E8 /* swresample.h */; }; 18862B422C806BD900D3564D /* buffersrc.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7BFA2BD8FC4E008558E8 /* buffersrc.h */; }; 18862B432C806BD900D3564D /* avformat.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C5C2BD8FC4E008558E8 /* avformat.h */; }; - 18862B442C806BD900D3564D /* DeviceManager2.h in Headers */ = {isa = PBXBuildFile; fileRef = 18862A1B2C8064E300D3564D /* DeviceManager2.h */; }; 18862B452C806BD900D3564D /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C082BD8FC4E008558E8 /* version.h */; }; 18862B462C806BD900D3564D /* ffversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C1E2BD8FC4E008558E8 /* ffversion.h */; }; 18862B472C806BD900D3564D /* intreadwrite.h in Headers */ = {isa = PBXBuildFile; fileRef = 180E7C532BD8FC4E008558E8 /* intreadwrite.h */; }; @@ -359,7 +356,6 @@ 18862BAE2C806BD900D3564D /* AiMouseAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FCA3962C7F2AD100C44A37 /* AiMouseAuth.m */; }; 18862BAF2C806BD900D3564D /* TimerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A202C8064E300D3564D /* TimerManager.m */; }; 18862BB02C806BD900D3564D /* HidManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A192C8064E300D3564D /* HidManager.m */; }; - 18862BB12C806BD900D3564D /* DeviceManager2.m in Sources */ = {isa = PBXBuildFile; fileRef = 18862A1F2C8064E300D3564D /* DeviceManager2.m */; }; 18862BB22C806BD900D3564D /* AiMouseTools2.m in Sources */ = {isa = PBXBuildFile; fileRef = 180E7B4F2BD7BD81008558E8 /* AiMouseTools2.m */; }; 18862BB32C806BD900D3564D /* AiSecretModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 184A71232BDE2DA60025A332 /* AiSecretModel.m */; }; 18862BB42C806BD900D3564D /* AiSender.m in Sources */ = {isa = PBXBuildFile; fileRef = 18AD83282BFB22DE009BDE3B /* AiSender.m */; }; @@ -585,6 +581,7 @@ 180E7D102BD8FF11008558E8 /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; }; 180E7D122BD8FF3A008558E8 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; 180E7D142BD8FF5C008558E8 /* liblzma.5.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = liblzma.5.tbd; path = usr/lib/liblzma.5.tbd; sourceTree = SDKROOT; }; + 181272BA2C81BF460046CCF2 /* libAiMouseSdk copy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libAiMouseSdk copy.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 181CE5BF2C6EED9900EF8D07 /* AiAliAuthManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AiAliAuthManager.h; sourceTree = ""; }; 181CE5C02C6EED9900EF8D07 /* AiAliAuthManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AiAliAuthManager.m; sourceTree = ""; }; 184A70F42BDA4C040025A332 /* AFSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFSecurityPolicy.h; sourceTree = ""; }; @@ -608,14 +605,11 @@ 18862A182C8064E300D3564D /* DeviceManger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceManger.h; sourceTree = ""; }; 18862A192C8064E300D3564D /* HidManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HidManager.m; sourceTree = ""; }; 18862A1A2C8064E300D3564D /* TimerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimerManager.h; sourceTree = ""; }; - 18862A1B2C8064E300D3564D /* DeviceManager2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceManager2.h; sourceTree = ""; }; 18862A1C2C8064E300D3564D /* BleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BleManager.h; sourceTree = ""; }; 18862A1D2C8064E300D3564D /* DeviceManger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceManger.m; sourceTree = ""; }; 18862A1E2C8064E300D3564D /* BleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BleManager.m; sourceTree = ""; }; - 18862A1F2C8064E300D3564D /* DeviceManager2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DeviceManager2.m; sourceTree = ""; }; 18862A202C8064E300D3564D /* TimerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimerManager.m; sourceTree = ""; }; 18862A212C8064E300D3564D /* HidManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HidManager.h; sourceTree = ""; }; - 18862BE12C806BD900D3564D /* libAiMouseSdk copy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libAiMouseSdk copy.a"; path = "/Users/apple/Desktop/code/MouseSdk-MacOS/MouseSdk/AiMouseSdk/build/Debug/libAiMouseSdk copy.a"; sourceTree = ""; }; 189C15842C05726600676A80 /* AiConnectManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AiConnectManager.h; sourceTree = ""; }; 189C15852C05726600676A80 /* AiConnectManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AiConnectManager.m; sourceTree = ""; }; 18AD83232BFAE8B9009BDE3B /* AiDeviceInfoManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AiDeviceInfoManager.h; sourceTree = ""; }; @@ -690,6 +684,7 @@ 180E7AA82BD7BB12008558E8 /* AiMouseSdk */, 180E7AA72BD7BB12008558E8 /* Products */, 180E7D092BD8FEB2008558E8 /* Frameworks */, + 181272BA2C81BF460046CCF2 /* libAiMouseSdk copy.a */, ); sourceTree = ""; }; @@ -1000,8 +995,6 @@ 18862A1E2C8064E300D3564D /* BleManager.m */, 18862A1A2C8064E300D3564D /* TimerManager.h */, 18862A202C8064E300D3564D /* TimerManager.m */, - 18862A1F2C8064E300D3564D /* DeviceManager2.m */, - 18862A1B2C8064E300D3564D /* DeviceManager2.h */, ); path = Manager; sourceTree = ""; @@ -1088,7 +1081,6 @@ 180E7D002BD8FC4F008558E8 /* swresample.h in Headers */, 180E7C852BD8FC4E008558E8 /* buffersrc.h in Headers */, 180E7CE42BD8FC4E008558E8 /* avformat.h in Headers */, - 18862A252C8064E300D3564D /* DeviceManager2.h in Headers */, 180E7C922BD8FC4E008558E8 /* version.h in Headers */, 180E7CA82BD8FC4E008558E8 /* ffversion.h in Headers */, 180E7CDD2BD8FC4E008558E8 /* intreadwrite.h in Headers */, @@ -1256,7 +1248,6 @@ 18862B412C806BD900D3564D /* swresample.h in Headers */, 18862B422C806BD900D3564D /* buffersrc.h in Headers */, 18862B432C806BD900D3564D /* avformat.h in Headers */, - 18862B442C806BD900D3564D /* DeviceManager2.h in Headers */, 18862B452C806BD900D3564D /* version.h in Headers */, 18862B462C806BD900D3564D /* ffversion.h in Headers */, 18862B472C806BD900D3564D /* intreadwrite.h in Headers */, @@ -1398,7 +1389,7 @@ ); name = "AiMouseSdk copy"; productName = AiMouseSdk; - productReference = 18862BE12C806BD900D3564D /* libAiMouseSdk copy.a */; + productReference = 181272BA2C81BF460046CCF2 /* libAiMouseSdk copy.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -1442,7 +1433,6 @@ 18FCA3982C7F2AD100C44A37 /* AiMouseAuth.m in Sources */, 18862A2A2C8064E300D3564D /* TimerManager.m in Sources */, 18862A232C8064E300D3564D /* HidManager.m in Sources */, - 18862A292C8064E300D3564D /* DeviceManager2.m in Sources */, 180E7BE52BD7BD84008558E8 /* AiMouseTools2.m in Sources */, 184A71252BDE2DA60025A332 /* AiSecretModel.m in Sources */, 18AD832A2BFB22DE009BDE3B /* AiSender.m in Sources */, @@ -1483,7 +1473,6 @@ 18862BAE2C806BD900D3564D /* AiMouseAuth.m in Sources */, 18862BAF2C806BD900D3564D /* TimerManager.m in Sources */, 18862BB02C806BD900D3564D /* HidManager.m in Sources */, - 18862BB12C806BD900D3564D /* DeviceManager2.m in Sources */, 18862BB22C806BD900D3564D /* AiMouseTools2.m in Sources */, 18862BB32C806BD900D3564D /* AiSecretModel.m in Sources */, 18862BB42C806BD900D3564D /* AiSender.m in Sources */, diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManager2.h b/MouseSdk/AiMouseSdk/Manager/DeviceManager2.h deleted file mode 100644 index cee9bb6..0000000 --- a/MouseSdk/AiMouseSdk/Manager/DeviceManager2.h +++ /dev/null @@ -1,127 +0,0 @@ -//// -//// DeviceManger.h -//// MouseSdk -//// -//// Created by incar on 2024/3/30. -//// -// -//#import -//#import "AiMouseSdk.h" -// -//NS_ASSUME_NONNULL_BEGIN -// -/////用于connectStateCallBack的connectState -//#define connectState_Success @"success" -//#define connectState_Fail @"fail" -// -//@interface DeviceManger : NSObject -// -//@property (nonatomic, readonly) AiMouseConnectType connectType;//连接类型 -//#pragma mark ------- 鼠标的回调 -//@property (nonatomic,strong)void (^authCallBack)(BOOL isSuccess);/// 鉴权回调 -//@property (nonatomic, copy)void (^aiMouseSendDeviceInfoDataCallBack)(NSString *data);/// 设备信息数据回调 -//@property (nonatomic, copy)void (^aiMouseSendCmdDataCallBack)(NSString *data);/// 鼠标按键指令回调 -/////录音相关 -//@property (nonatomic, copy)void (^begainRecoredCallBack)(void);/// 录音开始回调 -//@property (nonatomic, copy)void (^recordingCallBack)(NSString *data);/// 录音进行中回调 -//@property (nonatomic, copy)void (^finishRecoredCallBack)(NSString *data);/// 录音结束回调 -/////其他 -//@property (nonatomic, copy)void (^aiMouseAddLogCallBack)(NSString *log);///输出日志 -// -// -//#pragma mark ------- 接口 -/////单例 -//+(DeviceManger *)shared; -// -/////当前设置的连接类型：@"0"表示蓝牙；@"1"表示USB； -//- (NSString *)getCurrentConnectType; -// -/////开始监听鼠标的链接状态 -//- (void)begainMonitorAiMouseConnectStateDidChange:(NSString *)mouseName callBack:(void(^)(int connectType, BOOL connected))callBack; -// -////#pragma mark ------- 蓝牙的开始连接 -/////// 根据蓝牙设备名称直连蓝牙设备 超时时间15s -/////// - Parameter bleName: 设备名 -////- (void)connectBleDeviceWithName:(NSString *)bleName; -///////断开蓝牙设备链接 -////- (void)disconnectBleDevice:(void(^)(BOOL isSuccess))result; -//// -////#pragma mark ------- USB的开始连接 -///////开始尝试连接usb 超时时间15s -////- (void)connectHidDevice; -// -// -//#pragma mark ------- 共用 -///// 获取设备信息 -//- (void)getDeviceInfo:(void (^)(AiMouseDeviceInfo *deviceInfo,NSError *error))completation; -// -///// 获取信号强度 -//- (void)getRSSI:(void (^)(NSString *value,NSError *error))completation; -// -/////设置CPI值 -/////value: AiMouseDeviceInfo 中可以设置的值CPI_list -//- (void)setCPI:(NSInteger)value completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 设置品牌名称 -///// - Parameters: -///// - value: 品牌名称 -///// - finished: 设置结果回调 -//- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///////开始鉴权 -////-(void)startAuthentication; -// -/////// 开始鉴权 -////- (void)startAuthentication:(void (^)(BOOL isSuccess))completation; -// -///// 设置录音模式 -///// - Parameters: -///// - value: 0:常规模式，按按键打开关闭录音 1:命令模式，发命令打开关闭录音 -///// - finished: 设置结果回调 -//- (void)setRecordMode:(int)mode completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 设置长按滚轮弹出的网页地址 -///// - Parameters: -///// - url: 最大长度:49字节 -///// - finished: 设置结果回调 -//- (void)setUrl:(NSString *)url completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 设置长按滚轮弹出网页开关 -///// - Parameters: -///// - state: 0关闭，1打开 -///// - finished: 设置结果回调 -//- (void)setUrlState:(int)state completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 设置鼠标连接模式 -///// - Parameters: -///// - mode: 0:2.4G模式，1:蓝牙1模式，2:蓝牙2模式 -///// - finished: 设置结果回调 -//- (void)setMouseMode:(int)mode completation:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 获取录音模式 -///// - Parameter complete: mode 0:常规模式，按按键打开关闭录音 1:命令模式，发命令打开关闭录音 。error为nil才代表获取成功 -//- (void)getRecordMode:(void (^)(int mode,NSError *error))complete; -// -///// 获取长按滚轮弹出的网页地址 -///// - Parameter complete: url地址 。error为nil才代表获取成功 -//- (void)getUrl:(void (^)(NSString *url,NSError *error))complete; -// -///// 获取长按滚轮弹出的网页地址开关状态 -///// - Parameter complete: state 0关闭，1打开。 error为nil才代表获取成功 -//- (void)getUrlState:(void (^)(int state,NSError *error))complete; -// -///// 获取鼠标连接模式 -///// - Parameter complete: mode 0:2.4G模式，1:蓝牙1模式，2:蓝牙2模式 。error为nil才代表获取成功 -//- (void)getMouseModel:(void (^)(int mode,NSError *error))complete; -// -///// 打开录音 -///// - finished: 执行结果回调 -//- (void)openRecord:(void (^)(BOOL isSuccess,NSError *error))finished; -// -///// 关闭录音 -///// - finished: 执行结果回调 -//- (void)closeRecord:(void (^)(BOOL isSuccess,NSError *error))finished; -// -//@end -// -//NS_ASSUME_NONNULL_END diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManager2.m b/MouseSdk/AiMouseSdk/Manager/DeviceManager2.m deleted file mode 100644 index e49a962..0000000 --- a/MouseSdk/AiMouseSdk/Manager/DeviceManager2.m +++ /dev/null @@ -1,328 +0,0 @@ -//// -//// DeviceManger.m -//// MouseSdk -//// -//// Created by incar on 2024/3/30. -//// -// -//#import "DeviceManger.h" -//#import "HidManager.h" -//#import "BleManager.h" -// -//@interface DeviceManger() -// -//@property (nonatomic,strong) BleManager *ble; -//@property (nonatomic,strong) HidManager *hid; -// -////connectType 返回为0代表蓝牙，为1代表usb -//@property (nonatomic, copy)void (^aiMouseConnectStateDidChangeCallBack)(int connectType, BOOL connected);/// 设备连接状态回调 -// -//@end -// -//@implementation DeviceManger -//+(DeviceManger *)shared{ -// static DeviceManger *manager = nil; -// static dispatch_once_t oncePredicate; -// dispatch_once(&oncePredicate, ^{ -// -// [[AiMouse shared] setLogLevel:(AiMouseLogLevel_info)]; -// manager = [[DeviceManger alloc]init]; -// -// }); -// return manager; -//} -// -//- (instancetype)init{ -// self = [super init]; -// if (self) { -// [self setupBle]; -// [self setupHid]; -// -// //先默认设置蓝牙管理对象为鼠标 -// [[AiMouse shared] setDelegate:self.ble]; -// } -// return self; -//} -// -//-(AiMouseConnectType)connectType{ -// return [AiMouse shared].connectType; -//} -// -// -//- (NSString *)getCurrentConnectType { -// if ([AiMouse shared].connectType == AiMouseConnectType_bluetooth) { -// return @"0"; -// } -// else { -// return @"1"; -// } -//} -// -////- (void)switchConnect:(AiMouseConnectType)type{ -//// [[AiMouse shared] switchConnect:type]; -//// -//// if ([AiMouse shared].connectType == AiMouseConnectType_bluetooth) { -//// [self setupBle]; -//// [AiMouse shared].delegate = self.ble; -//// } -//// else{ -//// [self setupHid]; -//// [AiMouse shared].delegate = self.hid; -//// } -////} -// -//#pragma mark ------ 设备连接相关 -//- (void)begainMonitorAiMouseConnectStateDidChange:(NSString *)mouseName callBack:(void(^)(int connectType, BOOL connected))callBack{ -// self.aiMouseConnectStateDidChangeCallBack = callBack; -// [self.ble connectBleDeviceWithName:mouseName]; -// -//} -//- (void)connectBleDeviceWithName:(NSString *)bleName { -//// //初始化蓝牙 -//// [self setupBle]; -// [self.ble connectBleDeviceWithName:bleName]; -//} -// -////断开蓝牙设备链接 -//- (void)disconnectBleDevice:(void(^)(BOOL isSuccess))result { -// [self.ble disconnectBleDevice:result]; -//} -// -// -//- (void)connectHidDevice { -//// //初始化hid -//// [self setupHid]; -// [self.hid connectHidDevice]; -//} -// -//#pragma mark ------ 设备初始化 -//- (void)setupHid{ -// self.hid = [HidManager shared]; -// __weak typeof(self) ws = self; -// -// self.hid.authCallBack = ^(BOOL isSuccess) { -// if(ws.authCallBack)ws.authCallBack(isSuccess); -// }; -// self.hid.aiMouseConnectStateDidChangeCallBack = ^(BOOL connected) { -// if (ws.aiMouseConnectStateDidChangeCallBack) { -// ws.aiMouseConnectStateDidChangeCallBack(AiMouseConnectType_hid,connected); -// } -// //连接失败时，重新初始化USB监听 -// if (!connected) { -// [ws.hid close]; -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// [ws.hid open]; -// }); -// } -// }; -// -// self.hid.aiMouseSendCmdDataCallBack = ^(NSString * _Nonnull data) { -// if(ws.aiMouseSendCmdDataCallBack){ -// ws.aiMouseSendCmdDataCallBack(data); -// } -// }; -// -// self.hid.aiMouseSendDeviceInfoDataCallBack = ^(NSData * _Nonnull data) { -// if (ws.aiMouseSendDeviceInfoDataCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.aiMouseSendDeviceInfoDataCallBack(base64String); -// } -// }; -// self.hid.begainRecoredCallBack = ^{ -// if (ws.begainRecoredCallBack) { -// ws.begainRecoredCallBack(); -// } -// }; -// -// self.hid.recordingCallBack = ^(NSData *data) { -// if (ws.recordingCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.recordingCallBack(base64String); -// } -// }; -// -// self.hid.finishRecoredCallBack = ^(NSData * _Nonnull data) { -// if (ws.finishRecoredCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.finishRecoredCallBack(base64String); -// } -// }; -// -// self.hid.aiMouseAddLogCallBack = ^(NSString * _Nonnull log) { -// if (ws.aiMouseAddLogCallBack) { -// ws.aiMouseAddLogCallBack(log); -// } -// }; -//} -// -//- (void)setupBle{ -// self.ble = [BleManager shared]; -// __weak typeof(self) ws = self; -// -// self.ble.authCallBack = ^(BOOL isSuccess) { -// if(ws.authCallBack)ws.authCallBack(isSuccess); -// }; -// -// self.ble.aiMouseConnectStateDidChangeCallBack = ^(BOOL connected) { -// if (ws.aiMouseConnectStateDidChangeCallBack) { -// ws.aiMouseConnectStateDidChangeCallBack(AiMouseConnectType_bluetooth,connected); -// } -// -// //蓝牙连接失败，重新初始化USB监听 -// if (!connected) { -// [ws.hid close]; -// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ -// [ws.hid open]; -// }); -// } -// }; -// -// self.ble.aiMouseSendCmdDataCallBack = ^(NSString * _Nonnull data) { -// if(ws.aiMouseSendCmdDataCallBack){ -// ws.aiMouseSendCmdDataCallBack(data); -// } -// }; -// -// self.ble.aiMouseSendDeviceInfoDataCallBack = ^(NSData * _Nonnull data) { -// if (ws.aiMouseSendDeviceInfoDataCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.aiMouseSendDeviceInfoDataCallBack(base64String); -// } -// }; -// -// self.ble.begainRecoredCallBack = ^{ -// if (ws.begainRecoredCallBack) { -// ws.begainRecoredCallBack(); -// } -// }; -// -// self.ble.recordingCallBack = ^(NSData *data) { -// if (ws.recordingCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.recordingCallBack(base64String); -// } -// }; -// -// self.ble.finishRecoredCallBack = ^(NSData * _Nonnull data) { -// if (ws.finishRecoredCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// ws.finishRecoredCallBack(base64String); -// } -// }; -// -// self.ble.aiMouseAddLogCallBack = ^(NSString * _Nonnull log) { -// if (ws.aiMouseAddLogCallBack) { -// ws.aiMouseAddLogCallBack(log); -// } -// }; -//} -// -// -//#pragma mark ------ 设备相关接口 -/////获取设备信息 -//- (void)getDeviceInfo:(void (^)(AiMouseDeviceInfo *deviceInfo,NSError *error))completation{ -//// if ([AiMouse shared].connectType == AiMouseConnectType_bluetooth) { -//// [self.ble getDeviceInfo:completation]; -//// } -//// else{ -//// [self.hid getDeviceInfo:completation]; -//// } -// [[AiMouse shared] getDeviceInfo:completation]; -//} -// -///// 获取信号强度 -//- (void)getRSSI:(void (^)(NSString *value,NSError *error))completation{ -//// if ([AiMouse shared].connectType == AiMouseConnectType_bluetooth) { -//// [self.ble getRSSI:completation]; -//// } -//// else{ -//// [self.hid getRSSI:completation]; -//// } -// [[AiMouse shared] getRSSI:completation]; -//} -// -///// 设置CPI -//- (void)setCPI:(NSInteger)value completation:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] setCPI:value completation:finished]; -//} -// -///// 设置品牌名称 -///// - Parameters: -///// - value: 品牌名称 -///// - finished: 设置结果回调 -//- (void)setBrand:(NSString *)brand completation:(void (^)(BOOL isSuccess,NSError *error))finished { -// [[AiMouse shared] setBrand:brand completation:finished]; -//} -// -///////设备鉴权 -////-(void)startAuthentication { -//// if ([AiMouse shared].connectType == AiMouseConnectType_bluetooth) { -//// [self.ble startAuthentication]; -//// } -//// else{ -//// [self.hid startAuthentication]; -//// } -////} -//// -////- (void)startAuthentication:(void (^)(BOOL isSuccess))completation { -//// self.authCallBack = completation; -//// //设备鉴权 -//// [self startAuthentication]; -////} -// -///// 设置录音模式 -//- (void)setRecordMode:(int)mode completation:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] setRecordMode:mode completation:finished]; -//} -// -///// 设置长按滚轮弹出的网页地址 -//- (void)setUrl:(NSString *)url completation:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] setUrl:url completation:finished]; -//} -// -///// 设置长按滚轮弹出网页开关 -//- (void)setUrlState:(int)state completation:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] setUrlState:state completation:finished]; -//} -// -///// 设置鼠标连接模式 -//- (void)setMouseMode:(int)mode completation:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] setMouseMode:mode completation:finished]; -//} -// -///// 获取录音模式 -//- (void)getRecordMode:(void (^)(int mode,NSError *error))complete{ -// [[AiMouse shared] getRecordMode:complete]; -//} -// -///// 获取长按滚轮弹出的网页地址 -//- (void)getUrl:(void (^)(NSString *url,NSError *error))complete{ -// [[AiMouse shared] getUrl:complete]; -//} -// -///// 获取长按滚轮弹出的网页地址开关状态 -//- (void)getUrlState:(void (^)(int state,NSError *error))complete{ -// [[AiMouse shared] getUrlState:complete]; -//} -// -///// 获取鼠标连接模式 -//- (void)getMouseModel:(void (^)(int mode,NSError *error))complete{ -// [[AiMouse shared] getMouseModel:complete]; -//} -// -///// 打开录音 -//- (void)openRecord:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] openRecord:finished]; -//} -// -///// 关闭录音 -//- (void)closeRecord:(void (^)(BOOL isSuccess,NSError *error))finished{ -// [[AiMouse shared] closeRecord:finished]; -//} -//@end diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m index af81c90..eafcbfd 100644 --- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m +++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m @@ -11,10 +11,7 @@ #import "TlwMouseSdk.h" #import "TimerManager.h" - - @interface DeviceManger() - @property (nonatomic, strong) AiMouseDeviceInfo *deviceInfo; @property (nonatomic,strong) NSMutableData *recordData;//录音的数据 @property (nonatomic,strong) BleManager *ble; @@ -408,12 +405,6 @@ else if (self.tlwSdk.connectType == AiMouseConnectType_hid){ [self.hid writeToDevice:data]; } - -// if (self.aiMouseSendDeviceInfoDataCallBack) { -// // 将NSData转换为Base64编码的字符串 -// NSString *base64String = [data base64EncodedStringWithOptions:0]; -// self.aiMouseSendDeviceInfoDataCallBack(base64String); -// } } /// 鼠标按键指令回调 diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index 33c219b..510a2d2 100644 Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ