// 标题显示

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -189,7 +189,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             
             let formItem = item as! YHFormTitleItem
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -194,8 +194,9 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
             let formItem = item as! YHFormTitleItem
             
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            
+            let isNeedWrap = (formItem.type == .mainApplicantProfessionalQualification)
+            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle(), isNeedWrap:isNeedWrap)
+
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
             if formItem.type == .mainApplicantEducation { // 学历
@@ -406,9 +407,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
         let arr = items[indexPath.section]
         let item:YHFormItemProtocol = arr[indexPath.row]
         
-        if item is YHFormTitleItem { // 是标题
-            return 52.0
-        } else if item is YHFormAddItem { // 新增子女兄妹
+        if item is YHFormAddItem { // 新增子女兄妹
             return 70.0
         }
         return UITableView.automaticDimension

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -165,8 +165,7 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
             
             // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
+            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle())
             return cell
         }
         

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

@@ -251,7 +251,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -210,7 +210,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
+
             return cell
             
         } else if item is YHFormDetailItem { // 具体信息

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

@@ -266,7 +266,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -168,7 +168,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
             
         } else if item is YHFormDetailItem { // 具体信息

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

@@ -212,7 +212,7 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -166,7 +166,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -255,9 +255,8 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
             
             // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
-            
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
+           
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
             if formItem.type == .child {

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

@@ -244,7 +244,8 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
+
             return cell
         }
         

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

@@ -17,9 +17,39 @@ class YHFormItemTitleCell: UITableViewCell {
     let cancelTag = 9528
     
     var rightClickBlock:((YHFormTitleItemEditType)->Void)?
+    
+    // isNeedWrap 副标题是否需要换行
+    func setTitleAndSubTitle(title: String? = "", subTitle: String? = "", isNeedWrap:Bool = false) {
+        
+        let titleAttributes: [NSAttributedString.Key: Any] = [
+            .font: UIFont.PFSC_M(ofSize: 17),
+            .foregroundColor: UIColor.mainTextColor
+        ]
+        let subTitleAttributes: [NSAttributedString.Key: Any] = [
+            .font: UIFont.PFSC_R(ofSize: 12),
+            .foregroundColor: UIColor.labelTextColor2
+        ]
+        
+        let attrStr = NSMutableAttributedString(string:"", attributes: titleAttributes)
+    
+        if let title = title, !title.isEmpty {
+            let titleAttrStr = NSMutableAttributedString(string:title, attributes:titleAttributes)
+            attrStr.append(titleAttrStr)
+        }
+        // 副标题是否需要换行
+        if isNeedWrap {
+            let warpAttrStr = NSMutableAttributedString(string:"\n", attributes:titleAttributes)
+            attrStr.append(warpAttrStr)
+        }
+        
+        if let subTitle = subTitle, !subTitle.isEmpty {
+            let titleAttrStr = NSMutableAttributedString(string:subTitle, attributes:subTitleAttributes)
+            attrStr.append(titleAttrStr)
+        }
+        titleLabel.attributedText = attrStr
+    }
 
-
-    lazy var titleLabel: UILabel = {
+    private lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = .mainTextColor
         label.textAlignment = .left
@@ -28,15 +58,6 @@ class YHFormItemTitleCell: UITableViewCell {
         return label
     }()
     
-    lazy var subTitleLabel: UILabel = {
-        let label = UILabel()
-        label.textColor = .labelTextColor2
-        label.textAlignment = .left
-        label.numberOfLines = 0
-        label.font = UIFont.PFSC_R(ofSize: 12)
-        return label
-    }()
-    
     lazy var cancelButton: UIButton = {
         
         let btn = UIButton()
@@ -77,37 +98,26 @@ class YHFormItemTitleCell: UITableViewCell {
         
         self.selectionStyle = .none
         contentView.addSubview(titleLabel)
-        contentView.addSubview(subTitleLabel)
         contentView.addSubview(bottomLine)
         contentView.addSubview(editButton)
         contentView.addSubview(cancelButton)
 
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(subTitleLabel.snp.left).offset(-3)
-            make.centerY.equalToSuperview()
-        }
-        
-        subTitleLabel.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-16)
-            make.centerY.equalToSuperview()
-        }
-        
-        editButton.snp.makeConstraints { make in
-            make.size.equalTo(CGSizeMake(24, 24))
-            make.centerY.equalToSuperview()
-            make.right.equalToSuperview().offset(-18)
+            make.right.equalTo(cancelButton.snp.left).offset(-3)
+            make.top.equalToSuperview().offset(16)
+            make.bottom.equalToSuperview().offset(-16)
         }
         
         editButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(24, 24))
-            make.centerY.equalToSuperview()
+            make.top.equalTo(titleLabel).offset(0)
             make.right.equalToSuperview().offset(-18)
         }
         
         cancelButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(92, 40))
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(editButton)
             make.right.equalToSuperview()
         }
         

galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift

@@ -17,8 +17,9 @@ struct YHUserModel: SmartCodable {
     var ip: String?
     var imei: String?
     var channel: String?
-    
-    
-    
-    var token: String? // 暂无token
+    var token: String? {// 暂无token
+        
+//    var token: String? {
+//      return "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9"
+//    }
 }