Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -14,7 +14,7 @@ class YHHomePageViewModel : YHBaseViewModel {
     var arrHomeNewsData: [YHHomeListModel]?
     var banners: [YHBannerModel]?
     var classify: [YHHomeClassifyModel]?
-    var hkList: [YHHKEventModel]?
+    
     //首页相关参数
     private var curPageIndex : Int = 1
     private var page_Size : Int = 10
@@ -152,7 +152,7 @@ extension YHHomePageViewModel {
                                       "page_size": 10,
                                       "classify_id": classifyID]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article
-        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
@@ -178,18 +178,26 @@ extension YHHomePageViewModel {
         }
     }
     
-    func getHKEvent(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.hklist
+    func searchArticleList(_ title: String, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        let params: [String : Any] = ["page": 1,
+                                      "page_size": 10,
+                                      "title": title]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
                 let dic = json.data
-                guard let result = [YHHKEventModel].deserialize(from: dic as? [Any]) else {
+                guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
+                    self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
                 }
-                self.hkList = (result as! [YHHKEventModel])
+                
+                for item in result.data {
+                    item.calHeightParam()
+                }
+                self.arrHomeNewsData = result.data
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)