no message

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

@@ -7,8 +7,13 @@
 //
 
 import UIKit
+import PPBadgeViewSwift
 
 class MessageHomeOneCollectionViewCell: UICollectionViewCell {
+    
+    var images = ["news_comment","news_interaction","news_attention"]
+    var titles = ["评论和@","赞与互动","关注通知"]
+    
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> MessageHomeOneCollectionViewCell {
         let ID = "MessageHomeOneCollectionViewCell"
         collectionView.register(MessageHomeOneCollectionViewCell.self, forCellWithReuseIdentifier: ID)
@@ -16,8 +21,7 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
         cell.indexPath = indexPath
         return cell
     }
-    var images = ["news_comment","news_interaction","news_attention"]
-    var titles = ["评论和@","赞与互动","关注通知"]
+    
     //MARK: - indexPath
     var indexPath: IndexPath?{
         didSet {
@@ -38,6 +42,7 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
     
     //MARK: - 设置view
     private func setupViews() {
+        backgroundColor = .white
         addSubview(iconImageView)
         addSubview(titleLabel)
     }
@@ -56,10 +61,12 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
     }
     
     
-    lazy var iconImageView : UIImageView = {
+    private lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
         iconImageView.isUserInteractionEnabled = true
         iconImageView.pp.addDot(color: kFE352BColor)
+        iconImageView.pp.setBadge(height: 10)
+        iconImageView.pp.moveBadge(x: -5, y: -5)
         return iconImageView
     }()
     
@@ -69,4 +76,14 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
         titleLabel.font = kScaleBoldFont14
         return titleLabel
     }()
+    
+    var messageModel: MessageModel? {
+        didSet {
+            if messageModel?.isYes == 0 {
+                iconImageView.pp.hiddenBadge()
+            }else if messageModel?.isYes == 1 {
+                iconImageView.pp.showBadge()
+            }
+        }
+    }
 }

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

@@ -9,6 +9,10 @@
 import UIKit
 
 class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
+    
+    var images = ["news_inform","news_activity"]
+    var titles = ["星球通知","星球活动"]
+    
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> MessageHomeTwoCollectionViewCell {
         let ID = "MessageHomeTwoCollectionViewCell"
         collectionView.register(MessageHomeTwoCollectionViewCell.self, forCellWithReuseIdentifier: ID)
@@ -17,8 +21,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
         return cell
     }
     
-    var images = ["news_inform","news_activity"]
-    var titles = ["星球通知","星球活动"]
+   
     //MARK: - indexPath
     var indexPath: IndexPath?{
         didSet {
@@ -134,4 +137,14 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
         dotLabel.masksToBounds = true
         return dotLabel
     }()
+    
+    var messageModel: MessageModel? {
+        didSet {
+            if messageModel?.isYes == 0 {
+                dotLabel.isHidden = true
+            }else if messageModel?.isYes == 1 {
+                dotLabel.isHidden = false
+            }
+        }
+    }
 }

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

@@ -10,11 +10,12 @@ import UIKit
 
 class MessageMainViewController: BaseViewController {
     
+    var messageIndexModel : MessageIndexModel?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
-        setupLayouts()
-        
+        setupData()
     }
     
     override func setupViews() {
@@ -24,8 +25,9 @@ class MessageMainViewController: BaseViewController {
     }
     
     override func setupData() {
-        collectionView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { (page) in
-            
+        collectionView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
+            [weak self] (page) in
+            self?.userMemberMessageIndexApi()
         }
     }
     
@@ -48,6 +50,18 @@ class MessageMainViewController: BaseViewController {
     
 }
 
+extension MessageMainViewController {
+    
+    /// 用户消息消息首页
+    func userMemberMessageIndexApi() {
+        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageIndexApi {
+            [weak self] (messageIndexModel) -> (Void) in
+            self?.messageIndexModel = messageIndexModel as? MessageIndexModel
+            self?.collectionView.reloadData()
+        }
+    }
+}
+
 extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         return 2
@@ -66,9 +80,28 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
         switch indexPath.section {
         case 0:
             let cell = MessageHomeOneCollectionViewCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            if self.messageIndexModel != nil {
+                switch indexPath.row {
+                case 0:// 评论和@
+                    cell.messageModel = (self.messageIndexModel?.comment)!
+                case 1:// 赞与互动
+                    cell.messageModel = (self.messageIndexModel?.praise)!
+                default: //关注通知
+                    cell.messageModel = (self.messageIndexModel?.follow)!
+                }
+            }
+            
             return cell
         default:
             let cell = MessageHomeTwoCollectionViewCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+            if self.messageIndexModel != nil {
+                switch indexPath.row {
+                case 0:// 星球通知
+                    cell.messageModel = (self.messageIndexModel?.notification)!
+                default:// 星球活动
+                    cell.messageModel = (self.messageIndexModel?.activity)!
+                }
+            }
             return cell
         }
     }
@@ -93,11 +126,9 @@ extension MessageMainViewController: UICollectionViewDelegateFlowLayout,UICollec
             case 0:// 星球通知
                 let vc = MessagePlanetNotiController()
                 self.navigationController?.pushViewController(vc, animated: true)
-            case 1:// 星球活动
+            default:// 星球活动
                 let vc = MessagePlanetActivityController()
                 self.navigationController?.pushViewController(vc, animated: true)
-            default:
-                return
             }
         }
        

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -682,8 +682,8 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             completion(messageListModel)
         }
     }
-    
-    /// <#Description#>
+    // MARK: - 用户消息阅读
+    /// 用户消息阅读
     ///
     /// - Parameters:
     ///   - messageShowTypes: 活动展示类型 0纯展示;1系统通知消息;2内容消息; 3活动消息; 4话题消息 ;5后台系统消息; 6评论消息; 7回复消息 ;8回复@ 消息;9攒内容消息 ;10收藏内容消息; 11分享内容消息 ;12关注消息