Commit 29c71b0d authored by Steven杜宇's avatar Steven杜宇

vip

parent bd674b0f
...@@ -367,7 +367,12 @@ extension YHMyNewViewController { ...@@ -367,7 +367,12 @@ extension YHMyNewViewController {
func updateUserUI() { func updateUserUI() {
if YHLoginManager.shared.isLogin() { if YHLoginManager.shared.isLogin() {
userInfoView.userNameLabel.text = YHLoginManager.shared.userModel?.nickname ?? "Hi, 银河用户".local let name = self.userViewModel.nameCardInfo.username
if name.isEmpty {
userInfoView.userNameLabel.text = "Hi, 银河用户".local
} else {
userInfoView.userNameLabel.text = name
}
} else { } else {
userInfoView.userNameLabel.text = "登录/注册" userInfoView.userNameLabel.text = "登录/注册"
...@@ -387,10 +392,10 @@ extension YHMyNewViewController { ...@@ -387,10 +392,10 @@ extension YHMyNewViewController {
self.loginViewModel.getUserId { self.loginViewModel.getUserId {
[weak self] uid in [weak self] uid in
guard let self = self else { return } guard let self = self else { return }
requestUserAvatar() requestUserInfo()
} }
} else { } else {
requestUserAvatar() requestUserInfo()
} }
} else { } else {
...@@ -408,13 +413,25 @@ extension YHMyNewViewController { ...@@ -408,13 +413,25 @@ extension YHMyNewViewController {
} }
} }
func requestUserAvatar() { func requestUserInfo() {
if let uid = YHLoginManager.shared.userModel?.id, !uid.isEmpty { if let uid = YHLoginManager.shared.userModel?.id, !uid.isEmpty {
self.userViewModel.getUserNameCardInfo(uid: uid) { self.userViewModel.getUserNameCardInfo(uid: uid) {
[weak self] success, error in [weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
let url = URL(string: self.userViewModel.nameCardInfo.avatar) let url = URL(string: self.userViewModel.nameCardInfo.avatar)
self.userInfoView.avarImgView.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default")) self.userInfoView.avarImgView.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
if YHLoginManager.shared.isLogin() {
let name = self.userViewModel.nameCardInfo.username
if name.isEmpty {
userInfoView.userNameLabel.text = "Hi, 银河用户".local
} else {
userInfoView.userNameLabel.text = name
}
} else {
userInfoView.userNameLabel.text = "登录/注册"
userInfoView.vipLevel = .none
}
} }
} }
} }
......
...@@ -254,7 +254,7 @@ class YHMyUserInfoView: UIView { ...@@ -254,7 +254,7 @@ class YHMyUserInfoView: UIView {
func update(count: Int, label: UILabel) { func update(count: Int, label: UILabel) {
var text = "" var text = ""
let countStr = count < 10000 ? String(count) : String(format: "%.1fw", Double(count/1000)/10.0) let countStr = count < 10000 ? "\(count) " : String(format: "%.1fw ", Double(count/1000)/10.0)
if label.tag == Self.likeTag { if label.tag == Self.likeTag {
text = "点赞" text = "点赞"
......
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