Sfoglia il codice sorgente

1.镜像升级、云机重启、云机恢复出厂过程中不弹云手机连接失败弹窗

huangxiaodong 3 mesi fa
parent
commit
328c6848bb

+ 2 - 0
创维盒子/code/AppDelegate/AppDelegate.h

@@ -65,5 +65,7 @@
 
 #pragma mark 监听网络变化
 -(void)MonitorNetworkChangesFun;
+
+- (BOOL)didShowImageRenewViewFun;
 @end
 

+ 19 - 0
创维盒子/code/AppDelegate/AppDelegate.m

@@ -23,6 +23,10 @@
 #import <WebRTC/AMediaStream.h>
 #import "pingManager.h"
 #import "nasUploadFileManager.h"
+#import "imageVersionRenewTipView.h"
+#import "imageVersionUpdateDoneView.h"
+#import "imageVersionUpdateFailView.h"
+
 
 @interface AppDelegate ()<JJExceptionHandle,WXApiDelegate>
 {
@@ -485,4 +489,19 @@
     [SDImageCache sharedImageCache].config.diskCacheReadingOptions = NSDataReadingMappedIfSafe;
 }
 
+
+- (BOOL)didShowImageRenewViewFun{
+    
+    NSArray *subViews = ksharedAppDelegate.window.subviews;
+    
+    for (UIView*view in subViews) {
+        if([view isKindOfClass:[imageVersionRenewTipView class]]
+           ||[view isKindOfClass:[imageVersionUpdateDoneView class]]
+           ||[view isKindOfClass:[imageVersionUpdateFailView class]]){
+            return YES;
+        }
+    }
+
+    return NO;
+}
 @end

+ 4 - 1
创维盒子/code/NAS/NASViewController.m

@@ -1004,7 +1004,10 @@
 - (void)checkBoxHeartbeatFun
 {
     
-    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
+       ||[webRtcManager shareManager].isResetingType
+       ||[webRtcManager shareManager].isRebootIngType
+       || [ksharedAppDelegate didShowImageRenewViewFun]){
         return;
     }
     

+ 4 - 1
创维盒子/code/webRtc/webRtcManager/webRtcManager.m

@@ -1080,7 +1080,10 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
-    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
+       ||[webRtcManager shareManager].isResetingType
+       ||[webRtcManager shareManager].isRebootIngType
+       || [ksharedAppDelegate didShowImageRenewViewFun]){
         return;
     }
     

+ 4 - 1
创维盒子/code/webRtc/webRtcPlayerViewController.m

@@ -1480,7 +1480,10 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
-    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType
+       ||[webRtcManager shareManager].isResetingType
+       ||[webRtcManager shareManager].isRebootIngType
+       || [ksharedAppDelegate didShowImageRenewViewFun]){
         return;
     }