首页资讯

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

@@ -17,7 +17,7 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
     var arrItemVCs : [YHBaseViewController] = []
     
     lazy var segmentedView : JXSegmentedView = {
-       let view = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
+       let view = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 44))
         view.backgroundColor = .clear
         return view
     }()
@@ -94,9 +94,9 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         super.viewDidLayoutSubviews()
 
         let offy = k_Height_safeAreaInsetsTop() + 6 + YHHomeSearchView.viewH + 6
-        segmentedView.frame = CGRect(x: 0, y: offy, width: view.bounds.size.width, height: 48)
+        segmentedView.frame = CGRect(x: 0, y: offy, width: view.bounds.size.width, height: 44)
         
-        let offy1 = offy + 48 + 6
+        let offy1 = offy + 44
         listContainerView.frame = CGRect(x: 0, y: offy1, width: view.bounds.size.width, height: view.bounds.size.height - offy1 - k_Height_TabBar)
     }
     
@@ -240,8 +240,9 @@ extension YHHomeHoldViewPageViewController {
                 arrItemVCs.append(vc)
             } else if i == 3 {
                 //资讯
-                let vc = YHServerHKLifeViewController()
+                let vc = YHHomeInformationViewController()
                 arrItemVCs.append(vc)
+
             }
         }
         

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

@@ -123,7 +123,7 @@ extension YHHomeInfoDetailViewController: JXSegmentedListContainerViewListDelega
 extension YHHomeInfoDetailViewController {
     // 获取最新资讯
     func getTheNewestInfoList(isFirstPage: Bool) {
-        self.viewModel.getList(isFirsPage: isFirstPage) { success, error in
+        self.viewModel.getList(isFirsPage: isFirstPage, isHot: self.isHot) { success, error in
             self.collectView.reloadData()
             self.collectView.es.stopPullToRefresh()
             self.collectView.es.stopLoadingMore()

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import JXSegmentedView
 
 class YHHomeInformationViewController: YHBaseViewController {
 
@@ -45,7 +46,7 @@ class YHHomeInformationViewController: YHBaseViewController {
         self.view.backgroundColor = .white
         self.view.addSubview(self.collectView)
         self.collectView.snp.makeConstraints { make in
-            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+44)
+            make.top.equalTo(10)
             make.bottom.equalToSuperview()
             make.left.equalTo(20)
             make.right.equalTo(-20)
@@ -125,11 +126,17 @@ extension YHHomeInformationViewController : CollectionViewWaterfallLayoutDelegat
             row = row + 1
         }
         let listHeight = Float(Double(row) * kHomeItemHeight)
-        let totalHeight = 10.0 + listHeight + 4.0 + 0.5 + 65.0
+        let totalHeight = listHeight + 4.0 + 0.5 + 65.0
         return totalHeight
     }
 }
 
+extension YHHomeInformationViewController: JXSegmentedListContainerViewListDelegate {
+    func listView() -> UIView {
+        return view
+    }
+}
+
 extension YHHomeInformationViewController {
     // 获取最新资讯
     func getTheNewestInfoList(isFirstPage: Bool) {

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeInfoSectionHeadView.swift

@@ -73,7 +73,7 @@ class YHHomeInfoSectionHeadView: UICollectionReusableView {
         self.addSubview(bottomLineView)
         self.addSubview(titleLabel)
         collectView.snp.makeConstraints { make in
-            make.top.equalTo(10)
+            make.top.equalTo(0)
             make.left.right.equalToSuperview()
             make.height.equalTo(0)
         }

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

@@ -319,16 +319,20 @@ extension YHHomePageViewModel {
         }
     }
     
-    func getList(isFirsPage firstFlag : Bool, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func getList(isFirsPage : Bool, isHot:Bool? = nil, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         var params: [String : Any] = ["page": curPageIndex,
                                       "page_size": searchPageSize]
-        if firstFlag {
+        if isFirsPage {
             params = ["page": 1,
                       "page_size": searchPageSize]
         } else {
             params = ["page": curPageIndex + 1,
                       "page_size": searchPageSize]
         }
+        
+        if let isHot = isHot {
+            params["is_hot"] = isHot ? 1 : 0
+        }
         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 }
@@ -344,7 +348,7 @@ extension YHHomePageViewModel {
                     item.calHeightParam()
                 }
                 
-                if firstFlag {
+                if isFirsPage {
                     self.curPageIndex = 1
                     self.totalCount = result.total
                     self.arrHomeNewsData = result.data