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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -271,6 +271,7 @@
 		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 */; };
+		0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0472E25D2C534723008EAB6E /* YHLifeDetailViewController.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 */; };
@@ -892,6 +893,7 @@
 		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>"; };
+		0472E25D2C534723008EAB6E /* YHLifeDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLifeDetailViewController.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>"; };
@@ -2165,6 +2167,7 @@
 			isa = PBXGroup;
 			children = (
 				047AA3DC2C4A6126009C4554 /* YHLifeViewController.swift */,
+				0472E25D2C534723008EAB6E /* YHLifeDetailViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -3609,6 +3612,7 @@
 				04FA8B302C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift in Sources */,
 				04A7BD0F2BA41C9800BD35A2 /* YHMyDocumentsModel.swift in Sources */,
 				04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */,
+				0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */,
 				A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
 				045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
 				A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */,

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

@@ -67,9 +67,10 @@ class YHHomeIdentityListVC: YHBaseViewController {
         let lineView = UIView()
         lineView.backgroundColor = .separatorColor
         view.addSubview(lineView)
-        segmentedView.snp.makeConstraints { make in
-            make.left.equalTo(0)
-            make.right.equalTo(0)
+        let left = 20.0-Self.tabGap
+        self.segmentedView.snp.makeConstraints { make in
+            make.left.equalTo(left)
+            make.right.equalTo(-left)
             make.height.equalTo(44)
             make.top.equalTo(headImgView.snp.bottom).offset(8.0)
         }
@@ -114,6 +115,7 @@ class YHHomeIdentityListVC: YHBaseViewController {
         dataSource.itemWidth = Self.tabWidth
         dataSource.itemSpacing = Self.tabGap
         dataSource.itemWidthSelectedZoomScale = 1.0
+        dataSource.isItemSpacingAverageEnabled = false
         return dataSource
     }()
     
@@ -133,13 +135,6 @@ class YHHomeIdentityListVC: YHBaseViewController {
         self.tableView.snp.makeConstraints { make in
             make.top.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)
-        }
     }
 }
 
@@ -211,8 +206,8 @@ extension YHHomeIdentityListVC: UIScrollViewDelegate {
                 var model = TabBarShareModel()
                 model.showFlag = true
                 if let product = self.viewModel.detailModel.products.first {
-                    let url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/commodity_info?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxapp"
-                    model.shareUrl = url
+                    let path = "/pages/commodityInfo/commodityInfo?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp"
+                    model.shareUrl = path
                 }
                 
                 model.codeUrl = self.viewModel.detailModel.imageURLDefault

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

@@ -139,15 +139,24 @@ extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let model = self.viewModel.detailModel.products[indexPath.row]
-        let vc = YHH5WebViewVC()
-        
-        // TODO: - 谢
-        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=3&levelId=\(selectSubTab?.id ?? "")&productId=\(model.id)&from=wxApp&offsetTop=50"
-        vc.isWithBottomViewFlag = true
-        vc.isShareToMiniProgramFlag = true
-        vc.shareMiniPath = "/serviceHousekeeper/pages/documentEdit/documentEdit"
         
+        let vc = YHLifeDetailViewController()
+        vc.tabId =  self.selectSubTab?.id ?? ""
+        vc.productModel = model
+        vc.codeUrl = self.viewModel.detailModel.imageURLDefault
+        vc.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
         self.navigationController?.pushViewController(vc)
+        
+//        let vc = YHH5WebViewVC()
+//        
+//        // TODO: - 谢
+//        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=2&levelId=5&productId=30&from=wxApp"
+//        vc.isWithBottomViewFlag = true
+//        vc.isShareToMiniProgramFlag = true
+//                vc.shareMiniPath = "/pages/commodityInfo/commodityInfo?categoryId=3&levelId=\(selectSubTab?.id ?? "")&productId=\(model.id)&from=wxApp"
+
+//        
+//        self.navigationController?.pushViewController(vc)
     }
 }
 

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -55,7 +55,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //分享到H5或者小程序
     var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
     var shareMiniPath : String? //分享到小程序时的 path
-    var shareMiniTitle : String = "好友力荐新品，速来围观，不忘粗心"
+    var shareMiniTitle : String = "好友力荐新品，速来围观，不容错过！"
     
     //分享到H5的情况
     var shareH5Title : String = "20秒极速测分"