Commit db6daf53 authored by pete谢兆麟's avatar pete谢兆麟

UI 走查

parent 118a2587
...@@ -249,7 +249,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell { ...@@ -249,7 +249,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
titleLabel.snp.makeConstraints { make in titleLabel.snp.makeConstraints { make in
make.left.equalTo(centerImageView.snp.right).offset(12) make.left.equalTo(centerImageView.snp.right).offset(12)
make.right.equalToSuperview() make.right.equalToSuperview()
make.top.equalTo(centerImageView.snp.top) make.top.equalTo(centerImageView.snp.top).offset(12)
make.height.equalTo(22) make.height.equalTo(22)
} }
...@@ -296,7 +296,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell { ...@@ -296,7 +296,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
timelabel.snp.makeConstraints { make in timelabel.snp.makeConstraints { make in
make.left.equalTo(centerImageView.snp.right).offset(12) make.left.equalTo(centerImageView.snp.right).offset(12)
make.right.equalTo(-20) make.right.equalTo(-20)
make.top.equalTo(centerImageView.snp.top).offset(26) make.top.equalTo(centerImageView.snp.top).offset(36)
make.height.equalTo(18) make.height.equalTo(18)
} }
......
...@@ -67,7 +67,7 @@ extension YHGCInformationFillTipsCell { ...@@ -67,7 +67,7 @@ extension YHGCInformationFillTipsCell {
lable1.numberOfLines = 0 lable1.numberOfLines = 0
lable1.lineBreakMode = .byWordWrapping lable1.lineBreakMode = .byWordWrapping
let a: ASAttributedString = .init(" 1. 如您填写途中想离开系统,可以点击下方的", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor)) let a: ASAttributedString = .init(" 1. 如您填写途中想离开系统,可以点击下方的", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init("保存", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.brandMainColor)) let b: ASAttributedString = .init("保存", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.brandMainColor))
let c: ASAttributedString = .init(",在您有空闲的时间再继续进行填写;", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor)) let c: ASAttributedString = .init(",在您有空闲的时间再继续进行填写;", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
lable1.attributed.text = a + b + c lable1.attributed.text = a + b + c
...@@ -84,7 +84,7 @@ extension YHGCInformationFillTipsCell { ...@@ -84,7 +84,7 @@ extension YHGCInformationFillTipsCell {
lable2.lineBreakMode = .byWordWrapping lable2.lineBreakMode = .byWordWrapping
let aa: ASAttributedString = .init(" 2. 此次填写将花费您", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor)) let aa: ASAttributedString = .init(" 2. 此次填写将花费您", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("15-30分钟", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.brandMainColor)) let bb: ASAttributedString = .init("15-30分钟", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.brandMainColor))
let cc: ASAttributedString = .init(",我们将根据您所填写的信息,配置详细资料清单,一起为香港身份起航吧~", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor)) let cc: ASAttributedString = .init(",我们将根据您所填写的信息,配置详细资料清单,一起为香港身份起航吧~", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
lable2.attributed.text = aa + bb + cc lable2.attributed.text = aa + bb + cc
...@@ -237,7 +237,7 @@ extension YHGCInformationFillTipsCell { ...@@ -237,7 +237,7 @@ extension YHGCInformationFillTipsCell {
lable9.textColor = UIColor.mainTextColor lable9.textColor = UIColor.mainTextColor
let aaa: ASAttributedString = .init("申请过程中有任何疑问,请随时", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor)) let aaa: ASAttributedString = .init("申请过程中有任何疑问,请随时", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
let bbb: ASAttributedString = .init("联系您的专业文案老师", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor)) let bbb: ASAttributedString = .init("联系您的专业文案老师", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.brandMainColor))
let ccc: ASAttributedString = .init("为您解答护航。", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor)) let ccc: ASAttributedString = .init("为您解答护航。", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
lable9.attributed.text = aaa + bbb + ccc lable9.attributed.text = aaa + bbb + ccc
let imageV44 = UIImageView() let imageV44 = UIImageView()
......
...@@ -103,7 +103,7 @@ class YHInfoConsentForHKTravelCell: YHResignDocumentCell { ...@@ -103,7 +103,7 @@ class YHInfoConsentForHKTravelCell: YHResignDocumentCell {
} }
func setupCellInfo(title: String, detail: ASAttributedString, question: String, showBottomLine: Bool = false, needShowFailButton: Bool) { func setupCellInfo(title: String, detail: ASAttributedString, question: String, showBottomLine: Bool = false, needShowFailButton: Bool) {
bottomLineView.isHidden = !showBottomLine bottomLineView.isHidden = false
infoTitleLabel.text = title infoTitleLabel.text = title
infoDetailLabel.attributed.text = detail infoDetailLabel.attributed.text = detail
infoQuestionLabel.text = question infoQuestionLabel.text = question
...@@ -161,7 +161,7 @@ extension YHInfoConsentForHKTravelCell { ...@@ -161,7 +161,7 @@ extension YHInfoConsentForHKTravelCell {
} }
private func setupUI() { private func setupUI() {
updateCellCorner(.single) updateCellCorner(.top)
subContainerView.addSubview(infoTitleLabel) subContainerView.addSubview(infoTitleLabel)
subContainerView.addSubview(infoDetailLabel) subContainerView.addSubview(infoDetailLabel)
subContainerView.addSubview(topLineView) subContainerView.addSubview(topLineView)
...@@ -228,7 +228,7 @@ extension YHInfoConsentForHKTravelCell { ...@@ -228,7 +228,7 @@ extension YHInfoConsentForHKTravelCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(0.5) make.height.equalTo(1)
} }
infoFailLabel.snp.makeConstraints { make in infoFailLabel.snp.makeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
......
...@@ -37,7 +37,7 @@ class YHTotalIncomeCell: YHResignDocumentCell { ...@@ -37,7 +37,7 @@ class YHTotalIncomeCell: YHResignDocumentCell {
lazy var infoButton: UIButton = { lazy var infoButton: UIButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.setImage(UIImage(named: "other_info_warning"), for: .normal) button.setImage(UIImage(named: "gc_other_info_warning"), for: .normal)
button.addTarget(self, action: #selector(infoButtonDidClick(_:)), for: .touchUpInside) button.addTarget(self, action: #selector(infoButtonDidClick(_:)), for: .touchUpInside)
let padding: CGFloat = 4 let padding: CGFloat = 4
button.contentEdgeInsets = UIEdgeInsets(top: padding, button.contentEdgeInsets = UIEdgeInsets(top: padding,
...@@ -79,8 +79,8 @@ extension YHTotalIncomeCell { ...@@ -79,8 +79,8 @@ extension YHTotalIncomeCell {
infoDetailLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) infoDetailLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
topLineView.snp.makeConstraints { make in topLineView.snp.makeConstraints { make in
make.left.equalToSuperview() make.left.equalToSuperview().offset(18)
make.right.equalToSuperview() make.right.equalToSuperview().offset(-18)
make.height.equalTo(0.5) make.height.equalTo(0.5)
make.top.equalToSuperview() make.top.equalToSuperview()
} }
......
...@@ -55,7 +55,7 @@ class YHCompanySelectViewController: YHBaseViewController { ...@@ -55,7 +55,7 @@ class YHCompanySelectViewController: YHBaseViewController {
searchBar.font = UIFont.PFSC_R(ofSize: 14) searchBar.font = UIFont.PFSC_R(ofSize: 14)
searchBar.keyboardType = .default searchBar.keyboardType = .default
searchBar.delegate = self searchBar.delegate = self
searchBar.layer.cornerRadius = 20.5 searchBar.layer.cornerRadius = 3
searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42)) searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42))
searchBar.leftViewMode = .always searchBar.leftViewMode = .always
searchBar.clearButtonMode = .always searchBar.clearButtonMode = .always
...@@ -77,7 +77,7 @@ class YHCompanySelectViewController: YHBaseViewController { ...@@ -77,7 +77,7 @@ class YHCompanySelectViewController: YHBaseViewController {
button.setTitle("确认", for: .normal) button.setTitle("确认", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = 16.5 button.layer.cornerRadius = 3
button.addTarget(self, action: #selector(submit), for: .touchUpInside) button.addTarget(self, action: #selector(submit), for: .touchUpInside)
return button return button
}() }()
......
...@@ -89,7 +89,7 @@ extension YHGCVisaProgramPopVC { ...@@ -89,7 +89,7 @@ extension YHGCVisaProgramPopVC {
view.addSubview(subContainerView) view.addSubview(subContainerView)
subContainerView.addSubview(infoMarkLabel) subContainerView.addSubview(infoMarkLabel)
let ratio = 143.0 / 375.0 let ratio = 124.0 / 375.0
topProgramIcon.snp.makeConstraints { make in topProgramIcon.snp.makeConstraints { make in
make.top.left.right.equalToSuperview() make.top.left.right.equalToSuperview()
make.height.equalTo(topProgramIcon.snp.width).multipliedBy(ratio) make.height.equalTo(topProgramIcon.snp.width).multipliedBy(ratio)
......
...@@ -19,7 +19,7 @@ class YHGCApplicationTypeSelectCell: UITableViewCell { ...@@ -19,7 +19,7 @@ class YHGCApplicationTypeSelectCell: UITableViewCell {
return return
} }
selectIconView.image = isCurrentSelected ? UIImage(named: "gc_application_type_selected"): UIImage(named: "gc_application_type_unselected") selectIconView.image = isCurrentSelected ? UIImage(named: "gc_application_type_selected"): UIImage(named: "gc_application_type_unselected")
subContainerView.lineWidth = isCurrentSelected ? 1 : nil subContainerView.lineWidth = isCurrentSelected ? 2 : nil
subContainerView.lineColor = isCurrentSelected ? selectedBorderColor.cgColor : nil subContainerView.lineColor = isCurrentSelected ? selectedBorderColor.cgColor : nil
} }
} }
......
...@@ -17,6 +17,12 @@ class YHLiveAppointmentViewController: YHBaseViewController { ...@@ -17,6 +17,12 @@ class YHLiveAppointmentViewController: YHBaseViewController {
view.contentMode = .scaleAspectFit view.contentMode = .scaleAspectFit
return view return view
}() }()
private lazy var topbgImageView: UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "global_default_image_bg")
return view
}()
private lazy var centerContainerView: YHBaseDynamicCornerRadiusView = { private lazy var centerContainerView: YHBaseDynamicCornerRadiusView = {
let view = YHBaseDynamicCornerRadiusView(cornerRadius: 6, corner: .allCorners) let view = YHBaseDynamicCornerRadiusView(cornerRadius: 6, corner: .allCorners)
...@@ -117,6 +123,7 @@ class YHLiveAppointmentViewController: YHBaseViewController { ...@@ -117,6 +123,7 @@ class YHLiveAppointmentViewController: YHBaseViewController {
view.backgroundColor = UIColor.contentBkgColor view.backgroundColor = UIColor.contentBkgColor
view.addSubview(topImageView) view.addSubview(topImageView)
topImageView.addSubview(topbgImageView)
view.addSubview(centerContainerView) view.addSubview(centerContainerView)
centerContainerView.addSubview(flagLabel) centerContainerView.addSubview(flagLabel)
centerContainerView.addSubview(liveNameLabel) centerContainerView.addSubview(liveNameLabel)
...@@ -131,6 +138,10 @@ class YHLiveAppointmentViewController: YHBaseViewController { ...@@ -131,6 +138,10 @@ class YHLiveAppointmentViewController: YHBaseViewController {
make.top.equalTo(k_Height_NavigationtBarAndStatuBar) make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.width.equalTo(topImageView.snp.height) make.width.equalTo(topImageView.snp.height)
} }
topbgImageView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(100)
}
centerContainerView.snp.makeConstraints { make in centerContainerView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(16) make.left.equalToSuperview().offset(16)
make.right.equalToSuperview().offset(-16) make.right.equalToSuperview().offset(-16)
......
...@@ -109,7 +109,7 @@ class YHLiveStateViewController: YHBaseViewController { ...@@ -109,7 +109,7 @@ class YHLiveStateViewController: YHBaseViewController {
}() }()
view.addSubview(closeButton) view.addSubview(closeButton)
closeButton.snp.makeConstraints { make in closeButton.snp.makeConstraints { make in
make.right.equalTo(-10) make.right.equalTo(-16)
make.top.equalTo(10 + k_Height_statusBar()) make.top.equalTo(10 + k_Height_statusBar())
make.width.height.equalTo(24) make.width.height.equalTo(24)
} }
...@@ -122,7 +122,7 @@ class YHLiveStateViewController: YHBaseViewController { ...@@ -122,7 +122,7 @@ class YHLiveStateViewController: YHBaseViewController {
}() }()
view.addSubview(shareButton) view.addSubview(shareButton)
shareButton.snp.makeConstraints { make in shareButton.snp.makeConstraints { make in
make.right.equalTo(-56) make.right.equalTo(-62)
make.top.equalTo(10 + k_Height_statusBar()) make.top.equalTo(10 + k_Height_statusBar())
make.width.height.equalTo(24) make.width.height.equalTo(24)
} }
...@@ -167,14 +167,14 @@ class YHLiveStateViewController: YHBaseViewController { ...@@ -167,14 +167,14 @@ class YHLiveStateViewController: YHBaseViewController {
lineView.snp.makeConstraints { make in lineView.snp.makeConstraints { make in
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
make.top.equalTo(loginTitleLabel.snp.bottom).offset(23) make.top.equalTo(loginTitleLabel.snp.bottom).offset(23)
make.height.equalTo(1) make.height.equalTo(0.5)
make.width.equalTo(186) make.width.equalTo(186)
} }
loginSubTitleLabel = { loginSubTitleLabel = {
let label = UILabel() let label = UILabel()
label.text = "直播暂未开始" label.text = "直播暂未开始"
label.font = UIFont.PFSC_R(ofSize: 17) label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.white label.textColor = UIColor.white
label.textAlignment = .center label.textAlignment = .center
return label return label
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "global_default_image_bg@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "global_default_image_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "gc_other_info_warning@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "gc_other_info_warning@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "gc_visa_program_a@2x.png", "filename" : "弹窗背景图-A类@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "gc_visa_program_a@3x.png", "filename" : "弹窗背景图-A类@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "gc_visa_program_b@2x.png", "filename" : "弹窗背景图-B类@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "gc_visa_program_b@3x.png", "filename" : "弹窗背景图-B类@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "gc_visa_program_c@2x.png", "filename" : "弹窗背景图-C类@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "gc_visa_program_c@3x.png", "filename" : "弹窗背景图-C类@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
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