Skip to content

G
galaxy-iOS
Commit 7c538a60 authored by Steven杜宇's avatar Steven杜宇
1 Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

parents 039ae1df faf2526e
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 335 deletions
galaxy/Podfile
View file @ 7c538a60
......@@ -42,7 +42,7 @@ target 'galaxy' do
#定时器
pod 'SwiftyTimer','2.1.0'
#UIColor 的扩展
pod 'Hue','5.0.0'
# pod 'Hue','5.0.0'
#内存泄漏
pod 'LifetimeTracker','1.8.1'
#控制台转换成中文
......
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 7c538a60
......@@ -71,6 +71,7 @@
A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
A5167B272B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */; };
A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */; };
A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
......@@ -278,6 +279,7 @@
A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
A5167B262B692CF20084C08F /* YHPersonInfoIdentificationCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoIdentificationCardView.swift; sourceTree = "<group>"; };
A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoBaseViewController.swift; sourceTree = "<group>"; };
A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -669,9 +671,9 @@
A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */ = {
isa = PBXGroup;
children = (
A5167B302B6A24010084C08F /* C */,
A5167B2F2B6A23FC0084C08F /* V */,
A5167B2E2B6A23F50084C08F /* M */,
A5167B2F2B6A23FC0084C08F /* V */,
A5167B302B6A24010084C08F /* C */,
);
path = "PersonInfoList(个人信息表)";
sourceTree = "<group>";
......@@ -705,6 +707,7 @@
children = (
A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */,
A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */,
A5167B322B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift */,
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */,
A5FD63E92B67D95100D1D9DA /* YHFamilyMemberViewController.swift */,
);
......@@ -819,8 +822,8 @@
isa = PBXGroup;
children = (
A5ACE8E82B4564F7002C94D2 /* M */,
A5ACE8E92B4564F7002C94D2 /* C */,
A5ACE8EB2B4564F7002C94D2 /* V */,
A5ACE8E92B4564F7002C94D2 /* C */,
);
path = "Mine（我的）";
sourceTree = "<group>";
......@@ -1393,6 +1396,7 @@
A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
A5167B332B6A3A2D0084C08F /* YHPersonInfoBaseViewController.swift in Sources */,
A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
A5FD63FA2B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift in Sources */,
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,
......
galaxy/galaxy/AppDelegate.swift
View file @ 7c538a60
......@@ -35,7 +35,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
//2.通用UI设置
// setupWholeUI()
setupWholeUI()
//3.其他第三方sdk设置
thirdSetting()
......@@ -104,28 +104,9 @@ extension AppDelegate {
//异步延迟设置
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25) { [] in
//1、系统控件属性设置
//1.1
UITextField.appearance().tintColor = .mainColor
UITextView.appearance().tintColor = .mainColor
UITextField.appearance().tintColor = .brandMainColor
UITextView.appearance().tintColor = .brandMainColor
//1.2设置UINavigationBar title的字体和颜色
let titleTextAttributes = [NSAttributedString.Key.font : UIFont.PingFangScM(ofSize: 16) , NSAttributedString.Key.foregroundColor : UIColor.commonColor100]
UINavigationBar.appearance().titleTextAttributes = titleTextAttributes
UINavigationBar.appearance().tintColor = .white
//1.3UITabBar bar 的选中颜色
UITabBar.appearance().tintColor = UIColor.commonColor100
//1.4tabbar默认的背景色
UITabBar.appearance().barTintColor = UIColor.white
//2、一键登录初始化
// TXCommonHandler.sharedInstance().setAuthSDKInfo(BsConstant.kAliOnePressPhoneLoginKey)
//3.微信登录初始化
// BsWxLoginManager.shared.doWxInit()
//4.
IQKeyboardManager.shared.enable = true
IQKeyboardManager.shared.enableAutoToolbar = true
IQKeyboardManager.shared.resignOnTouchOutside = true // 控制点击背景是否收起键盘
......
galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift
View file @ 7c538a60
......@@ -14,11 +14,11 @@ class YHBasicContentView: ESTabBarItemContentView {
override init(frame: CGRect) {
super.init(frame: frame)
textColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
highlightTextColor = .commonColor100
highlightTextColor = .brandMainColor
iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
highlightIconColor = .commonColor100
highlightIconColor = .brandMainColor
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
View file @ 7c538a60
......@@ -20,21 +20,21 @@ 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.labelTextColor2)
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.labelTextColor2)
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.brandMainColor)
btn.layer.cornerRadius = 6
btn.layer.masksToBounds = true
btn.layer.borderWidth = 1
btn.layer.borderColor = UIColor.commonColor10.cgColor
btn.layer.borderColor = UIColor.labelTextColor2.cgColor
btn.addTarget(self, action: #selector(onReloadData), for: .touchUpInside)
return btn
}()
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
View file @ 7c538a60
......@@ -108,11 +108,11 @@ class YHHomeViewController: YHBaseViewController {
dataSource.isTitleColorGradientEnabled = true
dataSource.titles = arrItemTitles
dataSource.titleNormalFont = UIFont.PingFangScM(ofSize: 16)
dataSource.titleNormalColor = .commonColor25
dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 16)
dataSource.titleNormalColor = UIColor(hexString: "#888F98")
dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
dataSource.titleSelectedColor = .commonColor100
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
dataSource.titleSelectedColor = .brandMainColor
dataSource.isItemSpacingAverageEnabled = false
dataSource.itemWidth = JXSegmentedViewAutomaticDimension
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHMainContentBaseViewController.swift
View file @ 7c538a60
......@@ -29,11 +29,11 @@ class YHMainContentBaseViewController: UIViewController {
dataSource.isTitleColorGradientEnabled = true
dataSource.titles = arrItemTitles
dataSource.titleNormalFont = UIFont.PingFangScM(ofSize: 16)
dataSource.titleNormalColor = .commonColor25
dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 16)
dataSource.titleNormalColor = .labelTextColor2
dataSource.titleSelectedFont = UIFont.PingFangScM(ofSize: 18)
dataSource.titleSelectedColor = .commonColor100
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
dataSource.titleSelectedColor = .brandMainColor
dataSource.isItemSpacingAverageEnabled = false
dataSource.itemWidth = JXSegmentedViewAutomaticDimension
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHDavidCell4.swift
View file @ 7c538a60
......@@ -127,7 +127,7 @@ extension YHDavidCell4: FSPagerViewDataSource, FSPagerViewDelegate {
// cell.textLabel?.text = model.title
}
cell.imageView?.contentMode = .scaleAspectFill
cell.backgroundColor = .commonColor3
cell.backgroundColor = .contentBkgColor
cell.contentView.layer.shadowColor = UIColor.clear.cgColor
return cell
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
View file @ 7c538a60
......@@ -128,7 +128,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
}
cell.imageView?.contentMode = .scaleAspectFill
cell.backgroundColor = .commonColor3
cell.backgroundColor = .contentBkgColor
cell.contentView.layer.shadowColor = UIColor.clear.cgColor
return cell
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -48,7 +48,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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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,17 +48,17 @@ 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
}()
lazy var detailLabel: UILabel = {
let label = UILabel()
label.text = "XXXXXXX"
label.textColor = UIColor(hexString: "#888F98")
label.textColor = .labelTextColor2
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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -22,7 +22,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.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemOnlyDoubleChoiceCell.swift
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -22,16 +22,16 @@ 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
}()
lazy var subTitleLabel: UILabel = {
let label = UILabel()
label.textColor = UIColor(hexString:"#888F98")
label.textColor = .labelTextColor2
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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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/YHFamilyMemberViewController.swift
View file @ 7c538a60
......@@ -7,12 +7,10 @@
//
import UIKit
import JXSegmentedView
/*
*家庭成员信息
*/
class YHFamilyMemberViewController: YHBaseViewController {
class YHFamilyMemberViewController: YHPersonInfoBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
......@@ -21,25 +19,6 @@ class YHFamilyMemberViewController: YHBaseViewController {
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
// MARK: - JXSegmentedListContainerViewListDelegate
extension YHFamilyMemberViewController: JXSegmentedListContainerViewListDelegate {
func listView() -> UIView {
return view
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHMainApplicantInfoViewController.swift
View file @ 7c538a60
......@@ -11,44 +11,16 @@ import JXSegmentedView
/*
*主申请人信息
*/
class YHMainApplicantInfoViewController: YHBaseViewController {
class YHMainApplicantInfoViewController: YHPersonInfoBaseViewController {
var arrData : [YHPersonInfoCellModel] = []
override func viewDidLoad() {
super.viewDidLoad()
// view.backgroundColor = .red// for test hjl
// Do any additional setup after loading the view.
setupUI()
}
let contryInfoView = YHPersonInfoSessionHoldView()
let baseInfoView = YHPersonInfoSessionHoldView()
var homeTableView: YHGestureTableView = {
let tableView = YHGestureTableView(frame: .zero, style: .grouped)
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
tableView.register(YHPersonInfoCommonCell.self,forCellReuseIdentifier: YHPersonInfoCommonCell.cellReuseIdentifier)
return tableView
}()
}
// MARK: - JXSegmentedListContainerViewListDelegate
extension YHMainApplicantInfoViewController: JXSegmentedListContainerViewListDelegate {
func listView() -> UIView {
return view
}
}
private extension YHMainApplicantInfoViewController {
func fakeData() {
do {
......@@ -126,62 +98,22 @@ private extension YHMainApplicantInfoViewController {
func setupUI() {
fakeData()
homeTableView.delegate = self
homeTableView.dataSource = self
view.addSubview(homeTableView)
homeTableView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalTo(16)
make.right.equalTo(-16)
}
homeTableView.reloadData()
self.homeTableView.register(YHPersonInfoCommonCell.self,forCellReuseIdentifier: YHPersonInfoCommonCell.cellReuseIdentifier)
self.homeTableView.reloadData()
}
}
// MARK: - UITableViewDelegate 和 UITableViewDataSource
extension YHMainApplicantInfoViewController : UITableViewDelegate,UITableViewDataSource {
// func numberOfSections(in tableView: UITableView) -> Int {
// return 1
// }
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
extension YHMainApplicantInfoViewController {
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return arrData.count
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 0.001
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
return view
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 0.001
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
return view
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHPersonInfoCommonCell.self)
cell.model = arrData[indexPath.row]
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
printLog("点击了 tableView Cell \(indexPath.row)")
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHPersonInfoBaseViewController.swift 0 → 100644
View file @ 7c538a60
//
// YHPersonInfoBaseViewController.swift
// galaxy
//
// Created by davidhuangA on 2024/1/31.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import JXSegmentedView
class YHPersonInfoBaseViewController: YHBaseViewController {
public var homeTableView: YHGestureTableView = {
let tableView = YHGestureTableView(frame: .zero, style: .grouped)
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
return tableView
}()
public var vcCanScroll : Bool = true
override func viewDidLoad() {
super.viewDidLoad()
homeTableView.delegate = self
homeTableView.dataSource = self
view.addSubview(homeTableView)
}
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
homeTableView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalTo(16)
make.right.equalTo(-16)
}
}
}
// MARK: - 滑动使用
extension YHPersonInfoBaseViewController: UIScrollViewDelegate {
//控制滑动交互
func scrollViewDidScroll(_ scrollView: UIScrollView) {
let scrollViewSet: CGFloat = scrollView.contentOffset.y
if vcCanScroll == false {//不能滚动时
scrollView.contentOffset = CGPoint(x: 0, y: 0)
} else {
if (scrollViewSet <= 0) {
scrollView.contentOffset = CGPoint(x: 0, y: 0)
vcCanScroll = false
NotificationCenter.default.post(name: Notification.Name(rawValue: "leaveTop0"), object: nil)
} else {
scrollView.contentOffset = CGPoint(x: 0, y: scrollViewSet)
}
}
}
}
// MARK: - JXSegmentedListContainerViewListDelegate
extension YHPersonInfoBaseViewController: JXSegmentedListContainerViewListDelegate {
func listView() -> UIView {
return view
}
}
// MARK: - UITableViewDelegate 和 UITableViewDataSource
extension YHPersonInfoBaseViewController : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
return UITableViewCell()
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 0.001
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
return view
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 0.001
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.001))
return view
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHPersonInfoControllerHoldViewController.swift
View file @ 7c538a60
......@@ -13,25 +13,24 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
var canScroll : Bool = false {
didSet {
// for vc in arrItemVCs {
// vc.vcCanScroll = canScroll
// }
for vc in arrItemVCs {
vc.vcCanScroll = canScroll
}
}
}
let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"]
var arrItemVCs : [YHBaseViewController] = []
var arrItemVCs : [YHPersonInfoBaseViewController] = []
var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 58))
lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
let dataSource = JXSegmentedTitleDataSource()
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
......@@ -50,19 +49,36 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
super.viewDidLoad()
// for _ in arrItemTitles {
// let vc = YHDavidTestViewController()
// let vc = YHMainApplicantInfoViewController()
// arrItemVCs.append(vc)
// }
//添加
arrItemVCs.append(YHMainApplicantInfoViewController())
arrItemVCs.append(YHFamilyMemberViewController())
do {
let vc = YHMainApplicantInfoViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
arrItemVCs.append(vc)
}
do {
let vc = YHFamilyMemberViewController()
arrItemVCs.append(vc)
}
arrItemVCs.append(YHMainApplicantInfoViewController())
arrItemVCs.append(YHFamilyMemberViewController())
arrItemVCs.append(YHMainApplicantInfoViewController())
arrItemVCs.append(YHFamilyMemberViewController())//for test hjl
......@@ -111,12 +127,15 @@ class YHPersonInfoControllerHoldViewController: UIViewController {
segmentedView.frame = CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 58)
listContainerView.frame = CGRect(x: 0, y: 58, width: view.bounds.size.width, height: view.bounds.size.height - 58)
segmentedView.backgroundColor = .white
view.backgroundColor = .yellow//for test hjl
}
}
extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
}
/// 正在滚动中的回调
......@@ -127,7 +146,7 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedViewDelegate {
/// - rightIndex: 正在滚动中，相对位置处于右边的index
/// - percent: 从左往右计算的百分比
func segmentedView(_ segmentedView: JXSegmentedView, scrollingFrom leftIndex: Int, to rightIndex: Int, percent: CGFloat) {
NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
NotificationCenter.default.post(name: Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
}
}
......@@ -140,6 +159,6 @@ extension YHPersonInfoControllerHoldViewController: JXSegmentedListContainerView
}
func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
return arrItemVCs[index] as! JXSegmentedListContainerViewListDelegate
return arrItemVCs[index] as JXSegmentedListContainerViewListDelegate
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/C/YHPersonInformMainViewController.swift
View file @ 7c538a60
......@@ -26,14 +26,12 @@ class YHPersonInformMainViewController: YHBaseViewController {
tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
// tableView.register(YHDavidCell0.self,forCellReuseIdentifier: YHDavidCell0.cellReuseIdentifier)
return tableView
}()
var myHeadView : UIView = {
let view = UIView(frame: CGRect(x: 16, y: 0, width: KScreenWidth - 16 * 2, height: 128))
// view.backgroundColor = .yellow //for test hjl
return view
}()
......@@ -49,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
}()
......@@ -57,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
}()
......@@ -67,13 +65,13 @@ class YHPersonInformMainViewController: YHBaseViewController {
super.viewDidLoad()
NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop0"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
//1.UI
initView()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoCellView.swift
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -35,6 +35,17 @@ class YHPersonInfoCommonCell: UITableViewCell {
return contryInfoView
}()
override func layoutSubviews() {
super.layoutSubviews()
if holdView.superview != nil {
holdView.snp.makeConstraints { make in
make.top.equalTo(14)
make.left.bottom.equalToSuperview()
make.right.equalToSuperview().offset(-16)
}
}
}
}
extension YHPersonInfoCommonCell {
......@@ -50,7 +61,8 @@ extension YHPersonInfoCommonCell {
contentView.addSubview(holdView)
holdView.snp.makeConstraints { make in
make.top.equalTo(14)
make.left.right.bottom.equalToSuperview()
make.left.bottom.equalToSuperview()
make.width.equalTo(contentView.snp.width)
}
if model?.cellType == 0 {
......@@ -124,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)
......@@ -197,7 +209,6 @@ extension YHPersonInfoCommonCell {
}
}
}
else if model?.cellType == 2 {
guard let model = model else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoIdentificationCardView.swift
View file @ 7c538a60
......@@ -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/YHPersonInfoSessionHoldView.swift
View file @ 7c538a60
......@@ -12,7 +12,7 @@ class YHPersonInfoSessionHoldView: UIView {
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = .white
layer.cornerRadius = 12
layer.cornerRadius = 6
clipsToBounds = true
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息表)/V/YHPersonInfoSessionView.swift
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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/Modules/Mine（我的）/C/YHAboutUsViewController.swift
View file @ 7c538a60
......@@ -60,7 +60,7 @@ class YHAboutUsViewController: YHBaseViewController {
var label = UILabel()
label.text = "银河集团专注海外服务17年，总部设立在深圳，现已分别在北京、上海、广州等地建立分公司，立足于香港身份规划服务，业务逐步多元化发展。"
label.numberOfLines = 0
label.textColor = UIColor(hexString:"#888F98")
label.textColor = .labelTextColor2
label.textAlignment = NSTextAlignment.left
label.font = UIFont.systemFont(ofSize: 14)
return label
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHAboutUsAdvantageCell.swift
View file @ 7c538a60
......@@ -40,7 +40,7 @@ class YHAboutUsAdvantageCell: UICollectionViewCell {
lazy var detailLabel:UILabel = {
let label = UILabel()
label.text = "sdfasfdasfasdfasfasdfasdfsafasdfasdfasdfasfdas"
label.textColor = UIColor(hexString:"#888F98")
label.textColor = .labelTextColor2
label.numberOfLines = 0
label.textAlignment = .center
label.font = UIFont.systemFont(ofSize: 12)
......
galaxy/galaxy/Classes/Tools/Extention/AppDelegate+Extension.swift
View file @ 7c538a60
......@@ -7,41 +7,6 @@
//
import UIKit
// MARK: - 设置导航栏样式
extension AppDelegate{
func customAppearance() {
setNavigationBarAppearanceWhenContainedInInstancesOf(containers: [YHNavigationController.self])
setNavigationBarAppearanceWhenContainedInInstancesOf(containers: [YHBaseViewController.self])
}
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.barTintColor = UIColor.yellow
navigationBarAppearance.tintColor = UIColor.commonColor100
navigationBarAppearance.backIndicatorImage = UIImage(named: "back_icon")
navigationBarAppearance.backIndicatorTransitionMaskImage = UIImage(named: "back_icon")
navigationBarAppearance.setBackgroundImage(UIImage.from(color: UIColor.clear),for: .default)
navigationBarAppearance.isOpaque = true
navigationBarAppearance.shadowImage = nil
//隐藏返回文字
if #available(iOS 13, *) {
UIBarButtonItem.appearance().setBackButtonTitlePositionAdjustment(UIOffset( horizontal: -UIDevice.kScreenW, vertical: 0), for: .default)
}
let barItemAppearance = UIBarButtonItem.appearance(whenContainedInInstancesOf: containers)
barItemAppearance.setTitleTextAttributes([NSAttributedString.Key.foregroundColor : UIColor.clear,NSAttributedString.Key.font:UIFont.systemFont(ofSize: 14)], for: UIControl.State.normal)
barItemAppearance.setTitleTextAttributes([NSAttributedString.Key.foregroundColor : UIColor.clear,NSAttributedString.Key.font:UIFont.systemFont(ofSize: 14)], for: UIControl.State.highlighted)
}
}
// MARK: - Pay 支付
extension AppDelegate {
......
galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift
View file @ 7c538a60
......@@ -10,27 +10,56 @@ import UIKit
import SwifterSwift
extension UIColor {
// MARK: - 当前 app 主颜色
static let mainColor : UIColor = UIColor(hexString: "#46E0BB")!
static let commonColor100 : UIColor = UIColor(hexString: "#333333",transparency: 1.0)!
static let commonColor90 : UIColor = UIColor(hexString: "#333333",transparency: 0.9)!
static let commonColor65 : UIColor = UIColor(hexString: "#333333",transparency: 0.65)!
static let commonColor45 : UIColor = UIColor(hexString: "#333333",transparency: 0.45)!
static let commonColor25 : UIColor = UIColor(hexString: "#333333",transparency: 0.25)!
static let commonColor15 : UIColor = UIColor(hexString: "#333333",transparency: 0.15)!
static let commonColor10 : UIColor = UIColor(hexString: "#333333",transparency: 0.10)!
static let commonColor6 : UIColor = UIColor(hexString: "#333333",transparency: 0.06)!
static let commonColor4 : UIColor = UIColor(hexString: "#333333",transparency: 0.04)!
static let commonColor3 : UIColor = UIColor(hexString: "#333333",transparency: 0.03)!
static let backgroundColor : UIColor = UIColor(hexString: "#F2F7F6",transparency: 1.0)!
static let mainTextColor : UIColor = UIColor(hexString: "#00D19F")!
static let selectBgColor : UIColor = UIColor(hexString: "#D9FCF7")!
//黑色 50透明
static let black50Persent : UIColor = UIColor.black.withAlphaComponent(0.5)
//品牌主色
static let brandMainColor : UIColor = UIColor(hexString: "#2F7EF6")!
//品牌渐变色
static let arrBrandGradaterColors : [UIColor] = [UIColor(hexString: "#2274EE")!,UIColor(hexString: "#3A85FC")!]
//品牌主色 16
static let brandMainColor16 : UIColor = UIColor(hexString: "#2F7EF6",transparency: 0.16)!
//品牌主色 8
static let brandMainColor8: UIColor = UIColor(hexString: "#2F7EF6",transparency: 0.16)!
//标题/主内容
static let mainTextColor : UIColor = UIColor(hexString: "#222222")!
//次内容一
static let subTextColor : UIColor = UIColor(hexString: "#4E4E4E")!
//次内容二
static let subTextColor2 : UIColor = UIColor(hexString: "#7A7A7A")!
//标注内容一
static let labelTextColor : UIColor = UIColor(hexString: "#D3D3D3")!
//标注内容二
static let labelTextColor2 : UIColor = UIColor(hexString: "#888F98")!
//成功 color
static let successColor : UIColor = UIColor(hexString: "#49D2B1")!
//失败 color
static let failColor : UIColor = UIColor(hexString: "#F81D22")!
//警告 color
static let warnColor : UIColor = UIColor(hexString: "#FF9900")!
//提示 color
static let tipsColor : UIColor = UIColor(hexString: "#2F7EF6")!
//页面背景
static let pageBkgColor : UIColor = UIColor(hexString: "#F8F8F8")!
//内容背景色
static let contentBkgColor : UIColor = UIColor(hexString: "#F8F9FB")!
public convenience init(r : CGFloat, g : CGFloat, b : CGFloat,alpha:CGFloat = 1.0) {
......
galaxy/galaxy/Classes/Tools/Extention/UIFont+Extension.swift
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
View file @ 7c538a60
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment