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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 搜索
  标题错误修改
  吴测试牛逼

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHFourKingViewController.swift

@@ -53,13 +53,15 @@ extension YHFourKingViewController {
             for item in classify {
                 let model = item as YHHomeClassifyModel
                 if model.id == self.id {
-                    gk_navTitle = model.name
-                    self.sectionView.items = model.children
-                    let classifyID = model.children.first?.id ?? 0
-                    self.classId = classifyID
-                    self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
-                        guard let self = self else { return }
-                        self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
+                    if self.classId == 0 {
+                        gk_navTitle = model.name
+                        self.sectionView.items = model.children
+                        let classifyID = model.children.first?.id ?? 0
+                        self.classId = classifyID
+                        self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
+                            guard let self = self else { return }
+                            self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
+                        }
                     }
                 }
             }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift

@@ -47,7 +47,7 @@ class YHSearchInfomationVC: YHBaseViewController {
                 searchStr = "香港身份"
                 self.searchBar.textField.text = "香港身份"
             }
-            searchText(searchStr)
+            searchText()
             if searchStr.count > 0 {
                 self.saveSearchHistory(searchStr)
             }
@@ -81,6 +81,12 @@ class YHSearchInfomationVC: YHBaseViewController {
         tableView.backgroundColor = .white
         tableView.backgroundView = emptyDataTipsView
         tableView.register(YHSearchInfoCell.self, forCellReuseIdentifier: YHSearchInfoCell.cellReuseIdentifier)
+        tableView.es.addPullToRefresh {
+            self.loadFirstData()
+        }
+        tableView.es.addInfiniteScrolling {
+            self.loadMoreData()
+        }
         return tableView
     }()
     
@@ -92,7 +98,8 @@ class YHSearchInfomationVC: YHBaseViewController {
             guard let self = self else { return }
             self.searchHistoryView.isHidden = true
             self.searchBar.textField.text = text
-            searchText(text)
+            self.searchStr = text
+            searchText()
             self.saveSearchHistory(text)
         }
         return view
@@ -167,14 +174,53 @@ class YHSearchInfomationVC: YHBaseViewController {
         }
     }
     
-    func searchText(_ text:String) {
+    func searchText() {
+        self.tableView.scrollToTop()
         YHHUD.show(.progress(message: "搜索中..."))
-        // 去除两端的空格
-        let targetText = text.trimmingCharacters(in: .whitespaces)
-        self.viewModel.searchArticleList(targetText) {
+        viewModel.searchArticleList(self.searchStr, isFirstPage : true) {
             [weak self] success, error in
             YHHUD.hide()
             guard let self = self else { return }
+            
+            items.removeAll()
+            if let arr = self.viewModel.arrHomeNewsData {
+                items.append(contentsOf: arr)
+            }
+            emptyDataTipsView.isHidden = (items.count > 0)
+            searchHistoryView.isHidden = true
+            self.tableView.reloadData()
+            tableView.es.stopPullToRefresh()
+            if self.viewModel.hasMoreForHomeNews == false {
+                tableView.es.noticeNoMoreData()
+            }
+        }
+    }
+    
+    func loadMoreData() {
+        viewModel.searchArticleList(self.searchStr, isFirstPage : false) {
+            [weak self] success, error in
+            guard let self = self else { return }
+            
+            items.removeAll()
+            if let arr = self.viewModel.arrHomeNewsData {
+                items.append(contentsOf: arr)
+            }
+            emptyDataTipsView.isHidden = (items.count > 0)
+            searchHistoryView.isHidden = true
+            self.tableView.reloadData()
+            tableView.es.stopLoadingMore()
+            if self.viewModel.hasMoreForHomeNews == false {
+                tableView.es.noticeNoMoreData()
+            }
+        }
+    }
+    
+    func loadFirstData() {
+        
+        viewModel.searchArticleList(self.searchStr, isFirstPage : true) {
+            [weak self] success, error in
+            guard let self = self else { return }
+            
             items.removeAll()
             if let arr = self.viewModel.arrHomeNewsData {
                 items.append(contentsOf: arr)
@@ -182,6 +228,10 @@ class YHSearchInfomationVC: YHBaseViewController {
             emptyDataTipsView.isHidden = (items.count > 0)
             searchHistoryView.isHidden = true
             self.tableView.reloadData()
+            tableView.es.stopPullToRefresh()
+            if self.viewModel.hasMoreForHomeNews == false {
+                tableView.es.noticeNoMoreData()
+            }
         }
     }
     

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

@@ -255,34 +255,61 @@ extension YHHomePageViewModel {
     }
     
     // 搜索
-    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, params: params) { [weak self] json, code in
-                guard let self = self else { return }
-                //1. json字符串 转 对象
-                if json.code == 200 {
-                    let dic = json.data
-                    guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
-                        self.arrHomeNewsData = []
-                        callBackBlock(false,nil)
-                        return
-                    }
-                    
-                    for item in result.data {
-                        item.calHeightParam()
-                    }
+    func searchArticleList(_ title: String, isFirstPage:Bool, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        
+        var params: [String : Any] = [:]
+
+        if isFirstPage {
+            curPageIndex = 1
+            params = ["page": curPageIndex,
+                      "page_size": 10,
+                      "title": title]
+        } else {
+            params = ["page": curPageIndex + 1,
+                      "page_size": 10,
+                      "title": title]
+        }
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.article
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+            guard let self = self else { return }
+            //1. json字符串 转 对象
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
+                    self.arrHomeNewsData = []
+                    callBackBlock(false,nil)
+                    return
+                }
+                
+                for item in result.data {
+                    item.calHeightParam()
+                }
+                if isFirstPage {
+                    self.totalCount = result.total
                     self.arrHomeNewsData = result.data
-                    callBackBlock(true, nil)
+                    curPageIndex = 1
                 } else {
-                    let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                    callBackBlock(false, error)
+                    curPageIndex = curPageIndex + 1
+                    self.arrHomeNewsData?.append(contentsOf: result.data)
+                }
+                
+                if let count = self.arrHomeNewsData?.count {
+                    if count == self.totalCount {
+                        self.hasMoreForHomeNews = false
+                    } else {
+                        self.hasMoreForHomeNews = true
+                    }
                 }
-            } failBlock: { err in
+                callBackBlock(true, nil)
                 
-                callBackBlock(false,err)
+            } else {
+                self.arrHomeNewsData = []
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
             }
+        } failBlock: { err in
+            self.arrHomeNewsData = []
+            callBackBlock(false,err)
         }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift

@@ -61,15 +61,14 @@ extension YHServerHKLifeViewController {
                 if model.id == 2 {
                     self.sectionView.items = model.children
                     if self.classId == 0 {
-                        return
-                    }
-                    let classifyID = model.children.first?.id ?? 0
-                    self.classId = classifyID
-                    self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
-                        guard let self = self else { return }
-                        self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
-                        if self.homeViewModel.hasMoreForHomeNews == false {
-                            self.homeTableView.es.noticeNoMoreData()
+                        let classifyID = model.children.first?.id ?? 0
+                        self.classId = classifyID
+                        self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
+                            guard let self = self else { return }
+                            self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
+                            if self.homeViewModel.hasMoreForHomeNews == false {
+                                self.homeTableView.es.noticeNoMoreData()
+                            }
                         }
                     }
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceListViewController.swift

@@ -45,15 +45,14 @@ extension YHServiceListViewController {
                 if model.id == 1 {
                     self.normalView.sectionView.items = model.children
                     if self.classId == 0 {
-                        return
-                    }
-                    let classifyID = model.children.first?.id ?? 0
-                    self.classId = classifyID
-                    self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
-                        guard let self = self else { return }
-                        self.normalView.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
-                        if self.homeViewModel.hasMoreForHomeNews == false {
-                            self.normalView.homeTableView.es.noticeNoMoreData()
+                        let classifyID = model.children.first?.id ?? 0
+                        self.classId = classifyID
+                        self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
+                            guard let self = self else { return }
+                            self.normalView.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
+                            if self.homeViewModel.hasMoreForHomeNews == false {
+                                self.normalView.homeTableView.es.noticeNoMoreData()
+                            }
                         }
                     }
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServerNoOrderView.swift

@@ -58,6 +58,7 @@ class YHServerNoOrderView: UIView {
         }()
         
         tableHeadView = YHServerTableHeadView()
+        tableHeadView.titleLabel.text = "香港身份攻略"
         tableHeadView.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: 365)
         addSubview(homeTableView)
         homeTableView.tableHeaderView = tableHeadView

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceTableFootView.swift

@@ -84,6 +84,18 @@ extension YHServiceTableFootView: UICollectionViewDelegate, UICollectionViewData
             let vc = YHHomeWebViewController()
             vc.url = YHConfigManager.shared.h5Url + "?id=\(model.id)"
             vc.id = model.id
+            vc.block = {[weak self] model in
+                guard let self = self else { return }
+                let arr = self.items
+                for (index, targetItem) in arr.enumerated() {
+                    guard let target = targetItem else { return }
+                    if target.id == model.id {
+                        target.is_like = model.is_like
+                        target.like_count = model.like_count
+                        self.myCollectView.reloadItems(at: [IndexPath.SubSequence(item: index, section: 0)])
+                    }
+                }
+            }
             UIViewController.current?.navigationController?.pushViewController(vc)
         } else if model.type == 1 {
             printLog("直接播放视频")