瀏覽代碼

1.云手机模式 并且云机横屏状态bug修复

huangxiaodong 11 月之前
父節點
當前提交
9dabf2ac27

+ 3 - 0
创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -157,4 +157,7 @@
 /* ping 完后重连*/
 #define didPingBestWebRtcIPRoomNotification                 @"didPingBestWebRtcIPRoomNot"
 
+/* 需要退出云手机界面*/
+#define needToPoPCloudPhoneVCNotification                 @"needToPoPCloudPhoneVCNot"
+
 #endif /* Notification_h */

+ 7 - 4
创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.m

@@ -32,8 +32,9 @@
     
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(369.f);
-        make.width.mas_equalTo(323.f*AUTOSCALE);
-        make.centerY.mas_equalTo(-40.f);
+        //make.width.mas_equalTo(323.f*AUTOSCALE);
+        make.width.mas_equalTo(323.f);
+        make.centerY.mas_equalTo(0.f);
         make.centerX.mas_equalTo(0.f);
     }];
     
@@ -42,8 +43,10 @@
     [_whiteBgView addSubview:topImage];
     
     [topImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(244*AUTOSCALE);
-        make.width.mas_equalTo(323.f*AUTOSCALE);
+//        make.height.mas_equalTo(244*AUTOSCALE);
+//        make.width.mas_equalTo(323.f*AUTOSCALE);
+        make.height.mas_equalTo(244);
+        make.width.mas_equalTo(323.f);
         make.left.mas_equalTo(0.f);
         make.top.mas_equalTo(-40.f);
     }];

+ 31 - 11
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -86,7 +86,14 @@
     
     [self drawAnyView];
     
-    [self beginShowAlertFun];
+    CGFloat second = 0.1;
+    BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_cloudPhone_Model_Open];
+    if(haveOpenMask){
+        second = 5;
+    }
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(second * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self beginShowAlertFun];
+    });
 }
 
 - (void)drawAnyView{
@@ -1005,20 +1012,33 @@
         return;
     }
     
-    RenewTipView = [[imageVersionRenewTipView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [ksharedAppDelegate.window addSubview:RenewTipView];
-    RenewTipView.status = _otaUpgradeInfoModel.data.status;
+    BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_cloudPhone_Model_Open];
+    CGFloat second = 0.1;
     
-    //[self.view bringSubviewToFront:RenewTipView];
+    if(haveOpenMask){
+        second = 1.5;
+        [[NSNotificationCenter defaultCenter] postNotificationName:needToPoPCloudPhoneVCNotification object:nil];
+    }
     
     KWeakSelf
-    RenewTipView.didClickUpdateNowFun = ^{
-        [weakSelf otaUpdateNowFun];
-    };
     
-    RenewTipView.didClickCloseFun = ^{
-        [weakSelf didClickRenewTipViewCloseFun];
-    };
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(second * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        self->RenewTipView = [[imageVersionRenewTipView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+        [ksharedAppDelegate.window addSubview:self->RenewTipView];
+        self->RenewTipView.status = self->_otaUpgradeInfoModel.data.status;
+        //[self.view bringSubviewToFront:RenewTipView];
+        
+        
+        self->RenewTipView.didClickUpdateNowFun = ^{
+            [weakSelf otaUpdateNowFun];
+        };
+        
+        self->RenewTipView.didClickCloseFun = ^{
+            [weakSelf didClickRenewTipViewCloseFun];
+        };
+    });
+    
+   
 }
 
 - (void)didClickRenewTipViewCloseFun{