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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2141,13 +2141,14 @@
 			path = M;
 			sourceTree = "<group>";
 		};
-		047AA3DA2C4A6102009C4554 /* Life */ = {
+		047AA3DA2C4A6102009C4554 /* Life(生活) */ = {
 			isa = PBXGroup;
 			children = (
+				047AA3F12C50CEAC009C4554 /* VM */,
 				047AA3DE2C4A639C009C4554 /* V */,
 				047AA3DB2C4A6110009C4554 /* C */,
 			);
-			path = Life;
+			path = "Life(生活)";
 			sourceTree = "<group>";
 		};
 		047AA3DB2C4A6110009C4554 /* C */ = {
@@ -2203,6 +2204,13 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
+		047AA3F12C50CEAC009C4554 /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
 		04808C022B4686510056D53C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -2649,7 +2657,7 @@
 		A567E5662BD7643D00D5D5A0 /* Home(首页) */ = {
 			isa = PBXGroup;
 			children = (
-				047AA3DA2C4A6102009C4554 /* Life */,
+				047AA3DA2C4A6102009C4554 /* Life(生活) */,
 				0419A0952C48F79100A5FCFA /* InvitationWithGifts(邀请有礼) */,
 				A567E5672BD7643D00D5D5A0 /* VM */,
 				A567E56A2BD7643D00D5D5A0 /* M */,

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

@@ -284,13 +284,6 @@ extension YHHomeHoldViewPageViewController {
 extension YHHomeHoldViewPageViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
-        
-        if segmentedView.selectedIndex != 1 {
-            var model = TabBarShareModel()
-           model.showFlag = false
-           NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
-        }
-        
         self.segmentedView.reloadDataWithoutListContainer()
     }
 }

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

@@ -158,6 +158,19 @@ class YHHomeIdentityViewController: YHBaseViewController {
         }
     }
     
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        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
     }
@@ -249,9 +262,7 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
             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)
+                hideBottomOnTabbar()
             }
         }
     }

galaxy/galaxy/Classes/Modules/Home(首页)/Life/C/YHLifeViewController.swift → galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -13,21 +13,56 @@ class YHLifeViewController: YHBaseViewController {
     var sectionView: YHLifeSectionView!
     var tableView: UITableView!
     var headView = YHLifeHeadView()
-    
+    var viewModel: YHHomePageViewModel = YHHomePageViewModel()
+    var selectSubTab: YHHomeLifeCategoryModel? = nil
+
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
+        loadData()
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        loadData()
     }
 }
 
 extension YHLifeViewController {
     func loadData() {
+        let params : [String : Any] = ["pid" : 3]
+        self.viewModel.getGoodsCategory(params: params) {
+            [weak self] success, error in
+            guard let self = self else { return }
+            let items = self.viewModel.categoryArr.map { $0?.name }
+            let result = items.compactMap { $0 }
+            self.sectionView.items = result
+            self.selectSubTab = self.viewModel.categoryArr.first ?? YHHomeLifeCategoryModel()
+            getDetailImages()
+        }
+    }
     
+    func getDetailImages() {
+        if let selectItem = self.selectSubTab  {
+            let params:[String: Any] = ["categoryId": "3",
+                                        "levelId": selectItem.id]
+            self.viewModel.getGoodsCategoryDetail(params: params) {
+                [weak self] success, error in
+                guard let self = self else { return }
+                guard let url = URL(string: selectItem.image) else { return }
+                self.headView.imageView.kf.setImage(with: url)
+                if self.viewModel.detailModel.products.count == 0 {
+                    let label = UILabel(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: self.view.height - 44 - KScreenWidth - 16))
+                    label.text = "商品未上架，好货不怕晚，敬请期待！"
+                    label.textColor = UIColor.mainTextColor30
+                    label.font = UIFont.PFSC_M(ofSize: 14)
+                    label.textAlignment = .center
+                    self.tableView.tableFooterView = label
+                } else {
+                    self.tableView.tableFooterView = UIView()
+                }
+                self.tableView.reloadData()
+            }
+        }
     }
     
     func setupUI() {
@@ -36,8 +71,10 @@ extension YHLifeViewController {
         view.backgroundColor = .white
         sectionView = {
             let view = YHLifeSectionView()
-            view.items = ["创业", "教育", "永居"]
             view.block = {[weak self] model in
+                guard let self = self else { return }
+                self.selectSubTab = self.viewModel.categoryArr[model]
+                self.getDetailImages()
             }
             return view
         }()
@@ -71,11 +108,12 @@ extension YHLifeViewController {
 
 extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 10
+        return self.viewModel.detailModel.products.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHLifeItemTableViewCell.self)
+        cell.dataSource = self.viewModel.detailModel.products[indexPath.row]
         return cell
     }
     

galaxy/galaxy/Classes/Modules/Home(首页)/Life/V/YHLifeHeadView.swift → galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHLifeHeadView.swift

@@ -23,7 +23,7 @@ class YHLifeHeadView: UIView {
     
     func setUpView() {
         addSubview(imageView)
-        imageView.backgroundColor = .red
+        imageView.image = UIImage(named: "global_default_image")
         imageView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(8)

galaxy/galaxy/Classes/Modules/Home(首页)/Life/V/YHLifeItemTableViewCell.swift → galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHLifeItemTableViewCell.swift

@@ -12,6 +12,15 @@ class YHLifeItemTableViewCell: UITableViewCell {
     var centerImageView: UIImageView!
     var titleLabel: UILabel!
     var subTitleLabel: UILabel!
+    var dataSource: YHProductModel? {
+        didSet {
+            guard let dataSource = dataSource else { return }
+            self.titleLabel.text = dataSource.name
+            self.subTitleLabel.text = dataSource.description
+            guard let url = URL(string: dataSource.image) else { return }
+            self.centerImageView.kf.setImage(with: url)
+        }
+    }
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -37,7 +46,7 @@ class YHLifeItemTableViewCell: UITableViewCell {
         self.backgroundColor = .white
         centerImageView = {
             let imageView = UIImageView()
-            imageView.image = UIImage(named: "invitation_with_gifts_first")
+            imageView.image = UIImage(named: "global_default_image")
             return imageView
         }()
         contentView.addSubview(centerImageView)
@@ -49,7 +58,6 @@ class YHLifeItemTableViewCell: UITableViewCell {
         
         titleLabel = {
             let view = UILabel()
-            view.text = "注册公司"
             view.font = UIFont.PFSC_M(ofSize: 17)
             view.textColor = UIColor.mainTextColor
             return view
@@ -64,7 +72,6 @@ class YHLifeItemTableViewCell: UITableViewCell {
         
         subTitleLabel = {
             let view = UILabel()
-            view.text = "长期稳定银行渠道，可选择的银行多"
             view.font = UIFont.PFSC_M(ofSize: 14)
             view.textColor = UIColor.mainTextColor50
             return view

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

@@ -521,28 +521,28 @@ extension YHHomePageViewModel {
         
     func getGoodsCategoryDetail(params :[String:Any] = [:], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
             
-            let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeLifeDetail
-            let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
-                guard let self = self else { return }
-                //1. json字符串 转 对象
-                if json.code == 200 {
-                    let dic = json.data
-                    guard let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
-                        self.detailModel = YHHomeLifeCategoryDetailModel()
-                        callBackBlock(false, nil)
-                        return
-                    }
-                    self.detailModel = result
-                    callBackBlock(true, nil)
-                    
-                } else {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeLifeDetail
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+            guard let self = self else { return }
+            //1. json字符串 转 对象
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     self.detailModel = YHHomeLifeCategoryDetailModel()
-                    let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                    callBackBlock(false, error)
+                    callBackBlock(false, nil)
+                    return
                 }
-            } failBlock: { err in
+                self.detailModel = result
+                callBackBlock(true, nil)
+                
+            } else {
                 self.detailModel = YHHomeLifeCategoryDetailModel()
-                callBackBlock(false, err)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
             }
+        } failBlock: { err in
+            self.detailModel = YHHomeLifeCategoryDetailModel()
+            callBackBlock(false, err)
+        }
     }
 }

galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/V/YHHeadView.swift

@@ -23,7 +23,6 @@ class YHHeadView: UIView {
     
     func setUpView() {
         addSubview(imageView)
-        imageView.backgroundColor = .red
         imageView.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(510)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -82,7 +82,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
             PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
             PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
-            PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay),
+            PersonalModuleItem(icon: "mine_item_appoint", title: "关于银河湾".local, type:.appointGalaxyBay),
             PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity),
             PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
         ]

galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift

@@ -83,6 +83,8 @@ extension YHUatHelper {
     
     //获取功能模块的展示状态
     func getUatModuleStatusBy(module : YHUatModules) -> Bool {
+        
+        
         return true
     }
 }