未登录不能进入

我的- 收藏已购订单 ,绑定管理, 注销账号首页- 商品详情页退出登录- 到游客首页(暂时到登录页)

未登录不能进入
我的- 收藏已购订单 ,绑定管理, 注销账号首页- 商品详情页退出登录- 到游客首页(暂时到登录页)
张旭
1 parent f4abd0f4
Showing 10 changed files with 221 additions and 49 deletions
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineMineOrderCell.swift
metaCode/Classes/Main/MinePage/View/CNLiveMinePlayHistoryCell.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -101,5 +101,10 @@ extension Notification.Name {
         //电商h5订单支付成功通知
         public static let kDSSuccessPayOrderNotification = Notification.Name("kDSSuccessPayOrderNotification")
     }
-    
+    struct LoginManage{
+        //登录成功通知
+        public static let CNLiveLoginSuccessNotification = Notification.Name("CNLiveLoginSuccessNotification")
+        //退出登录失败通知
+        public static let CNLiveLoginOutNotification = Notification.Name("CNLiveLoginOutNotification")
+    }
 }
@@ -104,6 +104,7 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler,WKUIDelegate
         self.cnWebView.configuration.userContentController.add(self, name: "toShare")
         self.cnWebView.configuration.userContentController.add(self, name: "openAppPayment")
         self.cnWebView.configuration.userContentController.add(self, name: "getStatusHeight")
+        self.cnWebView.configuration.userContentController.add(self, name: "shopLogin")
     }
     func webViewRemoveScriptMessageHandler(){
@@ -111,6 +112,7 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler,WKUIDelegate
         self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "toShare")
         self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "openAppPayment")
         self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "getStatusHeight")
+        self.cnWebView.configuration.userContentController.removeScriptMessageHandler(forName: "shopLogin")
     }
     //电商h5的回调
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
@@ -209,6 +211,14 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler,WKUIDelegate
                     print("JavaScript执行结果: \(result)")
                 }
             }
+        }else if message.name == "shopLogin" {
+            ////电商登录
+            print("\(self.currentUrl)")
+            if metaAppDelegate.isLogin{
+                
+            }else{
+                metaAppDelegate.pushLoginVC()
+            }
         }
     }
     // MARK: - 字典转字符串
@@ -216,7 +226,7 @@ class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler,WKUIDelegate
         guard let json = json else {
             return nil
         }
-          
+        
         do {
             let data = try JSONSerialization.data(withJSONObject: json, options: .prettyPrinted)
             if let string = String(data: data, encoding: .utf8) {
@@ -92,6 +92,12 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = self.isHiddenNavigationBar
+        
+        
+        //登录成功通知
+        NotificationCenter.default.addObserver(self, selector: #selector(CNLiveLoginSuccessNotificationAction), name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+        
+        
         self.view.addSubview(self.webView)
         self.webView.webControllerUpdateNavSoundBlock = {  isSound in
@@ -132,6 +138,12 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             make.left.right.bottom.equalToSuperview()
         }
     }
+    
+    @objc func CNLiveLoginSuccessNotificationAction() {
+        //登录成功
+        self.webView.loadUrl(url: self.url?.absoluteString ?? "")
+    }
+
     func h5StopVideoPlayer(){
         // call h5停止播放视频
@@ -79,7 +79,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         wxButton.addTarget(self, action: #selector(sendWXLoginActionMothod), for: .touchUpInside)
         return wxButton
     }()
-        
+
     lazy var tipLabel: UILabel = {
         let tipLabel = UILabel.init()
         tipLabel.text = "未注册的手机号验证后自动为您创建元码账户"
@@ -89,6 +89,12 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         return tipLabel
     }()
+    lazy var navBackButton: UIButton = {
+        let wxButton = UIButton()
+        wxButton.setImage(UIImage(named: "mine_header_icon_white_back"), for: .normal)
+        wxButton.addTarget(self, action: #selector(ClickBackBtn), for: .touchUpInside)
+        return wxButton
+    }()
     var is_agree : Bool = false //是否同意协议
     var countryCode: String = "86"
@@ -111,6 +117,20 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
             make.height.equalTo(KSreenWidth*250/375)
         }
+        self.view.addSubview(self.navBackButton)
+        self.navBackButton.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.top.equalTo(get_system_nav_height()-10)
+            make.width.equalTo(50)
+            make.height.equalTo(30)
+        }
+        let count = self.navigationController?.viewControllers.count ?? 1
+        if count > 1{
+            self.navBackButton.isHidden = false
+        }else{
+            self.navBackButton.isHidden = true
+        }
+        
         self.setupPhoneView()
         self.setupVeriCodeView()
         self.setupLoginButtonView()
@@ -302,7 +322,8 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         CNLiveLoginViewModel.appleLogin(model: model) { result, status in
             if status == .success{
                 //获取用户信息 /api/identityApi/getUserMsg
-                CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { result, respStatue in
+                CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { [weak self] result, respStatue in
+                    guard let self = self else { return }
                     if respStatue == .success{
                         if let res = result as? MineGetUserMsgUsersModel{
                             let userInfo = UserInfoManager.shared.userInfo
@@ -318,8 +339,15 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                                 UserDefaults.standard.synchronize()
                             }
-                            let window = UIApplication.shared.delegate?.window
-                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                            if self.navBackButton.isHidden{
+                                let window = UIApplication.shared.delegate?.window
+                                window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                            }else{
+                                //发通知
+                                NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+                                metaAppDelegate.isLogin = true
+                                self.navigationController?.popViewController(animated: true)
+                            }
                         }
                     }else{
@@ -432,8 +460,10 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
             if status == .success{
                 //登录成功
                 //获取用户信息 /api/identityApi/getUserMsg
-                CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { result, respStatue in
+                CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) {[weak self] result, respStatue in
+                    guard let self = self else { return }
                     if respStatue == .success{
+                        
                         if let res = result as? MineGetUserMsgUsersModel{
                             let userInfo = UserInfoManager.shared.userInfo
                             userInfo.userMsgUsers = res
@@ -448,9 +478,15 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                                 UserDefaults.standard.synchronize()
                             }
-                            let window = UIApplication.shared.delegate?.window
-                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
-
+                            if self.navBackButton.isHidden{
+                                let window = UIApplication.shared.delegate?.window
+                                window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                            }else{
+                                //发通知
+                                NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+                                metaAppDelegate.isLogin = true
+                                self.navigationController?.popViewController(animated: true)
+                            }
                         }
                     }else{
                         let window = UIApplication.shared.delegate?.window
@@ -463,7 +499,8 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                     if res == "42013"{
                         if (type == CNLiveSendAuthRespApple) {
                             //获取用户信息 /api/identityApi/getUserMsg
-                            CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { result, respStatue in
+                            CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { [weak self] result, respStatue in
+                                guard let self = self else { return }
                                 if respStatue == .success{
                                     if let res = result as? MineGetUserMsgUsersModel{
                                         let userInfo = UserInfoManager.shared.userInfo
@@ -479,9 +516,15 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                                             UserDefaults.standard.synchronize()
                                         }
-                                        let window = UIApplication.shared.delegate?.window
-                                        window??.rootViewController = CNLiveBaseTabBarViewController.init()
-
+                                        if self.navBackButton.isHidden{
+                                            let window = UIApplication.shared.delegate?.window
+                                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                                        }else{
+                                            //发通知
+                                            NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+                                            metaAppDelegate.isLogin = true
+                                            self.navigationController?.popViewController(animated: true)
+                                        }
                                     }
                                 }else{
                                     let window = UIApplication.shared.delegate?.window
@@ -549,7 +592,8 @@ extension CNLiveLoginViewController {
         CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: countryCode, verCode: veriText.text ?? "") {[self] in
             loginButton.stopAnimating()
             //获取用户信息 /api/identityApi/getUserMsg
-            CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { result, respStatue in
+            CNLiveMineViewModel.requestGetUserMsg(sid: UserInfoManager.shared.userInfo.uid) { [weak self] result, respStatue in
+                guard let self = self else { return }
                 if respStatue == .success{
                     if let res = result as? MineGetUserMsgUsersModel{
                         let userInfo = UserInfoManager.shared.userInfo
@@ -565,9 +609,15 @@ extension CNLiveLoginViewController {
                             UserDefaults.standard.synchronize()
                         }
-                        let window = UIApplication.shared.delegate?.window
-                        window??.rootViewController = CNLiveBaseTabBarViewController.init()
-
+                        if self.navBackButton.isHidden{
+                            let window = UIApplication.shared.delegate?.window
+                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                        }else{
+                            //发通知
+                            NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+                            metaAppDelegate.isLogin = true
+                            self.navigationController?.popViewController(animated: true)
+                        }
                     }
                 }else{
                     let window = UIApplication.shared.delegate?.window
@@ -110,8 +110,17 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
 //        NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
 //        NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
 //        StandAuthNotificationSuccessAction()
+        
+        //登录成功通知
+        NotificationCenter.default.addObserver(self, selector: #selector(CNLiveLoginSuccessNotificationAction), name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+    }
+
+    @objc func CNLiveLoginSuccessNotificationAction() {
+        //登录成功
+        self.headerView.loginBtn.isHidden = true
     }
+    
     func loadGift(){
         showLoading(message: "")
         CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in
@@ -276,8 +285,9 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
     }
     deinit {
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
-        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
+        NotificationCenter.default.removeObserver(self)
+//        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+//        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
     }
 }
@@ -392,9 +402,13 @@ extension CNLiveMineViewController {
         }else if name == "已购内容"{
             //已购内容
-            let webVC = CNWebViewController()
-            webVC.url = URL(string: "http://wjjh5.cnlive.com/cnYjzg.html?id=6&channelName=yjzg&isShowTitle=true")
-            self.navigationController?.pushViewController(webVC, animated: true)
+            if metaAppDelegate.isLogin{
+                let webVC = CNWebViewController()
+                webVC.url = URL(string: "http://wjjh5.cnlive.com/cnYjzg.html?id=6&channelName=yjzg&isShowTitle=true")
+                self.navigationController?.pushViewController(webVC, animated: true)
+            }else{
+                metaAppDelegate.pushLoginVC()
+            }
         }else if name == "我的订单"{
         }else if name == "帮助与反馈"{
@@ -172,13 +172,17 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         }
         if _show_type == .setting {
-            view.addSubview(logoutButton)
-            logoutButton.snp.makeConstraints { make in
-                make.centerX.equalToSuperview()
-                make.left.equalToSuperview().offset(10)
-                make.right.equalToSuperview().offset(-10)
-                make.height.equalTo(45)
-                make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
+            if metaAppDelegate.isLogin{
+                view.addSubview(logoutButton)
+                logoutButton.snp.makeConstraints { make in
+                    make.centerX.equalToSuperview()
+                    make.left.equalToSuperview().offset(10)
+                    make.right.equalToSuperview().offset(-10)
+                    make.height.equalTo(45)
+                    make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
+                }
+            }else{
+                
             }
         }
         if _show_type == .about {
@@ -201,6 +205,8 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
         logoutButton.startAnimating()
         AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { [self] index in
             if index == 1 {
+                NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginOutNotification, object: nil)
+                metaAppDelegate.isLogin = false
                 logoutButton.stopAnimating()
                 UserDefaults.standard.set(false,forKey: "is_login")
                 UserInfoManager.clearUserInfo()
@@ -273,7 +279,11 @@ extension CNLiveTypeFeedBackViewController {
         }
         if _show_type == .setting {
             if indexPath.section == 0 {
-                self.navigationController?.pushViewController(CNLiveMineBindingManagerController.init(), animated: true)
+                if metaAppDelegate.isLogin{
+                    self.navigationController?.pushViewController(CNLiveMineBindingManagerController.init(), animated: true)
+                }else{
+                    metaAppDelegate.pushLoginVC()
+                }
             }
             if indexPath.section == 1 {
                 self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .privacy), animated: true)
@@ -282,7 +292,11 @@ extension CNLiveTypeFeedBackViewController {
                 self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .about), animated: true)
             }
             if indexPath.section == 3 {
-                self.navigationController?.pushViewController(CNLiveMineSignOutViewController.init(), animated: true)
+                if metaAppDelegate.isLogin{
+                    self.navigationController?.pushViewController(CNLiveMineSignOutViewController.init(), animated: true)
+                }else{
+                    metaAppDelegate.pushLoginVC()
+                }
             }
         }
         if _show_type == .privacy {
@@ -32,6 +32,16 @@ class MineHeaderView : UIView {
         return nameLabel
     }()
+    lazy var loginBtn: UIButton = {
+        let tipBtn = UIButton(type: .custom)
+        tipBtn.backgroundColor = HexColor("#DBE9FF")
+        tipBtn.setTitle("点击登录", for: .normal)
+        tipBtn.setTitleColor(HexColor("#1F76FF"), for: .normal)
+        tipBtn.layer.cornerRadius = 16
+        tipBtn.clipsToBounds = true
+        tipBtn.addTarget(self, action: #selector(loginBtnAction), for: .touchUpInside)
+        return tipBtn
+    }()
     lazy var tipBtn: UIButton = {
         let tipBtn = UIButton(type: .custom)
         tipBtn.backgroundColor = .clear
@@ -57,6 +67,14 @@ class MineHeaderView : UIView {
             make.left.equalTo(iconView.snp.right).offset(15)
         }
+        addSubview(loginBtn)
+        loginBtn.snp.makeConstraints { make in
+            make.left.equalTo(self.iconView.snp.right).offset(19)
+            make.centerY.equalTo(self.iconView.snp.centerY)
+            make.width.equalTo(120)
+            make.height.equalTo(32)
+        }
+        loginBtn.isHidden = metaAppDelegate.isLogin
 //        addSubview(tipBtn)
 //        tipBtn.snp.makeConstraints { make in
 //            make.centerY.equalToSuperview().offset(10)
@@ -76,6 +94,10 @@ class MineHeaderView : UIView {
         fatalError("init(coder:) has not been implemented")
     }
+    @objc func loginBtnAction() {
+        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController(), animated: true)
+    }
+
     @objc func tipBtnAction() {
         currentViewController()?.navigationController?.pushViewController(CNLiveMineAddInfoViewController.init(show_type: .message), animated: true)
     }
@@ -363,33 +363,62 @@ class CNLiveMineMineOrderCell : UITableViewCell {
     }
     @objc func allOrderBtnAction(){
-        CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "0")
+        if metaAppDelegate.isLogin{
+            let vc = CNLiveHomeMoreController()
+            CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "0")
+        }else{
+            metaAppDelegate.pushLoginVC()
+        }
     }
     @objc func waitPayBtnAction(){
-        CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "1")
+        if metaAppDelegate.isLogin{
+            let vc = CNLiveHomeMoreController()
+            CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "1")
+        }else{
+            metaAppDelegate.pushLoginVC()
+        }
     }
     @objc func waitFaHuoBtnAction(){
-        CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "2")
+        if metaAppDelegate.isLogin{
+            let vc = CNLiveHomeMoreController()
+            CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "2")
+        }else{
+            metaAppDelegate.pushLoginVC()
+        }
     }
     @objc func yiFaHuoBtnAction(){
-        CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "3")
+        if metaAppDelegate.isLogin{
+            let vc = CNLiveHomeMoreController()
+            CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "3")
+        }else{
+            metaAppDelegate.pushLoginVC()
+        }
     }
     @objc func shouHouBtnAction(){
-        CNLiveDownSlideTool.pushShopH5WithType(type: "4", state: "")
+        if metaAppDelegate.isLogin{
+            let vc = CNLiveHomeMoreController()
+            CNLiveDownSlideTool.pushShopH5WithType(type: "4", state: "")
+        }else{
+            metaAppDelegate.pushLoginVC()
+        }
     }
     @objc func imgTapAction(ges: UITapGestureRecognizer){
         let imageView = ges.view as! UIImageView
         let i = imageView.tag-1000
-        if i == 0{
-            //我的订单
-            CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "0")
-        }else if i == 1{
-            //购物车
-            CNLiveDownSlideTool.pushShopH5WithType(type: "2", state: "")
-        }else if i == 2{
-            //地址管理
-            CNLiveDownSlideTool.pushShopH5WithType(type: "3", state: "")
+        if metaAppDelegate.isLogin{
+            if i == 0{
+                //我的订单
+                CNLiveDownSlideTool.pushShopH5WithType(type: "1", state: "0")
+            }else if i == 1{
+                //购物车
+                CNLiveDownSlideTool.pushShopH5WithType(type: "2", state: "")
+            }else if i == 2{
+                //地址管理
+                CNLiveDownSlideTool.pushShopH5WithType(type: "3", state: "")
+            }
+        }else{
+            metaAppDelegate.pushLoginVC()
         }
     }
@@ -239,8 +239,12 @@ class CNLiveMinePlayHistoryCell : UITableViewCell ,UICollectionViewDelegate, UIC
             currentViewController()?.navigationController?.pushViewController(vc, animated: true)
         }else if i == 1{
             //我的收藏
-            let vc = CNLiveHomeMoreController()
-            currentViewController()?.navigationController?.pushViewController(vc, animated: true)
+            if metaAppDelegate.isLogin{
+                let vc = CNLiveHomeMoreController()
+                currentViewController()?.navigationController?.pushViewController(vc, animated: true)
+            }else{
+                metaAppDelegate.pushLoginVC()
+            }
         }
     }
@@ -22,6 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var isCaptured = false //是否录屏中
     var isGift = false//是否忽必烈礼物
     var giftModel:CNLiveHomePageHuBiLieGiftModel?//送礼分享model
+    var isLogin = false//是否登录
 //    var orientationLock = UIInterfaceOrientationMask.allButUpsideDown // 默认支持方向
 //    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
@@ -80,8 +81,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = KVCBackgroupColor
         let is_login = UserDefaults.standard.bool(forKey: "is_login")
+        self.isLogin = is_login
         //CNLiveBaseTabBarViewController.init()
-        window?.rootViewController = is_login ? CNLiveLaunchAdController.init() : UINavigationController(rootViewController: CNLiveLoginViewController.init())
+//        window?.rootViewController = is_login ? CNLiveLaunchAdController.init() : UINavigationController(rootViewController: CNLiveLoginViewController.init())
+        window?.rootViewController = is_login ? CNLiveLaunchAdController.init() : CNLiveBaseTabBarViewController.init()
         window?.makeKeyAndVisible()
         if is_login{
             //获取用户信息 /api/identityApi/getUserMsg
@@ -172,6 +175,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
+    // MARK: - rootLoginVC
+    func rootLoginVC(){
+        window?.rootViewController = UINavigationController(rootViewController: CNLiveLoginViewController.init())
+    }
+    func pushLoginVC(){
+        currentViewController()?.navigationController?.pushViewController(CNLiveLoginViewController.init(), animated: true)
+    }
+
+    
     // MARK: - 响应录屏状态变化
     @objc private func handleScreenCaptureChange() {
         if UIScreen.main.isCaptured {