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

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift

@@ -301,10 +301,40 @@ extension YHButlerServiceManager {
         let userInfo = QYUserInfo()
         userInfo.userId = userId
         userInfo.data = userData
-        QYSDK.shared().setUserInfo(userInfo) { success, error in
+        QYSDK.shared().setUserInfo(userInfo) { [weak self] success, error in
+            self?.logUserData(userId: userId, userData: userData, error: error)
             completion(success)
         }
     }
+
+    private func logUserData(userId: String, userData: String, error: Error?) {
+        var errorMsg = ""
+        if let error = error as? NSError {
+            switch error.code {
+            case 0:
+                errorMsg = "未知错误"
+            case 1:
+                errorMsg = "错误参数"
+            case 2:
+                errorMsg = "必须为融合SDK"
+            case 3:
+                errorMsg = "帐号错误-底层通信IM帐号未登录"
+            case 4:
+                errorMsg = "userId错误，应与帐号相同"
+            case 5:
+                errorMsg = "需要登出"
+            default:
+                break
+            }
+        }
+        let dic: [AnyHashable : Any] = [
+            "type": "unicornService",
+            "userData": userData,
+            "userId": userId,
+            "errorMsg": errorMsg
+        ]
+        YHAliYunLogManager.shared.addModuleName(.logTypeError, remark: dic)
+    }
     
     private func setupInfomationForQiYu(completion: @escaping (Bool) -> Void) {
         guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {

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

@@ -82,7 +82,7 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
        let bb: ASAttributedString = .init("最新适用的申请资格门槛：符合12项评核准备的其中6个。\n", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
         
        let cc: ASAttributedString = .init("       经初步评估，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
-       let dd: ASAttributedString = .init("您目前符合【优秀人才入境计划 - 综合计分制】的以下甄选条件！", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
+        let dd: ASAttributedString = .init("您目前符合【优秀人才入境计划 - 综合计分制】的以下甄选条件！", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.mainTextColor))
        let ee: ASAttributedString = .init("考虑到您目前已经具备的良好基础，建议您进一步孵化其他条件。", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         
         return aa+bb+cc+dd+ee

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -61,7 +61,7 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
         isFollowCanEdit = !child.is18YearsOld()
         // 随行
-        let title0 = YHFormTitleItem(type: .accompany)
+        let title0 = YHFormTitleItem(type: .E)
         let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody()))
         let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local)
         let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow()))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -60,7 +60,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         items.removeAll()
 
         // 随行
-        let title0 = YHFormTitleItem(type: .accompany)
+        let title0 = YHFormTitleItem(type: .E)
         let item0 = YHFormDetailItem(type: .isAccompanyToHK)
         item0.value = String(spouse.isFollow())
         let arr0:[YHFormItemProtocol] = [title0, item0]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -22,9 +22,7 @@ enum YHFormTitleItemType:Int, CaseIterable {
     case B
     case C
     case D
-    
-    // 随行
-    case accompany
+    case E
     // 国籍
     case nationality
     // 居住信息
@@ -257,7 +255,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "兄弟姐妹".local
         case .C:
             return "子女".local
-        case .accompany:
+        case .E:
             return "随行".local
         case .nationality:
             return "国籍".local
@@ -319,7 +317,7 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "".local
         case .isPreviousMarriageChild:
             return "".local
-        case .accompany:
+        case .E:
             return "".local
         case .nationality:
             return "".local

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

@@ -127,7 +127,7 @@ class YHWorkExperienceListViewController: YHBaseViewController {
 
 extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if viewModel?.mainModel.has_work_time_empty == 0 && viewModel?.mainModel.has_work_time_overlap == 0 {
+        if viewModel?.mainModel.has_work_time_overlap == 0 {
             return 2
         }
         return 3

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildPrimaryInfoVC.swift

@@ -59,7 +59,7 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
         isFollowCanEdit = !child.is18YearsOld()
         // 随行
-        let title0 = YHFormTitleItem(type: .accompany)
+        let title0 = YHFormTitleItem(type: .E)
         let item00 = YHFormDetailItem(type: .ownCustody, value:String(child.isOwnCustody()))
         let item01 = YHFormDetailItem(type: .birthday, value:child.birthday, tips:"请选择出生日期".local)
         let item02 = YHFormDetailItem(type: .isAccompanyToHK, value:String(child.isFollow()))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpousePrimaryInfoVC.swift

@@ -60,7 +60,7 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         items.removeAll()
 
         // 随行
-        let title0 = YHFormTitleItem(type: .accompany)
+        let title0 = YHFormTitleItem(type: .E)
         let item0 = YHFormDetailItem(type: .isAccompanyToHK)
         item0.value = String(spouse.isFollow())
         let arr0:[YHFormItemProtocol] = [title0, item0]