Skip to content

G
galaxy-iOS
Commit 4bb93179 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

bug修复

parent 3adbc068
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 17 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 4bb93179
......@@ -21,7 +21,7 @@ class YHHomePageViewController: YHBaseViewController {
let flowLayout = YHHomeCollectionLayout()
flowLayout.minimumInteritemSpacing = 7.0
flowLayout.minimumColumnSpacing = 10.0
flowLayout.sectionInset = UIEdgeInsets(top: 0, left: 20, bottom: 20, right: 20)
flowLayout.sectionInset = UIEdgeInsets(top: 0, left: 20, bottom: 0, right: 20)
let collectinoView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
collectinoView.backgroundColor = .white
......@@ -30,7 +30,6 @@ class YHHomePageViewController: YHBaseViewController {
collectinoView.dataSource = self
collectinoView.translatesAutoresizingMaskIntoConstraints = false
collectinoView.alwaysBounceVertical = true
collectinoView.isPagingEnabled = false
return collectinoView
}()
......@@ -85,7 +84,6 @@ private extension YHHomePageViewController {
if self.viewModel.hasMoreForHomeNews == false {
homeCollectView.es.noticeNoMoreData()
}
// self.homeCollectView.reloadData()
self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
}
......@@ -95,13 +93,11 @@ private extension YHHomePageViewController {
viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
guard let self = self else { return }
homeCollectView.es.stopPullToRefresh()
if self.viewModel.hasMoreForHomeNews == false {
homeCollectView.es.noticeNoMoreData()
}
self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
// self.homeCollectView.reloadData()
}
}
......@@ -126,7 +122,7 @@ private extension YHHomePageViewController {
homeHeaderView.frame = CGRect(x: 20, y: -YHHomeHeadView.viewH, width: KScreenWidth - 40, height: YHHomeHeadView.viewH)
homeCollectView.addSubview(homeHeaderView)
homeCollectView.contentInset = UIEdgeInsets(top: YHHomeHeadView.viewH, left: 0, bottom: 20, right: 0)
homeCollectView.contentInset = UIEdgeInsets(top: YHHomeHeadView.viewH, left: 0, bottom: 0, right: 0)
let tmpHeadView = homeCollectView.es.addPullToRefresh {
self.loadFirstData()
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ 4bb93179
......@@ -67,7 +67,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
guard let self = self else { return }
if success {
operationFlag = true
YHHUD.flash(message: "已点赞")
self.getData()
} else {
operationFlag = false
......@@ -78,7 +77,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
guard let self = self else { return }
if success {
operationFlag = true
YHHUD.flash(message: "已取消点赞")
self.getData()
} else {
operationFlag = false
......@@ -100,7 +98,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
guard let self = self else { return }
if success {
operationFlag = true
YHHUD.flash(message: "已收藏")
YHHUD.flash(message: "已加入收藏")
self.getData()
} else {
operationFlag = false
......@@ -111,7 +109,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
guard let self = self else { return }
if success {
operationFlag = true
YHHUD.flash(message: "已取消收藏")
self.getData()
} else {
operationFlag = false
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeWebBottomView.swift
View file @ 4bb93179
......@@ -56,7 +56,7 @@ class YHHomeWebBottomView: UIView {
}()
addSubview(likeButton)
likeButton.snp.makeConstraints { make in
make.right.equalTo(-31)
make.right.equalTo(-79)
make.top.equalTo(10)
make.height.equalTo(39)
make.width.equalTo(24)
......@@ -70,7 +70,7 @@ class YHHomeWebBottomView: UIView {
}()
addSubview(starButton)
starButton.snp.makeConstraints { make in
make.right.equalTo(-79)
make.right.equalTo(-31)
make.top.equalTo(10)
make.height.equalTo(39)
make.width.equalTo(24)
......
galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMyLikeViewModel.swift
View file @ 4bb93179
......@@ -32,7 +32,6 @@ extension YHMyLikeViewModel {
params = ["page": curPageIndex + 1,
"page_size": page_Size,
"operate_type": type]
curPageIndex = curPageIndex + 1
}
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.user
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
......@@ -55,10 +54,11 @@ extension YHMyLikeViewModel {
self.arrHomeNewsData = result.data
} else {
self.arrHomeNewsData?.append(contentsOf: result.data)
curPageIndex = curPageIndex + 1
}
if let count = self.arrHomeNewsData?.count {
if count == self.totalCount {
if count >= self.totalCount {
self.hasMoreForHomeNews = false
} else {
self.hasMoreForHomeNews = true
......@@ -87,7 +87,6 @@ extension YHMyLikeViewModel {
} else {
params = ["page": curPageIndex + 1,
"page_size": page_Size]
curPageIndex = curPageIndex + 1
}
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.userLook
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
......@@ -110,10 +109,11 @@ extension YHMyLikeViewModel {
self.arrHomeNewsData = result.data
} else {
self.arrHomeNewsData?.append(contentsOf: result.data)
curPageIndex = curPageIndex + 1
}
if let count = self.arrHomeNewsData?.count {
if count == self.totalCount {
if count >= self.totalCount {
self.hasMoreForHomeNews = false
} else {
self.hasMoreForHomeNews = true
......
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