pc端扫码登录，确定登录后，返回APP原页面，没有下导航栏。

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

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

创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -151,4 +151,7 @@
 /*设置推流页全屏是否通知*/
 #define setPlayerFullScreenNotification                 @"setPlayerFullScreenNot"
 
+/* PC扫码后*/
+#define PCDidLoginNotification                 @"PCDidLoginNoti"
+
 #endif /* Notification_h */

创维盒子/双子星云手机/Base/Controller/BaseViewController.h

@@ -39,6 +39,10 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark 禁用和开始右滑返回手势
 - (void)enablePanRightBack;
 - (void)noEnablePanRightBack;
+
+#pragma mark Tabbar隐藏或者显示
+- (void)showTabbarFun;
+- (void)hideTabbarFun;
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/mine/PCLoginViewController.m

@@ -151,15 +151,25 @@
             
         }
         
+        [weakSelf showTabbarFunInVC];
         [weakSelf.navigationController popToRootViewControllerAnimated:YES];
         
     } failure:^(NSError * _Nonnull error) {
         if(status == 2){
             [[iToast makeText:NSLocalizedString(@"pc_login_fail_tip",nil)] show];
         }
+        [weakSelf showTabbarFunInVC];
         [weakSelf.navigationController popToRootViewControllerAnimated:YES];
     }];
 }
 
+#pragma mark 修复PC登录后没有tabbar问题
+- (void)showTabbarFunInVC
+{
+    //[self showTabbarFun];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:PCDidLoginNotification object:nil];/*发送通知*/
+}
+
 //"pc_login_ing_tip" = "正在登录中…";
 @end

创维盒子/双子星云手机/mine/mineViewController.m

@@ -41,6 +41,8 @@
     [self.navigationBar setHidden:YES];
     [self.navBarBGView setHidden:YES];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(PCLoginDidPopFun)  name:PCDidLoginNotification  object:nil];
+    
     [self drawAnyView];
 }
 
@@ -605,6 +607,9 @@
     NSInteger tag = but.tag;
     
     if(tag == 100){
+        //test code
+       // [self getPCloginFun];
+        
         scanToPCLoginViewController *nextVC = [scanToPCLoginViewController new];
         [self.navigationController pushViewController:nextVC animated:YES];
     }
@@ -631,10 +636,10 @@
    
     KWeakSelf
     [[netWorkManager shareInstance] CommonGetWithCallBackCode:@"/box/login/addAndGetOne" Parameters:paraDict success:^(id  _Nonnull responseObject){
-//        SuperModel *ShareMarkMod = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
-//        if(ShareMarkMod){
-//            [weakSelf scanToPCloginFunWithID:responseObject[@"data"][@"boxLoginId"]];
-//        }
+        SuperModel *ShareMarkMod = [[SuperModel alloc] initWithDictionary:responseObject error:nil];
+        if(ShareMarkMod){
+            [weakSelf scanToPCloginFunWithID:responseObject[@"data"][@"boxLoginId"]];
+        }
         
     } failure:^(NSError * _Nonnull error) {
     }];
@@ -682,4 +687,12 @@
     nextVC.loginIdString = idStr;
     [self.navigationController pushViewController:nextVC animated:YES];
 }
+#pragma mark Pc登录页面Pop出来
+- (void)PCLoginDidPopFun
+{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self showTabbarFun];
+    });
+}
+
 @end

创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -108,7 +108,7 @@
     
     NSInteger result = [_mediaStream startUploadChannel:url ice:ice sn:roomName token:@"vclusters"];
     
-    HLog(@"result:%ld",result)
+    HLog(@"webrtc 发起连接 result:%ld",result)
     [_mediaStream setShouldGetStats:YES];
 }