Commit 0d38fb52 authored by Steven杜宇's avatar Steven杜宇

// 名片

parent 5e650735
...@@ -21,6 +21,11 @@ class YHFileRenameInputView: UIView { ...@@ -21,6 +21,11 @@ class YHFileRenameInputView: UIView {
var maxWordsCount = 30 var maxWordsCount = 30
var editBlock: ((String?) -> Void)? var editBlock: ((String?) -> Void)?
var dismissBlock: (() -> Void)? var dismissBlock: (() -> Void)?
var confirmBgColor: UIColor = .brandMainColor {
didSet {
confirmBtn.backgroundColor = confirmBgColor
}
}
lazy var blackMaskView: UIView = { lazy var blackMaskView: UIView = {
let view = UIView(frame: UIScreen.main.bounds) let view = UIView(frame: UIScreen.main.bounds)
......
...@@ -129,7 +129,7 @@ class YHEditHonorViewController: YHBaseViewController { ...@@ -129,7 +129,7 @@ class YHEditHonorViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) { override func backItemClick(_ sender: Any) {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -142,7 +142,7 @@ class YHEditHonorViewController: YHBaseViewController { ...@@ -142,7 +142,7 @@ class YHEditHonorViewController: YHBaseViewController {
override func navigationShouldPop() -> Bool { override func navigationShouldPop() -> Bool {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
......
...@@ -28,6 +28,7 @@ class YHEditInterestViewController: YHBaseViewController { ...@@ -28,6 +28,7 @@ class YHEditInterestViewController: YHBaseViewController {
var renameInputView: YHFileRenameInputView = { var renameInputView: YHFileRenameInputView = {
let view = YHFileRenameInputView.inputView(defalutText: "请输入自定义标签", "请输入10字以内的标签", "请输入自定义标签") let view = YHFileRenameInputView.inputView(defalutText: "请输入自定义标签", "请输入10字以内的标签", "请输入自定义标签")
view.confirmBgColor = UIColor.brandGrayColor8
return view return view
}() }()
override func viewDidLoad() { override func viewDidLoad() {
...@@ -84,7 +85,7 @@ class YHEditInterestViewController: YHBaseViewController { ...@@ -84,7 +85,7 @@ class YHEditInterestViewController: YHBaseViewController {
nextButton = { nextButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor button.backgroundColor = UIColor.brandGrayColor8
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("保存", for: .normal) button.setTitle("保存", for: .normal)
...@@ -172,7 +173,7 @@ class YHEditInterestViewController: YHBaseViewController { ...@@ -172,7 +173,7 @@ class YHEditInterestViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) { override func backItemClick(_ sender: Any) {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -185,7 +186,7 @@ class YHEditInterestViewController: YHBaseViewController { ...@@ -185,7 +186,7 @@ class YHEditInterestViewController: YHBaseViewController {
override func navigationShouldPop() -> Bool { override func navigationShouldPop() -> Bool {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -357,7 +358,7 @@ class YHEditInterestViewCell: UICollectionViewCell { ...@@ -357,7 +358,7 @@ class YHEditInterestViewCell: UICollectionViewCell {
var label = UILabel() var label = UILabel()
label.font = .PFSC_R(ofSize: 12) label.font = .PFSC_R(ofSize: 12)
label.textAlignment = .left label.textAlignment = .left
label.textColor = UIColor.mainTextColor label.textColor = UIColor.brandGrayColor8
return label return label
}() }()
...@@ -419,24 +420,26 @@ class YHEditInterestViewCell: UICollectionViewCell { ...@@ -419,24 +420,26 @@ class YHEditInterestViewCell: UICollectionViewCell {
deleteButton.isHidden = true deleteButton.isHidden = true
if dataSource.isSelect { if dataSource.isSelect {
contentView.layer.borderWidth = 1 contentView.layer.borderWidth = 1
contentView.layer.borderColor = UIColor.brandMainColor.cgColor contentView.layer.borderColor = UIColor.brandGrayColor8.cgColor
titleLabel.textColor = UIColor.brandMainColor titleLabel.font = .PFSC_M(ofSize: 12)
} else { } else {
contentView.layer.borderWidth = 0 contentView.layer.borderWidth = 0
contentView.layer.borderColor = UIColor.brandMainColor.cgColor contentView.layer.borderColor = UIColor.brandGrayColor8.cgColor
titleLabel.textColor = UIColor.mainTextColor titleLabel.font = .PFSC_R(ofSize: 12)
} }
} else { } else {
if dataSource.isSelect { if dataSource.isSelect {
contentView.layer.borderWidth = 1 contentView.layer.borderWidth = 1
contentView.layer.borderColor = UIColor.brandMainColor.cgColor contentView.layer.borderColor = UIColor.brandGrayColor8.cgColor
titleLabel.textColor = UIColor.brandMainColor
deleteButton.isHidden = true deleteButton.isHidden = true
titleLabel.font = .PFSC_M(ofSize: 12)
} else { } else {
contentView.layer.borderWidth = 0 contentView.layer.borderWidth = 0
contentView.layer.borderColor = UIColor.brandMainColor.cgColor contentView.layer.borderColor = UIColor.brandGrayColor8.cgColor
titleLabel.textColor = UIColor.mainTextColor
deleteButton.isHidden = false deleteButton.isHidden = false
titleLabel.font = .PFSC_R(ofSize: 12)
} }
} }
} }
......
...@@ -129,7 +129,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController { ...@@ -129,7 +129,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) { override func backItemClick(_ sender: Any) {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -142,7 +142,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController { ...@@ -142,7 +142,7 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
override func navigationShouldPop() -> Bool { override func navigationShouldPop() -> Bool {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
......
...@@ -91,7 +91,7 @@ class YHEditSchoolViewController: YHBaseViewController { ...@@ -91,7 +91,7 @@ class YHEditSchoolViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) { override func backItemClick(_ sender: Any) {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -104,7 +104,7 @@ class YHEditSchoolViewController: YHBaseViewController { ...@@ -104,7 +104,7 @@ class YHEditSchoolViewController: YHBaseViewController {
override func navigationShouldPop() -> Bool { override func navigationShouldPop() -> Bool {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
......
...@@ -91,7 +91,7 @@ class YHEditWorkViewController: YHBaseViewController { ...@@ -91,7 +91,7 @@ class YHEditWorkViewController: YHBaseViewController {
override func backItemClick(_ sender: Any) { override func backItemClick(_ sender: Any) {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
...@@ -104,7 +104,7 @@ class YHEditWorkViewController: YHBaseViewController { ...@@ -104,7 +104,7 @@ class YHEditWorkViewController: YHBaseViewController {
override func navigationShouldPop() -> Bool { override func navigationShouldPop() -> Bool {
if viewModel.didChange { if viewModel.didChange {
view.resignAllFirstResponders() view.resignAllFirstResponders()
YHCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) { YHGrayCommonAlertView.show("", "您尚未保存修改,确定关闭吗?", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
self.navigationController?.popViewController() self.navigationController?.popViewController()
} callBack: { } callBack: {
} }
......
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