灰度逻辑

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

@@ -10,14 +10,13 @@ import Foundation
 
 extension Int {
     
-    //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
+    //1-可见  2-不可见  3-新界面
     var uatValue : Bool {
         if self == 1 {
-            return false
-        } else if  self == 2 {
             return true
+        } else if  self == 2 {
+            return false
         }
-        
         return false
     }
 }
@@ -106,8 +105,11 @@ extension YHUatHelper {
         
         if let arr = viewModel.dataList?.list {
             for (_,item) in arr.enumerated() {
-                if item.module_number.int == module.rawValue {
-                    return item.result.uatValue
+                if item.module_number.int == module.rawValue,item.result == 2 {
+                    if let model = item.show_config {
+                        return model.op.uatValue
+                    }
+                    return module.defaultValue
                 }
             }
         }

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

@@ -10,10 +10,8 @@ import Foundation
 import HandyJSON
 
 
-//{"op": 1}
-
 class YHUatModel2 : HandyJSON {
-    var op : Int = -1
+    var op : Int = -1       //"op": 1, //1-可见  2-不可见
     required init() {
     }
 }
@@ -36,7 +34,7 @@ class YHUatModel : HandyJSON {
      */
     var module_number : String = ""
     var result : Int = 0 //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
-    var show_config : String = ""
+    var show_config : YHUatModel2?
     
     required init() {
     }
@@ -59,8 +57,7 @@ extension YHUatHelperViewModel {
     //请求灰度功能列表配置
     func getUatList(callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
         
-//        let params: [String] = ["1", "2","3", "4","5","6", "7","9"]
-        let params: [String] = ["1"]
+        let params: [String] = ["1", "2","3", "4","5","6", "7","9"]
         var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
         for (index,item) in params.enumerated() {
             if index == 0 {