From: liangzhenying <867174124@qq.com> Date: Wed, 30 Oct 2024 09:17:48 +0000 (+0800) Subject: 泰凌微新增设置网址开关 X-Git-Tag: 千寻适配d9~7 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ed4345fd8c5080a6b7185c397f1b019197c43060;p=mirrors%2FMouseSdk-MacOS.git 泰凌微新增设置网址开关 --- diff --git a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m index 2f3ab4b..c1c8902 100644 --- a/MouseSdk/AiMouseSdk/Manager/DeviceManger.m +++ b/MouseSdk/AiMouseSdk/Manager/DeviceManger.m @@ -42,7 +42,8 @@ - (instancetype)init{ self = [super init]; if (self) { - [self showLog:@"MouseSdk_v1.0.7"]; + NSLog(@"[AiMouseSdk] %@",@"MouseSdk_v1.0.8"); + [self showLog:@"MouseSdk_v1.0.8"]; [self setupSDK]; [self setupBle]; [self setupHid]; @@ -331,7 +332,8 @@ return; } if (self.productType == AiMouseProductType_tlw) { - finished(false,[NSError errorWithDomain:@"AiMouse SDK Error" code:AiMouseErrorCode_unknown userInfo:@{@"NSLocalizedDescriptionKey":@"当前鼠标不支持该接口"}]); +// finished(false,[NSError errorWithDomain:@"AiMouse SDK Error" code:AiMouseErrorCode_unknown userInfo:@{@"NSLocalizedDescriptionKey":@"当前鼠标不支持该接口"}]); + [self.tlwSdk setUrlState:state completation:finished]; } else{ [self.frkSdk setUrlState:state completation:finished]; diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h index b6d9289..0dee771 100644 --- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h +++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.h @@ -111,4 +111,10 @@ typedef NS_ENUM(NSInteger,TlwMouseLogLevel) { /// 关闭录音 /// - finished: 执行结果回调 - (void)closeRecord:(void (^)(BOOL isSuccess,NSError *error))finished; + +/// 设置长按滚轮弹出网页开关 +/// - Parameters: +/// - state: 0关闭,1打开 +/// - finished: 设置结果回调 +- (void)setUrlState:(int)state completation:(void (^)(BOOL isSuccess,NSError *error))finished; @end diff --git a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m index eaf2bc0..4e5166f 100644 --- a/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m +++ b/MouseSdk/AiMouseSdk/TlwMouseSdk/TlwMouseSdk.m @@ -56,7 +56,7 @@ } -(NSString *)version{ - return @"1.0.1"; + return @"1.0.2"; } -(TlwAudioManager *)audioManager{ @@ -354,6 +354,14 @@ }]; } + +/// 设置长按滚轮弹出网页开关 +/// - Parameters: +/// - state: 0关闭,1打开 +/// - finished: 设置结果回调 +- (void)setUrlState:(int)state completation:(void (^)(BOOL isSuccess,NSError *error))finished{ + +} #pragma mark - check dongle - (void)checkDongleState{ self.dongleTimes = 0; diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index 974ad7e..b917472 100644 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/ViewController.m b/MouseSdk/MouseSdk/ViewController.m index 4f1c465..be41ad4 100644 --- a/MouseSdk/MouseSdk/ViewController.m +++ b/MouseSdk/MouseSdk/ViewController.m @@ -126,12 +126,14 @@ 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"]; + NSMenuItem *item4 = [[NSMenuItem alloc] initWithTitle:@"鼠标状态查询" action:@selector(searchState:) keyEquivalent:@"4"]; + NSMenuItem *item5 = [[NSMenuItem alloc] initWithTitle:@"设置网址" action:@selector(setUrl:) keyEquivalent:@"5"]; [popupMenu addItem:item1]; [popupMenu addItem:item2]; [popupMenu addItem:item3]; [popupMenu addItem:item4]; + [popupMenu addItem:item5]; NSPoint buttonLocation = [sender convertPoint:NSZeroPoint toView:self.view]; [popupMenu popUpMenuPositioningItem:nil atLocation:buttonLocation inView:self.view]; @@ -155,6 +157,12 @@ - (void)searchState:(NSMenuItem*)sender { [self geviceInfoAction]; } + +- (void)setUrl:(NSMenuItem*)sender{ + [[DeviceManger shared] setUrlState:1 completation:^(BOOL isSuccess, NSError * _Nonnull error) { + NSLog(isSuccess? @"设置网址成功":@"设置网址失败"); + }]; +} - (void)geviceInfoAction{ // [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"x-apple.systempreferences:com.apple.preference.security?Privacy_ListenEvent"]]; // return;