完善灰度逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift

@@ -25,7 +25,7 @@ class YHOrderDetailViewController: YHBaseViewController {
             guard let self = self else { return }
             if success {
                 
-                if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 7)) {
+                if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 7)) == 1 {
                     let searchButton = {
                         let button = UIButton(type: .custom)
                         button.frame = CGRect(x: 0, y: 0, width: 81, height: 21)

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

@@ -264,7 +264,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         
         items.removeAll()
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 1)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 1)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_card", title: "我的名片".local, type:.myCard)
             items.append(item)
         }
@@ -274,28 +274,28 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter)
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 2)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode)
             items.append(item)
         }
         
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 4)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 4)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_appoint", title: "关于银河湾".local, type:.appointGalaxyBay)
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_activity", title: "我的活动".local, type:.myActivity)
             items.append(item)
         }
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 5)) == 1 {
             let item = PersonalModuleItem(icon: "mine_item_about_us", title: "关于我们".local, type:. aboutUs)
             items.append(item)
         }

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

@@ -10,15 +10,15 @@ import Foundation
 
 extension Int {
     
-    //1-可见  2-不可见  3-新界面
-    var uatValue : Bool {
-        if self == 1 {
-            return true
-        } else if  self == 2 {
-            return false
-        }
-        return false
-    }
+//    //1-可见  2-不可见  3-新界面
+//    var uatValue : Bool {
+//        if self == 1 {
+//            return true
+//        } else if  self == 2 {
+//            return false
+//        }
+//        return false
+//    }
 }
 
 enum YHUatModules: Int {
@@ -52,30 +52,30 @@ enum YHUatModules: Int {
     case Update_Suggest = 9 //更新-建议更新弹窗
     
     
-    //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
-    var defaultValue : Bool {
+    //1-可见  2-不可见  3-新界面
+    var defaultValue : Int {
         switch self {
         case .Mine_MyCard:
-            return true
+            return 1
         case .Mine_IntegralCenter:
-            return true
+            return 1
         case .Mine_EvaluationCode:
-            return true
+            return 1
         case .Mine_AboutYinHeHarbour:
-            return true
+            return 1
         case .Mine_MyActivity:
-            return true
+            return 1
         case .Mine_AboutUS:
-            return true
+            return 1
             
         case .Service_OrderSearch:
-            return false
+            return 2
         case .Update_Fource:
-            return false
+            return 2
         case .Update_Suggest:
-            return false
+            return 2
         default:
-            return false
+            return 2
         }
     }
 }
@@ -99,15 +99,15 @@ private extension YHUatHelper {
 extension YHUatHelper {
     
     //获取功能模块的展示状态
-    func getUatModuleStatusBy(module : YHUatModules?) -> Bool {
-        guard let module = module else { return false }
+    func getUatModuleStatusBy(module : YHUatModules?) -> Int {
+        guard let module = module else { return 1 }
         //1.查找服务端返回的值
         
         if let arr = viewModel.dataList?.list {
             for (_,item) in arr.enumerated() {
                 if item.module_number.int == module.rawValue,item.result == 2 {
                     if let model = item.show_config {
-                        return model.op.uatValue
+                        return model.op
                     }
                     return module.defaultValue
                 }

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

@@ -11,7 +11,7 @@ import HandyJSON
 
 
 class YHUatModel2 : HandyJSON {
-    var op : Int = -1       //"op": 1, //1-可见  2-不可见
+    var op : Int = -1       //"op": 1, //1-可见  2-不可见  3-新界面
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/M/YHAppVersionManager.swift

@@ -33,7 +33,7 @@ class YHAppVersionManager {
     func needShowRedPointOfSuggestVersionUpdate() -> Bool {
         var isShowRedPoint = false
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
             // 判断版本更新逻辑
             if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
                 if configModel.max_version != UIDevice.appVersion() {
@@ -57,7 +57,7 @@ class YHAppVersionManager {
     func needShowAlertViewOfSuggestVersionUpdate() -> Bool {
         var isShow = false
         
-        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) {
+        if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 9)) == 1 {
             if let configModel = YHConfigManager.shared.reqVM.configModel, configModel.suggest_updating == true {
                 if let alertLatestVersion = UserDefaults.standard.object(forKey: YhConstant.kShowAlertOfSuggestLatestVersion) as? String {
                     if !configModel.max_version.isEmpty, configModel.max_version != alertLatestVersion  {