Commit 22a37a6e authored by David黄金龙's avatar David黄金龙

1、删除不使用的代码

2、处理首页没有
parent 5e584b57
...@@ -98,13 +98,7 @@ private extension YHHomePageViewController { ...@@ -98,13 +98,7 @@ private extension YHHomePageViewController {
if self.viewModel.hasMoreForHomeNews == false { if self.viewModel.hasMoreForHomeNews == false {
homeCollectView.es.noticeNoMoreData() homeCollectView.es.noticeNoMoreData()
} }
self.homeCollectView.reloadData() self.homeCollectView.reloadData()
// DispatchQueue.main.asyncAfter(deadline: .now() + 3, execute:{
// printLog(YHHomeHeadView.viewH)
// printLog(self.homeCollectView.contentOffset)
// })
} }
} }
...@@ -112,8 +106,6 @@ private extension YHHomePageViewController { ...@@ -112,8 +106,6 @@ private extension YHHomePageViewController {
gk_navigationBar.isHidden = true gk_navigationBar.isHidden = true
view.backgroundColor = .white view.backgroundColor = .white
// NotificationCenter.default.addObserver(self, selector: #selector(homepageRefresh), name:YhConstant.YhNotification.refreshHomePageNotifiction, object: nil)
view.addSubview(searchView) view.addSubview(searchView)
searchView.snp.makeConstraints { make in searchView.snp.makeConstraints { make in
make.top.equalTo(k_Height_safeAreaInsetsTop() + 6) make.top.equalTo(k_Height_safeAreaInsetsTop() + 6)
......
...@@ -16,4 +16,16 @@ class YHBannerModel: YHBaseModel { ...@@ -16,4 +16,16 @@ class YHBannerModel: YHBaseModel {
var create_at: String = "" var create_at: String = ""
var skip_type: Int = 0 var skip_type: Int = 0
var id: Int = 0 var id: Int = 0
//是否为本地
var isLocalItemFlag : Bool = false
//
static func localDefaultItem() -> YHBannerModel {
let model = YHBannerModel()
model.isLocalItemFlag = true
model.img_url = "home_banner_default_icon"
model.type = 0
return model
}
} }
...@@ -75,9 +75,20 @@ private extension YHHomeBannerCollectionViewCell { ...@@ -75,9 +75,20 @@ private extension YHHomeBannerCollectionViewCell {
func updateUI() { func updateUI() {
guard let model = dataModel else { return } guard let model = dataModel else { return }
if let url = URL(string: model.img_url) {
bannerImagV.kf.setImage(with: url) if model.isLocalItemFlag {
bannerTitleLable.isHidden = true
effectV.isHidden = true
bannerImagV.image = UIImage(named: model.img_url)
} else {
bannerTitleLable.isHidden = false
effectV.isHidden = false
if let url = URL(string: model.img_url) {
bannerImagV.kf.setImage(with: url)
}
bannerTitleLable.text = model.name
} }
bannerTitleLable.text = model.name
} }
} }
...@@ -106,6 +106,9 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -106,6 +106,9 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
return return
} }
let model = dataArr[index] let model = dataArr[index]
if model.isLocalItemFlag {
return
}
if model.skip_url.isEmpty == false { if model.skip_url.isEmpty == false {
switch model.skip_type { switch model.skip_type {
case 1: //跳转H5 case 1: //跳转H5
......
...@@ -114,23 +114,41 @@ extension YHHomePageViewModel { ...@@ -114,23 +114,41 @@ extension YHHomePageViewModel {
if json.code == 200 { if json.code == 200 {
let dic = json.data let dic = json.data
guard let result = [YHBannerModel].deserialize(from: dic as? [Any]) else { guard let result = [YHBannerModel].deserialize(from: dic as? [Any]) else {
let model = YHBannerModel.localDefaultItem()
self.banners?.removeAll()
self.banners = [model]
callBackBlock(false,nil) callBackBlock(false,nil)
return return
} }
var arrData = result as? [YHBannerModel] var arrData = result as? [YHBannerModel]
if let arr = arrData,arr.count > 6 { if let arr = arrData {
arrData = Array(arrData?[0...5] ?? []) if arr.isEmpty {
let model = YHBannerModel.localDefaultItem()
arrData = [model]
} else if arr.count > 6 {
arrData = Array(arrData?[0...5] ?? [])
}
} }
self.banners = arrData self.banners = arrData
callBackBlock(true, nil) callBackBlock(true, nil)
} else { } else {
let model = YHBannerModel.localDefaultItem()
self.banners?.removeAll()
self.banners = [model]
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg) let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error) callBackBlock(false, error)
} }
} failBlock: { err in } failBlock: { err in
let model = YHBannerModel.localDefaultItem()
self.banners?.removeAll()
self.banners = [model]
callBackBlock(false,err) callBackBlock(false,err)
} }
} }
......
...@@ -143,6 +143,11 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -143,6 +143,11 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
return return
} }
let model = dataArr[index] let model = dataArr[index]
if model.isLocalItemFlag {
return
}
if model.skip_url.isEmpty == false { if model.skip_url.isEmpty == false {
switch model.skip_type { switch model.skip_type {
case 1: //跳转H5 case 1: //跳转H5
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@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