Build版本号V9.9.13,把麦克风权限添加上

This commit is contained in:
wbzhan 2019-07-23 19:50:27 +08:00
parent e5c41967ab
commit 21e643a821
4 changed files with 4 additions and 24 deletions

View File

@ -70,7 +70,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>9.9.11</string> <string>9.9.13</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
@ -379,7 +379,7 @@
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>为获取爱鱼奇智能硬件产品及用户的地址区域分布,以提供更好的特色服务,爱鱼奇将获取您的地址</string> <string>为获取爱鱼奇智能硬件产品及用户的地址区域分布,以提供更好的特色服务,爱鱼奇将获取您的地址</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>爱鱼奇需要您的同意,才能访问麦克风,以便于使用语音对讲等功能</string> <string>爱鱼奇需要您的同意,才能访问麦克风,以便于使用语音等功能</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>爱鱼奇需要您的同意,才能访问相册,以使用更换头像等图片上传功能</string> <string>爱鱼奇需要您的同意,才能访问相册,以使用更换头像等图片上传功能</string>
<key>UIBackgroundModes</key> <key>UIBackgroundModes</key>

View File

@ -40,6 +40,7 @@
self.isVideoModeHD = NO; self.isVideoModeHD = NO;
_isReject=YES; _isReject=YES;
_isStop = NO; _isStop = NO;
_isConnectCamera = NO;
_isconnecting = NO; _isconnecting = NO;
[self addTitleViewWithTitle:@"看护"]; [self addTitleViewWithTitle:@"看护"];
[self connectDevice]; [self connectDevice];
@ -1187,7 +1188,6 @@
case SWITCH_SCREEN_BUTTON_H_TAG:// case SWITCH_SCREEN_BUTTON_H_TAG://
{ {
if (![self.player isPlaying]) { if (![self.player isPlaying]) {
//
return; return;
} }

View File

@ -288,7 +288,6 @@ Strong UIImage *screenShotImage;//截图
}else{ }else{
NSLog(@"p2pConnect failure.失败,不能操作设备"); NSLog(@"p2pConnect failure.失败,不能操作设备");
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ 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]; [self hiddenMonitoringUI:NO callWithErrorType:GWP2PCallErrorNone isReCall:NO];
}); });
} }
@ -1873,13 +1872,8 @@ Strong UIImage *screenShotImage;//截图
[resolutionButton setBackgroundImage:LXImageWithImageName(@"ic_ctl_resolution.png") forState:UIControlStateNormal]; [resolutionButton setBackgroundImage:LXImageWithImageName(@"ic_ctl_resolution.png") forState:UIControlStateNormal];
[resolutionButton addTarget:self action:@selector(selectResolutionClick:) forControlEvents:UIControlEventTouchUpInside]; [resolutionButton addTarget:self action:@selector(selectResolutionClick:) forControlEvents:UIControlEventTouchUpInside];
// //
[bottomBarView addSubview:resolutionButton]; [bottomBarView addSubview:resolutionButton];
// openGlView scale
// //
TouchButton *switchScreenButton = [self getBottomBarButton]; 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)]; [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 setBackgroundImage:LXImageWithImageName(@"monitor_half_screen.png") forState:UIControlStateNormal];
[switchScreenButton addTarget:self action:@selector(onVerticalBtnPress:) forControlEvents:UIControlEventTouchUpInside]; [switchScreenButton addTarget:self action:@selector(onVerticalBtnPress:) forControlEvents:UIControlEventTouchUpInside];
[bottomBarView addSubview:switchScreenButton]; [bottomBarView addSubview:switchScreenButton];
// //
TouchButton *hungUpButton = [self getBottomBarButton]; 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)]; [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)];

View File

@ -40,12 +40,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
@interface YooseeNextConnectViewController ()<UITextFieldDelegate,UIAlertViewDelegate> @interface YooseeNextConnectViewController ()<UITextFieldDelegate,UIAlertViewDelegate>
{ {
void *_context; void *_context;
BOOL _bQuit;
BOOL _bInitWif;
BOOL _initPwSuc;//初始化密码是否成功
int _soundInitCode;
} }
@property (strong,nonatomic) NSMutableDictionary *addresses; @property (strong,nonatomic) NSMutableDictionary *addresses;
@ -71,7 +65,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
//智能联机 //智能联机
_initPwSuc = NO;
_isDeviceLinkIn = NO; _isDeviceLinkIn = NO;
self.conectType = conectType_Intelligent; self.conectType = conectType_Intelligent;
self.addresses = [[NSMutableDictionary alloc] initWithCapacity:1]; 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:UIKeyboardWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification 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]; [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink];
} }
-(void)viewWillAppear:(BOOL)animated{ -(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated]; [super viewWillAppear:animated];
_bQuit = NO;
} }
-(void)viewDidAppear:(BOOL)animated{ -(void)viewDidAppear:(BOOL)animated{
[super viewDidAppear:animated]; [super viewDidAppear:animated];
@ -361,7 +349,6 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
[self savePassw]; [self savePassw];
//声波智能联机 //声波智能联机
[self smartLinkConnect]; [self smartLinkConnect];
self.isFinish = NO;
} }
} }
} }
@ -375,7 +362,7 @@ typedef NS_ENUM(NSInteger,lodingViewdissMissStyle) {
[[GWP2PDeviceLinker shareInstance] p2pStopSmartLink]; [[GWP2PDeviceLinker shareInstance] p2pStopSmartLink];
[self connectNormalView]; [self connectNormalView];
[self.view makeToast:@"WiFi连接失败"]; [self.view makeToast:@"WiFi连接失败"];
} }
}); });
[[GWP2PDeviceLinker shareInstance] p2pSmartLinkDeviceWithWiFiSSID:weakSelf.wifiName password:weakSelf.wifiPwd useSimpleConfig:YES deviceLinkIn:^(NSDictionary *deviceDict) { [[GWP2PDeviceLinker shareInstance] p2pSmartLinkDeviceWithWiFiSSID:weakSelf.wifiName password:weakSelf.wifiPwd useSimpleConfig:YES deviceLinkIn:^(NSDictionary *deviceDict) {
NSLog(@"声波配网成功,返回数据:%@",deviceDict); NSLog(@"声波配网成功,返回数据:%@",deviceDict);