Commit d82ca26bf80d0d3d762e3d90a15f3b6a655aa5f4

Authored by 张旭
1 parent 24796ab2

no message

metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift
@@ -130,7 +130,8 @@ class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController ,UITableVi @@ -130,7 +130,8 @@ class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController ,UITableVi
130 let cell = CNLiveAlbumCell() 130 let cell = CNLiveAlbumCell()
131 return cell 131 return cell
132 } 132 }
133 - cell.setupNewUIMsgModel(model: albumModel,isDetail: true) 133 + cell.isDetail = true
  134 + cell.albumMsgModel = albumModel
134 return cell 135 return cell
135 } 136 }
136 } 137 }
metaCode/Classes/Main/HomePages/View/HomePage/CNLiveHomePageDuanJuCell.swift
@@ -105,7 +105,8 @@ class CNLiveHomePageDuanJuCell:UITableViewCell,UITableViewDelegate,UITableViewDa @@ -105,7 +105,8 @@ class CNLiveHomePageDuanJuCell:UITableViewCell,UITableViewDelegate,UITableViewDa
105 let cell = CNLiveAlbumCell() 105 let cell = CNLiveAlbumCell()
106 return cell 106 return cell
107 } 107 }
108 - cell.setupNewUIMsgModel(model: model,isDetail: false) 108 + cell.isDetail = false
  109 + cell.albumMsgModel = model
109 return cell 110 return cell
110 } 111 }
111 func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { 112 func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
@@ -11,6 +11,8 @@ class CNLiveAlbumCell:UITableViewCell{ @@ -11,6 +11,8 @@ class CNLiveAlbumCell:UITableViewCell{
11 11
12 var albumModelArr:Array<CNLiveAlbumListModel>? 12 var albumModelArr:Array<CNLiveAlbumListModel>?
13 13
  14 + var isDetail:Bool = false
  15 +
14 var _albumMsgModel : CNLiveAlbumMsgModel? 16 var _albumMsgModel : CNLiveAlbumMsgModel?
15 var albumMsgModel : CNLiveAlbumMsgModel? { 17 var albumMsgModel : CNLiveAlbumMsgModel? {
16 get{ 18 get{
@@ -18,6 +20,8 @@ class CNLiveAlbumCell:UITableViewCell{ @@ -18,6 +20,8 @@ class CNLiveAlbumCell:UITableViewCell{
18 } 20 }
19 set{ 21 set{
20 _albumMsgModel = newValue! 22 _albumMsgModel = newValue!
  23 +
  24 + self.setupNewUIMsgModel(model: _albumMsgModel!, isDetail: self.isDetail)
21 } 25 }
22 } 26 }
23 27
@@ -29,6 +33,8 @@ class CNLiveAlbumCell:UITableViewCell{ @@ -29,6 +33,8 @@ class CNLiveAlbumCell:UITableViewCell{
29 } 33 }
30 set{ 34 set{
31 _albumModel = newValue! 35 _albumModel = newValue!
  36 +
  37 + self.setupNewUI(model: _albumModel!)
32 } 38 }
33 } 39 }
34 //MARK: - 懒加载 40 //MARK: - 懒加载
@@ -82,7 +88,7 @@ class CNLiveAlbumCell:UITableViewCell{ @@ -82,7 +88,7 @@ class CNLiveAlbumCell:UITableViewCell{
82 fatalError("init(coder:) has not been implemented") 88 fatalError("init(coder:) has not been implemented")
83 } 89 }
84 func setupNewUI(model:CNLiveAlbumModel){ 90 func setupNewUI(model:CNLiveAlbumModel){
85 - self.albumModel = model 91 +
86 self.titleLabl.text = model.title 92 self.titleLabl.text = model.title
87 self.subTitleLabel.text = model.subTitle 93 self.subTitleLabel.text = model.subTitle
88 self.iconImgView.kf.setImage(with: URL(string: model.poster)) 94 self.iconImgView.kf.setImage(with: URL(string: model.poster))
@@ -90,13 +96,13 @@ class CNLiveAlbumCell:UITableViewCell{ @@ -90,13 +96,13 @@ class CNLiveAlbumCell:UITableViewCell{
90 self.playBtn.left = KSreenWidth-80 96 self.playBtn.left = KSreenWidth-80
91 } 97 }
92 func setupNewUIMsgModel(model:CNLiveAlbumMsgModel,isDetail:Bool){ 98 func setupNewUIMsgModel(model:CNLiveAlbumMsgModel,isDetail:Bool){
93 - self.albumMsgModel = model 99 +
94 //在追短剧model 100 //在追短剧model
95 self.titleLabl.text = model.albumName 101 self.titleLabl.text = model.albumName
96 self.subTitleLabel.text = model.subTitle 102 self.subTitleLabel.text = model.subTitle
97 self.iconImgView.kf.setImage(with: URL(string: model.albumImg)) 103 self.iconImgView.kf.setImage(with: URL(string: model.albumImg))
98 self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30 104 self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30
99 - if isDetail{ 105 + if self.isDetail{
100 self.playBtn.left = KSreenWidth-80 106 self.playBtn.left = KSreenWidth-80
101 }else{ 107 }else{
102 self.playBtn.left = KSreenWidth-80-30 108 self.playBtn.left = KSreenWidth-80-30