Commit 9b1f00df ilCode

情报页面iOS13部分UI适配问题

1 个父辈 b234e5a9
...@@ -9,7 +9,7 @@ import UIKit ...@@ -9,7 +9,7 @@ import UIKit
class MatchInfoCell: BaseTableViewCell { class MatchInfoCell: BaseTableViewCell {
static let reuseIdentifier = "MatchInfoCell" static let reuseIdentifier = "MatchInfoCell"
private lazy var cornerBgView: UIView = { private lazy var cornerBgView: UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = kWhite view.backgroundColor = kWhite
...@@ -38,7 +38,7 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -38,7 +38,7 @@ class MatchInfoCell: BaseTableViewCell {
private lazy var wtStackView: UIStackView = { private lazy var wtStackView: UIStackView = {
let stackView = UIStackView(arrangedSubviews: [weatherLab, temperatureLab]) let stackView = UIStackView(arrangedSubviews: [weatherLab, temperatureLab])
stackView.axis = .horizontal stackView.axis = .horizontal
stackView.alignment = .trailing stackView.alignment = .center
stackView.spacing = 15 stackView.spacing = 15
return stackView return stackView
}() }()
...@@ -53,6 +53,8 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -53,6 +53,8 @@ class MatchInfoCell: BaseTableViewCell {
lab.font = kBoldFontSize(16) lab.font = kBoldFontSize(16)
lab.textColor = kMainTitleColor lab.textColor = kMainTitleColor
lab.numberOfLines = 2 lab.numberOfLines = 2
lab.setContentHuggingPriority(.required, for: .horizontal)
lab.setContentCompressionResistancePriority(.required, for: .horizontal)
return lab return lab
}() }()
private lazy var hostInfoCountLab: UILabel = { private lazy var hostInfoCountLab: UILabel = {
...@@ -101,6 +103,8 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -101,6 +103,8 @@ class MatchInfoCell: BaseTableViewCell {
lab.textColor = kMainTitleColor lab.textColor = kMainTitleColor
lab.textAlignment = .right lab.textAlignment = .right
lab.numberOfLines = 2 lab.numberOfLines = 2
lab.setContentHuggingPriority(.required, for: .horizontal)
lab.setContentCompressionResistancePriority(.required, for: .horizontal)
return lab return lab
}() }()
private lazy var guestIcon: UIImageView = { private lazy var guestIcon: UIImageView = {
...@@ -217,18 +221,19 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -217,18 +221,19 @@ class MatchInfoCell: BaseTableViewCell {
let detailModel = model?.getJcInfoDetail() let detailModel = model?.getJcInfoDetail()
hostInfoCountLab.text = detailModel?.getHostOrGuestInfoCountStr() hostInfoCountLab.text = detailModel?.getHostOrGuestInfoCountStr()
guestInfoCountLab.text = detailModel?.getHostOrGuestInfoCountStr(isHost: false) guestInfoCountLab.text = detailModel?.getHostOrGuestInfoCountStr(isHost: false)
hostInfoLab.text = detailModel?.getOneHostOrGuestInfo() hostInfoLab.text = detailModel?.getOneHostOrGuestInfo()
midInfoLab.text = detailModel?.getOneMidInfo() midInfoLab.text = detailModel?.getOneMidInfo()
guestInfoLab.text = detailModel?.getOneHostOrGuestInfo(isHost: false) guestInfoLab.text = detailModel?.getOneHostOrGuestInfo(isHost: false)
infoCountLab.text = detailModel?.getTotalInfoCountStr() infoCountLab.text = detailModel?.getTotalInfoCountStr()
cornerBgView.snp.remakeConstraints { make in cornerBgView.snp.remakeConstraints { make in
make.left.top.equalToSuperview().offset(8) make.left.top.equalToSuperview().offset(8)
make.right.equalToSuperview().offset(-8) make.right.equalToSuperview().offset(-8)
make.bottom.equalToSuperview().offset((model?.isLast ?? false) ? -8 : 0) make.bottom.equalToSuperview().offset((model?.isLast ?? false) ? -8 : 0)
} }
gameAndNumLab.snp.makeConstraints { make in gameAndNumLab.snp.makeConstraints { make in
make.left.top.equalToSuperview().offset(10) make.left.top.equalToSuperview().offset(10)
make.height.equalTo(20) make.height.equalTo(20)
...@@ -238,6 +243,7 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -238,6 +243,7 @@ class MatchInfoCell: BaseTableViewCell {
make.right.equalToSuperview().offset(-10) make.right.equalToSuperview().offset(-10)
make.height.equalTo(20) make.height.equalTo(20)
} }
htgStackView.snp.makeConstraints { make in htgStackView.snp.makeConstraints { make in
make.top.equalTo(gameAndNumLab.snp.bottom).offset(10) make.top.equalTo(gameAndNumLab.snp.bottom).offset(10)
make.left.equalTo(gameAndNumLab) make.left.equalTo(gameAndNumLab)
...@@ -252,6 +258,7 @@ class MatchInfoCell: BaseTableViewCell { ...@@ -252,6 +258,7 @@ class MatchInfoCell: BaseTableViewCell {
guestIcon.snp.makeConstraints { make in guestIcon.snp.makeConstraints { make in
make.size.equalTo(hostIcon) make.size.equalTo(hostIcon)
} }
infoStackView.snp.makeConstraints { make in infoStackView.snp.makeConstraints { make in
make.top.equalTo(htgStackView.snp.bottom).offset(10) make.top.equalTo(htgStackView.snp.bottom).offset(10)
make.left.right.equalTo(htgStackView) make.left.right.equalTo(htgStackView)
......
...@@ -493,7 +493,7 @@ class LoginController: BaseController { ...@@ -493,7 +493,7 @@ class LoginController: BaseController {
return return
} }
AppleSignInManager().performSignIn() self.appleSignInManager.performSignIn()
} }
@objc private func guestLoginTapped() { @objc private func guestLoginTapped() {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!