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

# Conflicts:
#	galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift

@@ -145,6 +145,7 @@ class YHEducationDetailInfo: SmartCodable {
         case majorOther = "major_other"
         case hasBachelorDegree = "has_bachelor_degree"
         case certConfirm = "cert_confirm"
+        case college_id = "college_id"
     }
     
     required init() {

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

@@ -186,6 +186,12 @@ class YHGCMainApplicantInformationViewModel: YHBaseViewModel {
             }
         } else if nationality.contains("中国") && is_live_oversea_year == 1 {
             return [section, section2]
+        } else if nationality.contains("中国") && !addressCountry.contains("中国") {
+            if mainModel.is_handled == 1 {
+                return [section, section1]
+            } else {
+                return [section]
+            }
         } else {
             return [section2]
         }
@@ -197,8 +203,10 @@ class YHGCMainApplicantInformationViewModel: YHBaseViewModel {
             
         case .id1:
             mainModel.nationality = item.message ?? ""
+            mainModel.is_live_oversea_year = 0
         case .id2:
             mainModel.address.country = item.message ?? ""
+            mainModel.is_live_oversea_year = 0
         case .id3:
             mainModel.address.area = item.value ?? []
         case .id4:

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/VM/YHGCWorkItemListViewModel.swift

@@ -168,6 +168,8 @@ class YHGCWorkItemListViewModel: YHBaseViewModel {
             let value = model.value?.first?.int ?? 0
             if value == 0 {
                 mainModel.has_work_experience = 2
+                mainModel.has_company_consent = 2
+                mainModel.has_center_consent = 1
             } else if value == 1 {
                 mainModel.has_work_experience = 1
             }

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

@@ -26,7 +26,9 @@ extension YHJsApi {
         DispatchQueue.main.async {
             UIViewController.current?.navigationController?.popToRootViewController(animated: false)
             goTabBarBy(tabType: .service)
-            NotificationCenter.default.post(name: YhConstant.YhNotification.didJumpToServiceProgressNotification, object: nil)
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+                NotificationCenter.default.post(name: YhConstant.YhNotification.didJumpToHomePageLifeEduTabNotification, object: nil)
+            }
         }
     }
     

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -406,8 +406,6 @@ extension YhConstant {
         
         //关闭直播间弹出的分享界面
         public static let closeShareUIInLiveRoomNotifiction = Notification.Name(rawValue: "com.yinhe.app.close.share.ui")
-        
-        
         // 跳转到服务Tab 中的 服务进度
         public static let didJumpToServiceProgressNotification = Notification.Name(rawValue: "com.yinhe.service.tab.serviceprogress")
     }