Commit d0349142 authored by Steven杜宇's avatar Steven杜宇

// UI

parent a3c7843e
......@@ -11,15 +11,15 @@ import UIKit
class YHAddFriendCardCell: UITableViewCell {
static let cellReuseIdentifier = "YHAddFriendCardCell"
let secondCardColor = UIColor(hex: 0xF0F4FB)
let thirdCardColor = UIColor(hex: 0xBBBBBB, alpha: 0.1)
let secondCardColor = UIColor.brandGrayColor4
let thirdCardColor = UIColor.brandGrayColor3
var acceptBlock: ((Bool) -> Void)?
var cardCount: Int = 1 {
didSet {
var firstCardBottomMargin = 0.0
var secondCardBottomMargin = 0.0
if self.cardCount <= 1 {
} else if self.cardCount == 2 {
firstCardBottomMargin = -6.0
......@@ -282,7 +282,7 @@ class YHAddFriendCardCell: UITableViewCell {
self.secondCardView.snp.makeConstraints { make in
make.left.equalTo(self.cardView).offset(5)
make.right.equalTo(self.cardView).offset(-5)
make.height.equalTo(6)
make.height.equalTo(30)
make.bottom.equalTo(self.thirdCardView).offset(-6)
}
......@@ -290,7 +290,7 @@ class YHAddFriendCardCell: UITableViewCell {
make.left.equalTo(self.cardView).offset(10)
make.right.equalTo(self.cardView).offset(-10)
make.bottom.equalToSuperview()
make.height.equalTo(6)
make.height.equalTo(30)
}
}
......
......@@ -71,7 +71,7 @@ class YHMyFriendsCell: UITableViewCell {
lazy var lineView: UIView = {
let view = UIView()
view.backgroundColor = .separatorColor
view.backgroundColor = .brandGrayColor3
return view
}()
......
......@@ -44,7 +44,7 @@ class YHNameCardDynamicViewController: YHBaseViewController {
}()
lazy var noDataView: YHEmptyDataView = {
let view = YHEmptyDataView.createView("还未发布过动态", kEmptyOrderBgName)
let view = YHEmptyDataView.createView("还未发布过动态", kEmptyOrderBgName)
view.isHidden = true
return view
}()
......
......@@ -92,7 +92,7 @@ class YHNewNameCardViewController: YHBaseViewController {
lazy var avatarImgView: UIImageView = {
let avatarImgV = UIImageView()
avatarImgV.backgroundColor = UIColor.brandGrayColor8
// avatarImgV.backgroundColor = UIColor.brandGrayColor8
avatarImgV.layer.cornerRadius = 68.0 / 2
avatarImgV.clipsToBounds = true
return avatarImgV
......@@ -191,7 +191,7 @@ class YHNewNameCardViewController: YHBaseViewController {
let btn = UIButton(type: .custom)
btn.setTitle("发布动态", for: .normal)
btn.addTarget(self, action: #selector(publishBtnClicked), for: .touchUpInside)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor.brandGrayColor8
btn.layer.cornerRadius = 3.0
......@@ -500,7 +500,11 @@ class YHNewNameCardViewController: YHBaseViewController {
zodiacLabel.frame = CGRect(x: 0, y: 0, width: zodiacWidth + 8, height: 18)
// 昵称
var name: ASAttributedString = .init(string: self.viewModel.nameCardInfo.username, .font(UIFont.PFSC_M(ofSize: 21)), .foreground(UIColor.brandGrayColor8))
var nameText = self.viewModel.nameCardInfo.username
if self.viewModel.nameCardInfo.username.isEmpty, self.isCurrentUser {
nameText = "请填写昵称"
}
var name: ASAttributedString = .init(string: nameText, .font(UIFont.PFSC_M(ofSize: 21)), .foreground(UIColor.brandGrayColor8))
let cityTag: ASAttributedString = " \(.view(cityLabel, .original(.center)))"
let zodiacTag: ASAttributedString = " \(.view(zodiacLabel, .original(.center)))"
......@@ -522,26 +526,26 @@ class YHNewNameCardViewController: YHBaseViewController {
text1Arr.append(self.viewModel.nameCardInfo.industry)
}
if text1Arr.count > 0 {
text1 = text1Arr.joined(separator: " | ")
text1 = text1Arr.joined(separator: " · ")
}
self.professionalLabel.textColor = UIColor.brandGrayColor8
if text1.isEmpty {
if self.isCurrentUser { // 当前用户默认文案
self.professionalLabel.textColor = UIColor.mainTextColor30
text1 = "填写职位 | 填写所属行业"
self.professionalLabel.textColor = UIColor.brandGrayColor8
text1 = "职位 | 行业"
}
}
self.professionalLabel.text = text1
// 个性签名
self.signatureLabel.textColor = UIColor.brandGrayColor8
self.signatureLabel.textColor = UIColor.brandGrayColor6
var text2 = ""
if !self.viewModel.nameCardInfo.signature.isEmpty {
text2 = self.viewModel.nameCardInfo.signature
} else {
if self.isCurrentUser { // 当前用户默认文案
self.signatureLabel.textColor = UIColor.mainTextColor30
self.signatureLabel.textColor = UIColor.brandGrayColor6
text2 = "填写个性签名,展现真我风采,彰显独特身份"
}
}
......
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