From e6d250db58913729e73399ce2aef3b2482362fb9 Mon Sep 17 00:00:00 2001 From: fanyu Date: Fri, 30 Sep 2022 14:12:38 +0800 Subject: [PATCH 1/3] Display user id --- .../Common/Views/PeerInfoView.swift | 26 ++++-- .../Setting/BlockedUsersViewController.swift | 2 +- .../Setting/Cells/BlockUserCell.swift | 8 +- .../Storyboard/Setting.storyboard | 85 +++++++------------ 4 files changed, 55 insertions(+), 66 deletions(-) diff --git a/Mixin/UserInterface/Controllers/Common/Views/PeerInfoView.swift b/Mixin/UserInterface/Controllers/Common/Views/PeerInfoView.swift index 700c4aaeca..e324169219 100644 --- a/Mixin/UserInterface/Controllers/Common/Views/PeerInfoView.swift +++ b/Mixin/UserInterface/Controllers/Common/Views/PeerInfoView.swift @@ -36,11 +36,13 @@ class PeerInfoView: UIView, XibDesignable { } func render(result: SearchResult) { + var identityNumber: String? var specializedCategory: MessageSearchResult.SpecializedCategory? switch result { case let result as UserSearchResult: let user = result.user avatarImageView.setImage(with: user.avatarUrl, userId: user.userId, name: user.fullName) + identityNumber = user.identityNumber case let result as ConversationSearchResult: let conversation = result.conversation if conversation.isGroup() { @@ -62,6 +64,7 @@ class PeerInfoView: UIView, XibDesignable { case .group(let conversation): avatarImageView.setGroupImage(with: conversation.iconUrl) case .user(let user): + identityNumber = user.identityNumber avatarImageView.setImage(with: user.avatarUrl, userId: user.userId, name: user.fullName) } case let result as CircleMemberSearchResult: @@ -69,6 +72,7 @@ class PeerInfoView: UIView, XibDesignable { if member.category == ConversationCategory.GROUP.rawValue { avatarImageView.setGroupImage(with: member.iconUrl) } else { + identityNumber = member.identityNumber avatarImageView.setImage(with: member.iconUrl, userId: member.userId ?? "", name: member.name) } case let result as PhoneContactSearchResult: @@ -94,6 +98,9 @@ class PeerInfoView: UIView, XibDesignable { if let description = result.description { descriptionLabel.attributedText = description descriptionLabel.isHidden = false + } else if let identityNumber { + descriptionLabel.isHidden = false + descriptionLabel.text = identityNumber } else { descriptionLabel.isHidden = true } @@ -106,7 +113,8 @@ class PeerInfoView: UIView, XibDesignable { badgeImageView.isHidden = badgeImageView.image == nil superscriptLabel.text = nil prefixIconImageView.isHidden = true - descriptionLabel.isHidden = true + descriptionLabel.isHidden = false + descriptionLabel.text = user.identityNumber } func render(user: User, userBiographyAsSubtitle: Bool) { @@ -116,19 +124,22 @@ class PeerInfoView: UIView, XibDesignable { badgeImageView.isHidden = badgeImageView.image == nil superscriptLabel.text = nil prefixIconImageView.isHidden = true + descriptionLabel.isHidden = false if userBiographyAsSubtitle { - descriptionLabel.isHidden = false descriptionLabel.text = user.biography } else { - descriptionLabel.isHidden = true + descriptionLabel.text = user.identityNumber } } func render(receiver: MessageReceiver) { switch receiver.item { case let .group(conversation): + descriptionLabel.isHidden = true avatarImageView.setGroupImage(with: conversation.iconUrl) case let .user(user): + descriptionLabel.isHidden = false + descriptionLabel.text = user.identityNumber avatarImageView.setImage(with: user.avatarUrl, userId: user.userId, name: user.fullName) } titleLabel.text = receiver.name @@ -136,23 +147,28 @@ class PeerInfoView: UIView, XibDesignable { badgeImageView.isHidden = badgeImageView.image == nil superscriptLabel.text = nil prefixIconImageView.isHidden = true - descriptionLabel.isHidden = true } func render(member: CircleMember) { if member.category == ConversationCategory.GROUP.rawValue { avatarImageView.setGroupImage(with: member.iconUrl) + descriptionLabel.isHidden = true } else { avatarImageView.setImage(with: member.iconUrl, userId: member.userId ?? "", name: member.name) + if let identityNumber = member.identityNumber { + descriptionLabel.text = identityNumber + descriptionLabel.isHidden = false + } else { + descriptionLabel.isHidden = true + } } titleLabel.text = member.name badgeImageView.image = member.badgeImage badgeImageView.isHidden = badgeImageView.image == nil superscriptLabel.text = nil prefixIconImageView.isHidden = true - descriptionLabel.isHidden = true } func render(phoneContact: PhoneContact) { diff --git a/Mixin/UserInterface/Controllers/Setting/BlockedUsersViewController.swift b/Mixin/UserInterface/Controllers/Setting/BlockedUsersViewController.swift index 2189691488..aca9764505 100644 --- a/Mixin/UserInterface/Controllers/Setting/BlockedUsersViewController.swift +++ b/Mixin/UserInterface/Controllers/Setting/BlockedUsersViewController.swift @@ -58,7 +58,7 @@ extension BlockedUsersViewController: UITableViewDelegate, UITableViewDataSource func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId) as! BlockUserCell - cell.render(user: users[indexPath.row]) + cell.infoView.render(user: users[indexPath.row]) return cell } diff --git a/Mixin/UserInterface/Controllers/Setting/Cells/BlockUserCell.swift b/Mixin/UserInterface/Controllers/Setting/Cells/BlockUserCell.swift index e6a368f456..a2645dc3cd 100644 --- a/Mixin/UserInterface/Controllers/Setting/Cells/BlockUserCell.swift +++ b/Mixin/UserInterface/Controllers/Setting/Cells/BlockUserCell.swift @@ -3,12 +3,6 @@ import MixinServices class BlockUserCell: ModernSelectedBackgroundCell { - @IBOutlet weak var avatarImageView: AvatarImageView! - @IBOutlet weak var nameLabel: UILabel! - - func render(user: UserItem) { - avatarImageView.setImage(with: user) - nameLabel.text = user.fullName - } + @IBOutlet weak var infoView: PeerInfoView! } diff --git a/Mixin/UserInterface/Storyboard/Setting.storyboard b/Mixin/UserInterface/Storyboard/Setting.storyboard index 0f4f5ecda8..c45a1bf2fc 100644 --- a/Mixin/UserInterface/Storyboard/Setting.storyboard +++ b/Mixin/UserInterface/Storyboard/Setting.storyboard @@ -142,17 +142,17 @@ - +