Commit b84af6ea ilCode

update

1 个父辈 d2cd36a6
...@@ -111,7 +111,7 @@ class HadoopDetailGameInfoView: UIView { ...@@ -111,7 +111,7 @@ class HadoopDetailGameInfoView: UIView {
} }
gameStackView.snp.makeConstraints { make in gameStackView.snp.makeConstraints { make in
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
make.width.equalTo(80) make.width.equalTo(82)
} }
hostRankLab.snp.makeConstraints { make in hostRankLab.snp.makeConstraints { make in
make.left.equalToSuperview().offset(3) make.left.equalToSuperview().offset(3)
...@@ -137,6 +137,14 @@ class HadoopDetailGameInfoView: UIView { ...@@ -137,6 +137,14 @@ class HadoopDetailGameInfoView: UIView {
self.update(model: tmpGameInfo) self.update(model: tmpGameInfo)
}) })
.disposed(by: disposeBag) .disposed(by: disposeBag)
self.provider?.bigDataDetail
.asObservable()
.subscribe(onNext: { [weak self] tmpDetail in
guard let self = self else { return }
self.matchTimeLab.text = ScoreTools.getFormatMatchTime(time: tmpDetail?.matchTime, format: "MM/dd HH:mm")
})
.disposed(by: disposeBag)
} }
private func update(model: GameInfoModel?) { private func update(model: GameInfoModel?) {
...@@ -157,7 +165,6 @@ class HadoopDetailGameInfoView: UIView { ...@@ -157,7 +165,6 @@ class HadoopDetailGameInfoView: UIView {
self.hostRankLab.text = hostRank.isEmpty ? "" : "\(comName)\(hostRank)" self.hostRankLab.text = hostRank.isEmpty ? "" : "\(comName)\(hostRank)"
self.gameLab.text = comName self.gameLab.text = comName
self.matchTimeLab.text = ScoreTools.getFormatMatchTime(time: infoModel.matchTime, format: "MM/dd HH:mm")
self.guestBtn.setTitle(guestTeam.shortName ?? guestTeam.name ?? "", for: .normal) self.guestBtn.setTitle(guestTeam.shortName ?? guestTeam.name ?? "", for: .normal)
self.guestBtn.kf.setImage(with: URL(string: guestTeam.logo ?? ""), for: .normal, placeholder: R.image.default_team_logo()?.resize(to: resize), options: [.processor(processor)], completionHandler: { _ in self.guestBtn.kf.setImage(with: URL(string: guestTeam.logo ?? ""), for: .normal, placeholder: R.image.default_team_logo()?.resize(to: resize), options: [.processor(processor)], completionHandler: { _ in
......
...@@ -68,6 +68,7 @@ struct DetailComModel: Mappable { ...@@ -68,6 +68,7 @@ struct DetailComModel: Mappable {
struct BigDataDetailModel: Mappable { struct BigDataDetailModel: Mappable {
var hostName: String? var hostName: String?
var guestName: String? var guestName: String?
var matchTime: String?
var radarChartData: RadarChartDataModel? var radarChartData: RadarChartDataModel?
var statusAnalysis: StatusAnalysisModel? var statusAnalysis: StatusAnalysisModel?
...@@ -76,6 +77,7 @@ struct BigDataDetailModel: Mappable { ...@@ -76,6 +77,7 @@ struct BigDataDetailModel: Mappable {
mutating func mapping(map: ObjectMapper.Map) { mutating func mapping(map: ObjectMapper.Map) {
hostName <- map["home_name"] hostName <- map["home_name"]
guestName <- map["away_name"] guestName <- map["away_name"]
matchTime <- map["match_time"]
radarChartData <- map["radar_chart_data"] radarChartData <- map["radar_chart_data"]
statusAnalysis <- map["status_analysis"] statusAnalysis <- map["status_analysis"]
} }
......
...@@ -11,35 +11,6 @@ import UIKit ...@@ -11,35 +11,6 @@ import UIKit
class HadoopController: BaseController { class HadoopController: BaseController {
var provider: HadoopProvider<HadoopTarget>? var provider: HadoopProvider<HadoopTarget>?
private lazy var leftBtn: UIButton = {
let btn = UIButton()
btn.setTitle("大数据预测", for: .normal)
btn.setTitle("大数据预测", for: .selected)
btn.setTitleColor(.clear, for: .normal)
btn.setTitleColor(kMainTitleColor, for: .selected)
btn.titleLabel?.font = kBoldFontSize(16)
btn.setImage(R.image.btn_back_white(), for: .normal)
btn.setImage(R.image.btn_back_black(), for: .selected)
btn.rx.tap.subscribe(onNext: { [weak self] in
guard let self = self else { return }
self.navigationController?.popViewController(animated: true)
}).disposed(by: disposeBag)
return btn
}()
private lazy var rightLab: UILabel = {
let lab = UILabel()
lab.text = "53.24万人使用"
lab.textColor = kSubTitleColor
lab.font = kFontSize(12)
lab.textAlignment = .center
lab.sizeToFit()
lab.size = CGSize(width: lab.width + 8, height: lab.height + 8)
lab.corners(radius: lab.height/2.0)
lab.border(borderColor: kSubTitleColor)
return lab
}()
private lazy var header: HadoopHeaderView = { private lazy var header: HadoopHeaderView = {
let view = HadoopHeaderView() let view = HadoopHeaderView()
return view return view
...@@ -70,9 +41,6 @@ class HadoopController: BaseController { ...@@ -70,9 +41,6 @@ class HadoopController: BaseController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
gk_navLeftBarButtonItem = UIBarButtonItem(customView: leftBtn)
gk_navRightBarButtonItem = UIBarButtonItem(customView: rightLab)
view.addSubview(matchListView) view.addSubview(matchListView)
initProvider() initProvider()
...@@ -133,10 +101,10 @@ extension HadoopController { ...@@ -133,10 +101,10 @@ extension HadoopController {
} }
private func emptyStateDeal(isShow: Bool = true) { private func emptyStateDeal(isShow: Bool = true) {
leftBtn.isSelected = isShow gk_navTitle = isShow ? "大数据预测" : ""
rightLab.isHidden = (provider?.matchList.value.isEmpty ?? true) gk_statusBarStyle = isShow ? .darkContent : .lightContent
gk_statusBarStyle = leftBtn.isSelected ? .darkContent : .lightContent gk_navBarAlpha = isShow ? 1 : 0
gk_navBarAlpha = leftBtn.isSelected ? 1 : 0 gk_backImage = isShow ? R.image.btn_back_black() : R.image.btn_back_white()
} }
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!