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

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

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

@@ -12,10 +12,13 @@ import JXSegmentedView
 
 //MARK: - 生命周期函数 及变量
 class YHHomeHoldViewPageViewController: YHBaseViewController {
+    
     let arrItemTitles = ["推荐","身份","生活","资讯"]
     
     var arrItemVCs : [YHBaseViewController] = []
     
+    var identityVC: YHHomeIdentityViewController?
+    
     lazy var segmentedView : JXSegmentedView = {
        let view = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 44))
         view.backgroundColor = .clear
@@ -233,6 +236,7 @@ extension YHHomeHoldViewPageViewController {
             } else if i == 1 {
                 //身份
                 let vc = YHHomeIdentityViewController()
+                self.identityVC = vc
                 arrItemVCs.append(vc)
             } else if i == 2 {
                 //生活
@@ -284,6 +288,12 @@ extension YHHomeHoldViewPageViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
         self.segmentedView.reloadDataWithoutListContainer()
+        
+        if index == 1 { // 点击了身份tab 需要重置二级tab为第一个
+            if let vc = self.identityVC {
+                vc.updateSelectIndex(0)
+            }
+        }
     }
 }
 

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

@@ -170,6 +170,10 @@ class YHHomeIdentityViewController: YHBaseViewController {
         model.showFlag = false
         NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
     }
+    
+    func updateSelectIndex(_ index:Int) {
+        self.subTabBar.selectIndex = index
+    }
 }
 
 extension YHHomeIdentityViewController: JXSegmentedViewDelegate {
@@ -286,13 +290,13 @@ extension YHHomeIdentityViewController {
     
     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()
+                self.imgItems.removeAll()
                 for product in self.viewModel.detailModel.products {
                     self.headImgView.kf.setImage(with: URL(string: product.image))
                     for detail in product.details {

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

@@ -16,6 +16,20 @@ class YHIdentityTabBar: UIView {
     static let itemHeight = 26.0
     static let gap = 10.0
         
+    var selectIndex:Int = 0 {
+        didSet {
+            for (index, item) in self.subviews.enumerated() {
+                if item.isKind(of: UIButton.self) {
+                    let itemBtn = item as! UIButton
+                    self.setButton(itemBtn, isSelected: index == self.selectIndex)
+                }
+            }
+            if 0 <= self.selectIndex, self.selectIndex < self.items.count {
+                let selectItem = self.items[self.selectIndex]
+                self.selectBlock?(self.selectIndex, selectItem)
+            }
+        }
+    }
     var selectBlock:((Int, YHHomeLifeCategoryModel)->Void)?
     var items:[YHHomeLifeCategoryModel] = []
     
@@ -58,15 +72,6 @@ class YHIdentityTabBar: UIView {
     
     @objc func didTabButtonClicked(_ selectBtn: UIButton) {
         let selectIndex = selectBtn.tag-Self.baseTag
-        for (index, item) in self.subviews.enumerated() {
-            if item.isKind(of: UIButton.self) {
-                let itemBtn = item as! UIButton
-                self.setButton(itemBtn, isSelected: itemBtn.tag == selectBtn.tag)
-            }
-        }
-        if 0 <= selectIndex, selectIndex < self.items.count {
-            let selectItem = self.items[selectIndex]
-            self.selectBlock?(selectIndex, selectItem)
-        }
+        self.selectIndex = selectIndex
     }
 }