no message

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -108,12 +108,12 @@ extension AppDelegate {
 
      /// 设置全局的navigation
     func setNavBarAppearence() {
-//        WRNavigationBar.defaultStatusBarStyle = .lightContent
-//        WRNavigationBar.defaultShadowImageHidden = true
-////        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
-//        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
-//        WRNavigationBar.defaultNavBarTintColor = UIColor.white
-//        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
+        WRNavigationBar.defaultStatusBarStyle = .lightContent
+        WRNavigationBar.defaultShadowImageHidden = true
+//        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
+        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
+        WRNavigationBar.defaultNavBarTintColor = UIColor.white
+        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
         
         UINavigationBar.appearance().tintColor = UIColor.white
     }

RainbowPlanet/RainbowPlanet/Base/BaseNavigationController/BaseNavigationViewController.swift

@@ -24,6 +24,4 @@ class BaseNavigationViewController: UINavigationController {
         super.pushViewController(viewController, animated: animated)
     }
     
-    
-
 }

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -29,9 +29,9 @@ class ATAuthSDKManager: NSObject {
                 /// navigationbara
                 modelNew.navColor = kffffffColor
                 modelNew.navBackImage = kImage(name: "navbar_back_black")!
-//                WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kffffffColor)
+                WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kffffffColor)
                 UINavigationBar.appearance().tintColor = UIColor.black
-//                WRNavigationBar.defaultStatusBarStyle = .default
+                WRNavigationBar.defaultStatusBarStyle = .default
                 //Moblie
                 modelNew.numberFont = kRegularFont36!
                 modelNew.numberColor = UIColor.black

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

@@ -61,6 +61,11 @@ class MessageHomeThreeSectionTableViewCell: RCConversationCell {
     var rcConversationModel : RCConversationModel? {
         didSet {
             setDataModel(rcConversationModel)
+            if rcConversationModel?.isTop ?? false {
+                backgroundColor = kf7f8faColor
+            }else {
+                backgroundColor = kffffffColor
+            }
         }
     }
 }

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

@@ -238,6 +238,7 @@ extension MessageMainViewController: UITableViewDelegate,UITableViewDataSource {
         case 2:
             let cell = tableView.cellForRow(at: indexPath) as? MessageHomeThreeSectionTableViewCell
             Mediator.push(RongCloudIMRouterModuleType.IMChatPrivate(targetId: cell?.conversationModel?.targetId ?? "0", title: cell?.conversationTitle.text ?? ""))
+            
         default:
             break
         }
@@ -316,12 +317,14 @@ extension MessageMainViewController: UITableViewDelegate,UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if section == 2 {
+            return 0.000001
+        }
         return 10
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         return nil
-        
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {

RainbowPlanet/RainbowPlanet/Modules/RongCloudIMModule/IMChatPrivate/ViewController/IMChatPrivateViewController.swift

@@ -138,10 +138,10 @@ class IMChatPrivateViewController: RCConversationViewController {
             }
         }
         super.pluginBoardView(pluginBoardView, clickedItemWithTag: tag)
-//        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
-//        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
-//        WRNavigationBar.defaultNavBarTintColor = UIColor.white
-//        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
+        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
+        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
+        WRNavigationBar.defaultNavBarTintColor = UIColor.white
+        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
         UINavigationBar.appearance().tintColor = UIColor.white
 
     }

RainbowPlanet/RainbowPlanet/Modules/RongCloudIMModule/IMChatPrivateSet/View/IMChatPrivateSetOneTableViewCell.swift

@@ -100,13 +100,13 @@ class IMChatPrivateSetOneTableViewCell: UITableViewCell {
             if isBlackList {
                 RCIMClient.shared()?.remove(fromBlacklist: targetId!, success: {
                 }, error: { [weak self] (error) in
-                     self?.onSwitch.isOn = true
+                     self?.onSwitch.setOn(false, animated: false)
                      NXLLog(error)
                 })
             }else {
                 RCIMClient.shared()?.add(toBlacklist: targetId!, success: {
                 }, error: { [weak self] (error) in
-                    self?.onSwitch.isOn = false
+                    self?.onSwitch.setOn(false, animated: false)
                     NXLLog(error)
                 })
             }
@@ -132,7 +132,7 @@ class IMChatPrivateSetOneTableViewCell: UITableViewCell {
         didSet {
             
             if indexPath?.row == 0 {
-                onSwitch.isOn = rcConversation?.isTop ?? false
+                self.onSwitch.setOn(rcConversation?.isTop ?? false, animated: true)
             }
             
             if indexPath?.row == 1 {
@@ -140,16 +140,14 @@ class IMChatPrivateSetOneTableViewCell: UITableViewCell {
                     [weak self] (isBlack) in
                     //0表示已经在黑名单中，101表示不在黑名单中
                     if isBlack == 0 {
-                        self?.onSwitch.isOn = true
+                        self?.onSwitch.setOn(true, animated: true)
                         self?.isBlackList = true
-                    }
-                    
-                    if isBlack == 101 {
-                        self?.onSwitch.isOn = false
+                    } else {
+                        self?.onSwitch.setOn(false, animated: true)
                         self?.isBlackList = false
                     }
                 }, error: { [weak self] (error) in
-                    self?.onSwitch.isOn = false
+                    self?.onSwitch.setOn(false, animated: true)
                     NXLLog(error)
                 })
             }

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

@@ -121,9 +121,6 @@ class IMChatRoomViewController: RCConversationViewController {
     }
     
     override func pluginBoardView(_ pluginBoardView: RCPluginBoardView!, clickedItemWithTag tag: Int) {
-        
-        self.navigationItem.leftBarButtonItem = nil
-        self.navigationItem.rightBarButtonItem = nil
         if #available(iOS 11.0, *) {
             UIScrollView.appearance().contentInsetAdjustmentBehavior = .automatic
         } else {
@@ -131,13 +128,12 @@ class IMChatRoomViewController: RCConversationViewController {
                 self.automaticallyAdjustsScrollViewInsets = true
             }
         }
-        
-//        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
-//        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
-//        WRNavigationBar.defaultNavBarTintColor = UIColor.white
-//        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
-        UINavigationBar.appearance().tintColor = UIColor.white
         super.pluginBoardView(pluginBoardView, clickedItemWithTag: tag)
+        WRNavigationBar.defaultNavBarBarTintColor = kThemeColor
+        WRNavigationBar.defaultNavBarTitleColor = UIColor.white
+        WRNavigationBar.defaultNavBarTintColor = UIColor.white
+        WRNavigationBar.defaultNavBarBackgroundImage = UIImage.imageWithColor(color: kThemeColor)
+        UINavigationBar.appearance().tintColor = UIColor.white
 
     }
     

RainbowPlanet/RainbowPlanet/Tools/GuidePageView/GuidePageView.swift

@@ -82,7 +82,7 @@ class GuidePageView: UIView {
     //MARK: - 移除所有的View
     private func removeGuideViewFromSupview() {
         UIView.animate(withDuration: 1.0, delay: 0, options: UIView.AnimationOptions.curveEaseOut, animations: { [weak self] in
-//            WRNavigationBar.defaultStatusBarStyle = .default
+            WRNavigationBar.defaultStatusBarStyle = .default
             self?.alpha = 0.0
             let transform = CATransform3DScale(CATransform3DIdentity, 1.5, 1.5, 1.0)
             self?.layer.transform = transform

RainbowPlanet/RainbowPlanet/Tools/WRNavigationBar/WRNavigationBar.swift

@@ -311,24 +311,24 @@ extension UINavigationController: WRFatherAwakeProtocol
     }
     
     // swizzling system method: popToViewController
-    @objc func wr_popToViewController(_ viewController: UIViewController, animated: Bool) -> [UIViewController]?
-    {
-        setNeedsNavigationBarUpdate(titleColor: viewController.navBarTitleColor)
-        var displayLink:CADisplayLink? = CADisplayLink(target: self, selector: #selector(popNeedDisplay))
-        // UITrackingRunLoopMode: 界面跟踪 Mode，用于 ScrollView 追踪触摸滑动，保证界面滑动时不受其他 Mode 影响
-        // NSRunLoopCommonModes contains kCFRunLoopDefaultMode and UITrackingRunLoopMode
-        displayLink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
-        CATransaction.setCompletionBlock {
-            displayLink?.invalidate()
-            displayLink = nil
-            popProperties.displayCount = 0
-        }
-        CATransaction.setAnimationDuration(popProperties.popDuration)
-        CATransaction.begin()
-        let vcs = wr_popToViewController(viewController, animated: animated)
-        CATransaction.commit()
-        return vcs
-    }
+//    @objc func wr_popToViewController(_ viewController: UIViewController, animated: Bool) -> [UIViewController]?
+//    {
+//        setNeedsNavigationBarUpdate(titleColor: viewController.navBarTitleColor)
+//        var displayLink:CADisplayLink? = CADisplayLink(target: self, selector: #selector(popNeedDisplay))
+//        // UITrackingRunLoopMode: 界面跟踪 Mode，用于 ScrollView 追踪触摸滑动，保证界面滑动时不受其他 Mode 影响
+//        // NSRunLoopCommonModes contains kCFRunLoopDefaultMode and UITrackingRunLoopMode
+//        displayLink?.add(to: RunLoop.main, forMode: RunLoop.Mode.common)
+//        CATransaction.setCompletionBlock {
+//            displayLink?.invalidate()
+//            displayLink = nil
+//            popProperties.displayCount = 0
+//        }
+//        CATransaction.setAnimationDuration(popProperties.popDuration)
+//        CATransaction.begin()
+//        let vcs = wr_popToViewController(viewController, animated: animated)
+//        CATransaction.commit()
+//        return vcs
+//    }
     
     // swizzling system method: popToRootViewControllerAnimated
     @objc func wr_popToRootViewControllerAnimated(_ animated: Bool) -> [UIViewController]?
@@ -416,29 +416,29 @@ extension UINavigationController: WRFatherAwakeProtocol
 //==========================================================================
 extension UINavigationController: UINavigationBarDelegate
 {
-    public func navigationBar(_ navigationBar: UINavigationBar, shouldPop item: UINavigationItem) -> Bool
-    {
-        if let topVC = topViewController,
-           let coor = topVC.transitionCoordinator, coor.initiallyInteractive {
-            if #available(iOS 10.0, *) {
-                coor.notifyWhenInteractionChanges({ (context) in
-                    self.dealInteractionChanges(context)
-                })
-            } else {
-                coor.notifyWhenInteractionEnds({ (context) in
-                    self.dealInteractionChanges(context)
-                })
-            }
-            return true
-        }
-        
-        let itemCount = navigationBar.items?.count ?? 0
-        let n = viewControllers.count >= itemCount ? 2 : 1
-        let popToVC = viewControllers[viewControllers.count - n]
-        
-        popToViewController(popToVC, animated: true)
-        return true
-    }
+//    public func navigationBar(_ navigationBar: UINavigationBar, shouldPop item: UINavigationItem) -> Bool
+//    {
+//        if let topVC = topViewController,
+//           let coor = topVC.transitionCoordinator, coor.initiallyInteractive {
+//            if #available(iOS 10.0, *) {
+//                coor.notifyWhenInteractionChanges({ (context) in
+//                    self.dealInteractionChanges(context)
+//                })
+//            } else {
+//                coor.notifyWhenInteractionEnds({ (context) in
+//                    self.dealInteractionChanges(context)
+//                })
+//            }
+//            return true
+//        }
+//
+//        let itemCount = navigationBar.items?.count ?? 0
+//        let n = viewControllers.count >= itemCount ? 2 : 1
+//        let popToVC = viewControllers[viewControllers.count - n]
+//
+//        popToViewController(popToVC, animated: true)
+//        return true
+//    }
     
     // deal the gesture of return break off
     private func dealInteractionChanges(_ context: UIViewControllerTransitionCoordinatorContext)