Merge commit '1f48574e' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2122,8 +2122,6 @@
 				044414022BC39B8D00784A14 /* YHServerTableHeadView.swift */,
 				049AC4C52BC3E55300F857F4 /* YHServiceSectionView.swift */,
 				044414042BC3B9DE00784A14 /* YHServiceTableFootView.swift */,
-				044414062BC3C54B00784A14 /* YHHomeCollectionViewCell.swift */,
-				044414082BC3CE8500784A14 /* YHHomeCollectionLayout.swift */,
 				04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */,
 				049AC4C72BC513AB00F857F4 /* YHOrderListView.swift */,
 				049AC4C92BC5141600F857F4 /* YHServerNoOrderView.swift */,
@@ -2220,6 +2218,8 @@
 				A5F9AD322BC3CD66000323F8 /* YHHkLifeAndIdItemView.swift */,
 				A53F42BA2BC3DE6F009CAC70 /* YHHomeKingKongBlockItem.swift */,
 				A50A747B2BC8EC86003D28D9 /* YHHomeBannerCollectionViewCell.swift */,
+				044414062BC3C54B00784A14 /* YHHomeCollectionViewCell.swift */,
+				044414082BC3CE8500784A14 /* YHHomeCollectionLayout.swift */,
 				A50A747D2BC91308003D28D9 /* YHHomeBannerIndicatorView.swift */,
 			);
 			path = V;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHHomeCollectionViewCell.swift → galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeCollectionViewCell.swift

@@ -28,7 +28,7 @@ class YHHomeCollectionViewCell: UICollectionViewCell {
     }
     
     lazy var titleImageView:UIImageView = {
-        let imageV = UIImageView(image: UIImage(named: "home_title_image"))
+        let imageV = UIImageView(image: UIImage(named: "home_banner_default_icon"))
         imageV.contentMode = .scaleAspectFill
         return imageV
     }()
@@ -172,7 +172,7 @@ extension YHHomeCollectionViewCell {
         if let url = URL(string: listModel.img_url) {
             titleImageView.kf.setImage(with: url)
         }
-        descripeLable.text = listModel.title.defaultStringIfEmpty(detaultValue: "***")
+        descripeLable.text = listModel.title.defaultStringIfEmpty(detaultValue: "银河世纪")
         descripeLable.snp.removeConstraints()
         descripeLable.snp.remakeConstraints { make in
             make.top.equalToSuperview().offset(10)

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHInformationFillVC.swift

@@ -10,6 +10,7 @@ import UIKit
 
 class YHInformationFillVC: YHBaseViewController {
     
+    var type:Int = -1
     var msgArr:[YHDetailMessageModel] = []
     
     lazy var viewModel = {
@@ -81,7 +82,7 @@ class YHInformationFillVC: YHBaseViewController {
     
     func getMsgList() {
         YHHUD.show(.progress(message: "加载中..."))
-        self.viewModel.getMsgDetailList { 
+        self.viewModel.getMsgDetailList(type: self.type) {
             [weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMsgViewController.swift

@@ -48,6 +48,7 @@ class YHMsgViewController: YHBaseViewController {
             guard let self = self else { return }
             YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
                 let vc = YHInformationFillVC()
+                vc.type = 1
                 self.navigationController?.pushViewController(vc)
             }
         }
@@ -175,8 +176,12 @@ extension YHMsgViewController: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
        
-        let vc = YHInformationFillVC()
-        self.navigationController?.pushViewController(vc)
+        if 0 < indexPath.row && indexPath.row < msgArr.count {
+            let msgItem = msgArr[indexPath.row]
+            let vc = YHInformationFillVC()
+            vc.type = msgItem.type
+            self.navigationController?.pushViewController(vc)
+        }
     }
 
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -43,9 +43,10 @@ class YHMsgViewModel: NSObject {
         }
     }
     
-    func getMsgDetailList(_ callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+    func getMsgDetailList(type:Int, _ callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.msgDetaiList
-        let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
+        let params = ["type": type]
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
             
             let dic = json.data
             printLog("model 是 ==> \(json)")
@@ -76,4 +77,29 @@ class YHMsgViewModel: NSObject {
             callBackBlock(false, error)
         }
     }
+    
+    func readMessages(type:Int, msgIds:[Int], _ callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.readMsg
+        
+        let params:[String : Any] = ["type": type,
+                                     "ids": msgIds]
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
+            
+            let dic = json.data
+            printLog("model 是 ==> \(json)")
+            if json.code == 200 {
+                callBackBlock(true, nil)
+                
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+            
+        } failBlock: { error in
+            self.msgList = nil
+            callBackBlock(false, error)
+        }
+        
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -261,5 +261,7 @@ class YHAllApiName {
         static let unreadMsgList = "infoflow/unread-message"
         // 具体业务消息列表
         static let msgDetaiList = "infoflow/message/list"
+        // 标记消息已读
+        static let readMsg = "infoflow/read-push"
     }
 }

galaxy/galaxy/Res/Assets.xcassets/DavidTest/Contents.json

-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

galaxy/galaxy/Res/Assets.xcassets/DavidTest/home_person_icon.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "a1ee8b3bd2c4f4969fd48d8db3c66fd 93@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "a1ee8b3bd2c4f4969fd48d8db3c66fd 93@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

galaxy/galaxy/Res/Assets.xcassets/DavidTest/home_title_image.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "fa969293-cb4c-490e-b597-3345266ff912 54@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "fa969293-cb4c-490e-b597-3345266ff912 54@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}