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

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

@@ -9,6 +9,7 @@
 import UIKit
 import ESPullToRefresh
 import GKNavigationBarSwift
+import SmartCodable
 
 let kShowAlertOfSuggestLatestVersion =  "show_alert_suggest_latest_version"
 
@@ -107,6 +108,8 @@ class YHHomePageViewController: YHBaseViewController {
 }
 
 private extension YHHomePageViewController {
+    
+    
     @objc func didSearchBarClicked() {
         let vc = YHSearchInfomationVC()
         vc.searchPlaceHolder = searchView.placeHolder
@@ -115,17 +118,45 @@ private extension YHHomePageViewController {
     }
     
     func getData() {
-        homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
+        homeHeaderView.homeBannerView.dataArr = getLastBannerData()
         loadFirstData()
         getHomeBannerData()
     }
     
+    func getLastBannerData()->[YHBannerModel] {
+        let arrString2 = UserDefaults.standard.value(forKey: "homeBannerData")
+        if let tmp = arrString2 as? String,let dic = tmp.toArray() {
+            guard let result = [YHBannerModel].deserialize(from: dic as? [Any]) else {
+                return [YHBannerModel.localDefaultItem()]
+            }
+            
+            var arrData = result as? [YHBannerModel]
+            if let arr = arrData {
+                if arr.isEmpty {
+                    let model = YHBannerModel.localDefaultItem()
+                    arrData = [model]
+                    
+                } else if arr.count > 10 {
+                    arrData = Array(arrData?[0...9] ?? [])
+                }
+                return arrData!
+            }
+        }
+        
+        return [YHBannerModel.localDefaultItem()]
+    }
+    
     func getHomeBannerData() {
         DispatchQueue.global().async {
             self.viewModel.getHomeBanner(0) {[weak self] success, error in
                 guard let self = self else { return }
                 DispatchQueue.main.async {
-                    self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? [YHBannerModel.localDefaultItem()]
+                    self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? self.getLastBannerData()
+                    if let arrB = self.viewModel.banners,arrB.count > 0 {
+                        let arrString = arrB.toJSONString()
+                        UserDefaults.standard.set(arrString, forKey: "homeBannerData")
+                        UserDefaults.standard.synchronize()
+                    }
                 }
             }
         }

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

@@ -143,17 +143,23 @@ extension YHHomePageViewModel {
                 self.banners = arrData
                 callBackBlock(true, nil)
             } else {
-                let model = YHBannerModel.localDefaultItem()
-                self.banners?.removeAll()
-                self.banners = [model]
+                
+                if type != 0 {
+                    let model = YHBannerModel.localDefaultItem()
+                    self.banners?.removeAll()
+                    self.banners = [model]
+                }
+                
                 
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
                 callBackBlock(false, error)
             }
         } failBlock: { err in
-            let model = YHBannerModel.localDefaultItem()
-            self.banners?.removeAll()
-            self.banners = [model]
+            if type != 0 {
+                let model = YHBannerModel.localDefaultItem()
+                self.banners?.removeAll()
+                self.banners = [model]
+            }
             callBackBlock(false,err)
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -32,7 +32,7 @@ class YHFileListViewController: YHBaseViewController {
            [weak self] in
            guard let self = self else { return }
            self.navigationController?.popToRootViewController(animated: true)
-           goTabBarBy(tabType: .service)
+           self.goToTabService()
        }
        return view
     }()
@@ -74,6 +74,10 @@ class YHFileListViewController: YHBaseViewController {
         
     }
     
+    func goToTabService() {
+        goTabBarBy(tabType: .service)
+    }
+    
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
@@ -118,7 +122,6 @@ extension YHFileListViewController {
                         }
                     }
                     self.emptyView.isHidden = isHaveData
-                    
                     let r = self.myContentView.bounds
                     self.myContentView.frame = CGRect(x: kMargin, y: 217, width: KScreenWidth - 2*kMargin, height: r.height)
                     
@@ -155,7 +158,7 @@ extension YHFileListViewController {
     
     
     func setupUI() {
-        gk_navTitle = "文件清单"
+        gk_navTitle = "待完善清单"
         gk_navBarAlpha = 1.0
         gk_navBackgroundColor = .white
         
@@ -167,7 +170,9 @@ extension YHFileListViewController {
             make.height.equalTo(YHFileListBottomView.viewH)
         }
         
-        bottomView.block = { [self] flag in
+        bottomView.block = {
+            [weak self] flag in
+            guard let self = self else { return }
             if flag == 1 {
                 YHHUD.show(.progress(message: "正在生成图片"))
                 if let image = self.captureScrollView(scrollView: self.myScrollView) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListContentView.swift

@@ -72,9 +72,6 @@ extension YHFileListContentView {
         var lastView : UIView?
         for (index,item) in arrData.enumerated() {
             if let iii = item {
-                if iii.type == 0, iii.supplement_list.count <= 0 {
-                    continue
-                }
                 var view : UIView = YHFileListItemsView()
                 if iii.type == 0 {
                     (view as! YHFileListItemsView).dataModel = item