Commit 7233a776 authored by Steven杜宇's avatar Steven杜宇

// 动态

parent 5b0ffb9f
......@@ -32,10 +32,12 @@ class YHMyNewViewController: YHBaseViewController {
let likeViewModel: YHMyLikeViewModel = YHMyLikeViewModel()
let msgViewModel: YHMsgViewModel = YHMsgViewModel()
let friendViewModel = YHMatchUserViewModel()
let loginViewModel = YHLoginViewModel()
let userViewModel = YHMatchUserViewModel()
var functionGroupArr: [YHFunctionGroupInfo] = []
var isShowVipMemberHeader: Bool = false
var unreadFriendCount: Int = 0
private lazy var princleVM: YHPrincleViewModel = {
let vm = YHPrincleViewModel()
......@@ -218,6 +220,7 @@ class YHMyNewViewController: YHBaseViewController {
requstUserBasicInfo()
requestMemberInfo()
checkVipMemberShowLogic()
requestFriendRequest()
showAlert()
}
......@@ -434,6 +437,7 @@ extension YHMyNewViewController {
checkSettingRedPoint()
requstUserBasicInfo()
requestMemberInfo()
requestFriendRequest()
}
func requstUserBasicInfo() {
......@@ -501,6 +505,34 @@ extension YHMyNewViewController {
}
}
func requestFriendRequest() {
if YHLoginManager.shared.isLogin() {
self.friendViewModel.getMyFriendList { _, _ in
self.unreadFriendCount = self.friendViewModel.friendListModel.applyFriends.count
for group in self.functionGroupArr {
for item in group.arr {
if item.type == .myFriend {
item.isShowRedPoint = self.unreadFriendCount > 0
break
}
}
}
self.tableView .reloadData()
}
} else {
self.unreadFriendCount = 0
for group in self.functionGroupArr {
for item in group.arr {
if item.type == .myFriend {
item.isShowRedPoint = self.unreadFriendCount > 0
break
}
}
}
self.tableView .reloadData()
}
}
// 请求未读消息总数
func getTotalUnreadMsgCount() {
if YHLoginManager.shared.isLogin() {
......
......@@ -83,7 +83,7 @@ class YHNameCardDynamicViewController: YHBaseViewController {
self.tableView.reloadData()
self.tableView.es.stopLoadingMore()
self.tableView.es.stopPullToRefresh()
if !self.viewModel.hasMore {
if !self.viewModel.hasMore, self.arr.count > 0 {
self.tableView.es.noticeNoMoreData()
}
}
......
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