Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6948,7 +6948,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7090,7 +7090,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7295,7 +7295,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7342,7 +7342,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 13;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -502,7 +502,7 @@ extension YHHKPlanItemView : UITextViewDelegate {
         guard let model = dataMode else { return }
         guard let text = textView.text else { return }
         
-        var txtNum : Int =  calcTextLength(string: text)
+        let txtNum : Int =  calcTextLength(string: text)
         numberLabel.text =  txtNum.string + "/\(maxNumbler)"
         
         model.content = text

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordViewController.swift

@@ -167,7 +167,7 @@ extension YHIncomeRecordViewController {
     
     private func setupData() {
         let detail: ASAttributedString = .init(string: "备注：全年收入是指应课税（应纳所得税）的就业或业务收入，包括工资薪金、津贴、股票期权及从其拥有的公司所得的利润。由个人投资所产生的收入不会计算在内。", .font(UIFont.PFSC_R(ofSize: 13)), .foreground(UIColor(hexString: "#8993A2") ?? .gray))
-        let firstSection: [TableRow] = [.consentForHKTravel("收入情况", detail, "您在前一年，全年收入是否达港币100万元或以上")]
+        let firstSection: [TableRow] = [.consentForHKTravel("收入情况", detail, "您在近十二个月，总收入是否达到港币100万元或以上")]
         guard incomeModel.income_over_100 == YHIncomeOver100.true.rawValue else {
             datas = [firstSection]
             tableView.reloadData()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -116,6 +116,15 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             return [section, section1]
         } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
             return [section, section2]
+        } else if nationality.contains("中国") {
+            if is_live_oversea_year == 1 {
+                if mainModel.is_handled == 1 {
+                    return [section1, section2]
+                }
+                return [section2]
+            } else {
+                return [section1]
+            }
         } else {
             return [section2]
         }
@@ -340,6 +349,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             mainModel.address.foreign = item.message ?? ""
         case .id33:
             mainModel.is_live_oversea_year = item.value?.first?.int ?? 0
+            mainModel.is_handled = 0
         case .id34:
             mainModel.birth_place.foreign = item.message ?? ""
         case .id35:
@@ -640,6 +650,19 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
                 guard passport_issue_at.count > 0 else { return false }
                 guard passport_issue_date_start_at.count > 0 else { return false }
                 guard passport_issue_date_end_at.count > 0 else { return false }
+            } else if nationality.contains("中国") {
+                if is_live_oversea_year == 1 {
+                    guard passport_number.count > 0 else { return false }
+                    guard passport_issue_at.count > 0 else { return false }
+                    guard passport_issue_date_start_at.count > 0 else { return false }
+                    guard passport_issue_date_end_at.count > 0 else { return false }
+                }
+                if mainModel.is_handled == 1 {
+                    guard hk_macao_pass_number.count > 0 else { return false }
+                    guard hk_macao_pass_issue_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
+                }
             } else {
                 guard passport_number.count > 0 else { return false }
                 guard passport_issue_at.count > 0 else { return false }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

@@ -35,10 +35,25 @@ class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController {
 //    private var brotherButton : UIButton!
     
     private var arrButtons : [UIButton] = []
+    
+    
+    lazy var noNetWorkTipsView: YHEmptyDataView = {
+        let view = YHEmptyDataView.createView("暂无内容", kEmptyCommonBgName)
+        view.topMargin = 0
+        view.backgroundColor = .white
+        view.isHidden = true
+        return view
+    }()
 }
 
 private extension YHPreviewFamilyMemberViewController {
     func setupUI() {
+        
+        noNetWorkTipsView.isHidden = false
+        noNetWorkTipsView.backgroundColor = UIColor.contentBkgColor
+        view.addSubview(self.noNetWorkTipsView)
+        self.noNetWorkTipsView.topMargin = 20
+        
         view.addSubview(buttonHoldView)
         buttonHoldView.snp.makeConstraints { make in
             make.top.equalToSuperview()
@@ -259,6 +274,16 @@ private extension YHPreviewFamilyMemberViewController {
             previewVM.arrDataForMainApplicationInfo = []
         }
         homeTableView.reloadData()
+        
+        if previewVM.arrDataForMainApplicationInfo.count > 0 {
+            self.noNetWorkTipsView.isHidden = true
+            self.homeTableView.isHidden = false
+        } else {
+            
+            self.noNetWorkTipsView.isHidden = false
+            self.homeTableView.isHidden = true
+            
+        }
     }
     
     

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

@@ -186,7 +186,7 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab
                 guard let self = self else { return }
                 self.viewModel.updateModel(model)
                 let id = model.id
-                if id != .id1 && id != .id2 && id != .id6 && id != .id10 {
+                if id != .id1 && id != .id2 && id != .id6 && id != .id10 && id != .id11 {
                     self.updateDataSource()
                 }
             }

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

@@ -84,15 +84,15 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
         subTitleLabel = {
             let label = UILabel()
             label.font = UIFont.PFSC_R(ofSize: 12)
-            label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
+            label.text = "从获得有效学位（学士学位或以上）后第一份工作开始，直至最近一份工作"
             label.textColor = UIColor.labelTextColor2
+            label.numberOfLines = 0
             return label
         }()
         centerView.addSubview(subTitleLabel)
         subTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(20)
             make.top.equalTo(50)
-            make.height.equalTo(20)
             make.right.equalTo(-20)
         }