订单搜索 uat

galaxy/galaxy/AppDelegate.swift

@@ -58,6 +58,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         
         YHOSSManager.share.getOSSID()
         
+        
+        //TODO: - for test hjl
+        
+        YHUatHelper.shared.loadUatData()
+        
         //1.设置主窗口
         setupRootVC()
         return true

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

@@ -24,22 +24,26 @@ class YHOrderDetailViewController: YHBaseViewController {
         viewModel.getWhitelist {[weak self] success, error in
             guard let self = self else { return }
             if success {
-                let searchButton = {
-                    let button = UIButton(type: .custom)
-                    button.frame = CGRect(x: 0, y: 0, width: 81, height: 21)
-                    button.setImage(UIImage(named: "service_detail_search"), for: .normal)
-                    button.setTitleColor(UIColor.mainTextColor, for: .normal)
-                    button.setTitle("订单搜索", for: .normal)
-                    button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
-                    button.contentHorizontalAlignment = .right
-                    button.addTarget(self, action: #selector(self.searchButtonClick), for: .touchUpInside)
-                    button.isSelected = false
-                    button.iconInLeft(spacing: 4)
-                    return button
-                }()
-                let rightButtonItem =  UIBarButtonItem(customView: searchButton)
-                gk_navRightBarButtonItem = rightButtonItem
-                gk_navItemRightSpace = 16
+                
+                if YHUatHelper.shared.getUatModuleStatusBy(module: YHUatModules(rawValue: 7)) {
+                    let searchButton = {
+                        let button = UIButton(type: .custom)
+                        button.frame = CGRect(x: 0, y: 0, width: 81, height: 21)
+                        button.setImage(UIImage(named: "service_detail_search"), for: .normal)
+                        button.setTitleColor(UIColor.mainTextColor, for: .normal)
+                        button.setTitle("订单搜索", for: .normal)
+                        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+                        button.contentHorizontalAlignment = .right
+                        button.addTarget(self, action: #selector(self.searchButtonClick), for: .touchUpInside)
+                        button.isSelected = false
+                        button.iconInLeft(spacing: 4)
+                        return button
+                    }()
+                    let rightButtonItem =  UIBarButtonItem(customView: searchButton)
+                    gk_navRightBarButtonItem = rightButtonItem
+                    gk_navItemRightSpace = 16
+                }
+                
             }
         }
     }

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

@@ -8,6 +8,20 @@
 
 import Foundation
 
+extension Int {
+    
+    //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
+    var uatValue : Bool {
+        if self == 1 {
+            return false
+        } else if  self == 2 {
+            return true
+        }
+        
+        return false
+    }
+}
+
 enum YHUatModules: Int {
     /*
      默认展示
@@ -25,6 +39,7 @@ enum YHUatModules: Int {
      9、更新-建议更新弹窗、false
      */
     
+    case Mine_Unknow = 0
     case Mine_MyCard = 1 // 我的-我的名片
     case Mine_IntegralCenter = 2 // 我的-积分中心
     case Mine_EvaluationCode = 3 // 我的-我的测评码
@@ -55,22 +70,25 @@ enum YHUatModules: Int {
             return true
             
         case .Service_OrderSearch:
-            return true
-            
+            return false
         case .Update_Fource:
             return false
         case .Update_Suggest:
             return false
+        default:
+            return false
         }
     }
 }
 
 
-
-
-
 class YHUatHelper: NSObject {
     static let shared = YHUatHelper()
+    
+    private lazy var viewModel: YHUatHelperViewModel = {
+        let vm = YHUatHelperViewModel()
+        return vm
+    }()
 }
 
 // MARK: - 私有方法
@@ -82,9 +100,23 @@ private extension YHUatHelper {
 extension YHUatHelper {
     
     //获取功能模块的展示状态
-    func getUatModuleStatusBy(module : YHUatModules) -> Bool {
+    func getUatModuleStatusBy(module : YHUatModules?) -> Bool {
+        guard let module = module else { return false }
+        //1.查找服务端返回的值
         
         
-        return true
+        //2.返回默认值
+        return module.defaultValue
+    }
+    
+    //加载服务器的uat配置
+    func loadUatData() {
+        viewModel.getUatList { success, error in
+            if success {
+                
+            } else {
+                
+            }
+        }
     }
 }

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

@@ -11,6 +11,20 @@ import HandyJSON
 
 
 class YHUatModel : HandyJSON {
+    /*
+     默认展示
+     1、我的-我的名片、 true
+     2、我的-积分中心、true
+     3、我的-我的测评码、true
+     4、我的-银河湾、true
+     5、我的-我的活动、true
+     6、我的-关于我们、true
+
+     默认不展示
+     7、服务-订单搜索、false
+     8、更新-强制更新弹窗、false
+     9、更新-建议更新弹窗、false
+     */
     var module_number : String = ""
     var result : Int = 0 //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
     
@@ -32,8 +46,20 @@ class YHUatHelperViewModel : YHBaseViewModel {
 // MARK: - 共有方法
 extension YHUatHelperViewModel {
     //请求灰度功能列表配置
-    func getUatList(_ id: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let params: [String : Any] = ["id": id]
+    func getUatList(callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+        
+        let params: [String : Any] = [
+            "module_numbers[0]": "1",
+            "module_numbers[1]": "2",
+            "module_numbers[2]": "3",
+            "module_numbers[3]": "4",
+            "module_numbers[4]": "5",
+            "module_numbers[5]": "6",
+            "module_numbers[6]": "7",
+            "module_numbers[7]": "8",
+            "module_numbers[8]": "9",
+        ]
+        
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象