Commit 2d841f76 authored by Steven杜宇's avatar Steven杜宇

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

parents 3ce58cfc 8d00dd50
...@@ -59,18 +59,18 @@ class YHGrayCommonAlertView: UIView { ...@@ -59,18 +59,18 @@ class YHGrayCommonAlertView: UIView {
make.left.equalTo(22) make.left.equalTo(22)
make.right.equalTo(-22) make.right.equalTo(-22)
make.height.greaterThanOrEqualTo(21) make.height.greaterThanOrEqualTo(21)
make.top.equalTo(37) make.top.equalTo(32)
make.bottom.equalTo(disAgressButton.snp.top).offset(-20) make.bottom.equalTo(disAgressButton.snp.top).offset(-20)
} }
} else { } else {
lineView.isHidden = false lineView.isHidden = true
messageLabel.snp.remakeConstraints { make in messageLabel.snp.remakeConstraints { make in
make.left.equalTo(22) make.left.equalTo(22)
make.right.equalTo(-22) make.right.equalTo(-22)
make.height.greaterThanOrEqualTo(21) make.height.greaterThanOrEqualTo(21)
make.top.equalTo(lineView.snp.bottom).offset(21) make.top.equalTo(titleLabel.snp.bottom).offset(8)
make.bottom.equalTo(disAgressButton.snp.top).offset(-20) make.bottom.equalTo(disAgressButton.snp.top).offset(-20)
} }
} }
...@@ -147,12 +147,12 @@ class YHGrayCommonAlertView: UIView { ...@@ -147,12 +147,12 @@ class YHGrayCommonAlertView: UIView {
make.left.equalTo(22) make.left.equalTo(22)
make.right.equalTo(-22) make.right.equalTo(-22)
make.height.equalTo(20) make.height.equalTo(20)
make.top.equalTo(16) make.top.equalTo(32)
} }
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.textColor = UIColor.mainTextColor label.textColor = UIColor.brandGrayColor7
label.font = UIFont.PFSC_R(ofSize: 16) label.font = UIFont.PFSC_R(ofSize: 16)
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
...@@ -163,7 +163,7 @@ class YHGrayCommonAlertView: UIView { ...@@ -163,7 +163,7 @@ class YHGrayCommonAlertView: UIView {
make.left.equalTo(22) make.left.equalTo(22)
make.right.equalTo(-22) make.right.equalTo(-22)
make.height.equalTo(42) make.height.equalTo(42)
make.top.equalTo(63) make.top.equalTo(65)
} }
disAgressButton = { disAgressButton = {
...@@ -206,6 +206,7 @@ class YHGrayCommonAlertView: UIView { ...@@ -206,6 +206,7 @@ class YHGrayCommonAlertView: UIView {
lineView = { lineView = {
let line = UIView() let line = UIView()
line.isHidden = true
line.backgroundColor = UIColor.separatorColor line.backgroundColor = UIColor.separatorColor
return line return line
}() }()
......
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