Merge commit '3214f962' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -332,6 +332,7 @@
 		A5C5B3292B57CCBE00A7C5D1 /* YHDavidCell4.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B3282B57CCBE00A7C5D1 /* YHDavidCell4.swift */; };
 		A5C5B32B2B57D17600A7C5D1 /* YHDavidCell5.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32A2B57D17600A7C5D1 /* YHDavidCell5.swift */; };
 		A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
+		A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
@@ -713,6 +714,7 @@
 		A5C5B3282B57CCBE00A7C5D1 /* YHDavidCell4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDavidCell4.swift; sourceTree = "<group>"; };
 		A5C5B32A2B57D17600A7C5D1 /* YHDavidCell5.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDavidCell5.swift; sourceTree = "<group>"; };
 		A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
+		A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
@@ -1299,6 +1301,7 @@
 				045EEE592B9F171A0022A143 /* YHBasicInfoFillBottomView.swift */,
 				045EEE5A2B9F171A0022A143 /* YHBasicInfoFillCell.swift */,
 				045EEE5B2B9F171A0022A143 /* YHBasicInfoFillView.swift */,
+				A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2191,6 +2194,7 @@
 				04A6715C2B9FE9EA00C1FB91 /* YHUploadContentVC.swift in Sources */,
 				A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
 				045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
+				A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */,
 				0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */,
 				045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
 				044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
@@ -2671,7 +2675,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2713,7 +2717,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateResourceUploadVC.swift

@@ -18,7 +18,7 @@ class YHCertificateResourceUploadVC: YHBaseViewController {
     var status: YHCertificateUploadStatus = .all
     var items:[YHSupplementInfo] = []
     var viewModel: YHCertificateViewModel = YHCertificateViewModel()
-    var categoryInfo: YHCategoryData = YHCategoryData()
+    var categoryInfo: YHCategoryData!
 
     lazy var tableView: UITableView = {
         
@@ -97,20 +97,23 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let item = items[indexPath.section]
         let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath) as! YHCertificateInfoCell
-        cell.updateModel(item)
-        cell.templateBlock = {
-            [weak self] in
-            guard let self = self else { return }
-            let view = YHCertificateTemplateView.templateView(item.templateInfo)
-            view.scanTemplateBlock = {
-                [weak self] temlateInfo in
+        
+        if 0 <= indexPath.section && indexPath.section < items.count {
+            let item = items[indexPath.section]
+            cell.updateModel(item)
+            cell.templateBlock = {
+                [weak self] in
                 guard let self = self else { return }
-                let vc = UIViewController()
-                self.navigationController?.pushViewController(vc)
+                let view = YHCertificateTemplateView.templateView(item.templateInfo)
+                view.scanTemplateBlock = {
+                    [weak self] temlateInfo in
+                    guard let self = self else { return }
+                    let vc = UIViewController()
+                    self.navigationController?.pushViewController(vc)
+                }
+                view.show()
             }
-            view.show()
         }
         return cell
     }
@@ -122,6 +125,12 @@ extension YHCertificateResourceUploadVC: UITableViewDelegate, UITableViewDataSou
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         let vc = YHUploadContentVC()
+        vc.orderId = orderId
+        vc.categoryInfo = categoryInfo
+        if 0 <= indexPath.section && indexPath.section < items.count {
+            let item = items[indexPath.section]
+            vc.uploadInfo = item
+        }
         self.navigationController?.pushViewController(vc)
     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateModel.swift

@@ -68,7 +68,22 @@ class YHSupplementInfo: SmartCodable {
     var applicantName: String = ""
     var nameExtra: YHNameExtra = YHNameExtra()
     var templateInfo: YHTemplateInfo = YHTemplateInfo()
+    var auditContent: String = ""
+    var uploadRequirement: String = ""
     var contentUrl: [YHContentUrl] = []
+    
+    func getStatusName() -> String {
+        if checkStatus == YHCertificateUploadStatus.review.rawValue {
+            return "审核中".local
+        } else if checkStatus == YHCertificateUploadStatus.preUpload.rawValue {
+            return "待上传".local
+        } else if checkStatus == YHCertificateUploadStatus.finish.rawValue {
+            return "已通过".local
+        } else if checkStatus == YHCertificateUploadStatus.rejected.rawValue {
+            return "已驳回".local
+        }
+        return ""
+    }
 
     enum CodingKeys: String, CodingKey {
         case id = "id"
@@ -81,6 +96,8 @@ class YHSupplementInfo: SmartCodable {
         case applicantName = "applicant_name"
         case nameExtra = "name_extra"
         case templateInfo = "template_info"
+        case auditContent = "audit_content"
+        case uploadRequirement = "upload_requirement"
         case contentUrl = "content_url"
     }
     
@@ -165,6 +182,13 @@ class YHTemplateInfo: SmartCodable {
     var description: String = ""
     var materialPath: [YHMaterialPath] = []
     
+    func isNeedShowTemplate() -> Bool {
+        if self.description.isEmpty && self.materialPath.isEmpty {
+            return false
+        }
+        return true
+    }
+    
     required init() {
         
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateNameCell.swift

@@ -12,13 +12,16 @@ class YHCertificateNameCell: UITableViewCell {
     
     static let cellReuseIdentifier = "YHCertificateNameCell"
     
+    var editBlock:((YHContentUrl)->())?
+    
     var whiteView: UIView!
     var iconImgV: UIImageView!
     var nameLabel: UILabel!
     var timeLabel: UILabel!
     var editBtn: UIButton!
     
-
+    var contentItem: YHContentUrl!
+    
     required init?(coder: NSCoder) {
         super.init(coder: coder)
     }
@@ -29,10 +32,49 @@ class YHCertificateNameCell: UITableViewCell {
     }
     
     func updateModel(_ model: YHContentUrl) {
+        
+        contentItem = model
         nameLabel.text = model.name
         timeLabel.text = "上传于\(model.updatedAt)"
+        
+        var suffix = ""
+        var iconImgName = ""
+        
+        if !model.url.pathExtension.isEmpty {
+            suffix = model.url.pathExtension
+        } else {
+            suffix = model.suffix
+        }
+        
+        if suffix == "jpeg" {
+            iconImgName = "my_cer_type_jpg"
+            
+        } else if suffix == "jpg" {
+            iconImgName = "my_cer_type_jpg"
+            
+        } else if suffix == "png" {
+            iconImgName = "my_cer_type_png"
+            
+        } else if suffix == "pdf" {
+            iconImgName = "my_cer_type_pdf"
+            
+        } else if suffix == "doc" || suffix == "docx" {
+            iconImgName = "my_cer_type_word"
+        
+        } else if suffix == "ppt" || suffix == "pptx" {
+            iconImgName = "my_cer_type_ppt"
+        }
+        
+        iconImgV.image = UIImage(named: iconImgName)
     }
     
+    @objc func didEditBtnClicked() {
+        if let editBlock = editBlock {
+            editBlock(contentItem)
+        }
+    }
+    
+    
     func setupUI() {
         
         self.selectionStyle = .none
@@ -60,6 +102,8 @@ class YHCertificateNameCell: UITableViewCell {
         
         editBtn = UIButton()
         editBtn.setImage(UIImage(named:"my_cer_btn_edit"), for:.normal)
+        editBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
+        editBtn.addTarget(self, action: #selector(didEditBtnClicked), for: .touchUpInside)
         whiteView.addSubview(editBtn)
 
         whiteView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateCell.swift

@@ -11,14 +11,46 @@ import UIKit
 class YHCertificateTemplateCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHCertificateTemplateCell"
-    
+    var templateInfo: YHTemplateInfo? {
+        didSet {
+            guard let templateInfo = templateInfo else {
+                contentView.isHidden = true
+                return
+            }
+            
+            if templateInfo.description.isEmpty && templateInfo.materialPath.isEmpty {
+                contentView.isHidden = true
+                return
+            }
+            
+            contentView.isHidden = false
+            
+            if !templateInfo.name.isEmpty {
+                templateTitleLabel.text = "\(templateInfo.name)示例模版"
+            } else {
+                templateTitleLabel.text = ""
+            }
+            if !templateInfo.description.isEmpty {
+                tipsLabel.text = "注意事项: \(templateInfo.description)"
+            } else {
+                tipsLabel.text = ""
+            }
+            let noTemplate = templateInfo.materialPath.isEmpty
+            templateView.isHidden = noTemplate
+            templateView.snp.updateConstraints { make in
+                make.height.equalTo(noTemplate ? 0.0 : 62.0)
+                make.bottom.equalToSuperview().offset(noTemplate ? 0.0 : -34.0)
+            }
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
     lazy var tipsLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor.labelTextColor2
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize:12)
         label.numberOfLines = 0
-        label.text = "注意事项：这里是上传应该注意的事项这里是上传应该注意的事项这里是上传应该注意的事项。"
         return label
     }()
     
@@ -27,7 +59,8 @@ class YHCertificateTemplateCell: UITableViewCell {
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_M(ofSize:17)
-        label.text = "身份证示例模版"
+        label.text = "示例模版"
+        label.numberOfLines = 0
         return label
     }()
     
@@ -49,6 +82,8 @@ class YHCertificateTemplateCell: UITableViewCell {
     
     func createUI() {
     
+        self.selectionStyle = .none
+        
         contentView.addSubview(templateTitleLabel)
         contentView.addSubview(tipsLabel)
         contentView.addSubview(templateView)
@@ -57,7 +92,6 @@ class YHCertificateTemplateCell: UITableViewCell {
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
             make.top.equalToSuperview().offset(16)
-            make.height.equalTo(24.0)
         }
         tipsLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(20)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateView.swift

@@ -53,20 +53,20 @@ class YHCertificateTemplateView: UIView {
         
         titleLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(16)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(24)
+            make.left.equalToSuperview().offset(64)
+            make.right.equalToSuperview().offset(-64)
+            make.bottom.equalToSuperview().offset(-12)
         }
         closeBtn.snp.makeConstraints { make in
-            make.centerY.equalTo(titleLabel)
+            make.top.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-20)
             make.width.height.equalTo(24)
         }
-        closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 15, left: 15, bottom: 15, right: 15)
         line.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
             make.height.equalTo(1)
-            make.top.equalTo(titleLabel.snp.bottom).offset(12)
             make.bottom.equalToSuperview()
         }
         return view
@@ -91,6 +91,7 @@ class YHCertificateTemplateView: UIView {
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .center
         label.font = UIFont.PFSC_B(ofSize:17)
+        label.numberOfLines = 0
         label.text = "示例模版"
         return label
     }()
@@ -151,9 +152,9 @@ class YHCertificateTemplateView: UIView {
         if !model.description.isEmpty {
             tipsLabel.text = "注意事项:\(model.description)"
         }
+        templateView.isHidden =  model.materialPath.isEmpty
     
         let topMargin = model.description.isEmpty ? 0 : 20
-        
         templateView.snp.updateConstraints { make in
             make.top.equalTo(tipsLabel.snp.bottom).offset(topMargin)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHFileRenameInputView.swift

@@ -7,10 +7,10 @@
 //
 /*
 【Usage】
- let view = YHFileRenameInputView.inputView(defalutText:"adfasfsf", editBlock: {
-     text in
-     print("\(text)")
- })
+ let view = YHFileRenameInputView.inputView(defalutText:"adfasfsf")
+ view.editBlock = {
+    text in
+ }
  */
 
 import UIKit
@@ -18,7 +18,7 @@ import UIKit
 class YHFileRenameInputView: UIView {
     
     static let height = 217.0
-    var editBlock:((String?)->())?
+    var editBlock:((String?)->Void)?
     lazy var blackMaskView: UIView = {
         let view = UIView(frame:UIScreen.main.bounds)
         view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
@@ -66,7 +66,7 @@ class YHFileRenameInputView: UIView {
     lazy var textField:UITextField = {
         let textField = UITextField()
         textField.backgroundColor = .clear
-        textField.placeholder = "请输入文件名称"
+        textField.attributedPlaceholder = NSAttributedString(string: "请输入文件名称", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
         textField.font = UIFont.PFSC_M(ofSize: 16)
         textField.tintColor = UIColor.brandMainColor
         textField.textColor = UIColor.mainTextColor
@@ -104,10 +104,9 @@ class YHFileRenameInputView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    static func inputView(defalutText:String?, editBlock:((String?)->())?)-> YHFileRenameInputView {
+    static func inputView(defalutText:String?)-> YHFileRenameInputView {
         let view = YHFileRenameInputView(frame:CGRect(x: 0, y: 0, width:KScreenWidth, height:Self.height))
         view.textField.text = defalutText
-        view.editBlock = editBlock
         return view
     }
     
@@ -186,10 +185,15 @@ extension YHFileRenameInputView  {
     }
     
     @objc func didClickConfirmBtn() {
-        dismiss()
+        if isEmptyString(textField.text) {
+            YHHUD.flash(message: "重命名不可为空")
+            return
+        }
         if let editBlock = editBlock {
             editBlock(textField.text)
         }
+        dismiss()
+        
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -137,7 +137,7 @@ class YHCertificateViewModel: YHBaseViewModel {
     }
     
     
-    func uploadCertificates(params:[String : Any], isSilient:Bool = false, callBack:@escaping ((Bool)->())) {
+    func updateCertificates(params:[String : Any], isSilient:Bool = false, callBack:@escaping ((Bool)->())) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Certificate.certificateUploadApi
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift

@@ -300,15 +300,12 @@ private extension YHBasicInfoFillView {
                 make.right.equalTo(-12)
             }
             
-            
             guard let subModel = model.model else {
                 printLog("errorr: 数据有问题")
-                
                 title = model.question
                 if model.answer == "Y" {
                     didClickResponseBtn(btn: answer2Btn)
                 } else {
-                    
                     if model.answer == "N" {
                         didClickResponseBtn(btn: answer1Btn)
                     } else {
@@ -318,55 +315,21 @@ private extension YHBasicInfoFillView {
                 return
             }
             
+            let tmpHoldView : YHChoiceButtonHoldView = YHChoiceButtonHoldView()
             
-            var targetView : UIView = lable
-            
-            let targetId = Int(subModel.background_member?.info ?? "0")
-            for (index,item) in subModel.subset.enumerated() {
-                
-                let name = item.subset_name.count > 0 ? item.subset_name : "--"
-                let btn = UIButton(type: .custom)
-                btn.setTitle(name, for: .normal)
-                btn.setTitle(name, for: .selected)
-                btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
-                btn.setTitleColor(UIColor.mainTextColor, for: .normal)
-                btn.setTitleColor(UIColor.brandMainColor, for: .selected)
-                btn.setImage(UIImage(named: "basic_info_radio_0"), for: .normal)
-                btn.setImage(UIImage(named: "basic_info_radio_1"), for: .selected)
-                btn.iconInLeft(spacing: 6)
-                btn.tag = item.id
-                btn.addTarget(self, action: #selector(clickCheckBtn(sender:)), for: .touchUpInside)
-                mutilChoiceHoldView.addSubview(btn)
-                
-                if targetId == item.id {
-                    btn.isSelected = true
-                } else {
-                    btn.isSelected = false
-                }
-                
-                
-                
-                
-                if index == subModel.subset.count - 1 {
-                    btn.snp.makeConstraints { make in
-                        make.top.equalTo(targetView.snp.bottom).offset(kMargin)
-                        make.left.equalTo(16)
-                        make.height.equalTo(30)
-                        make.bottom.equalToSuperview().offset(-kMargin)
-                    }
-                } else {
-                    
-                    btn.snp.makeConstraints { make in
-                        make.top.equalTo(targetView.snp.bottom).offset(kMargin)
-                        make.left.equalTo(16)
-                        make.height.equalTo(30)
-                    }
-                }
-                
-                targetView = btn
-                arrCheckBtns.append(btn)
+            tmpHoldView.targetId = Int(subModel.background_member?.info ?? "0") ?? 0
+            tmpHoldView.dataModel = subModel.subset
+            tmpHoldView.callBackBlock = { tag in
+                self.model?.info = tag
             }
             
+            mutilChoiceHoldView.addSubview(tmpHoldView)
+            tmpHoldView.snp.makeConstraints { make in
+                make.top.equalTo(lable.snp.bottom).offset(kMargin)
+                make.left.equalTo(lable.snp.left)
+                make.right.equalTo(lable.snp.right)
+                make.bottom.equalToSuperview().offset(-kMargin)
+            }
             
             title = model.question
             if model.answer == "Y" {
@@ -451,18 +414,18 @@ extension YHBasicInfoFillView : UITextFieldDelegate {
     
     
     
-    @objc func clickCheckBtn(sender : UIButton) {
-        //修改成单选逻辑
-        if sender.isSelected != true {
-            for item in arrCheckBtns {
-                item.isSelected = false
-            }
-            sender.isSelected = true
-            model?.info = String(sender.tag)
-        }
-        
-        layoutForYES()
-    }
+//    @objc func clickCheckBtn(sender : UIButton) {
+//        //修改成单选逻辑
+//        if sender.isSelected != true {
+//            for item in arrCheckBtns {
+//                item.isSelected = false
+//            }
+//            sender.isSelected = true
+//            model?.info = String(sender.tag)
+//        }
+//        
+//        layoutForYES()
+//    }
 }
 
 
@@ -531,7 +494,6 @@ private extension YHBasicInfoFillView {
         } 
         else {
             //需要展示提示的情况
-            
             if model.type == 0 {
                 additionHoldView.isHidden = false
                 bottomLine.isHidden = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHChoiceButtonHoldView.swift

+//
+//  YHChoiceButtonHoldView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+class YHChoiceButtonHoldView: UIView {
+    typealias block = (_ index: String) -> ()
+    var callBackBlock: block?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .clear
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private var arrCheckBtns : [UIButton] = []
+    var targetId : Int = -1
+    var dataModel : [subsetModel] = [] {
+        didSet {
+            updateView()
+        }
+    }
+    
+    private func updateView() {
+        var x : CGFloat = 0
+        var y = 0
+        
+        arrCheckBtns.removeAll()
+        
+        for (index,item) in dataModel.enumerated() {
+            
+            let string = item.subset_name.isEmpty == false ? item.subset_name : "--"
+            let font = UIFont.PFSC_M(ofSize: 14)// 设置字体样式及大小
+            let maxWidth : CGFloat = KScreenWidth - 28 * 2 // label最大宽度限制
+            let butGap : CGFloat = 25
+            
+            var boundingBox = CGRect()
+            boundingBox = NSString(string: string).boundingRect(with: CGSize(width: KScreenWidth, height: .greatestFiniteMagnitude), options: [.usesLineFragmentOrigin], attributes: [.font : font], context: nil)
+            let width = boundingBox.size.width
+            
+            if CGFloat(x) + width  + 18.0 + butGap  > maxWidth {
+                x = 0
+                y = y + 1
+            }
+            
+            let btn = UIButton(type: .custom)
+            btn.setTitle(string, for: .normal)
+            btn.setTitle(string, for: .selected)
+            btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+            btn.setTitleColor(UIColor.mainTextColor, for: .normal)
+            btn.setTitleColor(UIColor.brandMainColor, for: .selected)
+            btn.setImage(UIImage(named: "basic_info_radio_0"), for: .normal)
+            btn.setImage(UIImage(named: "basic_info_radio_1"), for: .selected)
+            btn.iconInLeft(spacing: 6)
+            btn.tag = item.id
+            btn.addTarget(self, action: #selector(clickCheckBtn(sender:)), for: .touchUpInside)
+            addSubview(btn)
+            
+            
+            let offy = y * 36
+           
+            
+            if dataModel.count - 1 == index {
+                //最后一个控件
+                btn.snp.makeConstraints { make in
+                    make.left.equalTo(x)
+                    make.top.equalTo(offy)
+                    make.height.equalTo(20)
+                    make.width.equalTo(width + 18 + butGap)
+                    make.bottom.equalToSuperview()
+                }
+            } else {
+                btn.snp.makeConstraints { make in
+                    make.left.equalTo(x)
+                    make.top.equalTo(offy)
+                    make.height.equalTo(20)
+                    make.width.equalTo(width + 18 + butGap)
+                }
+            }
+            
+            if targetId == item.id {
+                btn.isSelected = true
+            } else {
+                btn.isSelected = false
+            }
+            
+            x = x + width + 18.0 + butGap
+            arrCheckBtns.append(btn)
+        }
+    }
+    
+    
+    @objc func clickCheckBtn(sender : UIButton) {
+        //修改成单选逻辑
+        if sender.isSelected != true {
+            for item in arrCheckBtns {
+                item.isSelected = false
+            }
+            sender.isSelected = true
+//            model?.info = String(sender.tag)
+//            block?(String(sender.tag))
+            callBackBlock?(String(sender.tag))
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift

@@ -49,6 +49,12 @@ class YHOtherResidenceFillView: UIView {
             guard let self = self else { return }
             self.endView.updateKeyName(name: "结束时间", keyValue: "")
             self.dataModel?.end_time = text
+            
+            if flag {
+                self.dataModel?.end_time_checked = true
+            } else {
+                self.dataModel?.end_time_checked = false
+            }
             self.layoutIfNeeded()
         }
         endView.snp.makeConstraints { make in