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

galaxy/fastlane/Fastfile

@@ -27,9 +27,10 @@ platform :ios do
   develop_branch = "develop"
   main_branch = "main"
   youhua_branch = "youhua-dev"
+  uat = "uat"
   
   #打包正使用的分支
-  myPack_branch = youhua_branch
+  myPack_branch = uat
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -4154,7 +4154,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4295,7 +4295,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4499,7 +4499,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4545,7 +4545,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

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

@@ -157,12 +157,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     }
     
     @objc func didLogoutBtnClicked() {
-        
-        //灰度规则配置
-        YHUatHelper.shared.loadUatData()
-        
-        
-        
         YHCommonAlertView.show("", "您确定要退出登录吗？", "取消", "确定",fullGuestureEnable: false) {
 
         } callBack: {

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

@@ -213,6 +213,9 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(clearUnreadBadge), name: YhConstant.YhNotification.didMarkAllMessagesReadedNotifiction, object: nil)
         
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(didRevUatParam), name: YhConstant.YhNotification.didRevUatParam, object: nil)
+        
     }
     
     deinit {
@@ -247,6 +250,11 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         }
     }
     
+    
+    @objc func didRevUatParam() {
+        loadItems()
+    }
+    
     @objc func clearUnreadBadge() {
         DispatchQueue.main.async {
             for item in self.items {
@@ -279,7 +287,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) == 1 {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 3)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode)
             items.append(item)
         }
@@ -295,7 +303,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) == 1 {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 6)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
             items.append(item)
         }

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

@@ -7,20 +7,6 @@
 //
 
 import Foundation
-
-extension Int {
-    
-//    //1-可见  2-不可见  3-新界面
-//    var uatValue : Bool {
-//        if self == 1 {
-//            return true
-//        } else if  self == 2 {
-//            return false
-//        }
-//        return false
-//    }
-}
-
 enum YHUatModules: Int {
     /*
      默认展示
@@ -88,11 +74,30 @@ class YHUatHelper: NSObject {
         let vm = YHUatHelperViewModel()
         return vm
     }()
+    
+    override init() {
+        super.init()
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(loginSuccess), name: YhConstant.YhNotification.didLoginSuccessNotifiction, object: nil)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
+        
+        
+    }
 }
 
 // MARK: - 私有方法
 private extension YHUatHelper {
     
+    @objc func loginSuccess() {
+        viewModel.isDataOk = false
+        loadUatData()
+    }
+    
+    @objc func logoutSuccess() {
+        viewModel.dataList = nil
+    }
 }
 
 // MARK: - 公有方法
@@ -133,7 +138,7 @@ extension YHUatHelper {
         if !viewModel.isDataOk {
             viewModel.getUatList { success, error in
                 if success {
-                    
+                    NotificationCenter.default.post(name: YhConstant.YhNotification.didRevUatParam, object: nil)
                 } else {
                     
                 }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -266,5 +266,9 @@ extension YhConstant {
         // 改变底部tabbar上 分享View的展示状态
         public static let changeShareViewStatusOnTabBarNotifiction = Notification.Name(rawValue: "com.yinhe.change.shareView.status")
         
+        
+        //获取灰度参数
+        public static let didRevUatParam = Notification.Name(rawValue: "com.yinhe.didRevUatParam")
+
     }
 }