Merge commit '9770aa2d' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2268,7 +2268,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2288,7 +2288,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.5;
+				MARKETING_VERSION = 0.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2310,7 +2310,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2330,7 +2330,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.5;
+				MARKETING_VERSION = 0.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -364,10 +364,10 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
     
     private func  handleJumpLogic(tapIndex : Int) {
         //开发模式下 任意跳转
-//#if DEBUG
-//        handleJumpLogicDebug(tapIndex: tapIndex)
-//        return
-//#endif
+#if DEBUG
+        handleJumpLogicDebug(tapIndex: tapIndex)
+        return
+#endif
         //正式环境
         handleJumpLogicRelease(tapIndex: tapIndex)
     }
@@ -405,6 +405,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             
         } else if tapIndex == 1 {
             //家庭程序信息
+            
             let vc = YHFamilyMemberInfoListVC(orderId: orderId ?? 0)
             vc.orderId = orderId ?? 0
             navigationController?.pushViewController(vc)

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

@@ -207,7 +207,7 @@ extension YHSpouseInfoContainerVC {
         guard  let spouse = spouse else { return }
         guard let info = spouse.toDictionary() else { return }
         
-        let dict:[String: Any] = ["order_id":spouse.orderId,
+        let dict:[String: Any] = ["order_id":orderId,
                                   "relation":spouse.relation,
                                   "step":isSubmit ? currentStep : 0,
                                   "next":isSubmit,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift

@@ -130,21 +130,21 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
     // 检查填写信息完整性
     func checkIntegrity() -> Bool {
         
-        if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber > 0 {
+        if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber != 0 {
           return false
         }
         
-        if let father = familyMemberInfo?.father, father.notFillNumber > 0 {
+        if let father = familyMemberInfo?.father, father.notFillNumber != 0 {
             return false
         }
             
-        if let mother = familyMemberInfo?.mother, mother.notFillNumber > 0 {
+        if let mother = familyMemberInfo?.mother, mother.notFillNumber != 0 {
             return false
         }
         
         if let childs = familyMemberInfo?.child, !childs.isEmpty {
             for child in childs {
-                if child.notFillNumber > 0 {
+                if child.notFillNumber != 0 {
                     return false
                 }
             }
@@ -152,7 +152,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
         
         if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
             for brother in brothers {
-                if brother.notFillNumber > 0 {
+                if brother.notFillNumber != 0 {
                     return false
                 }
             }

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

@@ -914,6 +914,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var finishFollow: Int = 0
     var step: Int = 0
     var isHandled: Int = 0
+    // notFillNumber = -1 表示还没开始填写任意数据项
     var notFillNumber: Int = -1
     var certificates: YHCertificates = YHCertificates()
     var usedName: String = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift

@@ -230,6 +230,9 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
             return 12
         } else {
             let year: Int = pickerView.selectedRow(inComponent: 0) + currentDateCom.year!
+            if type == .yyyy {
+                return 0
+            }
             let month: Int = pickerView.selectedRow(inComponent: 1) + 1
             let days: Int = howManyDays(inThisYear: year, withMonth: month)
             return days

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/M/YHScoreDataModel.swift

@@ -60,7 +60,7 @@ class YHScoreSessionModel : SmartCodable {
                     if model.answer.isEmpty == true {
                         item.isSelected = false
                     } else  {
-                        if model.answer.contains(index+1) {
+                        if model.answer.contains(String(index+1)) {
                             item.isSelected = true
                             continue
                         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/M/YHScoreResultBaseModel.swift

@@ -11,6 +11,6 @@ import SmartCodable
 
 struct YHScoreResultBaseModel: SmartCodable {
     var result : String = ""
-    var answer : [Int] = []
+    var answer : [String] = []
     var score : Int = 0
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/M/YHScoreResultModel.swift

@@ -18,7 +18,7 @@ struct YHScoreResultModel: SmartCodable {
     var talent_list_score : YHScoreResultBaseModel?
     
     var total_score : YHScoreSumscore?
-    var user_info : YHScoreUserInfo?
+    var userinfo : YHScoreUserInfo?
 }
 
 struct YHScoreUserInfo : SmartCodable {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreItemCell.swift

@@ -56,11 +56,8 @@ extension YHScoreItemCell {
         guard let arrData = optionData?.options else {
             return
         }
-        
-        for view in holdView.subviews {
-            view.removeFromSuperview()
-        }
-        holdView.removeFromSuperview()
+        holdView.removeSubviews()
+        contentView.removeSubviews()
         
         
         contentView.addSubview(holdView)
@@ -93,8 +90,6 @@ extension YHScoreItemCell {
         
         var tagView : UIView = resultView
         for (index,item) in arrData.enumerated() {
-            
-            
             let optionView = YHScoreOptionsView()
             optionView.dataModel = item
             holdView.addSubview(optionView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScorePersonInfoCell.swift

@@ -12,6 +12,12 @@ import AttributedString
 class YHScorePersonInfoCell: UITableViewCell {
     static let cellReuseIdentifier = "YHScorePersonInfoCell"
     
+    
+    lazy var requestVM : YHBaseViewModel =  {
+        let r = YHBaseViewModel()
+        return r
+    }()
+    
     var dataModel : YHScoreResultModel? {
         didSet {
             updateUI()
@@ -29,7 +35,7 @@ class YHScorePersonInfoCell: UITableViewCell {
     
     //姓名
     private lazy var nameLable : UILabel = {
-        let lable0 = UILabel(text: "DavidHuang")
+        let lable0 = UILabel(text: "")
         lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_M(ofSize: 16)
         return lable0
@@ -37,7 +43,7 @@ class YHScorePersonInfoCell: UITableViewCell {
     
     //电话号码
     private lazy var phoneLable : UILabel = {
-        let lable0 = UILabel(text: "15818743775")
+        let lable0 = UILabel(text: "")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 12)
         return lable0
@@ -192,8 +198,9 @@ extension YHScorePersonInfoCell {
             return
         }
         
-        nameLable.text = model.user_info?.username ?? "-"
-        phoneLable.text = model.user_info?.mobile ?? "-"
+        handleCardImage()
+        nameLable.text = model.userinfo?.username ?? "-"
+        phoneLable.text = model.userinfo?.mobile ?? "-"
         
         let score : String = String(model.total_score?.sum_score ?? 0)
         let a: ASAttributedString = .init(NSAttributedString(string: score), .font(UIFont.PFSC_R(ofSize: 43)),.foreground(UIColor(hex:0xFFEEB0)))
@@ -201,4 +208,19 @@ extension YHScorePersonInfoCell {
         scoreLable.attributed.text = a + b
     }
     
+    
+    
+    private func handleCardImage() {
+        guard let dataModel = dataModel?.userinfo, dataModel.head_url.isEmpty == false else { return }
+        
+        let url = dataModel.head_url
+        if url.isEmpty == false {
+            self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
+                guard let self = self else { return }
+                guard success != nil else { return }
+                self.headImagV.kf.setImage(with: URL(string: success))
+            }
+        }
+    }
+    
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScoreResultView.swift

@@ -116,8 +116,13 @@ private extension YHScoreResultView {
         guard let model = dataModel else { return }
         
         if model.answer.isEmpty {
-            iconImageV.image = UIImage(named: "score_satisfy_1")
-            nameLable.text = "不满足"
+            if model.result.contains("年龄") {
+                iconImageV.image = UIImage(named: "score_satisfy_0")
+                nameLable.text = model.result
+            } else {
+                iconImageV.image = UIImage(named: "score_satisfy_1")
+                nameLable.text = "不满足"
+            }
         } else {
             iconImageV.image = UIImage(named: "score_satisfy_0")
             nameLable.text = model.result