Merge branch 'develop' into alexzhu

galaxy/fastlane/Fastfile

@@ -9,7 +9,7 @@ platform :ios do
   release_profile_name = "dis.intelligence.com"
   
   adhoc_pgyer_api_key = "ba79f62a052072f2486ad29632fefd46"
-  release_pgyer_api_key =  "0973bc04e2c592317806c6268eaa207a"
+  release_pgyer_api_key =  "80288e92bc9ff83c45df5d0ee778853b"
 
   # bugly app_id
   adhoc_bugly_app_id = "3b10faa43e"

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -5132,7 +5132,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5274,7 +5274,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5479,7 +5479,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5526,7 +5526,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/AppDelegate.swift

@@ -154,6 +154,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/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAddAdoptersViewController.swift

@@ -251,7 +251,7 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
             return CGFloat(156 + count * 52)
         }
         if indexPath.row == 3 {
-            return 199
+            return 209
         }
         return 40
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIncomeDetailViewController.swift

@@ -337,9 +337,9 @@ extension YHAdopterIncomeDetailViewController: UITableViewDelegate, UITableViewD
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.row == 0 {
             if self.data.status == 2 {
-                return 119
+                return 139
             } else {
-                return 86
+                return 106
             }
         }
         if indexPath.row == 1 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTableViewCell.swift

@@ -81,11 +81,12 @@ class YHAdopterIncomeTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 12)
             label.textColor = UIColor.mainTextColor50
             label.numberOfLines = 0
-            let a: ASAttributedString = .init("温馨提示：", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
-            let b: ASAttributedString = .init("存款证明有效期为3个月", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            let c: ASAttributedString = .init("，并且存款金额为每个成员（包括额外新增受养人）", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
-            let d: ASAttributedString = .init("最低为12万", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
-            label.attributed.text = a + b + c + d
+            let a: ASAttributedString = .init("温馨提示：存款证明需主申名下，", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            let b: ASAttributedString = .init("申请前近3个月内开具有效", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
+            let c: ASAttributedString = .init("，总存款金额为所有家庭成员(包括额外新增受养人)的", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            let d: ASAttributedString = .init("个数乘以12万", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
+            let e: ASAttributedString = .init("，如一家三口则需主申直接开具36万", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            label.attributed.text = a + b + c + d + e
             return label
         }()
         centerView.addSubview(alertLabel)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTitleTableViewCell.swift

@@ -92,7 +92,7 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
         
         alertLabel = {
             let label = UILabel()
-            label.text = "存款证明有效期为3个月，并且存款金额为每个成员（包括额外新增受养人）最低为12万"
+            label.text = "存款证明需主申名下，申请前近3个月内开具有效，总存款金额为所有家庭成员(包括额外新增受养人)的个数乘以12万，如一家三口则需主申直接开具36万"
             label.font = UIFont.PFSC_R(ofSize: 14)
             label.textColor = UIColor.mainTextColor50
             label.numberOfLines = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift

@@ -118,6 +118,7 @@ class YHFamilyMemberInfoModel: SmartCodable {
     }
     
     func getBirthNation() -> String {
+    
         if self.birthPlaceAboard == "0" {
             return "国内"
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHCertificateInfoPhotoCell.swift

@@ -33,11 +33,11 @@ class YHCertificateInfoPhotoCell: UITableViewCell {
         self.contentView.backgroundColor = .clear
         contentView.addSubview(infoImgView)
         infoImgView.snp.makeConstraints { make in
-            make.left.equalTo(18)
-            make.right.equalTo(-18)
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
             make.top.equalTo(0)
             make.bottom.equalTo(0)
-            make.height.equalTo(infoImgView.snp.width).multipliedBy(2716.0/343.0)
+            make.height.equalTo(infoImgView.snp.width).multipliedBy(2467.0/343.0)
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift

@@ -264,7 +264,7 @@ class YHIFamilyInfoListCell: UITableViewCell {
                     guard let self = self else { return }
                     if item.id == .birthNation {
                         familyInfo.birthPlaceAboard = "\(selectItem.index)"
-                        self.selectBirthNation?(familyInfo.birthPlaceAboard == "0")
+                        self.selectBirthNation?(familyInfo.birthPlaceAboard != "1")
                     }
                 }
                 itemsContentView.addSubview(itemView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift

@@ -238,8 +238,8 @@ extension YHFamilyInfoConfirmViewModel {
         // 出生国家/地区
         let birthNation = model.info.getBirthNation()
         let historyBirthNation = model.info.getHistoryBirthNation()
-        let options = [YHFamilyInfoOption(index: 0, value: "国内", isSelect: model.info.birthPlaceAboard == "0"),
-                       YHFamilyInfoOption(index: 1, value: "国外", isSelect: model.info.birthPlaceAboard != "0")]
+        let options = [YHFamilyInfoOption(index: 0, value: "国内", isSelect: model.info.birthPlaceAboard != "1"),
+                       YHFamilyInfoOption(index: 1, value: "国外", isSelect: model.info.birthPlaceAboard == "1")]
         
         let birthNationInfo =   YHFamilyInfoItem(id: .birthNation,
                                                  action: .choice,
@@ -257,22 +257,24 @@ extension YHFamilyInfoConfirmViewModel {
         var birthPlaceActionType = YHFamilyInfoActionType.select
         // 出生地
         var birthPlace = ""
-        if model.info.birthPlaceAboard == "0" { // 当前出生国家是国内
-            birthPlaceId = .birthPlaceInChina
-            birthPlaceActionType = .select
-            birthPlace = model.info.birthPlace.area.joined(separator: "")
-        } else {
+        if model.info.birthPlaceAboard == "1" { // 当前出生国家是国外
             birthPlaceId = .birthPlaceAboard
             birthPlaceActionType = .edit
             birthPlace = model.info.birthPlace.foreign
+        
+        } else {
+            birthPlaceId = .birthPlaceInChina
+            birthPlaceActionType = .select
+            birthPlace = model.info.birthPlace.area.joined(separator: "")
         }
         
         //
         var birthPlaceHistory = ""
-        if model.info.birthPlaceAboardHistory == "0" { // 原出生国家是国内
-            birthPlaceHistory = model.info.birthPlaceHistory.area.joined(separator: "")
-        } else {
+        if model.info.birthPlaceAboardHistory == "1" { // 原出生国家是国外
             birthPlaceHistory = model.info.birthPlaceHistory.foreign
+
+        } else {
+            birthPlaceHistory = model.info.birthPlaceHistory.area.joined(separator: "")
         }
             
         let birthPlaceInfo =  YHFamilyInfoItem(id: birthPlaceId,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/UploadCertificate(7上传过关证件)/C/YHUploadCertificateVC.swift

@@ -196,17 +196,20 @@ extension YHUploadCertificateVC: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let vc = YHUploadCertificateDetailVC()
-//
-        
         if let model = viewModel.uploadCertificateDataListModel {
             var tmp : YHUploadCertificateModel?
             if indexPath.section == 0  {
+                if model.small_whites.count > 0,indexPath.row - 1 < model.small_whites.count {
                     tmp = model.small_whites[indexPath.row - 1]
                     vc.detailType = .SmallWhiteNote
+                }
             } else if indexPath.section == 1 {
+                if model.id_cards.count > 0,indexPath.row - 1 < model.id_cards.count {
                     tmp = model.id_cards[indexPath.row - 1]
                     vc.detailType = .HongKongCard
                 }
+            }
+            
             if let tmp = tmp {
                 vc.dataModel = tmp
                 self.navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -19,11 +19,12 @@ class YHJsApi: NSObject {
 extension YHJsApi {
     //4、跳转到 办证3 - 赴港时间预约界面
     @objc func gotoAppointCertificateSyn(_ orderID : String) {
-        
+        DispatchQueue.main.async {
             if let orderId = Int(orderID) {
                 let vc = YHCertificateAppointViewController()
                 vc.orderId = orderId
-            delegate?.navigationController?.pushViewController(vc)
+                self.delegate?.navigationController?.pushViewController(vc)
+            }
         }
     }
     

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
+    }
 }