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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -618,7 +618,6 @@
 		A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */; };
 		A5F886B62C61F76200B63CF5 /* YHLongtapPictureSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */; };
 		A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
-		A5F9EA012C647506005BCA73 /* flower2.json in Resources */ = {isa = PBXBuildFile; fileRef = A5F9EA002C647506005BCA73 /* flower2.json */; };
 		A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD45222C523DD300908AD9 /* YHJsApi.swift */; };
 		A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
 		A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; };
@@ -1287,7 +1286,6 @@
 		A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureReviewManager.swift; sourceTree = "<group>"; };
 		A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLongtapPictureSheetView.swift; sourceTree = "<group>"; };
 		A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
-		A5F9EA002C647506005BCA73 /* flower2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = flower2.json; sourceTree = "<group>"; };
 		A5FD45222C523DD300908AD9 /* YHJsApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHJsApi.swift; sourceTree = "<group>"; };
 		A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
 		A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; };
@@ -3386,7 +3384,6 @@
 		A5DF3D4A2BF9A304003D5F03 /* jsons */ = {
 			isa = PBXGroup;
 			children = (
-				A5F9EA002C647506005BCA73 /* flower2.json */,
 				A5F9EA022C647D32005BCA73 /* tabbar */,
 				043BA8822C24360C006EF02D /* people_rotate */,
 				043BA87C2C2435D4006EF02D /* people_launch */,
@@ -3621,7 +3618,6 @@
 				04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
 				048FA0332BFDDFF400AD3BA9 /* submit_head_animation.gif in Resources */,
 				A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
-				A5F9EA012C647506005BCA73 /* flower2.json in Resources */,
 				A5EE42022C216C78005BBA5D /* img_2.jpg in Resources */,
 				04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */,
 				044378A42BFC848C001F95AE /* loginBkg.mov in Resources */,
@@ -4386,7 +4382,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4411,7 +4407,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4527,7 +4523,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4552,7 +4548,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4731,7 +4727,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4756,7 +4752,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4777,7 +4773,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4802,7 +4798,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -154,7 +154,6 @@ extension YHHomeHoldViewPageViewController {
                     }
                 }
                 
-                
                 if model.type == 1 {
                     //正式弹窗
                     self.princleVM.postAlertStatus(15) { success, error in

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

@@ -52,6 +52,12 @@ class YHHomeBannerCollectionViewCell: FSPagerViewCell {
 private extension YHHomeBannerCollectionViewCell {
     
     func initView() {
+        
+        contentView.layer.shadowColor = UIColor.clear.cgColor
+        contentView.layer.shadowRadius = 0
+        contentView.layer.shadowOpacity = 0
+        contentView.layer.shadowOffset = .zero
+        
         contentView.addSubview(bannerImagV)
         bannerImagV.snp.makeConstraints { make in
             make.edges.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/C/YHOfficialApprovalResultVC.swift

@@ -181,7 +181,6 @@ private extension YHOfficialApprovalResultVC {
             princleVM.getApprovalLetter(param: param) { success, error in
                 if success {
                     //1、更新主申请人信息
-//                    self.contentView.isHidden = false
                     self.updateMainApplicationInfo()
                     
                     //2、更新letter信息
@@ -333,9 +332,12 @@ private extension YHOfficialApprovalResultVC {
         bannerView.layer.zPosition = 10
         
         
-//        let transform = CGAffineTransform(scaleX: 0.6, y: 0.75)
+//        let transform = CGAffineTransform(scaleX: 1.0, y: 0.95)
 //        bannerView.transformer = FSPagerViewTransformer(type:.linear)
-//        bannerView.itemSize = CGSize(width: 268, height: 148).applying(transform)
+//        bannerView.transformer?.minimumScale = 0.9
+        bannerView.transformer?.minimumAlpha = 1.0
+        
+//        bannerView.itemSize = CGSize(width: CGFloat(268).scaleSizeFrom375px(size: 268), height: CGFloat(148).scaleSizeFrom375px(size: 148)).applying(transform)
         bannerView.reloadData()
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessCheckView.swift

@@ -171,8 +171,7 @@ private extension YHOffivialApprovalSuccessCheckView {
             let topMargin = (KScreenHeight/812.0) * 156
             closeBtn.snp.makeConstraints { make in
                 make.top.equalTo(rewardBtn.snp.bottom).offset(topMargin)
-                make.width.equalTo(24)
-                make.height.equalTo(24)
+                make.width.height.equalTo(CGFloat(24).scaleSizeFrom375px(size: 24))
                 make.centerX.equalToSuperview()
             }
             closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
@@ -185,13 +184,6 @@ private extension YHOffivialApprovalSuccessCheckView {
             }
         }
         
-//        addSubview(animationView)
-//        animationView.snp.makeConstraints { make in
-//            make.edges.equalToSuperview()
-//        }
-//        animationView.play { completed in
-//            self.animationView.isHidden = true
-//        }
         
         addSubview(scrollBgImgV)
         scrollBgImgV.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -197,6 +197,11 @@ class YHServiceBannerCollectionViewCell: FSPagerViewCell {
 private extension YHServiceBannerCollectionViewCell {
     
     func initView() {
+        contentView.layer.shadowColor = UIColor.clear.cgColor
+        contentView.layer.shadowRadius = 0
+        contentView.layer.shadowOpacity = 0
+        contentView.layer.shadowOffset = .zero
+        
         contentView.addSubview(bannerImagV)
         bannerImagV.snp.makeConstraints { make in
             make.edges.equalToSuperview()