消息页面优化完成

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -38,7 +38,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             let messageIndexModel = messageIndexModel as? MessageIndexModel
             if messageIndexModel?.activity?.isYes == 1 || messageIndexModel?.follow?.isYes == 1 || messageIndexModel?.notification?.isYes == 1 || messageIndexModel?.praise?.isYes == 1 || messageIndexModel?.comment?.isYes == 1 {
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "MessageMainViewController"), object: messageIndexModel)
-
             }
             
         }

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -18,14 +18,12 @@ class BaseTabbarViewController: UITabBarController {
         self.delegate = self
         /// 社区
         let v1 = CommunityViewController()
-
         /// 商城
         let v2 = ShoppingMallViewController()
         /// 发布
         let v3 = BaseViewController()
         /// 消息
         let v4 = MessageMainViewController()
-
         /// 我的
         let v5 = UserPersonalCenterViewController()
 

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -49,6 +49,8 @@ class MessageListController: BaseViewController {
         }
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
+        DIYEmptyView.emptyTableView(tableView: tableView)
+        
     }
     
     override func setupData() {

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

@@ -58,32 +58,12 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
             make.centerY.equalToSuperview()
             make.size.equalTo(36)
         }
-        
         titleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(12)
+            make.centerY.equalToSuperview()
             make.left.equalTo(iconImageView.snp_right).offset(8)
             make.width.equalTo(67)
             make.height.equalTo(23)
         }
-        
-        subLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(titleLabel.snp.bottom).offset(4)
-            make.left.equalTo(titleLabel.snp_left)
-            make.right.equalToSuperview().offset(-52)
-            make.height.equalTo(19)
-        }
-        
-        timeLabel.snp.makeConstraints { (make) in
-            make.top.equalToSuperview().offset(17)
-            make.right.equalToSuperview().offset(-14)
-            make.height.equalTo(13)
-        }
-        
-        dotLabel.snp.makeConstraints { (make) in
-            make.centerY.equalTo(subLabel)
-            make.centerX.equalTo(timeLabel)
-            make.size.equalTo(10)
-        }
         lineLabel.snp.makeConstraints { (make) in
             make.bottom.equalToSuperview()
             make.height.equalTo(1)
@@ -169,6 +149,12 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                     make.right.equalToSuperview().offset(-52)
                     make.height.equalTo(19)
                 }
+                
+                dotLabel.snp.remakeConstraints { (make) in
+                    make.centerY.equalTo(subLabel)
+                    make.centerX.equalTo(timeLabel)
+                    make.size.equalTo(10)
+                }
             }
         }
     }

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

@@ -37,7 +37,7 @@ class MessageMainViewController: BaseViewController {
              [weak self] notification in
             self?.messageIndexModel = notification.object as? MessageIndexModel
             self?.collectionView.reloadData()
-            self?.tabBarItem.pp.addDot(color: kFE352BColor)
+            self?.setTabBarItemBadge()
         }
         collectionView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
@@ -72,11 +72,7 @@ extension MessageMainViewController {
             [weak self] (messageIndexModel) -> (Void) in
             self?.messageIndexModel = messageIndexModel as? MessageIndexModel
             self?.collectionView.reloadData()
-            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) != nil){
-//                self?.tabBarItem.badgeValue = ""
-            }else {
-//                 self?.tabBarItem.badgeValue = nil
-            }
+            self?.setTabBarItemBadge()
         }
     }
     
@@ -101,6 +97,8 @@ extension MessageMainViewController {
         vc.messageVCType = messageVCType
         vc.messageShowTypes = messageShowTypes
         self.navigationController?.pushViewController(vc, animated: true)
+        self.setTabBarItemBadge()
+
     }
 }
 
@@ -160,6 +158,7 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.comment?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .comment, messageShowTypes:  self?.messageIndexModel?.comment?.key ?? "")
+                        self?.setTabBarItemBadge()
                     }
                 }else {
                     self.pushMessageListController(messageVCType: .comment, messageShowTypes:  self.messageIndexModel?.comment?.key ?? "")
@@ -172,6 +171,8 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.praise?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .praise, messageShowTypes:  self?.messageIndexModel?.praise?.key ?? "")
+                        self?.setTabBarItemBadge()
+
                     }
                 }else {
                     self.pushMessageListController(messageVCType: .praise, messageShowTypes:  self.messageIndexModel?.praise?.key ?? "")
@@ -184,9 +185,11 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                         self?.messageIndexModel?.follow?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         self?.pushMessageListController(messageVCType: .follow, messageShowTypes:  self?.messageIndexModel?.follow?.key ?? "")
+                        self?.setTabBarItemBadge()
                     }
                 }else {
                     pushMessageListController(messageVCType: .follow, messageShowTypes:  self.messageIndexModel?.follow?.key ?? "")
+
                 }
             }
         default:
@@ -194,40 +197,51 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
             case 0:// 星球通知
                 if  self.messageIndexModel?.notification?.isYes == 1 {
                     userMemberReadMessageApi(messageShowTypes: self.messageIndexModel?.notification?.key ?? "") {
-                        self.messageIndexModel?.notification?.isYes = 0
+                        [weak self] in
+                        self?.messageIndexModel?.notification?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         let vc = MessagePlanetNotiController()
-                        vc.messageShowTypes = self.messageIndexModel?.notification?.key ?? ""
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        vc.messageShowTypes = self?.messageIndexModel?.notification?.key ?? ""
+                        self?.navigationController?.pushViewController(vc, animated: true)
+                        self?.setTabBarItemBadge()
                     }
                 }else {
                     let vc = MessagePlanetNotiController()
                     vc.messageShowTypes = self.messageIndexModel?.notification?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
+                    self.setTabBarItemBadge()
+
                 }
             default:// 星球活动
                 if  self.messageIndexModel?.activity?.isYes == 1 {
                     userMemberReadMessageApi(messageShowTypes: self.messageIndexModel?.activity?.key ?? "") {
-                        self.messageIndexModel?.activity?.isYes = 0
+                        [weak self] in
+                        self?.messageIndexModel?.activity?.isYes = 0
                         collectionView.reloadItems(at: [indexPath])
                         let vc = MessagePlanetActivityController()
-                        vc.messageShowTypes = self.messageIndexModel?.activity?.key ?? ""
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        vc.messageShowTypes = self?.messageIndexModel?.activity?.key ?? ""
+                        self?.navigationController?.pushViewController(vc, animated: true)
+                        self?.setTabBarItemBadge()
                     }
                 }else {
                     let vc = MessagePlanetActivityController()
                     vc.messageShowTypes = self.messageIndexModel?.activity?.key ?? ""
                     self.navigationController?.pushViewController(vc, animated: true)
+                    self.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) != nil){
-//            self.tabBarItem.badgeValue = ""
+       
+    }
+    
+    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{
+            self.tabBarItem.pp.moveBadge(x: -1, y: 3)
+            self.tabBarItem.pp.addDot(color: kFE352BColor)
         }else {
-//            self.tabBarItem.badgeValue = nil
+            self.tabBarItem.pp.hiddenBadge()
         }
-       
     }
 
     

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift

@@ -25,6 +25,8 @@ class MessagePlanetActivityController: BaseViewController {
         navigationBar.title = "星球活动"
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
+        DIYEmptyView.emptyTableView(tableView: tableView)
+
     }
     
     override func setupLayouts() {

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -24,6 +24,8 @@ class MessagePlanetNotiController: BaseViewController {
         navigationBar.title = "星球活动"
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
+        DIYEmptyView.emptyTableView(tableView: tableView)
+
     }
     
     override func setupLayouts() {

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

@@ -17,8 +17,7 @@ let kProductSever = false
 public func kApiDataPrefix() -> String {
     if kVirusPersonalService /** 接口前缀-开发服务器*/ {
         return ""
-    }
-    if kDevelopSever /** 接口前缀-开发服务器*/ {
+    }else if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com"
     } else if kBetaSever /** 接口前缀-测试服务器*/{
         return "https://api.dev.caihongxingqiu.com/beta"
@@ -41,7 +40,7 @@ public func kApiVirusPrefix() -> String {
     }else if kVirusDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com/virus/v2"
     } else if kVirusBetaSever /** 接口前缀-测试服务器*/{
-        return ""
+        return "https://api.dev.caihongxingqiu.com/beta/virus/v2"
     }else if kVirusProductSever /** 接口前缀-生产服务器*/ {
         return ""
     }else {
@@ -57,11 +56,11 @@ let kH5ProductSever = false
 // MARK: - H5
 public func kApiH5Prefix() -> String {
     if kH5PersonalService /** 接口前缀-开发服务器*/ {
-        return "http://192.168.23.129:8820"
+        return ""
     }else if kH5DevelopSever /** 接口前缀-开发服务器*/ {
         return "http://h5.dev.caihongxingqiu.com"
     } else if kH5BetaSever /** 接口前缀-测试服务器*/{
-        return ""
+        return "http://h5.beta.caihongxingqiu.com"
     }else if kH5ProductSever /** 接口前缀-生产服务器*/ {
         return ""
     }else {

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -21,4 +21,25 @@ class DIYEmptyView: LYEmptyView {
         detailLabTextColor = k666666Color
         
     }
+    
+    
+    /// tableView上的默认图
+    ///
+    /// - Parameter tableView: UITableView
+    class func emptyTableView(tableView:UITableView) {
+        let emptyView = DIYEmptyView.empty(withImageStr: "default_page_content", titleStr: nil, detailStr: "暂时没有内容哦")
+        emptyView?.contentViewY = kScaleValue(value: 164)
+        tableView.ly_emptyView = emptyView
+        tableView.ly_startLoading()
+    }
+    
+    /// collectionView上的默认图
+    ///
+    /// - Parameter collectionView: UICollectionView
+    class func emptyTableView(collectionView:UICollectionView) {
+        let emptyView = DIYEmptyView.empty(withImageStr: "default_page_content", titleStr: nil, detailStr: "暂时没有内容哦")
+        emptyView?.contentViewY = kScaleValue(value: 164)
+        collectionView.ly_emptyView = emptyView
+        collectionView.ly_startLoading()
+    }
 }