平方字体修改

galaxy/galaxy/AppDelegate.swift

@@ -109,7 +109,7 @@ extension AppDelegate {
                 UITextView.appearance().tintColor = .mainColor
                 
                 //1.2设置UINavigationBar title的字体和颜色
-                let titleTextAttributes = [NSAttributedString.Key.font : UIFont.PingFangScM(ofSize: 16) , NSAttributedString.Key.foregroundColor : UIColor.commonColor100]
+                let titleTextAttributes = [NSAttributedString.Key.font : UIFont.PFSC_M(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.PingFangScR(ofSize: 10)
+        titleLabel.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14), color: UIColor.commonColor45)
+        let label = UILabel(text: "暂无数据", font: UIFont.PFSC_R(ofSize: 14), color: UIColor.commonColor45)
         return label
     }()
     
     private lazy var descLabel: UILabel = {
-        let label = UILabel(text: "", font: UIFont.PingFangScR(ofSize: 12), color: UIColor.commonColor45)
+        let label = UILabel(text: "", font: UIFont.PFSC_R(ofSize: 12), color: UIColor.commonColor45)
         return label
     }()
     
     private lazy var reloadBtn: UIButton = {
-        let btn = UIButton.bs_button(title: "重新加载", font: UIFont.PingFangScM(ofSize: 12), normalColor: UIColor.commonColor100)
+        let btn = UIButton.bs_button(title: "重新加载", font: UIFont.PFSC_M(ofSize: 12), normalColor: UIColor.commonColor100)
         btn.layer.cornerRadius = 6
         btn.layer.masksToBounds = true
         btn.layer.borderWidth = 1

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

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

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

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

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

@@ -32,7 +32,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
     
     private lazy var headerTitleDesLable : UILabel = {
         let titleLable = UILabel(text: "您好,黄先生")
-        titleLable.font = UIFont.PingFangScM(ofSize: 21)
+        titleLable.font = UIFont.PFSC_M(ofSize: 21)
         return titleLable
     }()
     
@@ -270,7 +270,7 @@ extension YHInformationPerfectListVC {
         }
         
         let desLable = UILabel(text: "此表由主申请人填写，我们将会根据您的个人信息制作资料清单，请按顺序填写，提交后1-2个工作日内联系您哦~")
-        desLable.font = UIFont.PingFangScR(ofSize: 12)
+        desLable.font = UIFont.PFSC_R(ofSize: 12)
         desLable.numberOfLines = 0
         desLable.lineBreakMode = .byWordWrapping
         

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

@@ -41,7 +41,7 @@ class YHChildInitialInfoVC: YHBaseViewController {
     lazy var submitBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("提交".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
@@ -52,7 +52,7 @@ class YHChildInitialInfoVC: YHBaseViewController {
     lazy var saveBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("保存", for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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/C/YHFamilyMemberFormVC.swift

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

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

@@ -325,7 +325,7 @@ class YHFormPickerView: UIView {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#222222")
         label.textAlignment = .center
-        label.font = UIFont.PingFangScR(ofSize: 16)
+        label.font = UIFont.PFSC_R(ofSize: 16)
         label.text = "请选择"
         return label
     }()
@@ -333,7 +333,7 @@ class YHFormPickerView: UIView {
     lazy var cancelBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("取消".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor(hex: 0x222222), for: .normal)
         btn.addTarget(self, action: #selector(didClickCancelButton), for: .touchUpInside)
         return btn
@@ -342,7 +342,7 @@ class YHFormPickerView: UIView {
     lazy var confirmBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("确定".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal)
         btn.addTarget(self, action: #selector(didClickConfirmButton), for: .touchUpInside)
         return btn
@@ -582,7 +582,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#222222")
         label.textAlignment = .center
-        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         label.text = ""
         if let arr = dataDict[type] {
             if 0 <= row && row < arr.count {

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.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 16)
+        label.font = UIFont.PFSC_R(ofSize: 16)
         return label
     }()
     
@@ -44,7 +44,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("删除", for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
@@ -71,7 +71,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("删除".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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/YHFormItemExpireDateCell.swift

@@ -23,7 +23,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
             if let title = title {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
-                    .font: UIFont.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(ofSize: 14),
                     .foregroundColor: UIColor(hex:0x222222)]
                 let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
                 if isMust {
@@ -67,7 +67,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
@@ -75,7 +75,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         let label = UILabel()
         label.textColor = UIColor(hexString: "#222222")
         label.textAlignment = .left
-        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         label.isHidden = true
         return label
     }()
@@ -85,7 +85,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         label.textColor = UIColor(hexString: "#C0C0C0")
         label.text = "请选择".local
         label.textAlignment = .left
-        label.font = UIFont.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         label.isHidden = false
         return label
     }()
@@ -93,7 +93,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
     lazy var longTimeBtn: UIButton = {
         let btn = UIButton(type: .custom)
         btn.setTitle("长期".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor(hex: 0x222222), for: .normal)
         btn.iconInLeft(spacing: 6)
         btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)

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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
@@ -48,7 +48,7 @@ class YHFormItemInputTextCell: UITableViewCell {
         let textField = UITextField()
         textField.backgroundColor = .clear
         textField.placeholder = "请如实填写"
-        textField.font = UIFont.PingFangScR(ofSize: 14)
+        textField.font = UIFont.PFSC_R(ofSize: 14)
         textField.tintColor = UIColor(hex: 0xC0C0C0)
         textField.textColor = UIColor(hex: 0x222222)
 //        textField.delegate = self

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

@@ -54,7 +54,7 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("", for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0
@@ -69,7 +69,7 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
     lazy var answer2Btn: UIButton = {
         let btn = UIButton()
         btn.setTitle("", for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(btnTitleDefaultColor, for: .normal)
         btn.backgroundColor = btnBgDefaultColor
         btn.layer.cornerRadius = btnHeight/2.0

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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
@@ -60,7 +60,7 @@ class YHFormItemQuestionCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("是".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14),
+                    .font: UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 16)
+        label.font = UIFont.PFSC_R(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.PingFangScR(ofSize: 14)
+        label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
@@ -39,7 +39,7 @@ class YHFormItemTitleCell: UITableViewCell {
         
         let btn = UIButton()
         btn.setTitle("取消操作".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSaveAndSubmitView.swift

@@ -20,7 +20,7 @@ class YHSaveAndSubmitView: UIView {
     lazy var submitBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("提交".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#4388FF")
         btn.layer.cornerRadius = 8.0
@@ -31,7 +31,7 @@ class YHSaveAndSubmitView: UIView {
     lazy var saveBtn:UIButton = {
         let btn = UIButton()
         btn.setTitle("保存", for: .normal)
-        btn.titleLabel?.font = UIFont.PingFangScR(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_R(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(流程)/MyScore/V/YHScoreOptionsView.swift

@@ -23,7 +23,7 @@ class YHScoreOptionsView: UIView {
     private lazy var nameTextView : UITextView  = {
         let lable0 = UITextView()
         lable0.textColor = UIColor(hex: 0x4E4E4E)
-        lable0.font = UIFont.PingFangScR(ofSize: 14)
+        lable0.font = UIFont.PFSC_R(ofSize: 14)
         lable0.isScrollEnabled = false
         lable0.isEditable = false
         lable0.isSelectable = false
@@ -41,7 +41,7 @@ class YHScoreOptionsView: UIView {
     private lazy var customLabel : UILabel = {
         let customLabel = UILabel(frame: CGRect(x: 0, y: 0, width: 40, height: 20))
         customLabel.text = "-"
-        customLabel.font = .PingFangScR(ofSize: 12)
+        customLabel.font = .PFSC_R(ofSize: 12)
         customLabel.backgroundColor = UIColor(hex:0xF8F9FB)
         customLabel.textColor = UIColor(hex: 0x888F98)
         customLabel.layer.cornerRadius = 4
@@ -86,14 +86,14 @@ private extension YHScoreOptionsView {
         if model.isSelected == true {
             
             nameTextView.attributed.text = """
-            \(model.scoreName, .foreground(UIColor(hex: 0x3C86F8)), .font(UIFont.PingFangScR(ofSize: 14)))  \(.view(customLabel, .original(.center)))
+            \(model.scoreName, .foreground(UIColor(hex: 0x3C86F8)), .font(UIFont.PFSC_R(ofSize: 14)))  \(.view(customLabel, .original(.center)))
             """
             customLabel.backgroundColor = UIColor(hex:0x3C86F8,alpha:0.12)
             customLabel.textColor = UIColor(hex: 0x3C86F8)
             
         } else {
             nameTextView.attributed.text = """
-            \(model.scoreName, .foreground(UIColor(hex: 0x4E4E4E)), .font(UIFont.PingFangScR(ofSize: 14)))  \(.view(customLabel, .original(.center)))
+            \(model.scoreName, .foreground(UIColor(hex: 0x4E4E4E)), .font(UIFont.PFSC_R(ofSize: 14)))  \(.view(customLabel, .original(.center)))
             """
             customLabel.backgroundColor = UIColor(hex:0xF8F9FB)
             customLabel.textColor = UIColor(hex: 0x888F98)

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

@@ -23,7 +23,7 @@ class YHScorePersonInfoCell: UITableViewCell {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "DavidHuang")
         lable0.textColor = UIColor(hex: 0x222222)
-        lable0.font = UIFont.PingFangScM(ofSize: 16)
+        lable0.font = UIFont.PFSC_M(ofSize: 16)
         return lable0
     }()
     
@@ -31,7 +31,7 @@ class YHScorePersonInfoCell: UITableViewCell {
     private lazy var phoneLable : UILabel = {
         let lable0 = UILabel(text: "15818743775")
         lable0.textColor = UIColor(hex: 0x888F98)
-        lable0.font = UIFont.PingFangScR(ofSize: 12)
+        lable0.font = UIFont.PFSC_R(ofSize: 12)
         return lable0
     }()
     
@@ -40,7 +40,7 @@ class YHScorePersonInfoCell: UITableViewCell {
     private lazy var scoreLable : UILabel = {
         let lable0 = UILabel(text: "92 分")
         lable0.textColor = UIColor(hex: 0x3C86F8)
-        lable0.font = UIFont.PingFangScB(ofSize: 43)
+        lable0.font = UIFont.PFSC_B(ofSize: 43)
         lable0.textAlignment = .right
         return lable0
     }()
@@ -76,7 +76,7 @@ extension YHScorePersonInfoCell {
         
         let lable0 = UILabel(text: "香港优才评分报告")
         lable0.textColor = .white
-        lable0.font = UIFont.PingFangScB(ofSize: 24)
+        lable0.font = UIFont.PFSC_B(ofSize: 24)
         contentView.addSubview(lable0)
         lable0.snp.makeConstraints { make in
             make.top.equalTo(32)
@@ -88,7 +88,7 @@ extension YHScorePersonInfoCell {
         
         let lable1 = UILabel(text: "根据您填写的资料情况生成")
         lable1.textColor = UIColor(hex: 0xffffff,alpha: 0.8)
-        lable1.font = UIFont.PingFangScR(ofSize: 12)
+        lable1.font = UIFont.PFSC_R(ofSize: 12)
         contentView.addSubview(lable1)
         lable1.snp.makeConstraints { make in
             make.top.equalTo(lable0.snp.bottom).offset(6)
@@ -166,8 +166,8 @@ extension YHScorePersonInfoCell {
             make.height.equalTo(50)
         }
         
-        let a: ASAttributedString = .init("95", .font(UIFont.PingFangScR(ofSize: 43)),.foreground(UIColor(hex:0x3C86F8)))
-        let b: ASAttributedString = .init("分", .font(UIFont.PingFangScR(ofSize: 12)),.foreground(UIColor(hex:0x3C86F8)))
+        let a: ASAttributedString = .init("95", .font(UIFont.PFSC_R(ofSize: 43)),.foreground(UIColor(hex:0x3C86F8)))
+        let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex:0x3C86F8)))
         scoreLable.attributed.text = a + b
         
         
@@ -175,7 +175,7 @@ extension YHScorePersonInfoCell {
         
         let lable3 = UILabel(text: "综合得分")
         lable3.textColor = UIColor(hex: 0x888F98)
-        lable3.font = UIFont.PingFangScR(ofSize: 12)
+        lable3.font = UIFont.PFSC_R(ofSize: 12)
         lable3.textAlignment = .right
         contentView.addSubview(lable3)
         lable3.snp.makeConstraints { make in

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

@@ -36,7 +36,7 @@ class YHScoreResultView: UIView {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "年龄：32")
         lable0.textColor = UIColor(hex: 0x4E4E4E)
-        lable0.font = UIFont.PingFangScM(ofSize: 14)
+        lable0.font = UIFont.PFSC_M(ofSize: 14)
         return lable0
     }()
     
@@ -44,7 +44,7 @@ class YHScoreResultView: UIView {
     private lazy var desLable : UILabel = {
         let lable0 = UILabel(text: "得分：30分")
         lable0.textColor = UIColor(hex: 0x4E4E4E)
-        lable0.font = UIFont.PingFangScM(ofSize: 14)
+        lable0.font = UIFont.PFSC_M(ofSize: 14)
         return lable0
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore/V/YHScoreTitleView.swift

@@ -28,7 +28,7 @@ class YHScoreTitleView: UIView {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "年龄得分")
         lable0.textColor = UIColor(hex: 0x222222)
-        lable0.font = UIFont.PingFangScM(ofSize: 17)
+        lable0.font = UIFont.PFSC_M(ofSize: 17)
         return lable0
     }()
     
@@ -36,7 +36,7 @@ class YHScoreTitleView: UIView {
     private lazy var desLable : UILabel = {
         let lable0 = UILabel(text: "（最高30分）")
         lable0.textColor = UIColor(hex: 0x888F98)
-        lable0.font = UIFont.PingFangScR(ofSize: 14)
+        lable0.font = UIFont.PFSC_R(ofSize: 14)
         return lable0
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHPersonInfoControllerHoldViewController.swift

@@ -27,10 +27,10 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
         dataSource.isTitleColorGradientEnabled = true
         dataSource.titles = arrItemTitles
         
-        dataSource.titleNormalFont = UIFont.PingFangScR(ofSize: 16)
+        dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 16)
         dataSource.titleSelectedColor = UIColor(hex: 0x888F98)
         
-        dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
+        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
         dataSource.titleSelectedColor = UIColor(hex: 0x4388FF)
         
         dataSource.isItemSpacingAverageEnabled = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHPersonInformMainViewController.swift

@@ -47,7 +47,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "DavidHuang")
         lable0.textColor = UIColor(hex: 0x222222)
-        lable0.font = UIFont.PingFangScM(ofSize: 16)
+        lable0.font = UIFont.PFSC_M(ofSize: 16)
         return lable0
     }()
     
@@ -55,7 +55,7 @@ class YHPersonInformMainViewController: YHBaseViewController {
     private lazy var phoneLable : UILabel = {
         let lable0 = UILabel(text: "15818743775")
         lable0.textColor = UIColor(hex: 0x888F98)
-        lable0.font = UIFont.PingFangScR(ofSize: 12)
+        lable0.font = UIFont.PFSC_R(ofSize: 12)
         return lable0
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoCellView.swift

@@ -21,7 +21,7 @@ class YHPersonInfoCellView: UIView {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor(hex: 0x888F98)
-        lable0.font = UIFont.PingFangScR(ofSize: 14)
+        lable0.font = UIFont.PFSC_R(ofSize: 14)
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byCharWrapping
         return lable0
@@ -32,7 +32,7 @@ class YHPersonInfoCellView: UIView {
     private lazy var subtitleLable : UILabel = {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor(hex: 0x222222)
-        lable0.font = UIFont.PingFangScR(ofSize: 14)
+        lable0.font = UIFont.PFSC_R(ofSize: 14)
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byWordWrapping
         lable0.textAlignment = .right

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoCommonCell.swift

@@ -136,7 +136,7 @@ extension YHPersonInfoCommonCell {
                 let lable = UILabel()
                 lable.text = item0.cellTitle
                 lable.textColor = UIColor(hex: 0x222222)
-                lable.font = UIFont.PingFangScM(ofSize: 14)
+                lable.font = UIFont.PFSC_M(ofSize: 14)
                 holdView.addSubview(lable)
                 lable.snp.makeConstraints { make in
                     make.top.equalTo(tmp.snp.bottom).offset(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoIdentificationCardView.swift

@@ -28,7 +28,7 @@ class YHPersonInfoIdentificationCardView: UIView {
     private lazy var titleLable : UILabel = {
         let lable = UILabel()
         lable.textColor = UIColor(hex: 0x222222)
-        lable.font = UIFont.PingFangScM(ofSize: 14)
+        lable.font = UIFont.PFSC_M(ofSize: 14)
         return lable
     }()
     
@@ -56,7 +56,7 @@ class YHPersonInfoIdentificationCardView: UIView {
     private lazy var subtitleFrontLable : UILabel = {
         let lable = UILabel()
         lable.textColor = UIColor(hex: 0x888F98)
-        lable.font = UIFont.PingFangScR(ofSize: 14)
+        lable.font = UIFont.PFSC_R(ofSize: 14)
         lable.text = "身份证头像面"
         lable.textAlignment = .center
         return lable
@@ -66,7 +66,7 @@ class YHPersonInfoIdentificationCardView: UIView {
     private lazy var subtitleBackLable : UILabel = {
         let lable = UILabel()
         lable.textColor = UIColor(hex: 0x888F98)
-        lable.font = UIFont.PingFangScR(ofSize: 14)
+        lable.font = UIFont.PFSC_R(ofSize: 14)
         lable.text = "身份证国徽面"
         lable.textAlignment = .center
         return lable

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoSessionView.swift

@@ -22,7 +22,7 @@ class YHPersonInfoSessionView: UIView {
     private lazy var nameLable : UILabel = {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor(hex: 0x222222)
-        lable0.font = UIFont.PingFangScM(ofSize: 17)
+        lable0.font = UIFont.PFSC_M(ofSize: 17)
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byWordWrapping
         return lable0

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

@@ -147,7 +147,7 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let lable01 = UILabel(text: "信息填写提示")
-        lable01.font = UIFont.PingFangScB(ofSize: 18)
+        lable01.font = UIFont.PFSC_B(ofSize: 18)
         lable01.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
         
         topView.addSubview(lable01)

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

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

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

@@ -127,8 +127,8 @@ class YHSubmintAllInfoSuccessTipView: UIView {
             make.height.equalTo(50)
         }
         
-        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)))
+        let a: ASAttributedString = .init("90", .font(UIFont.PFSC_R(ofSize: 32)),.foreground(UIColor(hex:0xFF9900)))
+        let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(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.PingFangScM(ofSize: 16)]
+        navigationBarAppearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : UIColor.commonColor100,NSAttributedString.Key.font:UIFont.PFSC_M(ofSize: 16)]
         navigationBarAppearance.barTintColor = UIColor.yellow
         navigationBarAppearance.tintColor = UIColor.commonColor100
         navigationBarAppearance.backIndicatorImage = UIImage(named: "back_icon")

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

@@ -8,36 +8,33 @@
 
 import UIKit
 extension UIFont {
-    
-    
-//    PingFangSC-ExtraLight                 苹方 特细
-//    PingFangSC-Light                    苹方 细体
-//    PingFangSC-Regular                 苹方 常规
-//    PingFangSC-Medium                   苹方 中等
-//    PingFangSC-Bold                     苹方 粗体
-//    PingFangSC-Heavy                   苹方 特粗
-    
-    // MARK: - 苹果字体
+    // MARK: - 苹果平方字体
     //特细
-    class func PingFangScEL(ofSize size : CGFloat = 17) -> UIFont {
+    class func PFSC_Thin(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Thin", size: size)!
     }
     //细体
-    class func PingFangScL(ofSize size : CGFloat = 17) -> UIFont {
+    class func PFSC_L(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Light", size: size)!
     }
     //常规
-    class func PingFangScR(ofSize size : CGFloat = 17) -> UIFont {
+    class func PFSC_R(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Regular", size: size)!
     }
     
     //中等
-    class func PingFangScM(ofSize size : CGFloat = 17) -> UIFont {
+    class func PFSC_M(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Medium", size: size)!
     }
     
     //粗体
-    static func PingFangScB(ofSize size : CGFloat = 17) -> UIFont {
+    static func PFSC_B(ofSize size : CGFloat = 17) -> UIFont {
         return UIFont(name: "PingFangSC-Semibold", size: size)!
     }
+    
+    //特粗体
+    static func PFSC_UL(ofSize size : CGFloat = 17) -> UIFont {
+        return UIFont(name: "PingFangTC-Ultralight", 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.PingFangScM(ofSize: 10)
+        temp.font = UIFont.PFSC_M(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.PingFangScM(ofSize: 16)
+            button?.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         } else {
             button?.titleLabel?.font = font
         }
@@ -150,13 +150,13 @@ extension UIViewController {
     
     
     ///设置全局标题属性
-    func bs_setupTitleAttributedAll(font: UIFont = UIFont.PingFangScM(ofSize: 16), color: UIColor = .black) {
+    func bs_setupTitleAttributedAll(font: UIFont = UIFont.PFSC_M(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.PingFangScM(ofSize: 16), color: UIColor = .black, reset: Bool = false) {
+    func bs_setupTitleAttributed(title: String, font: UIFont = UIFont.PFSC_M(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.PingFangScM(ofSize: 16)
+        button?.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         button?.setTitle(title, for: .normal)
         button?.setTitleColor(color, for: .normal)
         button?.tintColor = color