Merge branch 'xiezhaolin' into develop

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

@@ -17,23 +17,9 @@ class YHFourKingViewController: YHBaseViewController {
 
     var dataSouce: [YHHomeListModel?] = [] {
         didSet {
-            self.homeTableView.reloadData()
+            self.tableFootView.items = dataSouce
         }
     }
-    var homeTableView: UITableView = {
-        let tableView = UITableView(frame: .zero, style: .plain)
-        if #available(iOS 15.0, *) {
-            tableView.sectionHeaderTopPadding = 0
-        }
-        tableView.backgroundColor = .clear
-        tableView.separatorStyle = .none
-        tableView.showsHorizontalScrollIndicator = false
-        tableView.showsVerticalScrollIndicator = false
-        tableView.rowHeight = UITableView.automaticDimension
-        tableView.estimatedRowHeight = 81.0
-        tableView.register(YHServerHKLifeViewCell.self,forCellReuseIdentifier: YHServerHKLifeViewCell.cellReuseIdentifier)
-        return tableView
-    }()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -80,79 +66,35 @@ extension YHFourKingViewController {
                     guard let self = self else { return }
                     self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
                     if self.homeViewModel.hasMoreForHomeNews == false {
-                        self.homeTableView.es.noticeNoMoreData()
+                        self.tableFootView.myCollectView.es.noticeNoMoreData()
                     }
                 }
             }
             return view
         }()
-        
-        view.addSubview(homeTableView)
-        homeTableView.tableFooterView = tableFootView
-        homeTableView.snp.makeConstraints { make in
-            make.bottom.left.right.equalToSuperview()
+        view.addSubview(sectionView)
+        sectionView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.height.equalTo(48)
         }
-        homeTableView.delegate = self
-        homeTableView.dataSource = self
         
-        homeTableView.es.addInfiniteScrolling {[weak self] in
+        tableFootView = YHServiceTableFootView()
+        tableFootView.moreBlock = {[weak self] in
             guard let self = self else { return }
             self.homeViewModel.getList(false, self.classId) {[weak self] success, error in
                 guard let self = self else { return }
+                self.tableFootView.myCollectView.es.stopLoadingMore()
                 self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
-                self.homeTableView.es.stopLoadingMore()
                 if self.homeViewModel.hasMoreForHomeNews == false {
-                    self.homeTableView.es.noticeNoMoreData()
+                    self.tableFootView.myCollectView.es.noticeNoMoreData()
                 }
             }
         }
-    }
-}
-
-// MARK: - UITableViewDelegate 和 UITableViewDataSource
-extension YHFourKingViewController : UITableViewDelegate,UITableViewDataSource {
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
-    
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        return 1
-    }
-    
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if sectionView.items.count == 1 {
-            return 0
+        view.addSubview(tableFootView)
+        tableFootView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar + 48)
         }
-        return 48
-    }
-    
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        return sectionView
-    }
-    
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 0.01
-    }
-    
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        return UIView()
-    }
-    
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return KScreenHeight
-    }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell0 = tableView.dequeueReusableCell(withClass: YHServerHKLifeViewCell.self)
-        cell0.tableFootView.items = dataSouce
-        cell0.selectionStyle = .none
-        return cell0
-    }
-    
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        
     }
 }

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

@@ -48,10 +48,11 @@ class YHServerHKLifeViewController: YHBaseViewController {
 
 extension YHServerHKLifeViewController {
     func loadData() {
-        
+        self.tableHeadView.bannarView.dataArr = [YHBannerModel.localDefaultItem()]
+
         homeViewModel.getHomeBanner(2){[weak self] success, error in
             guard let self = self else { return }
-            self.tableHeadView.bannarView.dataArr = self.homeViewModel.banners ?? []
+            self.tableHeadView.bannarView.dataArr = self.homeViewModel.banners ?? [YHBannerModel.localDefaultItem()]
         }
         
         homeViewModel.getHomeClassify{[weak self] success, error in
@@ -176,6 +177,9 @@ extension YHServerHKLifeViewController: JXSegmentedListContainerViewListDelegate
 }
 
 class YHServerHKLifeViewCell: UITableViewCell {
+    typealias LoadBlock = () -> ()
+    var moreBlock: LoadBlock?
+    
     static let cellReuseIdentifier = "YHServerHKLifeViewCell"
     var tableFootView: YHServiceTableFootView!
     
@@ -215,6 +219,12 @@ extension YHServerHKLifeViewCell {
         backgroundColor = .clear
         contentView.backgroundColor = .clear
         tableFootView = YHServiceTableFootView()
+        tableFootView.moreBlock = {[weak self] in
+            guard let self = self else { return }
+            if let block = self.moreBlock {
+                block()
+            }
+        }
         tableFootView.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight)
         contentView.addSubview(tableFootView)
     }

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

@@ -32,10 +32,11 @@ class YHServiceListViewController: YHBaseViewController {
 
 extension YHServiceListViewController {
     func loadData() {
-        
+        self.normalView.tableHeadView.bannarView.dataArr = [YHBannerModel.localDefaultItem()]
+
         homeViewModel.getHomeBanner(1){[weak self] success, error in
             guard let self = self else { return }
-            self.normalView.tableHeadView.bannarView.dataArr = self.homeViewModel.banners ?? []
+            self.normalView.tableHeadView.bannarView.dataArr = self.homeViewModel.banners ?? [YHBannerModel.localDefaultItem()]
         }
         
         homeViewModel.getHomeClassify{[weak self] success, error in

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

@@ -55,7 +55,7 @@ class YHServiceTableFootView: UIView {
         myCollectView.es.addInfiniteScrolling {[weak self] in
             guard let self = self else { return }
             if let block = moreBlock {
-                block ()
+                block()
             }
         }
     }