Commit 6d00cc0a authored by Steven杜宇's avatar Steven杜宇

// UI更改

parent 9c7966bd
...@@ -44,9 +44,7 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -44,9 +44,7 @@ class YHMatchUserViewController: YHBaseViewController {
btn.addTarget(self, action: #selector(didMatchBtnClicked), for: .touchUpInside) btn.addTarget(self, action: #selector(didMatchBtnClicked), for: .touchUpInside)
return btn return btn
}() }()
var isBottomBtnEnabled = true
lazy var headLottieView: LottieAnimationView = { lazy var headLottieView: LottieAnimationView = {
let view = LottieAnimationView(name: "people_head") let view = LottieAnimationView(name: "people_head")
view.loopMode = .loop view.loopMode = .loop
...@@ -227,6 +225,7 @@ class YHMatchUserViewController: YHBaseViewController { ...@@ -227,6 +225,7 @@ class YHMatchUserViewController: YHBaseViewController {
self.wingLeftImgV.isHidden = false self.wingLeftImgV.isHidden = false
self.wingRightImgV.isHidden = false self.wingRightImgV.isHidden = false
self.topLabel.isHidden = false self.topLabel.isHidden = false
self.bottomBtn.isHidden = false
} }
} }
...@@ -238,12 +237,7 @@ extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate { ...@@ -238,12 +237,7 @@ extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate {
extension YHMatchUserViewController: YHMatchProtocol { extension YHMatchUserViewController: YHMatchProtocol {
func startMatchUsers() { func startMatchUsers() {
self.bottomBtn.isHidden = true
if !self.isBottomBtnEnabled {
return
}
self.isBottomBtnEnabled = false
self.headLottieView.isHidden = true self.headLottieView.isHidden = true
self.launchLottieView.isHidden = false self.launchLottieView.isHidden = false
self.topLabel.isHidden = true self.topLabel.isHidden = true
...@@ -268,7 +262,6 @@ extension YHMatchUserViewController { ...@@ -268,7 +262,6 @@ extension YHMatchUserViewController {
func requestMatchUserList() { func requestMatchUserList() {
self.viewModel.getMatchUserlist { self.viewModel.getMatchUserlist {
success, error in success, error in
self.isBottomBtnEnabled = true
if success, self.viewModel.matchUserArr.count > 0 { if success, self.viewModel.matchUserArr.count > 0 {
let vc = YHMatchResultListViewController() let vc = YHMatchResultListViewController()
vc.delegate = self vc.delegate = self
......
...@@ -106,7 +106,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -106,7 +106,7 @@ class YHNameCardInfoView: DragCardView {
let nameLabel = UILabel() let nameLabel = UILabel()
nameLabel.textAlignment = .center nameLabel.textAlignment = .center
nameLabel.textColor = UIColor.mainTextColor nameLabel.textColor = UIColor.mainTextColor
nameLabel.font = UIFont.PFSC_B(ofSize:18) nameLabel.font = UIFont.PFSC_M(ofSize:21)
return nameLabel return nameLabel
}() }()
...@@ -137,7 +137,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -137,7 +137,7 @@ class YHNameCardInfoView: DragCardView {
lazy var bottomBtn:UIButton = { lazy var bottomBtn:UIButton = {
let btn = UIButton() let btn = UIButton()
btn.backgroundColor = .brandMainColor btn.setBackgroundImage(UIImage(named: "people_exchange_btn"), for: .normal)
btn.setTitle("交换名片", for: .normal) btn.setTitle("交换名片", for: .normal)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.titleLabel?.font = .PFSC_M(ofSize: 15) btn.titleLabel?.font = .PFSC_M(ofSize: 15)
...@@ -180,7 +180,7 @@ class YHNameCardInfoView: DragCardView { ...@@ -180,7 +180,7 @@ class YHNameCardInfoView: DragCardView {
private func initUI() { private func initUI() {
self.backgroundColor = .white self.backgroundColor = .white
self.layer.cornerRadius = 3.0 self.layer.cornerRadius = 6.0
self.clipsToBounds = true self.clipsToBounds = true
} }
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Rectangle 30 Copy@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Rectangle 30 Copy@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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