bager调整

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -58,7 +58,6 @@ extension AppDelegate {
                 setNoLoginOut()
             }else {
                 window?.rootViewController = BaseTabbarViewController.shared.tabBarViewController()
-
                 setData()
             }
         }else {// 进入首页
@@ -96,10 +95,9 @@ extension AppDelegate {
         BaseTabbarViewController.shared.setBadge()
         //添加登录view
         LoginNowView.initLoginNowView()
-
+        BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
         // 退出登录
         NotificationCenter.default.post(name: NSNotification.Name("loginOut"), object: nil)
-        BaseTabbarViewController.shared.setLoginOutTabBarItem()
     }
     
     /// 登录

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import Lottie
 import ESTabBarController_swift
+import PPBadgeViewSwift
 
 class BaseTabbarViewController: NSObject {
 
@@ -69,7 +70,6 @@ class BaseTabbarViewController: NSObject {
                 }
             }else {
                 if index == 2 {
-                    self?.lastIndex = index
                     return true
                 }else {
                     self?.reloadTabbar(index:index)
@@ -117,18 +117,19 @@ class BaseTabbarViewController: NSObject {
         
 //        v1.tabBarItem = ESTabBarItem.init(lottieAnimateContentView1, title: "社区", image: UIImage(named: "tabbar_home")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
 //        v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "福利", image: UIImage(named: "tabbar_shopping")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
+        
         tabBarItemStyle(navc: v1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "社区")
         tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "后院")
         v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
         v3.tabBarItem.imageInsets = UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
         tabBarItemStyle(navc: v4, normalImg: "tabbar_massage", selectorImg: "tabbar_massage_pre", title: "消息")
         tabBarItemStyle(navc: v5, normalImg: "tabbar_my", selectorImg: "tabbar_my_pre", title: "我的")
-                
-        if UserModel.isTokenNil() {
-            setLoginOutTabBarItem()
-        }else {
-            setLoginTabBarItem()
-        }
+        
+//        if UserModel.isTokenNil() {
+//            setLoginOutTabBarItem()
+//        }else {
+//            setLoginTabBarItem()
+//        }
 
         let n1 = BaseNavigationViewController.init(rootViewController: v1)
         let n2 = BaseNavigationViewController.init(rootViewController: v2)
@@ -193,28 +194,40 @@ class BaseTabbarViewController: NSObject {
     
     // 设置Badge
     func setBadge() {
-        //消息
-        let messageIndexModel = MessageIndexModel.shared.object()
-        if messageIndexModel?.activity?.isYes == 1 || messageIndexModel?.follow?.isYes == 1 || messageIndexModel?.notification?.isYes == 1 || messageIndexModel?.praise?.isYes == 1 || messageIndexModel?.comment?.isYes == 1 {
-            let tabBarItem = v4.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeColor = kFE352BColor
-            tabBarItem?.contentView?.badgeValue = ""
-            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
-        }else {
-            let tabBarItem = v4.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeValue = nil
-        }
-        
-        //我的
-        if UpdateVersionModel.shared.object()?.upGradeModelType == .update ||  UpdateVersionModel.shared.object()?.upGradeModelType == .strongUpdate {
-
-            let tabBarItem = v5.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeColor = kFE352BColor
-            tabBarItem?.contentView?.badgeValue = ""
-            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
+        if UserModel.isTokenNil() {
+            v4.tabBarItem.pp.hiddenBadge()
+            v5.tabBarItem.pp.hiddenBadge()
         }else {
-            let tabBarItem = v5.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeValue = nil
+            //消息
+            let messageIndexModel = MessageIndexModel.shared.object()
+            if messageIndexModel?.activity?.isYes == 1 || messageIndexModel?.follow?.isYes == 1 || messageIndexModel?.notification?.isYes == 1 || messageIndexModel?.praise?.isYes == 1 || messageIndexModel?.comment?.isYes == 1 {
+                v4.tabBarItem.pp.addDot(color:kFE352BColor)
+                v4.tabBarItem.pp.moveBadge(x: -3,y: 3)
+                
+                //            let tabBarItem = v4.tabBarItem as? ESTabBarItem
+                //            tabBarItem?.contentView?.badgeColor = kFE352BColor
+                //            tabBarItem?.contentView?.badgeValue = ""
+                //            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
+            }else {
+                //            let tabBarItem = v4.tabBarItem as? ESTabBarItem
+                //            tabBarItem?.contentView?.badgeValue = nil
+                v4.tabBarItem.pp.hiddenBadge()
+            }
+            
+            //我的
+            if UpdateVersionModel.shared.object()?.upGradeModelType == .update ||  UpdateVersionModel.shared.object()?.upGradeModelType == .strongUpdate {
+                
+                //            let tabBarItem = v5.tabBarItem as? ESTabBarItem
+                //            tabBarItem?.contentView?.badgeColor = kFE352BColor
+                //            tabBarItem?.contentView?.badgeValue = ""
+                //            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
+                v5.tabBarItem.pp.addDot(color:kFE352BColor)
+                v5.tabBarItem.pp.moveBadge(x: -3,y: 3)
+            }else {
+                //            let tabBarItem = v5.tabBarItem as? ESTabBarItem
+                //            tabBarItem?.contentView?.badgeValue = nil
+                v5.tabBarItem.pp.hiddenBadge()
+            }
         }
     }
     

RainbowPlanet/RainbowPlanet/Manager/RegisterLoginManager/RegisterLoginManager.swift

@@ -18,20 +18,20 @@ class RegisterLoginManager: NSObject {
         if UserModel.shared().getModel()?.isFollowSuggestTopic == 0 || UserModel.shared().getModel()?.isFollowSuggestTopic == nil  { //设置性别
             vc?.navigationController?.pushViewController(GenderSelectionViewController(), animated: true)
         }else {// 设置首页
+            BaseTabbarViewController.shared.setBadge()
             if vc?.presentingViewController != nil {
                 if vc?.navigationController?.presentationController != nil {
                         vc?.navigationController?.dismiss(animated: false, completion: {
                             NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
                             LoginNowView.removeLoginNowView()
                             kAppDelegate.setData()
-                            BaseTabbarViewController.shared.setLoginTabBarItem()
                         })
                 }else {
                     vc?.dismiss(animated: false, completion: {
                         NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
                         LoginNowView.removeLoginNowView()
+                        
                         kAppDelegate.setData()
-                        BaseTabbarViewController.shared.setLoginTabBarItem()
                     })
                 }
                 
@@ -40,9 +40,9 @@ class RegisterLoginManager: NSObject {
                 NotificationCenter.default.post(name: NSNotification.Name("login"), object: nil)
                 LoginNowView.removeLoginNowView()
                 kAppDelegate.setData()
-                BaseTabbarViewController.shared.setLoginTabBarItem()
-
             }
+            BaseTabbarViewController.shared.esTabBarController.selectedIndex = 0
+
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/BackyardModule/Backyard/ViewController/BackyardViewController.swift

@@ -35,7 +35,11 @@ class BackyardViewController: BaseJSWebViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.navigationBar.isHidden = true
-        statusBarStyle = .lightContent
+        if UserModel.isTokenNil() {
+            statusBarStyle = .default
+        }else {
+            statusBarStyle = .lightContent
+        }
     }
     
     override func didReceiveMemoryWarning() {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -129,13 +129,11 @@ class CommunityViewController: BaseViewController {
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("login"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
-            self?.tabBarController?.selectedIndex = 0
             self?.reloadSegmentedView()
         })
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
-            self?.tabBarController?.selectedIndex = 0
             self?.reloadSegmentedView()
             
         })

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

@@ -41,12 +41,12 @@ class MessageMainViewController: BaseViewController {
     }
     
     override func setupData() {
-        // 查看全部热门视频
+        
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("MessageMainViewController"), object: nil, queue: OperationQueue.main) {
              [weak self] notification in
             self?.messageIndexModel = notification.object as? MessageIndexModel
             self?.collectionView.reloadData()
-            self?.setTabBarItemBadge()
+            BaseTabbarViewController.shared.setBadge()
         }
         collectionView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
@@ -90,7 +90,7 @@ extension MessageMainViewController {
             [weak self] (messageIndexModel) -> (Void) in
             self?.messageIndexModel = messageIndexModel as? MessageIndexModel
             self?.collectionView.reloadData()
-            self?.setTabBarItemBadge()
+            BaseTabbarViewController.shared.setBadge()
             MJRefreshManager.mjRefreshManager(collectionView: self?.collectionView)
         }) {
             [weak self] loadingStauts in
@@ -119,7 +119,9 @@ extension MessageMainViewController {
         vc.messageVCType = messageVCType
         vc.messageShowTypes = messageShowTypes
         self.navigationController?.pushViewController(vc, animated: true)
-        self.setTabBarItemBadge()
+//        self.setTabBarItemBadge()
+        BaseTabbarViewController.shared.setBadge()
+
 
     }
 }
@@ -180,7 +182,12 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.comment?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .comment, messageShowTypes:  self?.messageIndexModel?.comment?.key ?? "")
-                        self?.setTabBarItemBadge()
+//                        self?.setTabBarItemBadge()
+                        let messageIndexModel = MessageIndexModel.shared.object()
+                        messageIndexModel?.comment?.isYes =  self?.messageIndexModel?.comment?.isYes
+                        MessageIndexModel.shared.saveObject(model: messageIndexModel!)
+                        BaseTabbarViewController.shared.setBadge()
+
                     }
                 }else {
                     self.pushMessageListController(messageVCType: .comment, messageShowTypes:  self.messageIndexModel?.comment?.key ?? "")
@@ -193,7 +200,11 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.praise?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .praise, messageShowTypes:  self?.messageIndexModel?.praise?.key ?? "")
-                        self?.setTabBarItemBadge()
+//                        self?.setTabBarItemBadge()
+                        let messageIndexModel = MessageIndexModel.shared.object()
+                        messageIndexModel?.praise?.isYes =  self?.messageIndexModel?.praise?.isYes
+                        MessageIndexModel.shared.saveObject(model: messageIndexModel!)
+                        BaseTabbarViewController.shared.setBadge()
 
                     }
                 }else {
@@ -207,7 +218,12 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.follow?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .follow, messageShowTypes:  self?.messageIndexModel?.follow?.key ?? "")
-                        self?.setTabBarItemBadge()
+                        let messageIndexModel = MessageIndexModel.shared.object()
+                        messageIndexModel?.follow?.isYes =  self?.messageIndexModel?.follow?.isYes
+                        MessageIndexModel.shared.saveObject(model: messageIndexModel!)
+                        BaseTabbarViewController.shared.setBadge()
+
+//                        self?.setTabBarItemBadge()
                     }
                 }else {
                     pushMessageListController(messageVCType: .follow, messageShowTypes:  self.messageIndexModel?.follow?.key ?? "")
@@ -225,13 +241,20 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         let vc = MessagePlanetNotiController()
                         vc.messageShowTypes = self?.messageIndexModel?.notification?.key ?? ""
                         self?.navigationController?.pushViewController(vc, animated: true)
-                        self?.setTabBarItemBadge()
+                        let messageIndexModel = MessageIndexModel.shared.object()
+                        messageIndexModel?.notification?.isYes =  self?.messageIndexModel?.notification?.isYes
+                        MessageIndexModel.shared.saveObject(model: messageIndexModel!)
+                        BaseTabbarViewController.shared.setBadge()
+
+//                        self?.setTabBarItemBadge()
                     }
                 }else {
                     let vc = MessagePlanetNotiController()
                     vc.messageShowTypes = self.messageIndexModel?.notification?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
-                    self.setTabBarItemBadge()
+                    BaseTabbarViewController.shared.setBadge()
+
+//                    self.setTabBarItemBadge()
 
                 }
             default:// 星球活动
@@ -243,13 +266,21 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         let vc = MessagePlanetActivityController()
                         vc.messageShowTypes = self?.messageIndexModel?.activity?.key ?? ""
                         self?.navigationController?.pushViewController(vc, animated: true)
-                        self?.setTabBarItemBadge()
+                        
+                        let messageIndexModel = MessageIndexModel.shared.object()
+                        messageIndexModel?.activity?.isYes =  self?.messageIndexModel?.activity?.isYes
+                        MessageIndexModel.shared.saveObject(model: messageIndexModel!)
+                        BaseTabbarViewController.shared.setBadge()
+
+//                        self?.setTabBarItemBadge()
                     }
                 }else {
                     let vc = MessagePlanetActivityController()
                     vc.messageShowTypes = self.messageIndexModel?.activity?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
-                    self.setTabBarItemBadge()
+                    BaseTabbarViewController.shared.setBadge()
+
+//                    self.setTabBarItemBadge()
 
                 }
             }
@@ -257,17 +288,17 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
        
     }
     
-    func setTabBarItemBadge() {
-        if self.messageIndexModel?.activity?.isYes == 1 || self.messageIndexModel?.follow?.isYes == 1 || self.messageIndexModel?.notification?.isYes == 1 || self.messageIndexModel?.praise?.isYes ==  1 ||  self.messageIndexModel?.comment?.isYes == 1{
-            let tabBarItem = self.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeColor = kFE352BColor
-            tabBarItem?.contentView?.badgeValue = ""
-            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
-        }else {
-            let tabBarItem = self.tabBarItem as? ESTabBarItem
-            tabBarItem?.contentView?.badgeValue = nil
-        }
-    }
+//    func setTabBarItemBadge() {
+//        if self.messageIndexModel?.activity?.isYes == 1 || self.messageIndexModel?.follow?.isYes == 1 || self.messageIndexModel?.notification?.isYes == 1 || self.messageIndexModel?.praise?.isYes ==  1 ||  self.messageIndexModel?.comment?.isYes == 1{
+//            let tabBarItem = self.tabBarItem as? ESTabBarItem
+//            tabBarItem?.contentView?.badgeColor = kFE352BColor
+//            tabBarItem?.contentView?.badgeValue = ""
+//            tabBarItem?.contentView?.badgeOffset = UIOffset(horizontal: 0, vertical: -22)
+//        }else {
+//            let tabBarItem = self.tabBarItem as? ESTabBarItem
+//            tabBarItem?.contentView?.badgeValue = nil
+//        }
+//    }
 
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {

RainbowPlanet/RainbowPlanet/Modules/RongCloudIMModule/IMChatRoom/ViewController/IMChatRoomViewController.swift

@@ -35,6 +35,13 @@ class IMChatRoomViewController: RCConversationViewController {
     
     fileprivate func setupNavigationBar()
     {
+        if #available(iOS 11.0, *) {
+            UIScrollView.appearance().contentInsetAdjustmentBehavior = .automatic
+        } else {
+            if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
+                self.automaticallyAdjustsScrollViewInsets = true
+            }
+        }
         navigationController?.interactivePopGestureRecognizer?.delegate = self
         navigationBar.wr_setBottomLineHidden(hidden: true)
         navigationBar.barBackgroundColor = kThemeColor
@@ -74,9 +81,14 @@ class IMChatRoomViewController: RCConversationViewController {
         super.viewWillAppear(animated)
         self.navigationItem.leftBarButtonItem = nil
         self.navigationItem.rightBarButtonItem = nil
-        self.navigationController?.isNavigationBarHidden = true
-        navigationController?.navigationBar.isTranslucent = false
-        UICollectionView.appearance().contentInset = UIEdgeInsets(top: 0,left: 0,bottom: 0,right: 0)
+        self.navigationController?.navigationBar.isHidden = true
+        if #available(iOS 11.0, *) {
+            UIScrollView.appearance().contentInsetAdjustmentBehavior = .never
+        } else {
+            if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
+                self.automaticallyAdjustsScrollViewInsets = false
+            }
+        }
     }
     
     func setRCIM() {
@@ -108,16 +120,24 @@ class IMChatRoomViewController: RCConversationViewController {
     }
     
     override func pluginBoardView(_ pluginBoardView: RCPluginBoardView!, clickedItemWithTag tag: Int) {
-        super.pluginBoardView(pluginBoardView, clickedItemWithTag: tag)
+        
+        self.navigationItem.leftBarButtonItem = nil
+        self.navigationItem.rightBarButtonItem = nil
+        if #available(iOS 11.0, *) {
+            UIScrollView.appearance().contentInsetAdjustmentBehavior = .automatic
+        } else {
+            if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
+                self.automaticallyAdjustsScrollViewInsets = true
+            }
+        }
+        
         WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
         WRNavigationBar.defaultNavBarTitleColor = UIColor.white
         WRNavigationBar.defaultNavBarTintColor = UIColor.white
         WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
-        self.navigationController?.isNavigationBarHidden = false
         UINavigationBar.appearance().tintColor = UIColor.white
-        if tag == 1001 {
-            UICollectionView.appearance().contentInset = UIEdgeInsets(top: kNavBarTotalHeight,left: 0,bottom: 0,right: 0)
-        }
+        super.pluginBoardView(pluginBoardView, clickedItemWithTag: tag)
+
     }
     
 

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -10,15 +10,15 @@ import Foundation
 
 /// Service
 let kPersonalService = false
-let kDevelopSever = false
-let kBetaSever = false
-let kProductSever = true
+let kDevelopSever = true
+let kBetaSever = true
+let kProductSever = false
 
 /// H5Service
-let kH5PersonalService = false
+let kH5PersonalService = true
 let kH5DevelopSever = false
-let kH5BetaSever = false
-let kH5ProductSever = true
+let kH5BetaSever = true
+let kH5ProductSever = false
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {