Merge branch 'main' into youhua-dev

* main:
  修改版本号  0.6.0.8
  优化 一处渲染方式
  修改一处bug
  修改打包分支
  修改版本号 0.6.0.7
  2处优化

# Conflicts:
#	galaxy/fastlane/Fastfile
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3043,7 +3043,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3249,7 +3249,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3297,7 +3297,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

@@ -237,17 +237,19 @@ private extension YHPreviewFamilyMemberViewController {
     @objc func clickButton(sender : UIButton) {
         
         for button in arrButtons {
-            if let arr = button.layer.sublayers {
-                for layer in arr {
-                    if layer is CAGradientLayer {
-                        layer.removeFromSuperlayer()
-                    }
-                }
-            }
+//            if let arr = button.layer.sublayers {
+//                for layer in arr {
+//                    if layer is CAGradientLayer {
+//                        layer.removeFromSuperlayer()
+//                    }
+//                }
+//            }
+            button.backgroundColor = UIColor.white
             button.setTitleColor(.black, for: .normal)
         }
-        sender.addYinHeGradualLayer()
-        sender.layoutIfNeeded()
+//        sender.addYinHeGradualLayer()
+//        sender.layoutIfNeeded()
+        sender.backgroundColor = .brandMainColor
         sender.setTitleColor(.white, for: .normal)
         
         if sender == parentButton {
@@ -289,6 +291,7 @@ private extension YHPreviewFamilyMemberViewController {
     
     private func highlightButton() {
         if !spouseButton.isHidden {
+            clickButton(sender:spouseButton)
             clickButton(sender:spouseButton)
             return
         }

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

@@ -119,6 +119,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
 #else
         let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
         versionLabel.text = version
+        versionLabel.isHidden = true
 #endif
     }