瀏覽代碼

开启云机模块后,从NAS模块再点击云机模块,界面显示推流界

huangxiaodong 7 月之前
父節點
當前提交
aacecca491

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

@@ -46,6 +46,7 @@
 @property (nonatomic, assign)BOOL isPlayerScreenLandscapeType;//拉流页面横屏状态
 @property (nonatomic, assign)BOOL supportScreenRotateType;
 
+@property (nonatomic, assign)BOOL isCloudPhoneModeNotPrivacyModeOpenType;//云手机模式 非隐私模式 第一次打开
 @property (nonatomic, assign)BOOL isCloudPhoneModeAndPrivacyModeOpenType;//云手机模式 并且隐私模式 第一次打开
 
 +(AppDelegate*)sharedAppDelegate;

+ 11 - 1
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -515,16 +515,17 @@
     
     BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_cloudPhone_Model_Open];
     if(haveOpenMask){
-        tabBarController.selectedIndex = 1;
         
         //非隐私模式 直接进入推拉流页
         if(ksharedAppDelegate.DeviceThirdIdMod && !ksharedAppDelegate.DeviceThirdIdMod.data.isPrivacyMode){
+            ksharedAppDelegate.isCloudPhoneModeNotPrivacyModeOpenType = YES;
             [cloudVC queryWebRtcMsgFun:YES];
         }
         else{
             ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType = YES;
         }
         
+        tabBarController.selectedIndex = 1;
     }
     
     ksharedAppDelegate.mainTabBar = tabBarController;
@@ -1504,4 +1505,13 @@
     [[netWorkManager shareInstance] DataEmbeddingPointBy:eventType withEventValue:eventValue];
     
 }
+
+- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController
+{
+    if(ksharedAppDelegate.isCloudPhoneModeNotPrivacyModeOpenType
+       || ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType){
+        return  NO;
+    }
+    return  YES;
+}
 @end

+ 5 - 2
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -37,7 +37,6 @@
     
     [self drawAnyView];
     
-    //[self queryWebRtcMsgFun:NO];
 }
 
 - (void)drawAnyView{
@@ -508,6 +507,11 @@
     webRtcPlayerViewController *vc = [webRtcPlayerViewController new];
     vc.webRtcMsgMod = webRtcMsgMod;
     [self.navigationController pushViewController:vc animated:YES];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        ksharedAppDelegate.isCloudPhoneModeNotPrivacyModeOpenType = NO;
+        ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType = NO;
+    });
 }
 
 #pragma mark 输入密码完成
@@ -517,7 +521,6 @@
     mainBlock(^{
         if(ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType){
             [weakSelf queryWebRtcMsgFun:YES];
-            ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType = NO;
         }
     });
 }