diff --git a/Ifish/Info.plist b/Ifish/Info.plist index ce20b9b..1e929c4 100644 --- a/Ifish/Info.plist +++ b/Ifish/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 9.9.11 + 9.9.13 ITSAppUsesNonExemptEncryption LSApplicationCategoryType @@ -379,7 +379,7 @@ NSLocationWhenInUseUsageDescription 为获取爱鱼奇智能硬件产品及用户的地址区域分布,以提供更好的特色服务,爱鱼奇将获取您的地址 NSMicrophoneUsageDescription - 爱鱼奇需要您的同意,才能访问麦克风,以便于使用语音对讲等功能 + 爱鱼奇需要您的同意,才能访问麦克风,以便于使用语音等功能 NSPhotoLibraryUsageDescription 爱鱼奇需要您的同意,才能访问相册,以使用更换头像等图片上传功能 UIBackgroundModes diff --git a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m index 434bacd..ad7b230 100644 --- a/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m +++ b/Ifish/controllers/IfishTabControllers/探索/lookafterWorkbech/ShopKanHuP2PViewController.m @@ -40,6 +40,7 @@ self.isVideoModeHD = NO; _isReject=YES; _isStop = NO; + _isConnectCamera = NO; _isconnecting = NO; [self addTitleViewWithTitle:@"看护"]; [self connectDevice]; @@ -1187,7 +1188,6 @@ case SWITCH_SCREEN_BUTTON_H_TAG://切换至横屏或者竖屏 { if (![self.player isPlaying]) { - //第一次成功渲染图像前,不可以切换至横屏 return; } diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m index b3b5116..d22d0f0 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/IfishP2PMonitorController.m @@ -288,7 +288,6 @@ Strong UIImage *screenShotImage;//截图 }else{ NSLog(@"p2pConnect failure.失败,不能操作设备"); dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self.view makeToast:@"连接失败"]; [self hiddenMonitoringUI:NO callWithErrorType:GWP2PCallErrorNone isReCall:NO]; }); } @@ -1873,13 +1872,8 @@ Strong UIImage *screenShotImage;//截图 [resolutionButton setBackgroundImage:LXImageWithImageName(@"ic_ctl_resolution.png") forState:UIControlStateNormal]; [resolutionButton addTarget:self action:@selector(selectResolutionClick:) forControlEvents:UIControlEventTouchUpInside]; - //暂时隐藏只选择高清 现在又放出来了 [bottomBarView addSubview:resolutionButton]; - - //全屏暂停回来 openGlView 出现问题scale改变? - - //右边的切换屏幕图标 TouchButton *switchScreenButton = [self getBottomBarButton]; [switchScreenButton setFrame:CGRectMake(width-CONTROLLER_BTN_H_W-5.0, (BOTTOM_BAR_HEIGHT-CONTROLLER_BTN_H_W)/2.0, CONTROLLER_BTN_H_W, CONTROLLER_BTN_H_W)]; @@ -1887,7 +1881,6 @@ Strong UIImage *screenShotImage;//截图 [switchScreenButton setBackgroundImage:LXImageWithImageName(@"monitor_half_screen.png") forState:UIControlStateNormal]; [switchScreenButton addTarget:self action:@selector(onVerticalBtnPress:) forControlEvents:UIControlEventTouchUpInside]; [bottomBarView addSubview:switchScreenButton]; - //右边的挂断图标 TouchButton *hungUpButton = [self getBottomBarButton]; [hungUpButton setFrame:CGRectMake(switchScreenButton.frame.origin.x-CONTROLLER_BTN_H_W-5.0, (BOTTOM_BAR_HEIGHT-CONTROLLER_BTN_H_W)/2.0, CONTROLLER_BTN_H_W, CONTROLLER_BTN_H_W)]; diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm index fff0a6f..478acc3 100644 --- a/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm +++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeControlller/YooseeNextConnectViewController.mm @@ -40,12 +40,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { @interface YooseeNextConnectViewController () { void *_context; - BOOL _bQuit; - BOOL _bInitWif; - BOOL _initPwSuc;//初始化密码是否成功 - - int _soundInitCode; - } @property (strong,nonatomic) NSMutableDictionary *addresses; @@ -71,7 +65,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { - (void)viewDidLoad { [super viewDidLoad]; //智能联机 - _initPwSuc = NO; _isDeviceLinkIn = NO; self.conectType = conectType_Intelligent; self.addresses = [[NSMutableDictionary alloc] initWithCapacity:1]; @@ -122,16 +115,11 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil]; - _bQuit = YES; - self.isWaiting = NO;//isWaiting is NO - self.isFinish = YES; - self.isRun = NO; [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink]; } -(void)viewWillAppear:(BOOL)animated{ [super viewWillAppear:animated]; - _bQuit = NO; } -(void)viewDidAppear:(BOOL)animated{ [super viewDidAppear:animated]; @@ -361,7 +349,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { [self savePassw]; //声波智能联机 [self smartLinkConnect]; - self.isFinish = NO; } } } @@ -375,7 +362,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) { [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink]; [self connectNormalView]; [self.view makeToast:@"WiFi连接失败"]; - } + } }); [[GWP2PDeviceLinker shareInstance] p2pSmartLinkDeviceWithWiFiSSID:weakSelf.wifiName password:weakSelf.wifiPwd useSimpleConfig:YES deviceLinkIn:^(NSDictionary *deviceDict) { NSLog(@"声波配网成功,返回数据:%@",deviceDict);