Merge branch 'develop' into xiezhaolin

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/C/YHMainApplicantInformationViewController.swift

galaxy/Podfile

@@ -85,6 +85,8 @@ target 'galaxy' do
   
   ############# 网易云信 IM相关 end  #############
   
+  #富文本库
+  pod 'AttributedString','3.3.5'
 end
 
 

galaxy/galaxy/AppDelegate.swift

@@ -109,7 +109,7 @@ extension AppDelegate {
                 UITextView.appearance().tintColor = .mainColor
                 
                 //1.2设置UINavigationBar title的字体和颜色
-                let titleTextAttributes = [NSAttributedString.Key.font : UIFont.PFSCM(ofSize: 16) , NSAttributedString.Key.foregroundColor : UIColor.commonColor100]
+                let titleTextAttributes = [NSAttributedString.Key.font : UIFont.PingFangScM(ofSize: 16) , NSAttributedString.Key.foregroundColor : UIColor.commonColor100]
                 UINavigationBar.appearance().titleTextAttributes = titleTextAttributes
                 UINavigationBar.appearance().tintColor = .white
                 

galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift

@@ -18,7 +18,7 @@ class YHBasicContentView: ESTabBarItemContentView {
         iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
         highlightIconColor = .commonColor100
 
-        titleLabel.font = UIFont.PFSCR(ofSize: 10)
+        titleLabel.font = UIFont.PingFangScR(ofSize: 10)
     }
     
     public required init?(coder aDecoder: NSCoder) {

galaxy/galaxy/Classes/Base/V/YHNoDataTipView.swift

@@ -20,17 +20,17 @@ class YHNoDataTipView: UIView {
     }()
     
     private lazy var titleLabel: UILabel = {
-        let label = UILabel(text: "暂无数据", font: UIFont.PFSCR(ofSize: 14), color: UIColor.commonColor45)
+        let label = UILabel(text: "暂无数据", font: UIFont.PingFangScR(ofSize: 14), color: UIColor.commonColor45)
         return label
     }()
     
     private lazy var descLabel: UILabel = {
-        let label = UILabel(text: "", font: UIFont.PFSCR(ofSize: 12), color: UIColor.commonColor45)
+        let label = UILabel(text: "", font: UIFont.PingFangScR(ofSize: 12), color: UIColor.commonColor45)
         return label
     }()
     
     private lazy var reloadBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "重新加载", font: UIFont.PFSCM(ofSize: 12), normalColor: UIColor.commonColor100)
+        let btn = UIButton.bs_button(title: "重新加载", font: UIFont.PingFangScM(ofSize: 12), normalColor: UIColor.commonColor100)
         btn.layer.cornerRadius = 6
         btn.layer.masksToBounds = true
         btn.layer.borderWidth = 1

galaxy/galaxy/Classes/Modules/Home(首页)/C/ContentBaseViewController.swift

@@ -29,10 +29,10 @@ class ContentBaseViewController: UIViewController {
         dataSource.isTitleColorGradientEnabled = true
         dataSource.titles = arrItemTitles
         
-        dataSource.titleNormalFont = UIFont.PFSCM(ofSize: 16)
+        dataSource.titleNormalFont = UIFont.PingFangScM(ofSize: 16)
         dataSource.titleNormalColor = .commonColor25
         
-        dataSource.titleSelectedFont = UIFont.PFSCM(ofSize: 18)
+        dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
         dataSource.titleSelectedColor = .commonColor100
         
         dataSource.isItemSpacingAverageEnabled = false

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -108,10 +108,10 @@ class YHHomeViewController: YHBaseViewController {
         dataSource.isTitleColorGradientEnabled = true
         dataSource.titles = arrItemTitles
         
-        dataSource.titleNormalFont = UIFont.PFSCM(ofSize: 16)
+        dataSource.titleNormalFont = UIFont.PingFangScM(ofSize: 16)
         dataSource.titleNormalColor = .commonColor25
         
-        dataSource.titleSelectedFont = UIFont.PFSCM(ofSize: 18)
+        dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
         dataSource.titleSelectedColor = .commonColor100
         
         dataSource.isItemSpacingAverageEnabled = false

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

+//
+//  YHMyInformationListViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+/*
+ *个人信息表
+ */
+class YHMyInformationListViewController: YHBaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

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

+//
+//  YHScoreDetailViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import GKNavigationBarSwift
+/*
+ 我的评分 /  评分详情
+ */
+
+class YHScoreDetailViewController: YHBaseViewController {
+    
+    
+    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+    
+    //头部背景图片
+    lazy var headBkgImagV: UIImageView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "score_bkg")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    
+    var homeTableView: YHGestureTableView = {
+        let tableView = YHGestureTableView(frame: .zero, style:.plain)
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.showsHorizontalScrollIndicator = false
+        tableView.showsVerticalScrollIndicator = false
+        tableView.rowHeight = UITableView.automaticDimension
+        tableView.register(YHScorePersonInfoCell.self,forCellReuseIdentifier: YHScorePersonInfoCell.cellReuseIdentifier)
+        
+        tableView.register(YHScoreItemCell.self,forCellReuseIdentifier: YHScoreItemCell.cellReuseIdentifier)
+        tableView.register(YHScoreItemCellForAge.self,forCellReuseIdentifier: YHScoreItemCellForAge.cellReuseIdentifier)
+        
+        
+        
+        //        tableView.register(YHDavidCell1.self,forCellReuseIdentifier: YHDavidCell1.cellReuseIdentifier)
+        //        tableView.register(YHDavidCell3.self,forCellReuseIdentifier: YHDavidCell3.cellReuseIdentifier)
+        //        tableView.register(YHDavidCell2.self,forCellReuseIdentifier: YHDavidCell2.cellReuseIdentifier)
+        //        tableView.register(YHDavidCell4.self,forCellReuseIdentifier: YHDavidCell4.cellReuseIdentifier)
+        //        tableView.register(YHDavidCell5.self,forCellReuseIdentifier: YHDavidCell5.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        
+        //0.0
+        serviceCenterMainReqVM.loadLocalScoreData()
+        
+        //1.0
+        initView()
+    }
+}
+
+// MARK: - private methods
+extension YHScoreDetailViewController {
+    private func initView()->Void {
+        
+        gk_navigationBar.isHidden = false
+        gk_backStyle = .white
+        gk_navTitle = "我的评分"
+        gk_navBackgroundColor = UIColor(hex: 0x528bf1)
+        gk_navTitleColor = .white
+        gk_navBarAlpha = 1
+        
+        
+        
+        view.addSubview(headBkgImagV)
+        headBkgImagV.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(326)
+        }
+        
+        
+        homeTableView.delegate = self
+        homeTableView.dataSource = self
+        view.addSubview(homeTableView)
+        homeTableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+        }
+        
+        //        homeTableView.backgroundColor = .purple //for test hjl
+    }
+    
+}
+
+// MARK: - delegates
+// MARK: - UITableViewDelegate 和 UITableViewDataSource
+extension YHScoreDetailViewController : UITableViewDelegate,UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 6
+    }
+    
+    
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHScorePersonInfoCell.self)
+            return cell
+        } else if indexPath.row == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCellForAge.self)
+            cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
+            return cell
+        }
+        
+        let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCell.self)
+        cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        printLog("点击了 tableView Cell \(indexPath.row)")
+    }
+}

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

@@ -12,6 +12,8 @@ import UIKit
 class YHServiceCenterSecondViewController: YHBaseViewController {
     
 //    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+    
+    private var arrData : [YHContactMainItemStatusModel] = []
     private var unfoldFlag : Bool = true //是否展开
     private lazy var downArrowImagev : UIImageView =  {
         let imagV = UIImageView(frame: CGRect(x: KScreenWidth - 16 - 32, y: 17, width: 24, height: 24))
@@ -61,6 +63,14 @@ extension YHServiceCenterSecondViewController {
         gk_navBarAlpha = 1.0
         gk_navLineHidden = false
         
+        let arr = [1,2,3]
+        for item in arr {
+            let model = YHContactMainItemStatusModel()
+            model.type = item
+            model.isFinished = false
+            arrData.append(model)
+        }
+        
         view.addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
@@ -101,9 +111,8 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
         if unfoldFlag == true {
-            return 10
+            return arrData.count
         }
         return 0
     }
@@ -143,6 +152,8 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let newCell = tableView.dequeueReusableCell(withClass: YHContractMainItemStatusCell.self)
         newCell.selectionStyle = .none
+        
+        newCell.dataModel = arrData[indexPath.row]
         return newCell
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift

+//
+//  YHContactMainItemStatusModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHContactMainItemStatusModel {
+    var type : Int = -1 {
+        didSet {
+            if type == 1 {
+                iconName = "service_center_sfsq_xxws_icon"
+                itemName = "信息完善"
+            } else if type == 2 {
+                iconName = "service_center_sfsq_zlsc_icon"
+                itemName = "资料上传"
+            } else if type == 3 {
+                iconName = "service_center_sfsq_wdpf_icon"
+                itemName = "我的评分"
+            }
+        }
+    }
+    var isFinished : Bool = false
+    
+    var iconName : String = ""
+    var itemName : String = ""
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHInformationPerfectModel.swift

+//
+//  YHInformationPerectModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHInformationPerfectModel {
+    var icon : String = ""
+    var name : String = ""
+    
+    var type : Int = -1 {
+        didSet{
+            
+            isFirstCell = false
+            isLastestCell = false
+            if type == 1 {
+                isFirstCell = true
+                name = "主申请人信息"
+                icon = "zsqrxx_icon"
+            } else if type ==  2 {
+                name = "家庭成员信息"
+                icon = "jtcyxx_icon"
+            } else if type ==  3 {
+                name = "基本资料"
+                icon = "jbzl_icon"
+            } else if type ==  4 {
+                name = "学历/专业资格"
+                icon = "xlzyzg_icon"
+            } else if type ==  5 {
+                name = "工作经验"
+                icon = "gzjy_icon"
+            } else if type ==  6 {
+                name = "其他信息"
+                icon = "qtxx_icon"
+                isLastestCell = true
+            }
+        }
+    }
+    
+    var status : String = ""
+    var color : UIColor = .red
+    var statusColor : UIColor = .red
+    var isFinished : Bool = false {
+        didSet {
+            status = isFinished ? "已完成" : "待完善"
+            color = isFinished ? UIColor(hex: 0x222222, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            statusColor = isFinished ? UIColor(hex: 0x3ECDC3, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            if type != 1 {
+                icon = isFinished ? icon : (icon + "_grey")
+            }
+        }
+    }
+    
+    var isDoing : Bool = false {
+        didSet {
+            color = isDoing ? UIColor(hex: 0x222222, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            statusColor = isDoing ? UIColor(hex: 0x3F8BF8, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            if type != 1 {
+                icon = isDoing ? icon : (icon + "_grey")
+            }
+        }
+    }
+    var isNextDoingCell : Bool = false
+    var isFirstCell : Bool = false
+    var isLastestCell : Bool = false
+}

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

+//
+//  YHScoreDataModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/28.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHScoreDataModel: SmartCodable {
+    var age_score : YHScoreSessionModel?
+    var language_score : YHScoreSessionModel?
+    var background_score : YHScoreSessionModel?
+    var work_experience_score : YHScoreSessionModel?
+    var education_score : YHScoreSessionModel?
+    var talent_list_score : YHScoreSessionModel?
+    
+    required init() {
+        
+    }
+    
+    subscript(_ index : Int) -> YHScoreSessionModel? {
+        if index == 1 {
+            return age_score
+        } else if index == 2 {
+            return language_score
+        } else if index == 3 {
+            return background_score
+        } else if index == 4 {
+            return work_experience_score
+        } else if index == 5 {
+            return education_score
+        } else if index == 6 {
+            return talent_list_score
+        }
+        return nil
+    }
+}
+
+class YHScoreOptiosModel : SmartCodable {
+    var isSelected : Bool = false
+    var scoreName : String = ""
+    var scoreValue : String = ""
+    
+    required init() {
+        
+    }
+}
+
+class YHScoreSessionModel : SmartCodable {
+    var name : String = "" //"年龄得分"
+    var score : String = "" //（最高30分）
+    var options : [YHScoreOptiosModel] = []
+    required init() {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHCertificateViewController.swift

+//
+//  YHCertificateViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCertificateViewController: YHBaseViewController {
+
+    var spouse:YHSpouse?
+    
+    var cardInfo: YHCNIdentityCard?
+        
+    var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
+    
+    lazy var tableView: UITableView = {
+        
+        let tableView = UITableView(frame:.zero, style:.plain)
+
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
+        tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
+        tableView.register(YHFormItemEnterDetailCell.self, forCellReuseIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier)
+        tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
+        tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
+        tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHFormItemExpireDateCell.self, forCellReuseIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier)
+        
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "配偶信息填写".local
+        createUI()
+        loadCertificateInfo()
+    }
+    
+    func createUI() {
+        
+        view.addSubview(tableView);
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview().offset(-100)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+        }
+    }
+    
+    func loadCertificateInfo() {
+        
+        let title0 = YHFormTitleItem(type: .chinaIdCardInfo)
+        let item01 = YHFormDetailItem(type: .certificateNumber)
+        let item02 = YHFormDetailItem(type: .certificateSignPlace)
+        let item03 = YHFormDetailItem(type: .certificateSignDate)
+        let item04 = YHFormDetailItem(type: .certificateValidDate)
+        let arr0:[YHFormItemProtocol] = [title0, item01, item02, item03, item04]
+            
+        let title1 = YHFormTitleItem(type: .passPortInfo)
+        let item10 = YHFormDetailItem(type: .cetificateType)
+        let item11 = YHFormDetailItem(type: .certificateNumber)
+        let item12 = YHFormDetailItem(type: .certificateSignPlace)
+        let item13 = YHFormDetailItem(type: .certificateSignDate)
+        let item14 = YHFormDetailItem(type: .certificateValidDate)
+        let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13, item14]
+
+        items.append(contentsOf: [arr0, arr1])
+        tableView.reloadData()
+    }
+}
+
+extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section >= items.count { return 0 }
+        let arr = items[section]
+        return arr.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.section >= items.count { return createDefaultCell(indexPath) }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return createDefaultCell(indexPath) }
+        
+        
+        let item:YHFormItemProtocol = arr[indexPath.row]
+        
+        if item is YHFormTitleItem { // 标题
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
+            cell.titleLabel.text = item.getTitle()
+            return cell
+            
+        }
+        
+        if item is YHFormDetailItem {
+            
+            let detailItem = item as! YHFormDetailItem
+            
+            if detailItem.type == .certificateNumber || detailItem.type == .certificateSignPlace { // 证件号码和签发地需要填写
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
+                let titleItem = arr[0] as! YHFormTitleItem
+                if detailItem.type == .certificateNumber {
+                    cell.titleLabel.text = (titleItem.type == .chinaIdCardInfo ? "中国身份证号" : "证件号码")
+                } else {
+                    cell.titleLabel.text = detailItem.getTitle()
+                }
+                return cell
+            }
+            
+            if detailItem.type == .cetificateType || detailItem.type == .certificateSignDate {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
+                cell.title = detailItem.getTitle()
+                cell.detail = "中国"
+                return cell
+            }
+            
+            if detailItem.type == .certificateValidDate {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemExpireDateCell.cellReuseIdentifier, for: indexPath) as! YHFormItemExpireDateCell
+                cell.title = detailItem.getTitle()
+                return cell
+            }
+            let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
+            cell.titleLabel.text = detailItem.getTitle()
+            return cell
+        }
+        
+        return createDefaultCell(indexPath)
+    }
+    
+    func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
+        
+        if indexPath.section >= items.count { return  }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return }
+        createCorner(cell: cell, arr: arr, indexPath: indexPath)
+    }
+    
+    func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        if indexPath.section >= items.count { return 0.0 }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if indexPath.row >= arr.count {  return 0.0 }
+        
+        let item = arr[indexPath.row]
+        
+        if item is YHFormTitleItem { // 标题
+            return 52.0
+        }
+        
+        if item is YHFormDetailItem {
+            return UITableView.automaticDimension
+        }
+        return 52.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 14.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        let vc = YHSpouseBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
+    }
+        
+    func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
+        // 复用时需清理
+        cell.layer.mask = nil
+        // 设置每块section圆角
+        if (indexPath.row == 0) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else if (indexPath.row == arr.count-1) {
+            let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            
+        } else {
+            cell.layer.mask = nil
+        }
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHCertificateInfo.swift

+//
+//  YHCertificateInfo.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCertificateInfo: NSObject {
+
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHConsortInfo.swift

-//
-//  YHConsortInfo.swift
-//  galaxy
-//
-//  Created by edy on 2024/1/23.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-
-class YHConsortInfo {
-    
-}
-
-public enum YHTableItemType : Int32 {
-    
-    // 是否随行
-    case accompany = 0
-    // 国籍
-    case country = 1
-    // 居住信息
-    case address = 2
-    // 港澳通信证
-    case hongkongMacaouPassport = 3
-}
-
-
-//表单条目信息
-class YHTableItemInfo {
-   
-    var type:YHTableItemType
-    var title:String {
-        return getTitle()
-    }
-    
-    init(type: YHTableItemType) {
-        self.type = type
-    }
-    
-    var subTitleItems:[YHTableSubItemInfo]? = Array()
-    
-    func getTitle()-> String {
-        switch self.type {
-        case .accompany:
-                return "随行".local
-            case .country:
-                return "国籍".local
-            case .address:
-                return "居住信息".local
-            case .hongkongMacaouPassport:
-                return "港澳通信证".local
-        }
-    }
-    
-    func getSubItems()->[YHTableSubItemInfo] {
-        
-        let item0 = YHTableSubItemInfo(type: .subTitle)
-        var res = [item0]
-        
-        switch self.type {
-            case .accompany:
-               res.append(YHTableSubItemInfo(type: .subAcompany))
-            
-            case .country:
-               res.append(YHTableSubItemInfo(type: .subCountry))
-            
-            case .address:
-                let item1 = YHTableSubItemInfo(type: .subIsLiveTogether, isMust: true)
-                let item2 = YHTableSubItemInfo(type: .subLiveNation, isMust: true)
-                let item3 = YHTableSubItemInfo(type: .subDetailAddress, isMust: true)
-                res.append(contentsOf:[item1, item2, item3])
-                           
-            case .hongkongMacaouPassport:
-                res.append(YHTableSubItemInfo(type: .subHongkongMacaouPassport, isMust: true))
-        }
-        return res
-    }
-}
-
-public enum YHTableSubItemType : Int32 {
-    
-    // 标题
-    case subTitle = 0
-    // 是否随行
-    case subAcompany = 1
-    // 国籍
-    case subCountry = 2
-    
-    /*    居住信息   */
-    // 是否与主申请人同住
-    case subIsLiveTogether = 3
-    // 居住国家/地区
-    case subLiveNation = 4
-    // 现居住城市
-    case subLiveCity = 5
-    // 详细地址
-    case subDetailAddress = 6
-    
-    // 港澳通信证
-    case subHongkongMacaouPassport = 7
-    
-}
-
-
-class YHTableSubItemInfo {
-    
-    var type:YHTableSubItemType
-    // 是否必填
-    var isMust:Bool
-    
-    // 是否随行
-    var isAccompany:Bool = false
-    // 港澳通信证
-    var isHongKongMacouPassport:Bool = false
-    // 国籍
-    var nation:String? = ""
-    
-    /** 居住信息  **/
-    // 是否与主申请人同住
-    var isLiveTogether:Bool = false
-    // 现居住国家
-    var liveContry:String? = ""
-    // 现居住城市
-    var liveCity:String? = ""
-    // 现居住详细地址
-    var liveAddress:String? = ""
-    
-    var title:String {
-        return getTitle()
-    }
-    
-    init(type: YHTableSubItemType, isMust:Bool = true) {
-        self.type = type
-        self.isMust = isMust
-    }
-    
-    func getTitle()-> String {
-        
-        switch self.type {
-            case .subTitle:
-                return "".local
-            case .subAcompany:
-                return "是否随行至香港".local
-            case .subCountry:
-                return "国家/地区".local
-            case .subIsLiveTogether:
-                return "是否与主申请人同住".local
-            case .subLiveNation:
-                return "国家/地区".local
-            case .subLiveCity:
-                return "现居住城市".local
-            case .subDetailAddress:
-                return "现居住地址".local
-            case .subHongkongMacaouPassport:
-                return "是否办理".local
-        }
-    }
-}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormAddInfoCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemAddCell.swift

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHFormAddInfoCell: UITableViewCell {
+class YHFormItemAddCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHFormAddInfoCell"
+    static let cellReuseIdentifier = "YHFormItemAddCell"
 
     let btnTitleColor = UIColor(hexString:"#4388FF")
     let btnHeight = 44.0
@@ -18,9 +18,19 @@ class YHFormAddInfoCell: UITableViewCell {
     
     var clickBlock:(()->Void)?
     
+    var title:String? {
+        didSet {
+            addBtn.setTitle(title, for: .normal)
+        }
+    }
+    
     lazy var addBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "新增信息", font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleColor)
-        btn.iconInLeft(spacing: 10)
+        let btn = UIButton()
+        btn.setTitle("新增信息".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleColor, for: .normal) 
+        btn.iconInLeft(spacing: 6)
+        
         btn.setImage(UIImage(named: "form_add_info"), for: .normal)
         btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)
         return btn

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemDegreeInfoCell.swift

+//
+//  YHFormItemDegreeInfoCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFormItemDegreeInfoCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemDegreeInfoCell"
+
+    var deleteBlock: (()->Void)?
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = "*"+title
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PingFangScR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                let starRange = NSRange(location: 0, length: 1)
+                questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PingFangScR(ofSize: 16)
+        return label
+    }()
+    
+    lazy var deleteButton: UIButton = {
+        
+        let btn = UIButton()
+        btn.setTitle("删除", for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0xF81D22), for: .normal)
+        btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
+//        btn.isHidden = true
+        return btn
+    }()
+    
+    lazy var degreeView:HKDegreeInfoItemView = {
+        let view = HKDegreeInfoItemView(frame: .zero)
+        return view
+    }()
+    
+    lazy var areaView:HKDegreeInfoItemView = {
+        let view = HKDegreeInfoItemView(frame: .zero)
+        return view
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(deleteButton)
+        contentView.addSubview(degreeView)
+        contentView.addSubview(areaView)
+        
+        titleLabel.text = "学位信息"
+        
+        titleLabel.snp.makeConstraints { make in
+            make.height.equalTo(52)
+            make.top.equalToSuperview()
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(deleteButton.snp.left)
+        }
+        
+        deleteButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: 64, height: 52))
+            make.centerY.equalTo(titleLabel)
+            make.right.equalToSuperview()
+        }
+        
+        degreeView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(titleLabel.snp.bottom)
+            make.height.equalTo(52)
+        }
+        
+        areaView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(degreeView.snp.bottom)
+            make.height.equalTo(52)
+            make.bottom.equalToSuperview()
+        }
+    }
+    
+    @objc func didClickDeleteBtn(btn:UIButton) {
+        
+        if let deleteBlock = deleteBlock {
+            deleteBlock()
+        }
+    }
+}
+
+class HKDegreeInfoItemView: UIView {
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        return label
+    }()
+    
+    lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#222222")
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = true
+        return label
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#C0C0C0")
+        label.text = "请选择".local
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = false
+        return label
+    }()
+    
+    lazy var arrowImgView: UIImageView = {
+        let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
+        return imgView
+    }()
+    
+    lazy var topLineView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF0F0F0)
+        return view
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    func createUI() {
+        
+        self.addSubview(titleLabel)
+        self.addSubview(detailLabel)
+        self.addSubview(tipsLabel)
+        self.addSubview(arrowImgView)
+        self.addSubview(topLineView)
+        
+        titleLabel.text = "XXXXXX"
+        detailLabel.text = "xxxxxxxx"
+        
+        topLineView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+            make.top.equalToSuperview()
+            make.height.equalTo(1.0)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(detailLabel.snp.left).offset(-8)
+            make.width.equalTo(120)
+            make.centerY.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.right.equalTo(arrowImgView.snp.left)
+            make.centerY.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.edges.equalTo(detailLabel)
+        }
+        arrowImgView.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(20, 20))
+            make.right.equalToSuperview().offset(-16)
+            make.centerY.equalToSuperview()
+        }
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHDoubleChoiceFormCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemDoubleChoiceCell.swift

@@ -8,36 +8,79 @@
 
 import UIKit
 
-class YHDoubleChoiceFormCell: UITableViewCell {
+// 选择项
+class YHFormChoiceItem {
     
-    static let cellReuseIdentifier = "YHDoubleChoiceFormCell"
+    var title:String
+    // 是否被选中
+    var isSelect:Bool
+    
+    init(title: String, isSelect: Bool) {
+        self.title = title
+        self.isSelect = isSelect
+    }
+}
+
+class YHFormItemDoubleChoiceCell: UITableViewCell {
+    
+    static let cellReuseIdentifier = "YHFormItemDoubleChoiceCell"
     let btnWidth = 70.0
     let btnHeight = 32.0
     let btnTitleSelectColor = UIColor(hex: 0x4487F9)
     let btnTitleDefaultColor = UIColor(hex:0x222222)
-    let btnBgColor = UIColor(hex:0xF8F9FB)
-    let confirmTag = 9527
-    let negativeTag = 9528
+    let btnBgDefaultColor = UIColor(hex:0xF8F9FB)
+    let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08)
+    let answerBaseTag  = 9527
     
-    var question:String? {
+    var answerBlock:(([YHFormChoiceItem], Int)->Void)?
+    
+    var title:String? {
         didSet {
             
-            if let question = question {
+            if let question = title {
                 let str = "*"+question
                 let attributes: [NSAttributedString.Key: Any] = [
-                    .font: UIFont.PFSCR(ofSize: 14),
+                    .font: UIFont.PingFangScR(ofSize: 14),
                     .foregroundColor: UIColor(hex:0x222222)
                 ]
                 let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
                 let starRange = NSRange(location: 0, length: 1)
                 questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
-                questionLabel.attributedText = questionAttrStr
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
     }
     
+    // 必须传2个item的arr
+    var answerArr:[YHFormChoiceItem]? {
+        didSet {
+            if let answerArr = answerArr, answerArr.count == 2 {
+                
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    let item = answerArr[i]
+                    answerBtn.setTitle(item.title, for: .normal)
+                    updateAnswerButton(answerBtn, item.isSelect)
                 }
+            } else {
+                // 重置所有答案状态
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    answerBtn.setTitle("", for: .normal)
+                    updateAnswerButton(answerBtn, false)
+                }
+            }
+        }
+    }
+    
+    // 更新答案按钮选中状态
+    func updateAnswerButton(_ btn:UIButton, _ isSelect:Bool) {
+        btn.layer.borderColor = (isSelect ? btnTitleSelectColor : .clear).cgColor
+        btn.setTitleColor((isSelect ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
     }
     
-    lazy var questionLabel: UILabel = {
+    lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
@@ -46,24 +89,33 @@ class YHDoubleChoiceFormCell: UITableViewCell {
         return label
     }()
     
-    lazy var confirmBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "是".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
-        btn.backgroundColor = btnBgColor
+    lazy var answer1Btn: UIButton = {
+        
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
         btn.layer.borderWidth = 1
-        btn.tag = confirmTag
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag
         btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
         return btn
     }()
     
-    lazy var negativeBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "否".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
-        btn.backgroundColor = btnBgColor
+    lazy var answer2Btn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
         btn.layer.borderWidth = 1
-        btn.tag = negativeTag
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag+1
         btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
         return btn
     }()
@@ -82,42 +134,45 @@ class YHDoubleChoiceFormCell: UITableViewCell {
         
         self.selectionStyle = .none
 
-        question = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
+        title = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
         
-        contentView.addSubview(questionLabel)
-        contentView.addSubview(negativeBtn)
-        contentView.addSubview(confirmBtn)
-        // 默认选择否按钮
-        didClickResponseBtn(btn: negativeBtn)
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(answer2Btn)
+        contentView.addSubview(answer1Btn)
         
-        questionLabel.snp.makeConstraints { make in
+        titleLabel.snp.makeConstraints { make in
             make.top.equalTo(contentView.snp.top).offset(22)
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(confirmBtn.snp.left).offset(-8)
+            make.right.equalTo(answer1Btn.snp.left).offset(-8)
             make.bottom.equalTo(contentView.snp.bottom).offset(-22)
         }
         
-        negativeBtn.snp.makeConstraints { make in
+        answer2Btn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
             make.right.equalToSuperview().offset(-16)
             make.top.equalToSuperview().offset(16)
         }
         
-        confirmBtn.snp.makeConstraints { make in
+        answer1Btn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
-            make.right.equalTo(negativeBtn.snp.left).offset(-8)
-            make.top.equalTo(negativeBtn)
+            make.right.equalTo(answer2Btn.snp.left).offset(-8)
+            make.top.equalTo(answer2Btn)
         }
     }
     
     @objc func didClickResponseBtn(btn: UIButton) {
-        let isConfirm = (btn.tag == confirmTag)
         
-        confirmBtn.layer.borderColor = (isConfirm ? btnTitleSelectColor : .clear).cgColor
-        confirmBtn.setTitleColor((isConfirm ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
-        negativeBtn.layer.borderColor = (isConfirm ? .clear : btnTitleSelectColor).cgColor
-        negativeBtn.setTitleColor((isConfirm ?  btnTitleDefaultColor: btnTitleSelectColor), for: .normal)
+        let selectIndex = btn.tag-answerBaseTag
+        if let resultArr = answerArr, resultArr.count == 2 {
             
+            for i in 0...1 {
+                let item = resultArr[i]
+                item.isSelect = (i == selectIndex)
+            }
+            answerArr = resultArr
+            if let answerBlock = answerBlock {
+                answerBlock(resultArr, selectIndex)
+            }
+        }
     }
-
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSingleLineSelectCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemEnterDetailCell.swift

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHSingleLineSelectCell: UITableViewCell {
+class YHFormItemEnterDetailCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHSingleLineSelectCell"
+    static let cellReuseIdentifier = "YHFormItemEnterDetailCell"
     
     // 是否必填 如必填title会展示红色*
     var isMust = false
@@ -29,7 +29,7 @@ class YHSingleLineSelectCell: UITableViewCell {
             if let title = title {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
-                    .font: UIFont.PFSCR(ofSize: 14),
+                    .font: UIFont.PingFangScR(ofSize: 14),
                     .foregroundColor: UIColor(hex:0x222222)
                 ]
                 let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
@@ -44,19 +44,21 @@ class YHSingleLineSelectCell: UITableViewCell {
 
     lazy var titleLabel: UILabel = {
         let label = UILabel()
+        label.text = "XXXXXXX"
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         return label
     }()
     
     lazy var detailLabel: UILabel = {
         let label = UILabel()
-        label.textColor = UIColor(hexString:"#333333")
+        label.text = "XXXXXXX"
+        label.textColor = UIColor(hexString: "#888F98")
         label.textAlignment = .right
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         return label
     }()
     
@@ -66,7 +68,11 @@ class YHSingleLineSelectCell: UITableViewCell {
     }()
     
     lazy var deleteButton: UIButton = {
-        let btn = UIButton.bs_button(title: "删除".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0xF81D22))
+        
+        let btn = UIButton()
+        btn.setTitle("删除".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0xF81D22), for: .normal)
         btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
         btn.isHidden = true
         return btn
@@ -89,8 +95,6 @@ class YHSingleLineSelectCell: UITableViewCell {
         contentView.addSubview(arrowImgView)
         contentView.addSubview(deleteButton)
 
-        title = "婚姻状况"
-        detailLabel.text = "沙发上发顺丰"
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalTo(detailLabel.snp.left).offset(-8)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemExpireDateCell.swift

+//
+//  YHFormItemExpireDateCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFormItemExpireDateCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemExpireDateCell"
+    let longTimeBtnWidth = 40.0
+    // 是否必填 如必填title会展示红色*
+    var isMust = false
+    
+    var clickBlock:(()->Void)?
+
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = (isMust ? ("*"+title) : title)
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PingFangScR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                if isMust {
+                    let starRange = NSRange(location: 0, length: 1)
+                    questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                }
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+    
+    var isLontTime:Bool = false {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    var tips:String? {
+        didSet {
+            tipsLabel.text = tips
+        }
+    }
+    
+    var detail:String? {
+        didSet {
+            detailLabel.text = detail
+            
+            if let detail = detail, !detail.isEmpty {
+                tipsLabel.isHidden = true
+                detailLabel.isHidden = false
+            } else {
+                tipsLabel.isHidden = false
+                detailLabel.isHidden = true
+            }
+        }
+    }
+    
+
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        return label
+    }()
+    
+    private lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#222222")
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = true
+        return label
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#C0C0C0")
+        label.text = "请选择".local
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = false
+        return label
+    }()
+    
+    lazy var longTimeBtn: UIButton = {
+        let btn = UIButton(type: .custom)
+        btn.setTitle("长期".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0x222222), for: .normal)
+        btn.iconInLeft(spacing: 6)
+        btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)
+        btn.setImage(UIImage(named: "form_square_select"), for: .selected)
+        btn.addTarget(self, action: #selector(didClickLongTimeBtn), for: .touchUpInside)
+        return btn
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(detailLabel)
+        contentView.addSubview(tipsLabel)
+        contentView.addSubview(longTimeBtn)
+
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(detailLabel.snp.left).offset(-6)
+            make.width.equalTo(120)
+            make.centerY.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-longTimeBtnWidth-16-6)
+            make.centerY.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.edges.equalTo(detailLabel)
+        }
+        longTimeBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(longTimeBtnWidth, 40))
+            make.right.equalToSuperview().offset(-16)
+            make.centerY.equalToSuperview()
+        }
+    }
+    
+    func updateUI() {
+    
+        detailLabel.isHidden = isLontTime
+        tipsLabel.isHidden = isLontTime
+        
+        longTimeBtn.snp.remakeConstraints { make in
+            make.size.equalTo(CGSizeMake(longTimeBtnWidth, 40))
+            make.centerY.equalToSuperview()
+            if isLontTime {
+                make.left.equalTo(detailLabel)
+            } else {
+                make.right.equalToSuperview().offset(-16)
+            }
+        }
+    }
+    
+    @objc func didClickLongTimeBtn() {
+     
+        longTimeBtn.isSelected = !longTimeBtn.isSelected
+        isLontTime = longTimeBtn.isSelected
+    
+        if let clickBlock = clickBlock {
+            clickBlock()
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSingleLineInputCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemInputTextCell.swift

@@ -8,9 +8,9 @@
 
 import UIKit
 
-class YHSingleLineInputCell: UITableViewCell {
+class YHFormItemInputTextCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHSingleLineInputCell"
+    static let cellReuseIdentifier = "YHFormItemInputTextCell"
     
     // 是否必填 如必填title会展示红色*
     var isMust = false
@@ -21,10 +21,10 @@ class YHSingleLineInputCell: UITableViewCell {
             if let title = title {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
-                    .font: UIFont.PFSCR(ofSize: 14),
+                    .font: UIFont.PingFangScR(ofSize: 14),
                     .foregroundColor: UIColor(hex:0x222222)
                 ]
-                var questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
                 if isMust {
                     let starRange = NSRange(location: 0, length: 1)
                     questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
@@ -40,7 +40,7 @@ class YHSingleLineInputCell: UITableViewCell {
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         return label
     }()
     
@@ -48,7 +48,7 @@ class YHSingleLineInputCell: UITableViewCell {
         let textField = UITextField()
         textField.backgroundColor = .clear
         textField.placeholder = "请如实填写"
-        textField.font = UIFont.PFSCR(ofSize: 14)
+        textField.font = UIFont.PingFangScR(ofSize: 14)
         textField.tintColor = UIColor(hex: 0xC0C0C0)
         textField.textColor = UIColor(hex: 0x222222)
 //        textField.delegate = self
@@ -72,17 +72,17 @@ class YHSingleLineInputCell: UITableViewCell {
         contentView.addSubview(textField)
         
         isMust = true
-        title = "曾用名"
         
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(textField.snp.left).offset(-8)
+            make.width.equalTo(120)
             make.centerY.equalToSuperview()
         }
         
         textField.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
             make.right.equalTo(contentView.snp.right).offset(-16)
+            make.left.equalTo(titleLabel.snp.right).offset(10)
         }
     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemOnlyDoubleChoiceCell.swift

+//
+//  YHFormItemOnlyDoubleChoiceCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/27.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemOnlyDoubleChoiceCell"
+    let btnWidth = 70.0
+    let btnHeight = 32.0
+    let btnTitleSelectColor = UIColor(hex: 0x4487F9)
+    let btnTitleDefaultColor = UIColor(hex:0x222222)
+    let btnBgDefaultColor = UIColor(hex:0xF8F9FB)
+    let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08)
+    let answerBaseTag  = 9527
+    
+    var answerBlock:(([YHFormChoiceItem], Int)->Void)?
+    
+    // 必须传2个item的arr
+    var answerArr:[YHFormChoiceItem]? {
+        didSet {
+            if let answerArr = answerArr, answerArr.count == 2 {
+                
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    let item = answerArr[i]
+                    answerBtn.setTitle(item.title, for: .normal)
+                    updateAnswerButton(answerBtn, item.isSelect)
+                }
+            } else {
+                // 重置所有答案状态
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    answerBtn.setTitle("", for: .normal)
+                    updateAnswerButton(answerBtn, false)
+                }
+            }
+        }
+    }
+    
+    // 更新答案按钮选中状态
+    func updateAnswerButton(_ btn:UIButton, _ isSelect:Bool) {
+        btn.layer.borderColor = (isSelect ? btnTitleSelectColor : .clear).cgColor
+        btn.setTitleColor((isSelect ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
+    }
+    
+    lazy var answer1Btn: UIButton = {
+        
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var answer2Btn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag+1
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.addSubview(answer1Btn)
+        contentView.addSubview(answer2Btn)
+        
+        answer1Btn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalToSuperview().offset(16)
+            make.centerY.equalToSuperview()
+        }
+        
+        answer2Btn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
+            make.left.equalTo(answer1Btn.snp.right).offset(10)
+            make.centerY.equalTo(answer1Btn)
+        }
+    }
+    
+    @objc func didClickResponseBtn(btn: UIButton) {
+        
+        let selectIndex = btn.tag-answerBaseTag
+        if let resultArr = answerArr, resultArr.count == 2 {
+            
+            for i in 0...1 {
+                let item = resultArr[i]
+                item.isSelect = (i == selectIndex)
+            }
+            answerArr = resultArr
+            if let answerBlock = answerBlock {
+                answerBlock(resultArr, selectIndex)
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHDoubleChoiceQuestionCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemQuestionCell.swift

@@ -9,9 +9,11 @@
 import UIKit
 
 
-class YHDoubleChoiceQuestionCell: UITableViewCell {
 
-     static let cellReuseIdentifier = "YHDoubleChoiceQuestionCell"
+
+class YHFormItemQuestionCell: UITableViewCell {
+    
+     static let cellReuseIdentifier = "YHFormItemQuestionCell"
      let btnWidth = 70.0
      let btnHeight = 32.0
      let btnTitleSelectColor = UIColor(hex: 0x4487F9)
@@ -20,37 +22,46 @@ class YHDoubleChoiceQuestionCell: UITableViewCell {
      let confirmTag = 9527
      let negativeTag = 9528
     
-    var question:String? {
+     var responseBlock:((Bool)->Void)?
+    
+     var title:String? {
          didSet {
             
-            if let question = question {
+            if let question = title {
                 let str = "*"+question
                 let attributes: [NSAttributedString.Key: Any] = [
-                    .font: UIFont.PFSCR(ofSize: 14),
+                    .font: UIFont.PingFangScR(ofSize: 14),
                     .foregroundColor: UIColor(hex:0x222222)
                 ]
                 let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
                 let starRange = NSRange(location: 0, length: 1)
                 questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
-                questionLabel.attributedText = questionAttrStr
+                titleLabel.attributedText = questionAttrStr
             }
-            
         }
     }
     
-    var selectBlock:((Bool) ->Void)?
+    var response:Bool = false {
+        didSet {
+            showResponse(response)
+        }
+    }
 
-    lazy var questionLabel: UILabel = {
+    lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.numberOfLines = 0
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         return label
     }()
     
     lazy var confirmBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "是".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        
+        let btn = UIButton()
+        btn.setTitle("是".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
@@ -61,7 +72,10 @@ class YHDoubleChoiceQuestionCell: UITableViewCell {
     }()
     
     lazy var negativeBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "否".local, font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleDefaultColor)
+        let btn = UIButton()
+        btn.setTitle("否".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0
         btn.layer.masksToBounds = true
@@ -84,14 +98,14 @@ class YHDoubleChoiceQuestionCell: UITableViewCell {
         
         self.selectionStyle = .none
         
-        question = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
-        contentView.addSubview(questionLabel)
+        title = "  1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？是否曾在香港或其他地方因任何罪行或违法行为被定罪？ "
+        contentView.addSubview(titleLabel)
         contentView.addSubview(negativeBtn)
         contentView.addSubview(confirmBtn)
         // 默认选择否按钮
-        didClickResponseBtn(btn: negativeBtn)
+        response = false
         
-        questionLabel.snp.makeConstraints { make in
+        titleLabel.snp.makeConstraints { make in
             make.top.equalTo(contentView.snp.top).offset(12)
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-16)
@@ -99,8 +113,8 @@ class YHDoubleChoiceQuestionCell: UITableViewCell {
         
         negativeBtn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
-            make.left.equalTo(questionLabel)
-            make.top.equalTo(questionLabel.snp.bottom).offset(12)
+            make.left.equalTo(titleLabel)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
             make.bottom.equalToSuperview().offset(-16)
         }
         
@@ -112,12 +126,16 @@ class YHDoubleChoiceQuestionCell: UITableViewCell {
     }
     
     @objc func didClickResponseBtn(btn: UIButton) {
-        let isConfirm = (btn.tag == confirmTag)
+        response = (btn.tag == confirmTag)
+        if let responseBlock = responseBlock {
+            responseBlock(btn.tag==confirmTag)
+        }
+    }
     
+    func showResponse(_ isConfirm: Bool) {
         confirmBtn.layer.borderColor = (isConfirm ? btnTitleSelectColor : .clear).cgColor
         confirmBtn.setTitleColor((isConfirm ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
         negativeBtn.layer.borderColor = (isConfirm ? .clear : btnTitleSelectColor).cgColor
         negativeBtn.setTitleColor((isConfirm ?  btnTitleDefaultColor: btnTitleSelectColor), for: .normal)
-        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemSelectSheetCell.swift

+//
+//  YHSheetSelectCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+
+class YHFormItemSelectSheetCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFormItemSelectSheetCell"
+    
+    // 是否必填 如必填title会展示红色*
+    var isMust = false
+    var title:String? {
+        didSet {
+            
+            if let title = title {
+                let str = (isMust ? ("*"+title) : title)
+                let attributes: [NSAttributedString.Key: Any] = [
+                    .font: UIFont.PingFangScR(ofSize: 14),
+                    .foregroundColor: UIColor(hex:0x222222)
+                ]
+                let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+                if isMust {
+                    let starRange = NSRange(location: 0, length: 1)
+                    questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor(hex:0xFF3A3A), range: starRange)
+                }
+                titleLabel.attributedText = questionAttrStr
+            }
+        }
+    }
+    
+    var tips:String? {
+        didSet {
+            tipsLabel.text = tips
+        }
+    }
+    
+    var detail:String? {
+        didSet {
+            detailLabel.text = detail
+            
+            if let detail = detail, !detail.isEmpty {
+                tipsLabel.isHidden = true
+                detailLabel.isHidden = false
+            } else {
+                tipsLabel.isHidden = false
+                detailLabel.isHidden = true
+            }
+        }
+    }
+    
+
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString:"#333333")
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        return label
+    }()
+    
+    private lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#222222")
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = true
+        return label
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor(hexString: "#C0C0C0")
+        label.text = "请选择".local
+        label.textAlignment = .left
+        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.isHidden = false
+        return label
+    }()
+    
+    lazy var arrowImgView: UIImageView = {
+        let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
+        return imgView
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(detailLabel)
+        contentView.addSubview(tipsLabel)
+        contentView.addSubview(arrowImgView)
+
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalTo(detailLabel.snp.left).offset(-8)
+            make.width.equalTo(120)
+            make.centerY.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.right.equalTo(arrowImgView.snp.left)
+            make.centerY.equalToSuperview()
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.edges.equalTo(detailLabel)
+        }
+        arrowImgView.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(20, 20))
+            make.right.equalToSuperview().offset(-16)
+            make.centerY.equalToSuperview()
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormTitleCell.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemTitleCell.swift

@@ -8,13 +8,13 @@
 
 import UIKit
 
-class YHFormTitleCell: UITableViewCell {
+class YHFormItemTitleCell: UITableViewCell {
 
-    static let cellReuseIdentifier = "YHFormTitleCell"
+    static let cellReuseIdentifier = "YHFormItemTitleCell"
     let editTag = 9527
     let cancelTag = 9528
     
-    var rightClickBlock:((YHFamilyMemberEditType)->Void)?
+    var rightClickBlock:((YHFormTitleItemEditType)->Void)?
 
 
     lazy var titleLabel: UILabel = {
@@ -22,7 +22,7 @@ class YHFormTitleCell: UITableViewCell {
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 16)
+        label.font = UIFont.PingFangScR(ofSize: 16)
         return label
     }()
     
@@ -31,12 +31,16 @@ class YHFormTitleCell: UITableViewCell {
         label.textColor = UIColor(hexString:"#888F98")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         return label
     }()
     
     lazy var cancelButton: UIButton = {
-        let btn = UIButton.bs_button(title: "取消操作".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0x4487F9))
+        
+        let btn = UIButton()
+        btn.setTitle("取消操作".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal)
         btn.tag = cancelTag
         btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
         btn.isHidden = true
@@ -111,7 +115,7 @@ class YHFormTitleCell: UITableViewCell {
         }
     }
     
-    func showEditType(type: YHFamilyMemberEditType) {
+    func showEditType(type: YHFormTitleItemEditType) {
         switch type {
             case .none:
                 cancelButton.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractCell.swift

@@ -41,14 +41,14 @@ class YHContractCell: UITableViewCell {
         let lable = UILabel()
         lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         lable.font = kFont(name: "PingFangSC-Medium", size: 17)
-        lable.text = "香港优秀人才计划-张先生"
+        lable.text = ""
         return lable
     }()
     
     lazy var contractIdLable = {
         let lable = UILabel()
         lable.font = kFont(name: "PingFangSC-Medium", size: 17)
-        lable.text = "订单号：10936"
+        lable.text = ""
         lable.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
         lable.font = kFont(name: "PingFangSC-Regular", size: 12)
         return lable
@@ -64,7 +64,8 @@ class YHContractCell: UITableViewCell {
 extension YHContractCell {
     func updateUI() {
         contractNameLable.text = dataModel?.productName ?? "-"
-        contractIdLable.text = dataModel?.orderSn ?? "-"
+        let str = "订单号：" + (dataModel?.id ?? "-")
+        contractIdLable.text = str
     }
     
     func setupUI() {

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift

@@ -31,6 +31,7 @@ class YHPrivacyAlertView: UIView {
     }
     
     func setView() {
+        backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
         centerView = {
             let view = UIView()
             view.backgroundColor = .white

galaxy/galaxy/Classes/Tools/Extention/AppDelegate+Extension.swift

@@ -18,7 +18,7 @@ extension AppDelegate{
     func setNavigationBarAppearanceWhenContainedInInstancesOf(containers: [UIAppearanceContainer.Type]){
         let navigationBarAppearance = UINavigationBar.appearance(whenContainedInInstancesOf: containers)
         
-        navigationBarAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : UIColor.commonColor100,NSAttributedString.Key.font:UIFont.PFSCM(ofSize: 16)]
+        navigationBarAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : UIColor.commonColor100,NSAttributedString.Key.font:UIFont.PingFangScM(ofSize: 16)]
         navigationBarAppearance.barTintColor = UIColor.yellow
         navigationBarAppearance.tintColor = UIColor.commonColor100
         navigationBarAppearance.backIndicatorImage = UIImage(named: "back_icon")

galaxy/galaxy/Classes/Tools/Extention/UILable+Extension.swift

@@ -13,7 +13,7 @@ extension UILabel {
         let temp = UILabel()
         temp.textColor = UIColor(hexString: "#333333", transparency: 0.45)
         temp.textAlignment = .center
-        temp.font = UIFont.PFSCM(ofSize: 10)
+        temp.font = UIFont.PingFangScM(ofSize: 10)
         temp.backgroundColor = UIColor(hexString: "#333333", transparency: 0.04)
         temp.layer.cornerRadius = 2
         temp.clipsToBounds = true

galaxy/galaxy/Classes/Tools/Helper/BsHUD/YHHUD.swift

@@ -107,7 +107,7 @@ extension YHHUD{
                       duration:TimeInterval = 0.5,
                       isRemoveBefore: Bool = true,
                       insets: UIEdgeInsets = UIEdgeInsets(top: 0, left: 20, bottom: 120, right: 20),
-                      contentInsets: UIEdgeInsets = UIEdgeInsets(top: 8, left: 12, bottom: 8, right: 12),
+                      contentInsets: UIEdgeInsets = UIEdgeInsets(top: 12, left: 21, bottom: 12, right: 21),
                       containerWindow: UIWindow? = nil,
                       walk:((UILabel)->Void)? = nil){
         if isRemoveBefore{