|
|
@@ -210,13 +210,25 @@
|
|
|
self.isLoginAgainType = NO;
|
|
|
|
|
|
if(!_isQRCodeType){
|
|
|
- dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
- mainBlock(^{
|
|
|
- [playerRootVC setShowImgAndVoiceTypeFun:NO];
|
|
|
+ __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
|
|
|
+
|
|
|
+ if(isPrivacyMode)
|
|
|
+ {
|
|
|
+ [playerRootVC setShowImgAndVoiceTypeFun:NO];
|
|
|
+ [self showCalculatorVC];
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ [self HandleEnterNotPrivacyModeFun];
|
|
|
+
|
|
|
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
|
+ mainBlock(^{
|
|
|
+ [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
|
|
|
+ playerRootVC.isPwdVCShow = NO;
|
|
|
+ [playerRootVC setShowImgAndVoiceTypeFun:YES];
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
+ }
|
|
|
|
|
|
- [self showCalculatorVC];
|
|
|
_isQRCodeType = NO;
|
|
|
}
|
|
|
else{
|
|
|
@@ -242,6 +254,16 @@
|
|
|
// self.window.rootViewController = playerNav;
|
|
|
}
|
|
|
|
|
|
+#pragma mark 处理进来是非隐私模式的情况
|
|
|
+- (void)HandleEnterNotPrivacyModeFun
|
|
|
+{
|
|
|
+ NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
|
|
|
+ if (maskModel != 0){
|
|
|
+ [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:0];
|
|
|
+ [iTools lc_setAlternateIconName:@"AppIcon1"];
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
- (void)setPwdOk{
|
|
|
[self enterMainVCFromScene];
|
|
|
|
|
|
@@ -445,9 +467,12 @@
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if(![connectDeviceManager shareInstance].DeviceThirdIdMod){
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- BOOL haveOpenMask = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
|
|
|
- if(!haveOpenMask)
|
|
|
+ BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
|
|
|
+ if(!isPrivacyMode)
|
|
|
{
|
|
|
[connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:ShowImgAndVoiceNotification object:nil];
|