Commit 3f406535 authored by David黄金龙's avatar David黄金龙

1、修改一处可能的bug

2、处理一处
parent 543bdf54
......@@ -107,9 +107,8 @@ extension AppDelegate: JPUSHRegisterDelegate {
NotificationCenter.default.post(name: YhConstant.YhNotification.didRequestUnreadMsgTotalCountNotification, object: nil)
// 请求消息列表通知
NotificationCenter.default.post(name: YhConstant.YhNotification.didRequestUnreadMsgListNotification, object: nil)
//for test hjl
NotificationCenter.default.post(name: YhConstant.YhNotification.didRevMsgNotifiction, object: nil)//for test hjl
//更新首页消息
NotificationCenter.default.post(name: YhConstant.YhNotification.didRevMsgNotifiction, object: nil)
}
}
......
......@@ -193,13 +193,15 @@ extension YHActivityListViewController {
self.tableView.reloadData()
self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
// DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
self.tableView.es.stopLoadingMore()
if self.viewModel.hasMoreForActivityList == false {
self.tableView.es.noticeNoMoreData()
self.tableView.footer?.alpha = 1
}
})
// })
self.tableView.reloadData()
}
}
......
......@@ -112,42 +112,33 @@ class YHHomePageViewController: YHBaseViewController {
if YHLoginManager.shared.isLogin() == false {
return
}
// DispatchQueue.global().async {
self.serviceCenterMainReqVM.getContactList {
[weak self] success, error in
guard let self = self else { return }
let isShow = self.serviceCenterMainReqVM.arrContactList.count > 0
if isShow {
self.serviceCenterMainReqVM.getContactList {
[weak self] success, error in
guard let self = self else { return }
let isShow = self.serviceCenterMainReqVM.arrContactList.count > 0
if isShow {
self.viewModel.getBasicInfoForSigner { success, error in
if success {
self.homeHeaderView.orderTipsView.dataModelForBasicInfo = self.viewModel.signerModel
} else {
}
self.viewModel.getBasicInfoForSigner { success, error in
self.viewModel.getLastTwoMessagesForSigner { success, error in
if success {
self.homeHeaderView.orderTipsView.dataModelForBasicInfo = self.viewModel.signerModel
self.homeHeaderView.orderTipsView.arrLastTwoMessage = self.viewModel.arrLastTwoMessages
self.homeHeaderView.updateSubViewsConstraints()
} else {
}
self.viewModel.getLastTwoMessagesForSigner { success, error in
if success {
self.homeHeaderView.orderTipsView.arrLastTwoMessage = self.viewModel.arrLastTwoMessages
self.homeHeaderView.updateSubViewsConstraints()
} else {
}
// DispatchQueue.main.async {
self.showOrderTipsView(isShow)
// }
}
}
} else {
// DispatchQueue.main.async {
self.showOrderTipsView(isShow)
// }
}
}
} else {
self.showOrderTipsView(isShow)
}
// }
}
}
// 是否展示订单提示视图
......@@ -164,7 +155,7 @@ class YHHomePageViewController: YHBaseViewController {
self.getData()
}
var r = CGRectZero //for test hjl
var r = CGRectZero
r.origin.y = -homeHeaderViewHeight - 81
r.origin.x = 0
r.size.width = KScreenWidth
......@@ -175,6 +166,14 @@ class YHHomePageViewController: YHBaseViewController {
homeCollectView.es.addInfiniteScrolling {
self.loadMoreData()
}
self.homeCollectView.es.stopPullToRefresh()
self.homeCollectView.es.stopLoadingMore()
if self.viewModel.hasMoreForHomeNews == false {
self.homeCollectView.es.noticeNoMoreData()
self.homeCollectView.footer?.alpha = 1
}
self.homeCollectView.reloadData()
}
}
......@@ -293,7 +292,6 @@ private extension YHHomePageViewController {
UserDefaults.standard.synchronize()
}
// DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
self.homeCollectView.es.stopPullToRefresh()
......@@ -302,17 +300,11 @@ private extension YHHomePageViewController {
self.homeCollectView.footer?.alpha = 1
}
// CATransaction.setDisableActions(true)
self.homeCollectView.reloadData()
// CATransaction.commit()
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25, execute: {
self.requestOrder()
})
// })
}
}
......
......@@ -46,6 +46,8 @@ class YHOrderTipsItemView: UIView {
func updateData() {
guard let message = message else { return }
let typeString = self.getTypeString()
lableMyOrder.text = typeString
lableName.text = message.content
......@@ -175,10 +177,9 @@ extension YHOrderTipsItemView {
make.centerY.equalToSuperview()
make.left.equalTo(12)
make.height.equalTo(18)
make.width.lessThanOrEqualTo(60)
make.width.greaterThanOrEqualTo(50)
}
addSubview(segmentationView)
segmentationView.snp.makeConstraints { make in
make.left.equalTo(lableMyOrder.snp.right).offset(8)
......
......@@ -232,6 +232,7 @@ private extension YHOrderTipsView {
firstItem.isHidden = true
secondItem.isHidden = true
}
if let first = arrLastTwoMessage?.first, let last = arrLastTwoMessage?.last {
firstItem.message = first
secondItem.message = last
......
......@@ -33,8 +33,6 @@ class YHHomePageViewModel : YHBaseViewModel {
//首页 签约用户信息
var signerModel : YHSignerInfoModel?
// var testNumber : Int = 5 //for test hjl
}
//接口
......
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