// 首页身份

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -270,6 +270,7 @@
 		0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
 		0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
 		0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
+		0472E25C2C521E64008EAB6E /* YHHomeIdentityListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472E25B2C521E64008EAB6E /* YHHomeIdentityListVC.swift */; };
 		04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */; };
 		047619E92BA9867100F45358 /* YHCountryHotView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047619E82BA9867100F45358 /* YHCountryHotView.swift */; };
 		047619ED2BA9B9C900F45358 /* area.plist in Resources */ = {isa = PBXBuildFile; fileRef = 047619EC2BA9B9C900F45358 /* area.plist */; };
@@ -889,6 +890,7 @@
 		046AB7762BD674170086C6F1 /* galaxy.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxy.entitlements; sourceTree = "<group>"; };
 		046AB7772BD674170086C6F1 /* galaxyDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyDebug.entitlements; sourceTree = "<group>"; };
 		046AB7782BD674170086C6F1 /* galaxyTestEnv.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = galaxyTestEnv.entitlements; sourceTree = "<group>"; };
+		0472E25B2C521E64008EAB6E /* YHHomeIdentityListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeIdentityListVC.swift; sourceTree = "<group>"; };
 		04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = "<group>"; };
 		047619E82BA9867100F45358 /* YHCountryHotView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCountryHotView.swift; sourceTree = "<group>"; };
 		047619EC2BA9B9C900F45358 /* area.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = area.plist; sourceTree = "<group>"; };
@@ -2724,6 +2726,7 @@
 				A567E5762BD7643D00D5D5A0 /* YHHomePageViewController.swift */,
 				A5000F502C3BC28B00843452 /* YHHomeHoldViewPageViewController.swift */,
 				04213B242C48C15400797900 /* YHHomeIdentityViewController.swift */,
+				0472E25B2C521E64008EAB6E /* YHHomeIdentityListVC.swift */,
 				04213B282C48EF5200797900 /* YHHomeInformationViewController.swift */,
 				04213B2E2C49154900797900 /* YHHomeInfoDetailContainerViewController.swift */,
 				04213B302C4917BD00797900 /* YHHomeInfoDetailViewController.swift */,
@@ -3431,6 +3434,7 @@
 				044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
 				044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */,
 				04213B252C48C15400797900 /* YHHomeIdentityViewController.swift in Sources */,
+				0472E25C2C521E64008EAB6E /* YHHomeIdentityListVC.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
 				04213B352C4F85A900797900 /* YHHomeLifeCategoryModel.swift in Sources */,
 				04FB01CE2C23DDBD0040115D /* YHPeopleMatchNoDataView.swift in Sources */,

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

+//
+//  YHHomeIdentityListVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import JXSegmentedView
+
+class YHHomeIdentityItem {
+    var url: String = ""
+    var img: UIImage? = nil
+    var imgView: UIImageView = UIImageView()
+    func getSize() -> CGSize {
+        if let img = self.img, img.size.width > 0.0,  img.size.height > 0.0{
+            return CGSize(width:img.size.width, height: (img.size.height/img.size.width) * KScreenWidth)
+        }
+        return CGSize(width: KScreenWidth, height: KScreenWidth)
+    }
+    init(url: String = "", img: UIImage? = nil) {
+        self.url = url
+        self.img = img
+    }
+}
+
+class YHHomeIdentityListVC: YHBaseViewController {
+
+    var selectSubTab: YHHomeLifeCategoryModel? = nil
+    var imgItems:[YHHomeIdentityItem] = []
+
+    var scrollContentY: CGFloat = 0.0
+    var isShowBottomView: Bool = false
+    
+    lazy var viewModel: YHHomePageViewModel = {
+        let vm = YHHomePageViewModel()
+        return vm
+    }()
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style:.grouped)
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = UIColor.white
+        tableView.separatorStyle = .none
+        tableView.register(YHHomeIdentityCell.self, forCellReuseIdentifier: YHHomeIdentityCell.cellReuseIdentifier)
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.bounces = false
+        tableView.tableHeaderView = self.headerView
+        tableView.separatorStyle = .none
+        return tableView
+    }()
+    
+    lazy var headerView:UIView = {
+        let view = UIView(frame: CGRectMake(0, 0, KScreenWidth, KScreenWidth+44.0+8.0))
+        view.backgroundColor = .white
+        view.addSubview(self.headImgView)
+        headImgView.snp.makeConstraints { make in
+            make.left.top.right.equalToSuperview()
+            make.height.equalTo(headImgView.snp.width)
+        }
+        self.segmentedView.dataSource = segmentedDataSource
+        view.addSubview(self.segmentedView)
+        segmentedView.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(0)
+            make.height.equalTo(44)
+            make.top.equalTo(headImgView.snp.bottom).offset(8.0)
+        }
+        return view
+    }()
+    
+    lazy var headImgView: UIImageView = {
+        let imgView = UIImageView()
+        imgView.image = UIImage(named: "global_default_image")
+        return imgView
+    }()
+    
+    lazy var segmentedView : JXSegmentedView = {
+       let segmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 44))
+        segmentedView.delegate = self
+        //配置指示器
+        let indicator = JXSegmentedIndicatorLineView()
+        indicator.indicatorWidth = 16
+        indicator.indicatorHeight = 2
+        indicator.indicatorCornerRadius = 0.0
+        indicator.indicatorColor = .brandMainColor
+        segmentedView.indicators = [indicator]
+        segmentedView.defaultSelectedIndex = 0
+        return segmentedView
+    }()
+    
+    static let tabWidth = 64.0
+    // 默认为4个tab
+    static let tabGap = (KScreenWidth-20.0*2-tabWidth*4.0)/3.0
+    
+    lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
+        let dataSource = JXSegmentedTitleDataSource()
+        dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 16)
+        dataSource.titleNormalColor = UIColor.init(hex: 0x94A3B8)
+        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
+        dataSource.titleSelectedColor = .mainTextColor
+        dataSource.itemWidth = Self.tabWidth
+        dataSource.itemSpacing = Self.tabGap
+        dataSource.itemWidthSelectedZoomScale = 1.0
+        return dataSource
+    }()
+    
+    var titles: [String] = []
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+        loadData()
+    }
+    
+    func createUI() {
+        gk_navigationBar.isHidden = true
+        self.view.backgroundColor = .white
+
+        self.view.addSubview(self.tableView)
+        self.tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(8.0)
+            make.left.right.bottom.equalToSuperview()
+        }
+        let left = 20.0-Self.tabGap
+        self.segmentedView.snp.remakeConstraints { make in
+            make.left.equalTo(left)
+            make.right.equalTo(-left)
+            make.height.equalTo(44)
+            make.top.equalTo(headImgView.snp.bottom).offset(8.0)
+        }
+    }
+}
+
+extension YHHomeIdentityListVC: JXSegmentedViewDelegate {
+    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
+        if 0 <= index, index < self.imgItems.count {
+            self.tableView.scrollToRow(at: IndexPath(row: index, section: 0), at: .top, animated: true)
+        }
+    }
+}
+
+extension YHHomeIdentityListVC: UITableViewDataSource, UITableViewDelegate {
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHHomeIdentityCell.cellReuseIdentifier, for: indexPath) as! YHHomeIdentityCell
+        if 0 <= indexPath.row, indexPath.row < self.imgItems.count {
+            let item = self.imgItems[indexPath.row]
+            cell.image = item.img
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if 0 <= indexPath.row, indexPath.row < self.imgItems.count {
+            let item = self.imgItems[indexPath.row]
+            return item.getSize().height
+        }
+        return KScreenWidth
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.imgItems.count
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+}
+
+extension YHHomeIdentityListVC: 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()
+            }
+        }
+        let gap = 10.0
+        if scrollView.contentOffset.y > self.scrollContentY+gap {
+            self.scrollContentY = scrollView.contentOffset.y
+            printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
+            if !self.isShowBottomView {
+                self.isShowBottomView = true
+                printLog("ABC show: \(self.scrollContentY)")
+                var model = TabBarShareModel()
+                model.showFlag = true
+                model.shareUrl = ""
+                model.codeUrl = self.viewModel.detailModel.imageURLDefault
+                model.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
+                NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
+
+            }
+            
+        } else if scrollView.contentOffset.y < self.scrollContentY-gap {
+            printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
+            self.scrollContentY = scrollView.contentOffset.y
+            if self.isShowBottomView {
+                self.isShowBottomView = false
+                printLog("ABC hide: \(self.scrollContentY)")
+                var model = TabBarShareModel()
+                model.showFlag = false
+                NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
+            }
+        }
+    }
+}
+
+extension YHHomeIdentityListVC {
+    
+    func loadData() {
+        if let selectItem = self.selectSubTab  {
+            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), placeholder: UIImage(named: "global_default_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()
+            }
+        }
+    }
+    
+    func requestImages() {
+        let ossGroup = DispatchGroup()
+        for item in self.imgItems {
+            ossGroup.enter()
+            item.imgView.kf.setImage(with: URL(string: item.url)) { result in
+                switch result {
+                case .success(let value):
+                    item.img = value.image
+                case .failure(let error):
+                    print("image download failed: \(error.localizedDescription)")
+                }
+                ossGroup.leave()
+            }
+        }
+        ossGroup.notify(queue: .main) {
+            self.tableView.reloadData()
+            DispatchQueue.main.asyncAfter(deadline: .now()+0.2, execute: {
+                self.tableView.setContentOffset(CGPointZero, animated: false)
+            })
+        }
+    }
+}

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

@@ -9,124 +9,33 @@
 import UIKit
 import JXSegmentedView
 
-class YHHomeIdentityItem {
-    var url: String = ""
-    var img: UIImage? = nil
-    var imgView: UIImageView = UIImageView()
-    func getSize() -> CGSize {
-        if let img = self.img, img.size.width > 0.0,  img.size.height > 0.0{
-            return CGSize(width:img.size.width, height: (img.size.height/img.size.width) * KScreenWidth)
-        }
-        return CGSize(width: KScreenWidth, height: KScreenWidth)
-    }
-    init(url: String = "", img: UIImage? = nil) {
-        self.url = url
-        self.img = img
-    }
-}
+
 
 class YHHomeIdentityViewController: YHBaseViewController {
     
-    var scrollContentY: CGFloat = 0.0
-    var isShowBottomView: Bool = false
     var subTabArr:[YHHomeLifeCategoryModel] = []
-    var selectSubTab: YHHomeLifeCategoryModel? = nil
     
     lazy var viewModel: YHHomePageViewModel = {
         let vm = YHHomePageViewModel()
         return vm
     }()
     
-    var imgItems:[YHHomeIdentityItem] = []
-
     lazy var subTabBar: YHIdentityTabBar = {
         let bar = YHIdentityTabBar.tabBarForItems([])
         bar.selectBlock = {
             [weak self] index, item in
             guard let self = self else { return }
-            self.tableView.setContentOffset(.zero, animated: true)
-            self.tableView.reloadData()
-            if self.segmentedView.selectedIndex != 0 {
-                self.segmentedView.defaultSelectedIndex = 0
-                self.segmentedView.reloadDataWithoutListContainer()
-            }
-            self.selectSubTab = item
-            getDetailImages()
+            self.scrollView.setContentOffset(CGPointMake(KScreenWidth * Double(index), 0), animated: false)
         }
         return bar
     }()
     
-    lazy var tableView: UITableView = {
-        let tableView = UITableView(frame: CGRect.zero, style:.grouped)
-        tableView.contentInsetAdjustmentBehavior = .never
-        tableView.showsVerticalScrollIndicator = false
-        tableView.backgroundColor = UIColor.white
-        tableView.separatorStyle = .none
-        tableView.register(YHHomeIdentityCell.self, forCellReuseIdentifier: YHHomeIdentityCell.cellReuseIdentifier)
-        tableView.delegate = self
-        tableView.dataSource = self
-        tableView.bounces = false
-        tableView.tableHeaderView = self.headerView
-        return tableView
-    }()
-    
-    lazy var headerView:UIView = {
-        let view = UIView(frame: CGRectMake(0, 0, KScreenWidth, KScreenWidth+44.0+8.0))
-        view.backgroundColor = .white
-        view.addSubview(self.headImgView)
-        headImgView.snp.makeConstraints { make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(headImgView.snp.width)
-        }
-        self.segmentedView.dataSource = segmentedDataSource
-        view.addSubview(self.segmentedView)
-        segmentedView.snp.makeConstraints { make in
-            make.left.equalTo(0)
-            make.right.equalTo(0)
-            make.height.equalTo(44)
-            make.top.equalTo(headImgView.snp.bottom).offset(8.0)
-        }
+    lazy var scrollView:UIScrollView = {
+        let view = UIScrollView()
+        view.isScrollEnabled = false
         return view
     }()
     
-    lazy var headImgView: UIImageView = {
-        let imgView = UIImageView()
-        imgView.image = UIImage(named: "global_default_image")
-        return imgView
-    }()
-    
-    lazy var segmentedView : JXSegmentedView = {
-       let segmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 44))
-        segmentedView.delegate = self
-        //配置指示器
-        let indicator = JXSegmentedIndicatorLineView()
-        indicator.indicatorWidth = 16
-        indicator.indicatorHeight = 2
-        indicator.indicatorCornerRadius = 0.0
-        indicator.indicatorColor = .brandMainColor
-        segmentedView.indicators = [indicator]
-        segmentedView.defaultSelectedIndex = 0
-        return segmentedView
-    }()
-    
-    static let tabWidth = 64.0
-    // 默认为4个tab
-    static let tabGap = (KScreenWidth-20.0*2-tabWidth*4.0)/3.0
-    
-    lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
-        let dataSource = JXSegmentedTitleDataSource()
-        dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 16)
-        dataSource.titleNormalColor = UIColor.init(hex: 0x94A3B8)
-        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
-        dataSource.titleSelectedColor = .mainTextColor
-        dataSource.itemWidth = Self.tabWidth
-        dataSource.itemSpacing = Self.tabGap
-        dataSource.itemWidthSelectedZoomScale = 1.0
-        return dataSource
-    }()
-    
-    var titles: [String] = []
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         createUI()
@@ -137,7 +46,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
         gk_navigationBar.isHidden = true
         self.view.backgroundColor = .white
 
-        self.view.addSubview(self.tableView)
+        self.view.addSubview(self.scrollView)
         self.view.addSubview(self.subTabBar)
         self.subTabBar.snp.makeConstraints { make in
             make.top.equalToSuperview()
@@ -145,17 +54,10 @@ class YHHomeIdentityViewController: YHBaseViewController {
             make.right.equalTo(-20)
             make.height.equalTo(44)
         }
-        self.tableView.snp.makeConstraints { make in
+        self.scrollView.snp.makeConstraints { make in
             make.top.equalTo(self.subTabBar.snp.bottom).offset(8.0)
             make.left.right.bottom.equalToSuperview()
         }
-        let left = 20.0-Self.tabGap
-        self.segmentedView.snp.remakeConstraints { make in
-            make.left.equalTo(left)
-            make.right.equalTo(-left)
-            make.height.equalTo(44)
-            make.top.equalTo(headImgView.snp.bottom).offset(8.0)
-        }
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -163,25 +65,12 @@ class YHHomeIdentityViewController: YHBaseViewController {
         hideBottomOnTabbar()
     }
     
-    
     func hideBottomOnTabbar() {
         //隐藏
         var model = TabBarShareModel()
         model.showFlag = false
         NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
     }
-    
-    func updateSelectIndex(_ index:Int) {
-        self.subTabBar.selectIndex = index
-    }
-}
-
-extension YHHomeIdentityViewController: JXSegmentedViewDelegate {
-    func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-        if 0 <= index, index < self.imgItems.count {
-            self.tableView.scrollToRow(at: IndexPath(row: index, section: 0), at: .top, animated: true)
-        }
-    }
 }
 
 extension YHHomeIdentityViewController: JXSegmentedListContainerViewListDelegate {
@@ -190,84 +79,6 @@ extension YHHomeIdentityViewController: JXSegmentedListContainerViewListDelegate
     }
 }
 
-extension YHHomeIdentityViewController: UITableViewDataSource, UITableViewDelegate {
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHHomeIdentityCell.cellReuseIdentifier, for: indexPath) as! YHHomeIdentityCell
-        if 0 <= indexPath.row, indexPath.row < self.imgItems.count {
-            let item = self.imgItems[indexPath.row]
-            cell.image = item.img
-        }
-        return cell
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        if 0 <= indexPath.row, indexPath.row < self.imgItems.count {
-            let item = self.imgItems[indexPath.row]
-            return item.getSize().height
-        }
-        return KScreenWidth
-    }
-    
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.imgItems.count
-    }
-    
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 0.01
-    }
-    
-    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        return 0.01
-    }
-    
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        return UIView()
-    }
-    
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        return UIView()
-    }
-}
-
-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()
-//            }
-//        }
-        let gap = 10.0
-        if scrollView.contentOffset.y > self.scrollContentY+gap {
-            self.scrollContentY = scrollView.contentOffset.y
-            printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
-            if !self.isShowBottomView {
-                self.isShowBottomView = true
-                printLog("ABC show: \(self.scrollContentY)")
-                var model = TabBarShareModel()
-                model.showFlag = true
-                model.shareUrl = ""
-                model.codeUrl = self.viewModel.detailModel.imageURLDefault
-                model.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
-                NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
-
-            }
-            
-        } else if scrollView.contentOffset.y < self.scrollContentY-gap {
-            printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
-            self.scrollContentY = scrollView.contentOffset.y
-            if self.isShowBottomView {
-                self.isShowBottomView = false
-                printLog("ABC hide: \(self.scrollContentY)")
-                hideBottomOnTabbar()
-            }
-        }
-    }
-}
-
 extension YHHomeIdentityViewController {
     
     func loadData() {
@@ -283,55 +94,19 @@ extension YHHomeIdentityViewController {
                 }
             }
             self.subTabBar.updateItems(subTabArr)
-            self.selectSubTab = self.subTabArr.first
-            getDetailImages()
-        }
-    }
-    
-    func getDetailImages() {
-        if let selectItem = self.selectSubTab  {
-            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), placeholder: UIImage(named: "global_default_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()
-            }
-        }
-    }
             
-    func requestImages() {
-        let ossGroup = DispatchGroup()
-        for item in self.imgItems {
-            ossGroup.enter()
-            item.imgView.kf.setImage(with: URL(string: item.url)) { result in
-                switch result {
-                case .success(let value):
-                    item.img = value.image
-                case .failure(let error):
-                    print("image download failed: \(error.localizedDescription)")
+            self.scrollView.removeSubviews()
+            for (index, item) in subTabArr.enumerated() {
+                let vc = YHHomeIdentityListVC()
+                vc.selectSubTab = item
+                vc.view.frame = CGRect(x: KScreenWidth * Double(index), y: 0, width: KScreenWidth, height: self.scrollView.height)
+                vc.loadData()
+                self.addChild(vc)
+                self.scrollView.addSubview(vc.view)
             }
-                self.tableView.reloadData()
-                ossGroup.leave()
-            }
-        }
-        ossGroup.notify(queue: .main) {
-            self.tableView.reloadData()
+            self.scrollView.contentSize = CGSize(width: KScreenWidth * Double(self.subTabArr.count), height: self.scrollView.height)
         }
     }
 }
+
+

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

@@ -15,11 +15,9 @@ class YHHomeIdentityCell: UITableViewCell {
         didSet {
             if let img = image {
                 imgView.image = img
-                self.bottomLineView.isHidden = false
 
             } else {
                 imgView.image = UIImage(named: "global_default_image")
-                self.bottomLineView.isHidden = false
             }
         }
     }
@@ -30,12 +28,6 @@ class YHHomeIdentityCell: UITableViewCell {
         return view
     }()
     
-    lazy var bottomLineView: UIView = {
-        let view = UIView()
-        view.backgroundColor = .separatorColor
-        return view
-    }()
-    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         setupUI()
@@ -47,14 +39,9 @@ class YHHomeIdentityCell: UITableViewCell {
     
     func setupUI() {
         self.contentView.addSubview(self.imgView)
-        self.contentView.addSubview(self.bottomLineView)
         
         self.imgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
-        self.bottomLineView.snp.makeConstraints { make in
-            make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(1.0)
-        }
     }
 }