From b98ff32fe02c63ad900dec820281552a66045790 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 3 Sep 2021 15:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=85=AC=E5=B1=8F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B6=85=E7=AE=A1=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/widget/MessageView.java | 5 +++- .../drawable-xhdpi/ic_room_super_admin.png | Bin 0 -> 9328 bytes .../user/bean/UserInfo.java | 24 +++++++++--------- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_room_super_admin.png diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 760605a44..c738e13b8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -1751,7 +1751,10 @@ public class MessageView extends FrameLayout { R.mipmap.ic_user_official_13dp, null) : null, badgeWidth, badgeHeight) .append(newUser ? Constants.NEW_USER_ICON : "", badgeWidth, badgeHeight) - .append(NobleUtil.getLocalResourcePath(userBadge), badgeWidth, badgeHeight); + .append(NobleUtil.getLocalResourcePath(userBadge), badgeWidth, badgeHeight) + .append(AvRoomDataManager.get().isSuperAdmin(chatRoomMessage.getFromAccount()) ? ResourcesCompat.getDrawable(getResources(), + R.drawable.ic_room_super_admin, null) : null, + SizeUtils.dp2px(tvContent.getContext(), 66), expLevelHeight); // 官方主播认证 String tvOfficialMask = NobleUtil.getLevel(UserInfo.OAC_NAME, chatRoomMessage).trim(); diff --git a/app/src/main/res/drawable-xhdpi/ic_room_super_admin.png b/app/src/main/res/drawable-xhdpi/ic_room_super_admin.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb6468988a8ef510fb886c20d2bb87065d7eb68 GIT binary patch literal 9328 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 e{{1#`1pYtqlKVF;WoK9b0000 toMap(@Nullable Map map, UserInfo userInfo) { + public Map toMap(@Nullable Map map, UserInfo userInfo) { if (map == null) { map = new HashMap<>(); } @@ -579,6 +578,7 @@ public class UserInfo implements Serializable { /** * 判断是否为官方账号 + * * @return */ public boolean isOfficial() { @@ -633,8 +633,8 @@ public class UserInfo implements Serializable { /** * 靓号变色 - * @param defColor - * 非靓号颜色 + * + * @param defColor 非靓号颜色 */ public SpannableString getNick(int defColor) { @@ -651,11 +651,11 @@ public class UserInfo implements Serializable { spannableString.setSpan(colorSpan, 0, nick.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } - return spannableString; + return spannableString; } @Data - public static class Location{ + public static class Location { /** @@ -712,7 +712,7 @@ public class UserInfo implements Serializable { * 官方主播认证铭牌 */ @Data - public static class NamePlate{ + public static class NamePlate { private long id; private String iconPic; private String fixedWord;