Browse Source

1.需求变更:被挤下线 不杀死app

huangxiaodong 7 months ago
parent
commit
022b1cf417

+ 2 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -6159,7 +6159,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6241,7 +6241,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEVELOPMENT_TEAM = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (

+ 1 - 1
创维盒子/双子星云手机/Class/Set/previewFile/audioPlayerViewController.m

@@ -65,7 +65,7 @@
     //数据埋点
     //数据埋点
     [[netWorkManager shareInstance] DataEmbeddingPointBy:4 withEventValue:@"Music_preview"];
     [[netWorkManager shareInstance] DataEmbeddingPointBy:4 withEventValue:@"Music_preview"];
     
     
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(LogoutByOtherFun)  name:logoutByOtherNotification  object:nil];
+    //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(LogoutByOtherFun)  name:logoutByOtherNotification  object:nil];
 }
 }
 
 
 - (void)viewDidAppear:(BOOL)animated
 - (void)viewDidAppear:(BOOL)animated

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

@@ -504,6 +504,12 @@
 #pragma mark 跳转webrtc 页面
 #pragma mark 跳转webrtc 页面
 -  (void)gotoWebRtcVcBy:(webRtcMsgModel*)webRtcMsgMod
 -  (void)gotoWebRtcVcBy:(webRtcMsgModel*)webRtcMsgMod
 {
 {
+    
+    NSArray * vcArrs = self.navigationController.viewControllers;
+    if(vcArrs.count != 1){
+        return;
+    }
+    
     webRtcPlayerViewController *vc = [webRtcPlayerViewController new];
     webRtcPlayerViewController *vc = [webRtcPlayerViewController new];
     vc.webRtcMsgMod = webRtcMsgMod;
     vc.webRtcMsgMod = webRtcMsgMod;
     [self.navigationController pushViewController:vc animated:YES];
     [self.navigationController pushViewController:vc animated:YES];

+ 2 - 2
创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -684,7 +684,7 @@
     //退出推流页
     //退出推流页
     [self.navigationController popViewControllerAnimated:NO];
     [self.navigationController popViewControllerAnimated:NO];
     //与安卓保存一致 tabbar 退倒nas页
     //与安卓保存一致 tabbar 退倒nas页
-    [ksharedAppDelegate.mainTabBar setSelectedIndex:0];
+    //[ksharedAppDelegate.mainTabBar setSelectedIndex:0];
     
     
     [self HandleSomethingByExitVC];
     [self HandleSomethingByExitVC];
     
     
@@ -700,7 +700,7 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:lockBypwdNotification object:nil];
         [[NSNotificationCenter defaultCenter] postNotificationName:lockBypwdNotification object:nil];
         
         
     } didClickCancel:^{
     } didClickCancel:^{
-        exit(0);/*强制退出app*/
+        //exit(0);/*强制退出app*/
     }];
     }];
     logoutAlertVC.modalPresentationStyle = UIModalPresentationCustom;
     logoutAlertVC.modalPresentationStyle = UIModalPresentationCustom;