no message

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -57,8 +57,9 @@ extension AppDelegate {
             if(UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil ) {//设置性别话题
                 setNoLoginOut()
             }else {
-                window?.rootViewController = BaseTabbarViewController.shared
+                window?.rootViewController = BaseTabbarViewController.shared()
                 setData()
+                LoginNowView.removeLoginNowView()
             }
         }else {// 进入首页
             setNoLoginOut()
@@ -81,7 +82,7 @@ extension AppDelegate {
         // 移除快递信息
         DeliveryMethodTypeModel.shared().removeLoginModel()
         // 设置tabBar
-        self.window?.rootViewController = BaseTabbarViewController.shared
+        self.window?.rootViewController = BaseTabbarViewController.shared()
         //添加登录view
         LoginNowView.initLoginNowView()
     }
@@ -93,10 +94,10 @@ extension AppDelegate {
         // 移除快递信息
         DeliveryMethodTypeModel.shared().removeLoginModel()
         // 选择中index
-        BaseTabbarViewController.shared.setBadge()
+        baseTabbarViewController?.setBadge()
         //添加登录view
         LoginNowView.initLoginNowView()
-        BaseTabbarViewController.shared.selectedIndex = 0
+        baseTabbarViewController?.selectedIndex = 0
         // 退出登录
         NotificationCenter.default.post(name: NSNotification.Name("loginOut"), object: nil)
     }

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -1,5 +1,5 @@
 //
-//  BaseTabbarViewController.swift
+//  baseTabbarViewController?.swift
 //  RainbowPlanet
 //
 //  Created by 南鑫林 on 2019/3/8.
@@ -12,9 +12,15 @@ import PPBadgeViewSwift
 import SwiftyMediator
 import RongIMLib
 
+var baseTabbarViewController : BaseTabbarViewController?
+
 class BaseTabbarViewController: UITabBarController {
     
-    static let shared : BaseTabbarViewController = BaseTabbarViewController()
+    class func shared() -> UITabBarController {
+        baseTabbarViewController = BaseTabbarViewController()
+        return baseTabbarViewController ?? BaseTabbarViewController()
+    }
+    
     /// 社区
     var v1 : CommunityViewController!
     /// 兑换专区

RainbowPlanet/RainbowPlanet/Manager/RegisterLoginManager/RegisterLoginManager.swift

@@ -17,7 +17,7 @@ class RegisterLoginManager: NSObject {
         if UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil  { //设置性别
             vc?.navigationController?.pushViewController(GenderSelectionViewController(), animated: true)
         }else {// 设置首页
-            BaseTabbarViewController.shared.setBadge()
+            baseTabbarViewController?.setBadge()
             if vc?.presentingViewController != nil {
                 if vc?.navigationController?.presentationController != nil {
                         vc?.navigationController?.dismiss(animated: false, completion: {
@@ -40,7 +40,7 @@ class RegisterLoginManager: NSObject {
                 LoginNowView.removeLoginNowView()
                 kAppDelegate.setData()
             }
-            BaseTabbarViewController.shared.selectedIndex = 0
+            baseTabbarViewController?.selectedIndex = 0
 
         }
     }

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -205,12 +205,12 @@ class WebViewJavascriptBridgeManager: NSObject {
         if wvjbModel?.modelType  == .view {
             // 发布
             if wvjbModel?.params?.paramsModelPage == .publist {
-                BaseTabbarViewController.shared.pushPublishVC()
+                baseTabbarViewController?.pushPublishVC()
             }
             // 推荐
             if wvjbModel?.params?.paramsModelPage == .join {
-                BaseTabbarViewController.shared.selectedIndex = 0
-                BaseTabbarViewController.shared.v1.reloadSegmentedView()
+                baseTabbarViewController?.selectedIndex = 0
+                baseTabbarViewController?.v1.reloadSegmentedView()
                 if viewController != nil {
                     viewController?.navigationController?.popToRootViewController(animated: true)
                 }
@@ -221,8 +221,8 @@ class WebViewJavascriptBridgeManager: NSObject {
             }
             // 去星球
             if wvjbModel?.params?.paramsModelPage == .planet {
-                BaseTabbarViewController.shared.selectedIndex = 0
-                BaseTabbarViewController.shared.v1.reloadSegmentedStarView()
+                baseTabbarViewController?.selectedIndex = 0
+                baseTabbarViewController?.v1.reloadSegmentedStarView()
                 if viewController != nil {
                     viewController?.navigationController?.popToRootViewController(animated: true)
                 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -151,7 +151,7 @@ class CommunityNavigationBarView: BaseView {
             if UserModel.isTokenNil() {
                 kAppDelegate.setLogin()
             }else {
-                BaseTabbarViewController.shared.pushPublishVC()
+                baseTabbarViewController?.pushPublishVC()
             }
         }).disposed(by: disposeBag)
         return leftButton

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageHomeOneSectionTableViewCell.swift

@@ -110,7 +110,7 @@ extension MessageHomeOneSectionTableViewCell: UICollectionViewDelegateFlowLayout
                     let messageIndexModel = MessageIndexModel.shared.object()
                     messageIndexModel?.comment?.isYes =  self?.messageIndexModel?.comment?.isYes
                     MessageIndexModel.shared.saveObject(model: messageIndexModel!)
-                    BaseTabbarViewController.shared.setBadge()
+                    baseTabbarViewController?.setBadge()
 
                 }
             }else {
@@ -127,7 +127,7 @@ extension MessageHomeOneSectionTableViewCell: UICollectionViewDelegateFlowLayout
                     let messageIndexModel = MessageIndexModel.shared.object()
                     messageIndexModel?.praise?.isYes =  self?.messageIndexModel?.praise?.isYes
                     MessageIndexModel.shared.saveObject(model: messageIndexModel!)
-                    BaseTabbarViewController.shared.setBadge()
+                    baseTabbarViewController?.setBadge()
 
                 }
             }else {
@@ -144,7 +144,7 @@ extension MessageHomeOneSectionTableViewCell: UICollectionViewDelegateFlowLayout
                     let messageIndexModel = MessageIndexModel.shared.object()
                     messageIndexModel?.follow?.isYes =  self?.messageIndexModel?.follow?.isYes
                     MessageIndexModel.shared.saveObject(model: messageIndexModel!)
-                    BaseTabbarViewController.shared.setBadge()
+                    baseTabbarViewController?.setBadge()
                 }
             }else {
                 pushMessageListController(messageVCType: .follow, messageShowTypes:  self.messageIndexModel?.follow?.key ?? "")
@@ -187,7 +187,7 @@ extension MessageHomeOneSectionTableViewCell {
         vc.messageVCType = messageVCType
         vc.messageShowTypes = messageShowTypes
         UIViewController.topMost?.navigationController?.pushViewController(vc, animated: true)
-        BaseTabbarViewController.shared.setBadge()
+        baseTabbarViewController?.setBadge()
 
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -59,7 +59,7 @@ class MessageMainViewController: BaseViewController {
              [weak self] notification in
             self?.messageIndexModel = notification.object as? MessageIndexModel
             self?.tableView.reloadData()
-            BaseTabbarViewController.shared.setBadge()
+            baseTabbarViewController?.setBadge()
         }
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("RCIMReceiveMessageDelegate"), object: nil, queue: OperationQueue.main) {
@@ -102,7 +102,7 @@ extension MessageMainViewController {
             [weak self] (messageIndexModel) -> (Void) in
             self?.messageIndexModel = messageIndexModel as? MessageIndexModel
             self?.tableView.reloadData()
-            BaseTabbarViewController.shared.setBadge()
+            baseTabbarViewController?.setBadge()
             MJRefreshManager.mjRefreshManager(tableView: self?.tableView)
         }) {
             [weak self] loadingStauts in
@@ -122,7 +122,7 @@ extension MessageMainViewController {
         self.users = RCIMClient.shared()?.getConversationList([RCConversationType.ConversationType_PRIVATE.rawValue])
         self.conversationModels = Mapper<ConversationModel>().mapArray(JSONString: self.users?.description ?? "[]")
         self.tableView.reloadData()
-        BaseTabbarViewController.shared.setBadge()
+        baseTabbarViewController?.setBadge()
         NXLLog(self.users)
     }
     
@@ -140,7 +140,7 @@ extension MessageMainViewController {
         vc.messageVCType = messageVCType
         vc.messageShowTypes = messageShowTypes
         self.navigationController?.pushViewController(vc, animated: true)
-        BaseTabbarViewController.shared.setBadge()
+        baseTabbarViewController?.setBadge()
     }
 }
 
@@ -204,13 +204,13 @@ extension MessageMainViewController: UITableViewDelegate,UITableViewDataSource {
                         let messageIndexModel = MessageIndexModel.shared.object()
                         messageIndexModel?.notification?.isYes =  self?.messageIndexModel?.notification?.isYes
                         MessageIndexModel.shared.saveObject(model: messageIndexModel!)
-                        BaseTabbarViewController.shared.setBadge()
+                        baseTabbarViewController?.setBadge()
                     }
                 }else {
                     let vc = MessagePlanetNotiController()
                     vc.messageShowTypes = self.messageIndexModel?.notification?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
-                    BaseTabbarViewController.shared.setBadge()
+                    baseTabbarViewController?.setBadge()
                 }
             default:// 星球活动
                 if  self.messageIndexModel?.activity?.isYes == 1 {
@@ -225,13 +225,13 @@ extension MessageMainViewController: UITableViewDelegate,UITableViewDataSource {
                         let messageIndexModel = MessageIndexModel.shared.object()
                         messageIndexModel?.activity?.isYes =  self?.messageIndexModel?.activity?.isYes
                         MessageIndexModel.shared.saveObject(model: messageIndexModel!)
-                        BaseTabbarViewController.shared.setBadge()
+                        baseTabbarViewController?.setBadge()
                     }
                 }else {
                     let vc = MessagePlanetActivityController()
                     vc.messageShowTypes = self.messageIndexModel?.activity?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
-                    BaseTabbarViewController.shared.setBadge()
+                    baseTabbarViewController?.setBadge()
                 }
             }
         case 2:

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -319,7 +319,7 @@ extension PublishEditController {
         }
         self.dismissToRootViewController(animated: false) {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: aliyunVodUpToYoPublishModel)
-            BaseTabbarViewController.shared.selectedIndex = 0
+            baseTabbarViewController?.selectedIndex = 0
         }
 
     }

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishArticle/ViewController/PublishArticleViewController.swift

@@ -67,7 +67,7 @@ class PublishArticleViewController: BaseNewWebViewController {
                 break
             case 3://3.发布成功
                 NotificationCenter.default.post(name: NSNotification.Name("PublishPostSuccess"), object: nil)
-                BaseTabbarViewController.shared.v1.reloadSegmentedFollowView()
+                baseTabbarViewController?.v1.reloadSegmentedFollowView()
                 SwiftProgressHUD.shared().hide()
                 self?.tabBarController?.selectedIndex = 0
                 self?.navigationController?.popViewController(animated: true)

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishEditContent/ViewController/PublishEditVideoContentViewController.swift

@@ -188,7 +188,7 @@ class PublishEditVideoContentViewController: BaseViewController {
             self.navigationController?.popViewController(animated: true)
         }else {
             self.dismissToRootViewController(animated: false) {
-                BaseTabbarViewController.shared.selectedIndex = 0
+                baseTabbarViewController?.selectedIndex = 0
             }
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishNewModule/PublishManager/PublishManagerUploadView.swift

@@ -56,7 +56,7 @@ class PublishManagerUploadView: BaseView {
            let vc = PublishEditVideoContentViewController()
             vc.publishManagerModel = self?.publishManagerModel
             vc.isRenewEdit = true
-            BaseTabbarViewController.shared.v1.navigationController?.pushViewController(vc, animated: true)
+            baseTabbarViewController?.v1.navigationController?.pushViewController(vc, animated: true)
         }).disposed(by: disposeBag)
     }
     

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/LoginNow/LoginNowView.swift

@@ -107,9 +107,9 @@ class LoginNowView: UIView {
     class func initLoginNowView() {
         if  LoginNowView.shared.loginNowView == nil {
             let loginNowView = LoginNowView(frame:CGRect(x: 0, y: -50, width: kScreenWidth, height: 50))
-//            let tabbar = BaseTabbarViewController.shared.esTabBarController.tabBar as? ESTabBar
-            let tabbar = BaseTabbarViewController.shared.tabBar
-            tabbar.addSubview(loginNowView)
+//            let tabbar = baseTabbarViewController?.esTabBarController.tabBar as? ESTabBar
+            let tabbar = baseTabbarViewController?.tabBar
+            tabbar?.addSubview(loginNowView)
             LoginNowView.shared.loginNowView = loginNowView
         }
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/ViewController/SearchContentListViewController.swift

@@ -97,7 +97,7 @@ extension SearchContentListViewController {
             [weak self] (communityPostsModel) -> (Void) in
             
             DIYEmptyView.emptyNoDataActionCollectionView(collectionView: self?.collectionView, imageStr: .six, detailStr: .six, btnTitleStr: .three, btnClickBlock: {
-                BaseTabbarViewController.shared.pushPublishVC()
+                baseTabbarViewController?.pushPublishVC()
 
             })
             

RainbowPlanet/RainbowPlanet/Router/RouterManager.swift

@@ -62,7 +62,7 @@ class RouterManager: NSObject {
             break
         case .recommend?: //推荐
             let vc = UIViewController.topMost
-            let v1 = BaseTabbarViewController.shared.v1
+            let v1 = baseTabbarViewController?.v1
             v1?.reloadSegmentedView()
             v1?.tabBarController?.selectedIndex = 0
             if vc?.presentingViewController != nil {
@@ -75,7 +75,7 @@ class RouterManager: NSObject {
             break
         case .star?: //星球
             let vc = UIViewController.topMost
-            let v1 = BaseTabbarViewController.shared.v1
+            let v1 = baseTabbarViewController?.v1
             v1?.reloadSegmentedStarView()
             v1?.tabBarController?.selectedIndex = 0
             if vc?.presentingViewController != nil {