Преглед на файлове

1.缓存设备信息,在无网络情况下可以进入云机

huangxiaodong преди 3 месеца
родител
ревизия
3878ceb971

+ 14 - 12
创维盒子/code/Class/Calculator/CalculatorViewController.m

@@ -406,7 +406,7 @@
         
                 if ([desPwdStr isEqualToString:text]){
                     HLog(@"输入密码正确")
-                    
+                    CGFloat needDelayedTime = 0.01;
                     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
                     {
                         //[[iToast makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)] show];
@@ -414,19 +414,21 @@
                         [view show];
                         [self.view addSubview:view];
                         
+                        needDelayedTime = 2.0;
                         //return;
                     }
-                    
-                    ksharedAppDelegate.isFirstInputPwdDone = YES;
-                    ksharedAppDelegate.isDidShowPwdType = NO;
-                    [self.view removeFromSuperview];
-                    //被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
-                    if(![webRtcManager shareManager].isWaitShowLogoutAlert){
-                        [[webRtcManager shareManager] beginToLinkWebRtcFun];
-                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                            [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
-                        });
-                    }
+                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(needDelayedTime * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                        ksharedAppDelegate.isFirstInputPwdDone = YES;
+                        ksharedAppDelegate.isDidShowPwdType = NO;
+                        [self.view removeFromSuperview];
+                        //被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
+                        if(![webRtcManager shareManager].isWaitShowLogoutAlert){
+                            [[webRtcManager shareManager] beginToLinkWebRtcFun];
+                            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
+                            });
+                        }
+                    });
                 }
 
         }

+ 14 - 13
创维盒子/code/Class/Controller/HWWebViewController.m

@@ -350,27 +350,28 @@
                     if ([desPwdStr isEqualToString:text]){
                         
                         HLog(@"输入密码正确")
-                        
+                        CGFloat needDelayedTime = 0.01;
                         if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
                         {
                             //[[iToast makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)] show];
                             customToastVew *view = [customToastVew makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)];
                             [view show];
                             [self.view addSubview:view];
-                            
+                            needDelayedTime = 2.0;
                             //return;
                         }
-                        
-                        ksharedAppDelegate.isFirstInputPwdDone = YES;
-                        ksharedAppDelegate.isDidShowPwdType = NO;
-                        [self.view removeFromSuperview];
-                        //被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
-                        if(![webRtcManager shareManager].isWaitShowLogoutAlert){
-                            [[webRtcManager shareManager] beginToLinkWebRtcFun];
-                            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                                [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
-                            });
-                        }
+                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(needDelayedTime * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                            ksharedAppDelegate.isFirstInputPwdDone = YES;
+                            ksharedAppDelegate.isDidShowPwdType = NO;
+                            [self.view removeFromSuperview];
+                            //被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
+                            if(![webRtcManager shareManager].isWaitShowLogoutAlert){
+                                [[webRtcManager shareManager] beginToLinkWebRtcFun];
+                                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                                    [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
+                                });
+                            }
+                        });
                     }
                     else if([text isEqualToString:keyToForgetPwd]){
                         [[NSNotificationCenter defaultCenter] postNotificationName:forgetPwdNotification object:nil];

+ 21 - 18
创维盒子/code/Class/Guide/inputPWDViewController.m

@@ -523,33 +523,36 @@
         return;
     }
     
+    CGFloat needDelayedTime = 0.01;
     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
     {
         //[[iToast makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)] show];
         customToastVew *view = [customToastVew makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)];
         [view show];
         [self.view addSubview:view];
-        
+        needDelayedTime = 2.0;
         //return;
     }
     
-    ksharedAppDelegate.isFirstInputPwdDone = YES;
-    ksharedAppDelegate.isDidShowPwdType = NO;
-    
-    if(_isQRCodeType){
-        [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
-    }
-   
-    //非隐私模式被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
-    if(![webRtcManager shareManager].isWaitShowLogoutAlert){
-        [[webRtcManager shareManager] beginToLinkWebRtcFun];
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
-        });
-    }
-    
-    //view 加载在windows上
-    [self.view removeFromSuperview];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(needDelayedTime * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        ksharedAppDelegate.isFirstInputPwdDone = YES;
+        ksharedAppDelegate.isDidShowPwdType = NO;
+        
+        if(self->_isQRCodeType){
+            [[NSNotificationCenter defaultCenter] postNotificationName:GuideOkNotification object:nil];
+        }
+       
+        //非隐私模式被别的设备挤下线 重新链接 如果是链接中 走这个函数会被return
+        if(![webRtcManager shareManager].isWaitShowLogoutAlert){
+            [[webRtcManager shareManager] beginToLinkWebRtcFun];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter] postNotificationName:didInputPWDNotification object:nil];
+            });
+        }
+        
+        //view 加载在windows上
+        [self.view removeFromSuperview];
+    });
     
 }