Merge branch 'develop' into duyu

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(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift

@@ -47,7 +47,7 @@ class YHFamilyMemberFormVC: YHBaseViewController {
         
         let btn = UIButton()
         btn.setTitle("提交".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0

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

@@ -38,7 +38,7 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
     lazy var submitBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("提交".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
@@ -49,7 +49,7 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
     lazy var saveBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("保存", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(UIColor(hexString:"#222222"), for: .normal)
         btn.backgroundColor = UIColor(hexString:"#F8F9FB")
         btn.layer.cornerRadius = 8.0

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

@@ -27,7 +27,7 @@ class YHFormItemAddCell: UITableViewCell {
     lazy var addBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("新增信息".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleColor, for: .normal) 
         btn.iconInLeft(spacing: 6)
         

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

@@ -19,7 +19,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
             if let title = title {
                 let str = "*"+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)
@@ -36,7 +36,7 @@ class YHFormItemDegreeInfoCell: 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
     }()
     
@@ -44,7 +44,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("删除", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        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
@@ -123,7 +123,7 @@ class HKDegreeInfoItemView: UIView {
         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
     }()
     
@@ -131,7 +131,7 @@ class HKDegreeInfoItemView: UIView {
         let label = UILabel()
         label.textColor = UIColor(hexString: "#222222")
         label.textAlignment = .left
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         label.isHidden = true
         return label
     }()
@@ -141,7 +141,7 @@ class HKDegreeInfoItemView: UIView {
         label.textColor = UIColor(hexString: "#C0C0C0")
         label.text = "请选择".local
         label.textAlignment = .left
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         label.isHidden = false
         return label
     }()

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

@@ -40,7 +40,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
             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)
@@ -93,7 +93,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
@@ -108,7 +108,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
     lazy var answer2Btn: UIButton = {
         let btn = UIButton()
         btn.setTitle("", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0

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

@@ -29,7 +29,7 @@ class YHFormItemEnterDetailCell: 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)
@@ -48,7 +48,7 @@ class YHFormItemEnterDetailCell: 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
     }()
     
@@ -58,7 +58,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
         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
     }()
     
@@ -71,7 +71,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("删除".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        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

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

@@ -21,7 +21,7 @@ class YHFormItemInputTextCell: 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)
@@ -40,7 +40,7 @@ class YHFormItemInputTextCell: 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 YHFormItemInputTextCell: 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

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

@@ -30,7 +30,7 @@ class YHFormItemQuestionCell: UITableViewCell {
             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)
@@ -52,7 +52,7 @@ class YHFormItemQuestionCell: UITableViewCell {
         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
     }()
     
@@ -60,7 +60,7 @@ class YHFormItemQuestionCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("是".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0
@@ -74,7 +74,7 @@ class YHFormItemQuestionCell: UITableViewCell {
     lazy var negativeBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("否".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgColor
         btn.layer.cornerRadius = btnHeight/2.0

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

@@ -21,7 +21,7 @@ class YHFormItemSelectSheetCell: 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)
@@ -60,7 +60,7 @@ class YHFormItemSelectSheetCell: 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
     }()
     
@@ -68,7 +68,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         let label = UILabel()
         label.textColor = UIColor(hexString: "#222222")
         label.textAlignment = .left
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         label.isHidden = true
         return label
     }()
@@ -78,7 +78,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         label.textColor = UIColor(hexString: "#C0C0C0")
         label.text = "请选择".local
         label.textAlignment = .left
-        label.font = UIFont.PFSCR(ofSize: 14)
+        label.font = UIFont.PingFangScR(ofSize: 14)
         label.isHidden = false
         return label
     }()

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

@@ -22,7 +22,7 @@ class YHFormItemTitleCell: 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,7 +31,7 @@ class YHFormItemTitleCell: 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
     }()
     
@@ -39,7 +39,7 @@ class YHFormItemTitleCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("取消操作".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSCR(ofSize: 14)
+        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)

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

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import AttributedString
+//import AttributedString
 
 class YHInformationFillTipsAlertView: UIView {
     typealias Block = (Bool) -> ()
@@ -60,9 +60,9 @@ class YHInformationFillTipsAlertView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         backgroundColor = UIColor(white: 0.5, alpha: 0.1)
-        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
-        tap.delegate = self
-        addGestureRecognizer(tap)
+//        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+//        tap.delegate = self
+//        addGestureRecognizer(tap)
         
         setView()
     }
@@ -80,10 +80,12 @@ class YHInformationFillTipsAlertView: UIView {
             return view
         }()
         addSubview(centerView)
+        
+        let viewH = KScreenHeight > 680 ? 680 : (KScreenHeight - 64)
         centerView.snp.makeConstraints { make in
             make.bottom.equalToSuperview()
             make.width.equalTo(KScreenWidth)
-            make.height.equalTo(680)
+            make.height.equalTo(viewH)
         }
         
         
@@ -135,7 +137,6 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let topView = UIView()
-//        topView.backgroundColor = .red
         centerView.addSubview(topView)
         topView.snp.makeConstraints { make in
             make.left.right.top.equalToSuperview()
@@ -143,7 +144,7 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let lable01 = UILabel(text: "信息填写提示")
-        lable01.font = kFont(size: 17)
+        lable01.font = UIFont.PingFangScB(ofSize: 18)
         lable01.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         
         topView.addSubview(lable01)
@@ -172,10 +173,9 @@ class YHInformationFillTipsAlertView: UIView {
         centerView.addSubview(middleView)
         middleView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalTo(topView.snp.bottom)
+            make.top.equalTo(topView.snp.bottom).offset(-20)
             make.bottom.equalTo(bottomView.snp.top)
         }
-//        middleView.backgroundColor = .purplefor test hjl
         
         middleView.addSubview(homeTableView)
         homeTableView.snp.makeConstraints { make in
@@ -183,8 +183,6 @@ class YHInformationFillTipsAlertView: UIView {
         }
         homeTableView.delegate = self
         homeTableView.dataSource = self
-        
-//        homeTableView.backgroundColor = .red //for test hjl
     }
     
     @objc func onClickReadyBtn() {
@@ -273,9 +271,4 @@ extension YHInformationFillTipsAlertView : UITableViewDelegate,UITableViewDataSo
         cell.selectionStyle = .none
         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(服务中心)/V/YHInformationFillTipsCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import AttributedString
 
 class YHInformationFillTipsCell: UITableViewCell {
     static let cellReuseIdentifier = "YHInformationFillTipsCell"
@@ -48,7 +49,6 @@ extension YHInformationFillTipsCell {
         contentView.backgroundColor = .clear
         
         contentView.addSubview(holdView)
-//        holdView.backgroundColor = .yellow //for test hjl
         
         holdView.snp.makeConstraints { make in
             make.top.bottom.equalToSuperview()
@@ -71,10 +71,14 @@ extension YHInformationFillTipsCell {
         
         
         let lable1 = UILabel(text: "    1. 如您填写途中想离开系统，记得点击保存，在您有空闲的时间再继续进行填写；")
-        lable1.font = kFont(size: 14)
+        lable1.font = UIFont.PingFangScR(ofSize: 14)
         lable1.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         lable1.numberOfLines = 0
         lable1.lineBreakMode = .byWordWrapping
+        let a: ASAttributedString = .init("    1. 如您填写途中想离开系统，", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        let b: ASAttributedString = .init("记得点击保存", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(hex:0x3271F5)))
+        let c: ASAttributedString = .init("，在您有空闲的时间再继续进行填写；", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        lable1.attributed.text = a + b + c
         
         holdView.addSubview(lable1)
         lable1.snp.makeConstraints { make in
@@ -83,11 +87,17 @@ extension YHInformationFillTipsCell {
         }
         
         let lable2 = UILabel(text: "    2. 此次填写将花费您30-40分钟，系统将根据您所填写的信息，形成详细资料清单，一起为香港身份起航吧~")
-        lable2.font = kFont(size: 14)
+        lable2.font =  UIFont.PingFangScR(ofSize: 14)
         lable2.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         lable2.numberOfLines = 0
         lable2.lineBreakMode = .byWordWrapping
         
+        let aa: ASAttributedString = .init("    2. 此次填写将花费您", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        let bb: ASAttributedString = .init("30-40分钟", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(hex:0x3271F5)))
+        let cc: ASAttributedString = .init("，系统将根据您所填写的信息，形成详细资料清单，一起为香港身份起航吧~", .font(UIFont.PingFangScR(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        lable2.attributed.text = aa + bb + cc
+        
+        
         holdView.addSubview(lable2)
         lable2.snp.makeConstraints { make in
             make.top.equalTo(lable1.snp.bottom).offset(12)
@@ -103,7 +113,6 @@ extension YHInformationFillTipsCell {
         holdView2.snp.makeConstraints { make in
             make.top.equalTo(lable2.snp.bottom).offset(12)
             make.left.right.equalToSuperview()
-//            make.bottom.equalToSuperview().offset(-16)//for test hjl
         }
         
         
@@ -120,7 +129,7 @@ extension YHInformationFillTipsCell {
         
         
         let lable3 = UILabel(text: "准备材料：")
-        lable3.font = kFont(size: 14)
+        lable3.font =  UIFont.PingFangScM(ofSize: 14)
         lable3.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         holdView2.addSubview(lable3)
         lable3.snp.makeConstraints { make in
@@ -145,7 +154,7 @@ extension YHInformationFillTipsCell {
         }
         
         let lable4 = UILabel(text: "身份证正反面照片（外国国籍准备护照）")
-        lable4.font = kFont(size: 14)
+        lable4.font =  UIFont.PingFangScR(ofSize: 14)
         lable4.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         holdView2.addSubview(lable4)
         lable4.snp.makeConstraints { make in
@@ -166,7 +175,7 @@ extension YHInformationFillTipsCell {
         }
         
         let lable5 = UILabel(text: "护照（如有）")
-        lable5.font = kFont(size: 14)
+        lable5.font =  UIFont.PingFangScR(ofSize: 14)
         lable5.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         holdView2.addSubview(lable5)
         lable5.snp.makeConstraints { make in
@@ -188,7 +197,7 @@ extension YHInformationFillTipsCell {
         }
         
         let lable6 = UILabel(text: "港澳通行证正反面照片（如有）")
-        lable6.font = kFont(size: 14)
+        lable6.font =  UIFont.PingFangScR(ofSize: 14)
         lable6.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         holdView2.addSubview(lable6)
         lable6.snp.makeConstraints { make in
@@ -210,7 +219,7 @@ extension YHInformationFillTipsCell {
         }
         
         let lable7 = UILabel(text: "简历/工作总结")
-        lable7.font = kFont(size: 14)
+        lable7.font =  UIFont.PingFangScR(ofSize: 14)
         lable7.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         holdView2.addSubview(lable7)
         lable7.snp.makeConstraints { make in
@@ -246,7 +255,7 @@ extension YHInformationFillTipsCell {
         
         
         let lable8 = UILabel(text: "温馨提示：")
-        lable8.font = kFont(size: 14)
+        lable8.font = UIFont.PingFangScR(ofSize: 12)
         lable8.textColor = UIColor(red: 0.263, green: 0.533, blue: 1, alpha: 1)
         holdView3.addSubview(lable8)
         lable8.snp.makeConstraints { make in
@@ -260,7 +269,7 @@ extension YHInformationFillTipsCell {
         let lable9 = UILabel(text: "请确认您所上传的资料真实有效，避免因递交资料存在问题给您造成不便。")
         lable9.numberOfLines = 0
         lable9.lineBreakMode = .byWordWrapping
-        lable9.font = kFont(size: 12)
+        lable9.font = UIFont.PingFangScR(ofSize: 12)
         lable9.textColor = UIColor(red: 0.263, green: 0.533, blue: 1, alpha: 1)
         holdView3.addSubview(lable9)
         lable9.snp.makeConstraints { make in
@@ -274,14 +283,13 @@ extension YHInformationFillTipsCell {
         let lable10 = UILabel(text: "* 申请过程中有任何疑问，请随时联系专属服务群内的专业文案老师为您解答护航。")
         lable10.numberOfLines = 0
         lable10.lineBreakMode = .byWordWrapping
-        lable10.font = kFont(size: 12)
+        lable10.font = UIFont.PingFangScR(ofSize: 12)
         lable10.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
         holdView3.addSubview(lable10)
         lable10.snp.makeConstraints { make in
             make.top.equalTo(lable9.snp.bottom).offset(7)
             make.left.equalTo(lable9.snp.left)
             make.right.equalToSuperview().offset(-16)
-//            make.height.equalTo(28)
             make.bottom.equalToSuperview().offset(-18)
         }
     }

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

@@ -115,8 +115,6 @@ class YHSubmintAllInfoSuccessTipView: UIView {
         messageLabel = {
             let label = UILabel()
             label.text = "90分"
-//            label.font = kFont(name: "DINAlternate-Bold", size: 22)
-//            label.textColor = UIColor(hex:0xFF9900)
             label.textAlignment = .center
             label.numberOfLines = 1
             return label
@@ -129,8 +127,8 @@ class YHSubmintAllInfoSuccessTipView: UIView {
             make.height.equalTo(50)
         }
         
-        let a: ASAttributedString = .init("90", .font(kFont(name: "PingFang SC", size: 32)),.foreground(UIColor(hex:0xFF9900)))
-        let b: ASAttributedString = .init("分", .font(kFont(name: "PingFang SC", size: 12)),.foreground(UIColor(hex:0x888F98)))
+        let a: ASAttributedString = .init("90", .font(UIFont.PingFangScR(ofSize: 32)),.foreground(UIColor(hex:0xFF9900)))
+        let b: ASAttributedString = .init("分", .font(UIFont.PingFangScR(ofSize: 12)),.foreground(UIColor(hex:0x888F98)))
         messageLabel.attributed.text = a + b
         
         disAgressButton = {

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/UIFont+Extension.swift

@@ -9,18 +9,35 @@
 import UIKit
 extension UIFont {
     
+    
+//    PingFangSC-ExtraLight                 苹方 特细
+//    PingFangSC-Light                    苹方 细体
+//    PingFangSC-Regular                 苹方 常规
+//    PingFangSC-Medium                   苹方 中等
+//    PingFangSC-Bold                     苹方 粗体
+//    PingFangSC-Heavy                   苹方 特粗
+    
     // MARK: - 苹果字体
-    class func PFSCR(ofSize size : CGFloat = 15) -> UIFont {
+    //特细
+    class func PingFangScEL(ofSize size : CGFloat = 17) -> UIFont {
+        return UIFont(name: "PingFangSC-Thin", size: size)!
+    }
+    //细体
+    class func PingFangScL(ofSize size : CGFloat = 17) -> UIFont {
+        return UIFont(name: "PingFangSC-Light", size: size)!
+    }
+    //常规
+    class func PingFangScR(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Regular", size: size)!
     }
     
-    class func PFSCM(ofSize size : CGFloat = 15) -> UIFont {
+    //中等
+    class func PingFangScM(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Medium", size: size)!
     }
     
-    //    static func PFSCB(ofSize size : CGFloat = 15) -> UIFont {
-    //        return UIFont(name: "PingFangSC-Bold", size: size)!
-    //    }
-    
-    
+    //粗体
+    static func PingFangScB(ofSize size : CGFloat = 17) -> UIFont {
+        return UIFont(name: "PingFangSC-Semibold", size: size)!
+    }
 }

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/Extention/UIViewController+Extension.swift

@@ -97,7 +97,7 @@ extension UIViewController {
         }
         
         if font == nil {
-            button?.titleLabel?.font = UIFont.PFSCM(ofSize: 16)
+            button?.titleLabel?.font = UIFont.PingFangScM(ofSize: 16)
         } else {
             button?.titleLabel?.font = font
         }
@@ -150,13 +150,13 @@ extension UIViewController {
     
     
     ///设置全局标题属性
-    func bs_setupTitleAttributedAll(font: UIFont = UIFont.PFSCM(ofSize: 16), color: UIColor = .black) {
+    func bs_setupTitleAttributedAll(font: UIFont = UIFont.PingFangScM(ofSize: 16), color: UIColor = .black) {
         let titleDict = [NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: color]
         self.navigationController?.navigationBar.titleTextAttributes = titleDict
     }
     
     ///设置独立标题属性
-    func bs_setupTitleAttributed(title: String, font: UIFont = UIFont.PFSCM(ofSize: 16), color: UIColor = .black, reset: Bool = false) {
+    func bs_setupTitleAttributed(title: String, font: UIFont = UIFont.PingFangScM(ofSize: 16), color: UIColor = .black, reset: Bool = false) {
         var titleLabel: UILabel?
         if let label = self.navigationItem.titleView as? UILabel,
            reset == false {
@@ -208,7 +208,7 @@ extension UIViewController {
         }
         button?.setImage(image, for: .normal)
         button?.setImage(image, for: .highlighted)
-        button?.titleLabel?.font = UIFont.PFSCM(ofSize: 16)
+        button?.titleLabel?.font = UIFont.PingFangScM(ofSize: 16)
         button?.setTitle(title, for: .normal)
         button?.setTitleColor(color, for: .normal)
         button?.tintColor = color