Merge branch 'davidhuang' into develop

* davidhuang:
  图片替换
  10  七鱼智能 灰度
  个人 头像链接替换
  头像 地址替换 方便七鱼客服中展示用户自己头像
  一处代码优化

galaxy/galaxy/AppDelegate.swift

@@ -67,15 +67,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         
         YHOSSManager.share.getOSSID()
         
-        
-        //for test hjl
-        AGCInstance.startUp()
-        AGCAppLinking.instance().handle { (link, error) in
-            let deepLink = link?.deepLink
-            //TODO: 增加deeplink地址跳转
-            print(deepLink as Any)
-        }
-        
         //设置主窗口
         setupRootVC()
         return true
@@ -153,6 +144,11 @@ extension AppDelegate {
         
         //3、AGC 短链相关
         AGCInstance.startUp()
+        AGCAppLinking.instance().handle { (link, error) in
+            let deepLink = link?.deepLink
+            //TODO: 增加deeplink地址跳转
+            print(deepLink as Any)
+        }
     }
     
     //2.通用全局UI设置相关

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepOneViewController.swift

@@ -186,7 +186,9 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
                 self.photoImageView.image = result
                 self.viewModel.uploadImage(result, true) {[weak self] success, error in
                     guard let self = self else { return }
-                    self.viewModel.model.avatar = success ?? ""
+                    var replacedString = (success ?? "").getCdnUrl()
+                    print(replacedString)
+                    self.viewModel.model.avatar = replacedString
                 }
             }
             self.navigationController?.pushViewController(clipperVC, animated: true)

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHUserInfoSettingViewController.swift

@@ -164,7 +164,10 @@ class YHUserInfoSettingViewController: YHBaseViewController {
                 self.photoImageView.image = result
                 self.viewModel.uploadImage(result, true) {[weak self] success, error in
                     guard let self = self else { return }
-                    self.headUrl = success ?? ""
+                    
+                    let replacedString = (success ?? "").getCdnUrl()
+                    print(replacedString)
+                    self.headUrl = replacedString
                 }
             }
             self.navigationController?.pushViewController(clipperVC, animated: true)

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift

@@ -151,7 +151,10 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
                 self.photoImageView.image = result
                 self.viewModel.uploadImage(result, true) {[weak self] success, error in
                     guard let self = self else { return }
-                    viewModel.model.avatar = success ?? ""
+                    
+                    var replacedString = (success ?? "").getCdnUrl()
+                    print(replacedString)
+                    viewModel.model.avatar = replacedString
                     if self.viewModel.isCanNext(step: 1) {
                         nextButton.isEnabled = true
                         nextButton.backgroundColor =  UIColor.brandMainColor

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

@@ -22,6 +22,8 @@ enum YHUatModules: Int {
      
      8、更新-强制更新弹窗、true
      9、更新-建议更新弹窗、false
+     
+     10、七鱼智能客服、false
      */
     
     case Mine_Unknow = 0
@@ -37,6 +39,8 @@ enum YHUatModules: Int {
     case Update_Fource = 8 //更新-强制更新弹窗
     case Update_Suggest = 9 //更新-建议更新弹窗
     
+    case QiYu_Service = 10 //七鱼智能客服入口
+    
     
     //1-可见  2-不可见  3-新界面
     var defaultValue : Int {
@@ -60,6 +64,8 @@ enum YHUatModules: Int {
             return 2
         case .Update_Suggest:
             return 2
+        case .QiYu_Service:
+            return 2
         default:
             return 2
         }

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

@@ -31,6 +31,7 @@ class YHUatModel : HandyJSON {
      7、服务-订单搜索、false
      8、更新-强制更新弹窗、true
      9、更新-建议更新弹窗、false
+     10、七鱼智能客服、false
      */
     var module_number : String = ""
     var result : Int = 0 //命中结果 0-未找到该规则，走默认逻辑 1-未命中，2-命中
@@ -61,7 +62,7 @@ extension YHUatHelperViewModel {
             return
         }
         
-        let params: [String] = ["1", "2","3", "4","5","6","9"]
+        let params: [String] = ["1", "2","3", "4","5","6","9","10"]
         var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
         for (index,item) in params.enumerated() {
             if index == 0 {

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -322,4 +322,11 @@ extension String {
         }
         return nil
     }
+    
+    //头像使用cdn地址
+    func getCdnUrl() -> String {
+        var replacedString = self.replacingOccurrences(of: "prod-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com", with: "prod-cdn-pub.galaxy-immi.com")
+        replacedString = replacedString.replacingOccurrences(of: "test-bucket-v1-pub.oss-cn-shenzhen.aliyuncs.com", with: "test-cdn-pub.galaxy-immi.com")
+        return replacedString
+    }
 }