Merge branch 'qmas-1130' into AI-1212

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6800,7 +6800,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6942,7 +6942,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7147,7 +7147,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7194,7 +7194,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/AppDelegate.swift

@@ -69,7 +69,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         AGCAppLinking.instance().handle { (link, error) in
             let deepLink = link?.deepLink
             //TODO: 增加deeplink地址跳转
-            print(deepLink as Any)
         }
         
         // QiYu SDK初始化

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveHKView.swift

@@ -112,6 +112,11 @@ class YHImproveHKView: UIView {
         return btn
     }()
     
+    lazy var templateListView:YHImproveSchemeTemplateListView = {
+        let view = YHImproveSchemeTemplateListView.listView()
+        return view
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: .zero)
         setupUI()
@@ -122,9 +127,8 @@ class YHImproveHKView: UIView {
     }
     
     @objc func didRightBtnClicked() {
-       let view = YHImproveSchemeTemplateListView.listView()
-       view.items = item.templates
-       view.show()
+       self.templateListView.items = item.templates
+       self.templateListView.show()
     }
     
     func setupUI() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListCell.swift

@@ -13,11 +13,8 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
     static let cellReuseIdentifier = "YHImproveSchemeTemplateListCell"
         
     var model = YHSchemeTemplatesModel()
+    var clickBlock: ((YHSchemeTemplatesModel)->())?
 
-    lazy var previewFileTool:YHFilePreviewTool = {
-        let tool = YHFilePreviewTool(targetVC: UIViewController.current)
-       return tool
-    }()
 
     lazy var lineView:UIView = {
         let view = UIView()
@@ -45,12 +42,7 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
     }()
     
     @objc func didBtnClicked() {
-        if !model.url.isEmpty {            
-            let viewModel = YHBaseViewModel()
-            viewModel.getRealUsefulUrl(model.url) { success in
-                self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"预览")
-            }
-        }
+        clickBlock?(model)
     }
     
     required init?(coder: NSCoder) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListView.swift

@@ -15,6 +15,11 @@ class YHImproveSchemeTemplateListView: UIView {
         return v
     }
     
+    lazy var previewFileTool:YHFilePreviewTool = {
+        let tool = YHFilePreviewTool(targetVC: UIViewController.current)
+       return tool
+    }()
+
     let bottomFixHeight = 102.0
     
     var items: [YHSchemeTemplatesModel] = [] {
@@ -155,6 +160,24 @@ extension YHImproveSchemeTemplateListView : UITableViewDelegate, UITableViewData
             let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveSchemeTemplateListCell.cellReuseIdentifier, for: indexPath) as! YHImproveSchemeTemplateListCell
             cell.titleLabel.text = "\(indexPath.row+1)、\(item.name)"
             cell.model = item
+            cell.clickBlock = {
+                [weak self] model in
+                guard let self = self else { return }
+                if !model.url.isEmpty {
+                    let viewModel = YHBaseViewModel()
+                    if model.url.contains("pub.galaxy-immi.com") { // 资源文件
+                        viewModel.getRealUsefulUrl(model.url) { success in
+                            self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"预览")
+                        }
+                    } else { // web
+                        let vc = YHH5WebViewVC()
+                        vc.url = model.url
+                        vc.isFullScreenFlag = false
+                        UIViewController.current?.navigationController?.pushViewController(vc)
+                    }
+                }
+                self.dismiss()
+            }
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveTargetListCell.swift

@@ -58,7 +58,7 @@ class YHImproveTargetListCell: UITableViewCell {
     
     lazy var subtitleLabel: UILabel = {
         let label = UILabel()
-        label.text = "接下来请您依据如下指引进行提升准备"
+        label.text = "以下指引供您按需参考"
         label.font = UIFont.PFSC_R(ofSize: 12)
         label.textColor = .init(hex: 0x8993A2)
         return label

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -199,7 +199,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
+                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.sign_valid_date) {
                         if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
                             failString = ""
                         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift

@@ -191,9 +191,9 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
             cell.clickBlock = { [weak self] value, index in
                 guard let self = self else { return }
                 if index == 0 {
-                    self.viewModel?.mainModel.work_time_overlap_remark = value
-                } else {
                     self.viewModel?.mainModel.work_time_empty_remark = value
+                } else {
+                    self.viewModel?.mainModel.work_time_overlap_remark = value
                 }
             }
             cell.backgroundColor = .clear
@@ -215,7 +215,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
         if let data = dataSource {
             for item in data {
                 if item.company_name == "" {
-                    height = height + 52
+                    height = height + 76
                 } else {
                     let text = item.company_name // 要显示的文本内容
                     let font = UIFont.PFSC_B(ofSize: 14) // 字体大小

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperiencePositionViewViewController.swift

@@ -24,7 +24,7 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
     var isShowPrompt: Bool = false
     var isShowMessageSelect: Bool = true
     var isKeyboardShow: Bool = false
-    var selectReasonIndex: Int = 0
+    var selectReasonIndex: Int = 5
     var selectEditItem = YHWorkExperienceFileModel()
     
     override func viewDidLoad() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceCompanySelectView.swift

@@ -1008,6 +1008,7 @@ class YHCompanyReasonFileCell: UITableViewCell {
                 rightButton.isSelected = false
                 leftButton.layer.borderWidth = 0
                 rightButton.layer.borderWidth = 0
+                alertLabel.isHidden = true
             }
             if model?.has_provide_certificate == 1 {
                 leftButton.isSelected = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -561,7 +561,11 @@ extension YHWorkExperienceItemView: UITextFieldDelegate {
         }
         
         let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
-        if (dataSource?.id == .id1 || dataSource?.id == .id7 || dataSource?.id == .id14 || dataSource?.id == .id16 || dataSource?.id == .id18) && newText.count > 10 {
+        if (dataSource?.id == .id7 || dataSource?.id == .id14 || dataSource?.id == .id16 || dataSource?.id == .id18) && newText.count > 10 {
+            return false
+        }
+        
+        if dataSource?.id == .id1 && newText.count > 50 {
             return false
         }
         
@@ -586,7 +590,7 @@ extension YHWorkExperienceItemView: UITextFieldDelegate {
             return false
         }
         
-        if (dataSource?.id == .id12 || dataSource?.id == .id8) && newText.count > 50 {
+        if (dataSource?.id == .id12 || dataSource?.id == .id8 ) && newText.count > 50 {
             return false
         }