是否激活状态变更
This commit is contained in:
parent
24bb267f97
commit
e8fd85f3dd
|
|
@ -151,16 +151,16 @@ Strong UIImage *screenShotImage;//截图
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// if ([self.contact.isActive isEqualToString:@"1"]) {
|
if ([self.contact.isActive isEqualToString:@"1"]) {
|
||||||
|
|
||||||
[self cameraConnectSeting];
|
[self cameraConnectSeting];
|
||||||
// }else if ([self.contact.isActive isEqualToString:@"0"]){
|
}else if ([self.contact.isActive isEqualToString:@"0"]){
|
||||||
|
|
||||||
// UIAlertView *alert=[[UIAlertView alloc] initWithTitle:@"" message:@"请扫描产品外包装上的激活码来激活摄像头" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"前往扫描", nil];
|
UIAlertView *alert=[[UIAlertView alloc] initWithTitle:@"" message:@"请扫描产品外包装上的激活码来激活摄像头" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"前往扫描", nil];
|
||||||
// alert.tag = WEIJIHUO_ALERT;
|
alert.tag = WEIJIHUO_ALERT;
|
||||||
// [alert show];
|
[alert show];
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
//环境校验
|
//环境校验
|
||||||
-(void)checkNetStatus{
|
-(void)checkNetStatus{
|
||||||
|
|
@ -236,19 +236,19 @@ Strong UIImage *screenShotImage;//截图
|
||||||
_isReject=YES;
|
_isReject=YES;
|
||||||
_isStop = NO;
|
_isStop = NO;
|
||||||
_isPushNextView = NO;
|
_isPushNextView = NO;
|
||||||
// if ([self.contact.isActive isEqualToString:@"1"]) {
|
if ([self.contact.isActive isEqualToString:@"1"]) {
|
||||||
[self connectDevice];
|
[self connectDevice];
|
||||||
// }
|
}
|
||||||
//监控竖屏时,各控件初始化(先)
|
//监控竖屏时,各控件初始化(先)
|
||||||
[self initComponentForPortrait];
|
[self initComponentForPortrait];
|
||||||
//监控横屏时,各控件初始化(后)
|
//监控横屏时,各控件初始化(后)
|
||||||
[self initComponentForHorizontalScreen];
|
[self initComponentForHorizontalScreen];
|
||||||
|
|
||||||
// if ([self.contact.isActive isEqualToString:@"1"]) {
|
if ([self.contact.isActive isEqualToString:@"1"]) {
|
||||||
//
|
|
||||||
// }else{
|
}else{
|
||||||
[self.yProgressView stop];
|
[self.yProgressView stop];
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
#pragma mark --LoadBaseUI
|
#pragma mark --LoadBaseUI
|
||||||
-(UIView *)canvasView{
|
-(UIView *)canvasView{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue