Skip to content

G
galaxy-iOS
Commit dca74673 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

新增字体

parent 0f96ce67
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 17 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ dca74673
......@@ -589,6 +589,8 @@
04B4B8DC2C90696E00ED82BC /* YHResignDocumentManagementVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B4B8DB2C90696E00ED82BC /* YHResignDocumentManagementVC.swift */; };
04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
04BD83412CCA1705003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 04BD83402CCA1705003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.otf */; };
04BD83432CCA1BD1003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04BD83422CCA1BD1003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.ttf */; };
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */; };
......@@ -1555,6 +1557,8 @@
04B4B8DB2C90696E00ED82BC /* YHResignDocumentManagementVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentManagementVC.swift; sourceTree = "<group>"; };
04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
04BD83402CCA1705003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "AlibabaPuHuiTi-3-95-ExtraBold.otf"; sourceTree = "<group>"; };
04BD83422CCA1BD1003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "AlibabaPuHuiTi-3-95-ExtraBold.ttf"; sourceTree = "<group>"; };
04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsCell.swift; sourceTree = "<group>"; };
......@@ -5026,6 +5030,8 @@
A5E69D4F2BA304D400411932 /* Font */ = {
isa = PBXGroup;
children = (
04BD83422CCA1BD1003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.ttf */,
04BD83402CCA1705003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.otf */,
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */,
);
path = Font;
......@@ -5234,9 +5240,11 @@
049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */,
045EEED42B9F171A0022A143 /* scoreOptionData.plist in Resources */,
A5EE42032C216C78005BBA5D /* data.json in Resources */,
04BD83432CCA1BD1003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.ttf in Resources */,
045EEED62B9F171A0022A143 /* YHQuestionList.plist in Resources */,
04EA2E722BF74FA200AE80B0 /* zixun.json in Resources */,
A5C5B2EE2B4F9B8800A7C5D1 /* Localizable.xcstrings in Resources */,
04BD83412CCA1705003A88DF /* AlibabaPuHuiTi-3-95-ExtraBold.otf in Resources */,
A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */,
A51044182B493675006B60BB /* README.md in Resources */,
A5EE42012C216C78005BBA5D /* img_0.png in Resources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignAlertView.swift
View file @ dca74673
......@@ -12,7 +12,7 @@ import AttributedString
class YHLookResignAlertView: UIView {
var dismissBlock: (() -> Void)?
var centerView: UIView!
var titleLabel: UIImageView!
var titleLabel: UILabel!
var messageLabel: UILabel!
var closeButton: UIButton!
var sureButton: UIButton!
......@@ -43,8 +43,10 @@ class YHLookResignAlertView: UIView {
}
titleLabel = {
let label = UIImageView()
label.image = UIImage(named: "look_resign_title")
let label = UILabel()
label.text = "缴费须知"
label.font = UIFont.PFSC_M(ofSize: 26)
label.textColor = UIColor.mainTextColor
return label
}()
centerView.addSubview(titleLabel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultHeadView.swift
View file @ dca74673
......@@ -11,19 +11,28 @@ import AttributedString
class YHLookResignResultHeadView: UIView {
var bgImageView: UIImageView!
var titleImageView: UIImageView!
var titleImageView: UILabel!
var messageLabel: UILabel!
var state: Int = 0 {
didSet {
for fontFamilyName in UIFont.familyNames {
print("+++++++ : \(fontFamilyName)")
// for fontName in UIFont.fontNames(forFamilyName: fontFamilyName) {
// print("Available font: \(fontName)") //使用这里的名字哦
// }
}
if state == 0 {
bgImageView.image = UIImage(named: "look_resign_result_head_one")
titleImageView.image = UIImage(named: "look_resign_result_title_one")
// titleImageView.image = UIImage(named: "look_resign_result_title_one")
titleImageView.text = "续签审核中"
} else if state == 1 {
bgImageView.image = UIImage(named: "look_resign_result_head_two")
titleImageView.image = UIImage(named: "look_resign_result_title_two")
// titleImageView.image = UIImage(named: "look_resign_result_title_two")
titleImageView.text = "续签待补件"
} else {
bgImageView.image = UIImage(named: "look_resign_result_head_three")
titleImageView.image = UIImage(named: "look_resign_result_title_three")
// titleImageView.image = UIImage(named: "look_resign_result_title_three")
titleImageView.text = "续签已获批"
}
}
}
......@@ -81,15 +90,16 @@ class YHLookResignResultHeadView: UIView {
}
titleImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "resign_upload_doc_head")
let imageView = UILabel()
imageView.font = UIFont(name: "AlimamaShuHeiTi-Bold", size: 32)
imageView.textColor = UIColor(hex: 0x001c48)
return imageView
}()
addSubview(titleImageView)
titleImageView.snp.makeConstraints { make in
make.left.equalTo(20)
make.top.equalTo(23 + k_Height_NavigationtBarAndStatuBar)
make.height.equalTo(33)
make.top.equalTo(20 + k_Height_NavigationtBarAndStatuBar)
make.height.equalTo(39)
make.width.equalTo(160)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultPrivateView.swift
View file @ dca74673
......@@ -48,7 +48,7 @@ class YHLookResignResultPrivateView: UIView {
messageLabel = {
let label = UILabel()
let a = ASAttributedString.init("已阅读并同意", .font(UIFont.PFSC_R(ofSize:13)), .foreground(UIColor.mainTextColor50))
let c = ASAttributedString.init("缴费须知", .font(UIFont.PFSC_R(ofSize:13)),.foreground(UIColor.brandMainColor), .action {
let c = ASAttributedString.init("缴费须知", .font(UIFont.PFSC_R(ofSize:13)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
// 跳转引导
self.alert()
})
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/LookResignResult(查看续签结果)/V/YHLookResignResultStateThreeTableViewCell.swift
View file @ dca74673
......@@ -77,9 +77,9 @@ class YHLookResignResultStateThreeTableViewCell: UITableViewCell {
flagLabel = {
let label = UILabel()
label.textAlignment = .center
let a = ASAttributedString.init("请查看", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
let b = ASAttributedString.init("《", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
let c = ASAttributedString.init("领取续签签证指引", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
let a = ASAttributedString.init("请查看", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
let b = ASAttributedString.init("《", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
let c = ASAttributedString.init("领取续签签证指引", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor), .underline(.single), .action {
// 跳转引导
let view = YHLookResignGuideLineView.sheetView()
view.ischeckBeforeFlag = false
......@@ -88,8 +88,8 @@ class YHLookResignResultStateThreeTableViewCell: UITableViewCell {
}
view.show()
})
let d = ASAttributedString.init(" 》", .font(UIFont.PFSC_M(ofSize:14)),.foreground(UIColor.brandMainColor))
let e = ASAttributedString.init("根据指引操作", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.mainTextColor50))
let d = ASAttributedString.init(" 》", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.brandMainColor))
let e = ASAttributedString.init("根据指引操作", .font(UIFont.PFSC_R(ofSize:14)), .foreground(UIColor.mainTextColor50))
label.attributed.text = a+b+c+d+e
return label
}()
......
galaxy/galaxy/Res/Info.plist
View file @ dca74673
......@@ -118,6 +118,7 @@
<key>UIAppFonts</key>
<array>
<string>DIN Alternate Bold</string>
<string>AlibabaPuHuiTi-3-95-ExtraBold</string>
</array>
<key>UIBackgroundModes</key>
<array>
......
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