Pārlūkot izejas kodu

消息页面点赞与互动

南鑫林 5 gadi atpakaļ
vecāks
revīzija
dae3cb82b8

+ 6 - 6
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -17,7 +17,7 @@ class MessagePlanetNotiController: BaseViewController {
     
     var messageShowTypes : String = ""
     var cellHeightsDictionary = Dictionary<IndexPath, Any>()
-    var messageDataModels = Array<MessageDataModel>()
+    var messageDataModels : Array<MessageDataModel>?
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -45,7 +45,7 @@ class MessagePlanetNotiController: BaseViewController {
     override func setupData() {
         tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
-            self?.userMemberMessageList(page: page)
+            self?.userMemberMessageList(page: 1)
         }
         tableView.addAutoNormalFooter(withAutomaticallyRefresh: true, loadMoreBlock: {
             [weak self] (page) in
@@ -76,10 +76,10 @@ extension MessagePlanetNotiController {
             
             let messageListModel = messageListModel as? MessageListModel
             if messageListModel?.pagination?.currentPage == 1{
-                self?.messageDataModels.removeAll()
+                self?.messageDataModels?.removeAll()
                 self?.tableView.resetNoMoreData()
             }
-            self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
+            self?.messageDataModels = (self?.messageDataModels ??  Array<MessageDataModel>()) + (messageListModel?.data ??  Array<MessageDataModel>())
             self?.tableView.reloadData()
             MJRefreshManager.mjRefreshManagerPaginationNoHiddenFooter(tableView: self?.tableView,pagination: messageListModel?.pagination)
         }) {
@@ -95,12 +95,12 @@ extension MessagePlanetNotiController {
 extension MessagePlanetNotiController: UITableViewDataSource, UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return messageDataModels.isEmpty ?  0 : messageDataModels.count
+        return messageDataModels?.count ?? 0
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = MessagePlanetNotiTableCell.cellWith(tableView: tableView, indexPath: indexPath)
-        cell.messageDataModel = messageDataModels[indexPath.row]
+        cell.messageDataModel = messageDataModels?[indexPath.row]
         return cell
     }