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

@@ -29,6 +29,12 @@ class YHHomeIdentityViewController: YHBaseViewController {
     
     var scrollContentY: CGFloat = 0.0
     var isShowBottomView: Bool = false
+    
+    lazy var viewModel: YHHomePageViewModel = {
+        let vm = YHHomePageViewModel()
+        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")),
@@ -107,6 +113,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
     }()
     
     static let tabWidth = 64.0
+    // 默认为4个tab
     static let tabGap = (KScreenWidth-20.0*2-tabWidth*4.0)/3.0
     
     lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
@@ -125,6 +132,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         createUI()
+        loadData()
     }
     
     func createUI() {
@@ -140,7 +148,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
             make.height.equalTo(44)
         }
         self.tableView.snp.makeConstraints { make in
-            make.top.equalTo(self.subTabBar.snp.bottom)
+            make.top.equalTo(self.subTabBar.snp.bottom).offset(8.0)
             make.left.right.bottom.equalToSuperview()
         }
         let left = 20.0-Self.tabGap
@@ -216,8 +224,9 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
             }
         }
         let gap = 10.0
-        if scrollView.contentOffset.y >= self.scrollContentY+gap {
+        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)")
@@ -230,7 +239,8 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
 
             }
             
-        } else if scrollView.contentOffset.y <= self.scrollContentY-gap {
+        } 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
@@ -245,8 +255,14 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
 
 extension YHHomeIdentityViewController {
     
-    func requestData() {
-        
+    func loadData() {
+        let params : [String : Any] = ["pid" : 2]
+        self.viewModel.getGoodsCategory(params: params) { 
+            [weak self] success, error in
+            guard let self = self else { return }
+            self.viewModel.categoryArr
+            
+        }
     }
     
     func requestImages() {