no message

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -30,5 +30,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
         return true
     }
+    
+    ///当App将从后台回到前台时调用,之后肯定调用applicationDidBecomeActive方法表示程序进入active状态,但App第一次启动时不是从后台启动,所以首次加载时不会调用此方法.
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageIndexApi {
+            (messageIndexModel) -> (Void) in
+            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

@@ -50,13 +50,13 @@ class BaseTabbarViewController: ESTabBarController {
         /// 消息
         let v4 = MessageMainViewController()
         /// 我的
-//        let v5 = MineViewController()
         let v5 = UserPersonalCenterViewController()
 
         v1.tabBarItem = ESTabBarItem.init(BaseIrregularityBasicContentView(),title: "社区", image: UIImage(named: "tabbar_home"), selectedImage: UIImage(named: "tabbar_home_pre"))
         v2.tabBarItem = ESTabBarItem.init(BaseIrregularityBasicContentView(),title: "商城", image: UIImage(named: "tabbar_shopping"), selectedImage: UIImage(named: "tabbar_shopping_pre"))
         v3.tabBarItem = ESTabBarItem.init(BaseIrregularityContentView(), title: nil, image: UIImage(named: "tabbar_publish"), selectedImage: UIImage(named: "tabbar_publish"))
         v4.tabBarItem = ESTabBarItem.init(BaseIrregularityBasicContentView(),title: "消息", image: UIImage(named: "tabbar_massage"), selectedImage: UIImage(named: "tabbar_massage_pre"))
+        v4.tabBarItem.pp.addBadge(number: 1)
         v5.tabBarItem = ESTabBarItem.init(BaseIrregularityBasicContentView(),title: "我的", image: UIImage(named: "tabbar_my"), selectedImage: UIImage(named: "tabbar_my_pre"))
         
         let n1 = BaseNavigationViewController.init(rootViewController: v1)

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

@@ -124,8 +124,10 @@ class CommunityViewController: BaseViewController {
         // 查看全部热门视频
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityPopularVideo"), object: nil, queue: OperationQueue.main) {
              [weak self] (notification) in
-//            let vc = CommunityVideoListController()
-//            self?.navigationController?.pushViewController(vc, animated: true)
+            let id = notification.object as? Int
+            let vc = CommunityVideoListController()
+            vc.contentId = id ?? 0
+            self?.navigationController?.pushViewController(vc, animated: true)
         }
         
         // 查看其他用户中心

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

@@ -148,6 +148,28 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
             }
             subLabel.text = messageModel?.view?.content
             timeLabel.text = messageModel?.view?.createdAt
+            if messageModel?.view?.content == nil {
+                titleLabel.snp.remakeConstraints { (make) in
+                    make.centerY.equalToSuperview()
+                    make.left.equalTo(iconImageView.snp_right).offset(8)
+                    make.width.equalTo(67)
+                    make.height.equalTo(23)
+                }
+            }else {
+                titleLabel.snp.remakeConstraints { (make) in
+                    make.top.equalTo(12)
+                    make.left.equalTo(iconImageView.snp_right).offset(8)
+                    make.width.equalTo(67)
+                    make.height.equalTo(23)
+                }
+                
+                subLabel.snp.remakeConstraints { (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)
+                }
+            }
         }
     }
 }

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

@@ -10,6 +10,13 @@ import UIKit
 
 class MessageMainViewController: BaseViewController {
     
+    deinit {
+        if observe != nil {
+            NotificationCenter.default.removeObserver(observe!)
+        }
+    }
+    weak var observe : NSObjectProtocol?
+    
     var messageIndexModel : MessageIndexModel?
     
     override func viewDidLoad() {
@@ -25,6 +32,13 @@ 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?.tabBarItem.pp.addDot(color: kFE352BColor)
+        }
         collectionView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.userMemberMessageIndexApi()
@@ -58,6 +72,11 @@ 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
+            }
         }
     }
     
@@ -202,6 +221,12 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
                 }
             }
         }
+        
+        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
+        }
        
     }