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

// UI更改

parent 71f6f6b4
...@@ -24,6 +24,16 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -24,6 +24,16 @@ class YHMatchUserViewController: YHBaseViewController {
return label return label
}() }()
lazy var wingLeftImgV: UIImageView = {
let view = UIImageView(image: UIImage(named: "people_match_wing_left"))
return view
}()
lazy var wingRightImgV: UIImageView = {
let view = UIImageView(image: UIImage(named: "people_match_wing_right"))
return view
}()
lazy var bottomBtn:UIButton = { lazy var bottomBtn:UIButton = {
let btn = UIButton() let btn = UIButton()
btn.backgroundColor = .brandMainColor btn.backgroundColor = .brandMainColor
...@@ -118,11 +128,8 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -118,11 +128,8 @@ class YHMatchUserViewController: YHBaseViewController {
func createUI() { func createUI() {
let wingLeftImgV = UIImageView(image: UIImage(named: "people_match_wing_left")) self.view.addSubview(self.wingLeftImgV)
self.view.addSubview(wingLeftImgV) self.view.addSubview(self.wingRightImgV)
let wingRightImgV = UIImageView(image: UIImage(named: "people_match_wing_right"))
self.view.addSubview(wingRightImgV)
self.view.addSubview(topLabel) self.view.addSubview(topLabel)
self.view.addSubview(firstImageView) self.view.addSubview(firstImageView)
...@@ -173,12 +180,12 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -173,12 +180,12 @@ class YHMatchUserViewController: YHBaseViewController {
make.top.equalTo(self.bottomBtn.snp.bottom).offset(12) make.top.equalTo(self.bottomBtn.snp.bottom).offset(12)
} }
wingLeftImgV.snp.makeConstraints { make in self.wingLeftImgV.snp.makeConstraints { make in
make.width.height.equalTo(19) make.width.height.equalTo(19)
make.right.equalTo(self.topLabel.snp.left) make.right.equalTo(self.topLabel.snp.left)
make.centerY.equalTo(self.topLabel) make.centerY.equalTo(self.topLabel)
} }
wingRightImgV.snp.makeConstraints { make in self.wingRightImgV.snp.makeConstraints { make in
make.width.height.equalTo(19) make.width.height.equalTo(19)
make.left.equalTo(self.topLabel.snp.right) make.left.equalTo(self.topLabel.snp.right)
make.centerY.equalTo(self.topLabel) make.centerY.equalTo(self.topLabel)
...@@ -217,6 +224,9 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -217,6 +224,9 @@ class YHMatchUserViewController: YHBaseViewController {
self.headLottieView.isHidden = false self.headLottieView.isHidden = false
self.launchLottieView.isHidden = false self.launchLottieView.isHidden = false
self.rotateLottieView.isHidden = true self.rotateLottieView.isHidden = true
self.wingLeftImgV.isHidden = false
self.wingRightImgV.isHidden = false
self.topLabel.isHidden = false
} }
} }
...@@ -236,6 +246,9 @@ extension YHMatchUserViewController: YHMatchProtocol { ...@@ -236,6 +246,9 @@ extension YHMatchUserViewController: YHMatchProtocol {
self.isBottomBtnEnabled = false self.isBottomBtnEnabled = false
self.headLottieView.isHidden = true self.headLottieView.isHidden = true
self.launchLottieView.isHidden = false self.launchLottieView.isHidden = false
self.topLabel.isHidden = true
self.wingLeftImgV.isHidden = true
self.wingRightImgV.isHidden = true
self.launchLottieView.loopMode = .playOnce self.launchLottieView.loopMode = .playOnce
self.launchLottieView.play { self.launchLottieView.play {
[weak self] completed in [weak self] completed in
......
...@@ -17,7 +17,7 @@ class YHInterestTopicLayout: UICollectionViewFlowLayout { ...@@ -17,7 +17,7 @@ class YHInterestTopicLayout: UICollectionViewFlowLayout {
override func prepare() { override func prepare() {
super.prepare() super.prepare()
self.minimumInteritemSpacing = 12 self.minimumInteritemSpacing = 12
self.minimumLineSpacing = 8 self.minimumLineSpacing = 12
} }
override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? { override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
......
...@@ -32,8 +32,7 @@ class YHTopicItemCell: UICollectionViewCell { ...@@ -32,8 +32,7 @@ class YHTopicItemCell: UICollectionViewCell {
func setupUI() { func setupUI() {
contentView.layer.cornerRadius = 3.0 contentView.layer.cornerRadius = 3.0
contentView.layer.borderColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.3).cgColor contentView.backgroundColor = UIColor.init(hex: 0xF8F8F8)
contentView.layer.borderWidth = 1.0
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in titleLabel.snp.makeConstraints { make in
......
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