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

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

@@ -37,10 +37,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
         return vm
     }()
     
-    var imgItems:[YHHomeIdentityItem] = [YHHomeIdentityItem(img:UIImage(named: "identity_talent_1")),
-                                         YHHomeIdentityItem(img:UIImage(named: "identity_talent_2")),
-                                         YHHomeIdentityItem(img:UIImage(named: "identity_talent_3")),
-                                         YHHomeIdentityItem(img:UIImage(named: "identity_talent_4"))]
+    var imgItems:[YHHomeIdentityItem] = []
 
     lazy var subTabBar: YHIdentityTabBar = {
         let bar = YHIdentityTabBar.tabBarForItems([])
@@ -53,6 +50,8 @@ class YHHomeIdentityViewController: YHBaseViewController {
                 self.segmentedView.defaultSelectedIndex = 0
                 self.segmentedView.reloadDataWithoutListContainer()
             }
+            self.selectSubTab = item
+            getDetailImages()
         }
         return bar
     }()
@@ -116,7 +115,6 @@ class YHHomeIdentityViewController: YHBaseViewController {
     
     lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
-        dataSource.titles = ["项目介绍", "申请条件", "申请流程", "费用详情"]
         dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 16)
         dataSource.titleNormalColor = UIColor.init(hex: 0x94A3B8)
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
@@ -127,6 +125,8 @@ class YHHomeIdentityViewController: YHBaseViewController {
         return dataSource
     }()
     
+    var titles: [String] = []
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         createUI()
@@ -161,7 +161,9 @@ class YHHomeIdentityViewController: YHBaseViewController {
 
 extension YHHomeIdentityViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-        self.tableView.scrollToRow(at: IndexPath(row: index, section: 0), at: .top, animated: true)
+        if 0 <= index, index < self.imgItems.count {
+            self.tableView.scrollToRow(at: IndexPath(row: index, section: 0), at: .top, animated: true)
+        }
     }
 }
 
@@ -215,12 +217,12 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         printLog("offset: \(scrollView.contentOffset.y)")
-        if scrollView.contentOffset.y <= self.headerView.height {
-            if self.segmentedView.selectedIndex != 0 {
-                self.segmentedView.defaultSelectedIndex = 0
-                self.segmentedView.reloadDataWithoutListContainer()
-            }
-        }
+//        if scrollView.contentOffset.y <= self.headerView.height {
+//            if self.segmentedView.selectedIndex != 0 {
+//                self.segmentedView.defaultSelectedIndex = 0
+//                self.segmentedView.reloadDataWithoutListContainer()
+//            }
+//        }
         let gap = 10.0
         if scrollView.contentOffset.y > self.scrollContentY+gap {
             self.scrollContentY = scrollView.contentOffset.y
@@ -259,16 +261,6 @@ extension YHHomeIdentityViewController {
             [weak self] success, error in
             guard let self = self else { return }
             
-            if true {
-                let a = YHHomeLifeCategoryModel()
-                a.name = "高才"
-                a.id = "90"
-                let b = YHHomeLifeCategoryModel()
-                b.name = "优才"
-                b.id = "91"
-                self.viewModel.categoryArr = [a, b]
-            }
-            
             subTabArr.removeAll()
             for item in self.viewModel.categoryArr {
                 if let item = item {
@@ -276,16 +268,34 @@ extension YHHomeIdentityViewController {
                 }
             }
             self.subTabBar.updateItems(subTabArr)
-            
-            for item in self.subTabArr {
-                let params:[String: Any] = ["categoryId": "2",
-                                            "levelId": item.id]
-                self.viewModel.getGoodsCategoryDetail(params: params) {
-                    [weak self] success, error in
-                    guard let self = self else { return }
-                    
+            self.selectSubTab = self.subTabArr.first
+            getDetailImages()
+        }
+    }
+    
+    func getDetailImages() {
+        if let selectItem = self.selectSubTab  {
+            self.imgItems.removeAll()
+            let params:[String: Any] = ["categoryId": "2",
+                                        "levelId": selectItem.id]
+            self.viewModel.getGoodsCategoryDetail(params: params) {
+                [weak self] success, error in
+                guard let self = self else { return }
+                self.titles.removeAll()
+                for product in self.viewModel.detailModel.products {
+                    self.headImgView.kf.setImage(with: URL(string: product.image))
+                    for detail in product.details {
+                        let item = YHHomeIdentityItem()
+                        item.url = detail.image
+                        self.imgItems.append(item)
+                        self.titles.append(detail.name)
+                    }
                 }
-                
+                self.segmentedDataSource.titles = self.titles
+                self.segmentedView.dataSource = self.segmentedDataSource
+                self.segmentedView.reloadDataWithoutListContainer()
+                self.tableView.reloadData()
+                requestImages()
             }
         }
     }
@@ -301,6 +311,7 @@ extension YHHomeIdentityViewController {
                 case .failure(let error):
                     print("image download failed: \(error.localizedDescription)")
                 }
+                self.tableView.reloadData()
                 ossGroup.leave()
             }
         }