|
|
@@ -653,13 +653,13 @@
|
|
|
#pragma mark 忘记密码返回
|
|
|
- (void)forgetPwdBackFun:(NSNotification*)not
|
|
|
{
|
|
|
- if(_preRootPlayerNav)
|
|
|
- {
|
|
|
- self.window.rootViewController = _preRootPlayerNav;
|
|
|
- }
|
|
|
- else{
|
|
|
+// if(_preRootPlayerNav)
|
|
|
+// {
|
|
|
+// self.window.rootViewController = _preRootPlayerNav;
|
|
|
+// }
|
|
|
+// else{
|
|
|
[self enterMainVCFromScene];
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
[self showCalculatorVC];
|
|
|
}
|
|
|
@@ -667,17 +667,17 @@
|
|
|
#pragma mark 忘记密码设置密码完成
|
|
|
- (void)forgetPwdDidSetPwdFun:(NSNotification*)not
|
|
|
{
|
|
|
- if(_preRootPlayerNav)
|
|
|
- {
|
|
|
- NSArray *vcArr = _preRootPlayerNav.viewControllers;
|
|
|
- if(vcArr.count > 2){
|
|
|
- [_preRootPlayerNav popToViewController:vcArr[1] animated:NO];
|
|
|
- }
|
|
|
- self.window.rootViewController = _preRootPlayerNav;
|
|
|
- }
|
|
|
- else{
|
|
|
+// if(_preRootPlayerNav)
|
|
|
+// {
|
|
|
+// NSArray *vcArr = _preRootPlayerNav.viewControllers;
|
|
|
+// if(vcArr.count > 2){
|
|
|
+// [_preRootPlayerNav popToViewController:vcArr[1] animated:NO];
|
|
|
+// }
|
|
|
+// self.window.rootViewController = _preRootPlayerNav;
|
|
|
+// }
|
|
|
+// else{
|
|
|
[self enterMainVCFromScene];
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
[self closeCalculatorVC];
|
|
|
|
|
|
@@ -701,13 +701,13 @@
|
|
|
#pragma mark 扫码切换设备点击返回
|
|
|
- (void)scanChangeDeviceBackFun:(NSNotification*)not
|
|
|
{
|
|
|
- if(_preRootPlayerNav)
|
|
|
- {
|
|
|
- self.window.rootViewController = _preRootPlayerNav;
|
|
|
- }
|
|
|
- else{
|
|
|
+// if(_preRootPlayerNav)
|
|
|
+// {
|
|
|
+// self.window.rootViewController = _preRootPlayerNav;
|
|
|
+// }
|
|
|
+// else{
|
|
|
[self enterMainVCFromScene];
|
|
|
- }
|
|
|
+ // }
|
|
|
|
|
|
[self showCalculatorVC];
|
|
|
}
|