From 96d1ba7f8eb3db06837d0bc19d3505475667f921 Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Thu, 14 May 2020 15:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E9=A5=B0=E5=8A=A8=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java   | 2 +-
 .../java/com/yizhuan/erban/home/fragment/MeFragment.java     | 3 ++-
 .../java/com/yizhuan/erban/ui/widget/UserInfoDialog.java     | 2 +-
 .../erban/community/square/adapter/SquareDynamicAdapter.java | 5 ++++-
 .../yizhuan/xchat_android_core/user/bean/BaseUserInfo.java   | 2 ++
 nim_uikit/res/layout/nim_message_activity_text_layout.xml    | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
index 2d54d9f54..eb329fc1b 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
@@ -229,7 +229,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
 
         private void updateNobleView(ChatRoomMember chatRoomMember) {
             String nobleHeadWear = (String) NobleUtil.getResource(NobleResourceType.KEY_HEAD_WEAR, chatRoomMember);
-            String headWear=NobleUtil.getHeadResource(HeadWearInfo.PIC, chatRoomMember);
+            String headWear=NobleUtil.getHeadResource(HeadWearInfo.EFFECT, chatRoomMember)!=null?NobleUtil.getHeadResource(HeadWearInfo.EFFECT, chatRoomMember):NobleUtil.getHeadResource(HeadWearInfo.PIC, chatRoomMember);
             if (!TextUtils.isEmpty(headWear)) {
                 // 头饰
                 ivHeadWear.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
index 334fd1c0c..6609bf9a1 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
@@ -227,7 +227,8 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
                     mBinding.ivUserNobleLevel.setVisibility(View.GONE);
 //                    mBinding.tvNobleRemainTime.setVisibility(View.GONE);
                 }
-                NobleUtil.loadHeadWear(headWearInfo.getPic(), mBinding.ivAvatarHeadWear);
+
+                NobleUtil.loadHeadWear(headWearInfo.getEffect()!=null?headWearInfo.getEffect():headWearInfo.getPic(), mBinding.ivAvatarHeadWear);
             } else if (nobleInfo != null) {
                 mBinding.ivUserNobleLevel.setVisibility(View.VISIBLE);
                 NobleUtil.loadResource(NobleUtil.getBadgeByLevel(nobleInfo.getLevel()), mBinding.ivUserNobleLevel);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
index f1250f1dd..4414fb3f5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
@@ -589,7 +589,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         // 设置普通人
         if (userHeadwear != null && !TextUtils.isEmpty(userHeadwear.getPic())) {
             havaHead = true;
-            NobleUtil.loadHeadWear(userHeadwear.getPic(), ivAvatarHeadWear);
+            NobleUtil.loadHeadWear(userHeadwear.getEffect()!=null?userHeadwear.getEffect():userHeadwear.getPic(), ivAvatarHeadWear);
         }
 
         if (nobleInfo == null || TextUtils.isEmpty(nobleInfo.getCardBg())) {
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
index e5f18fc05..b4d57e1f2 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
@@ -102,9 +102,12 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
         //头饰 贵族头饰
         ImageView ivHeadWear = helper.getView(R.id.iv_head_wear);
         GlideApp.with(ivHeadWear.getContext()).clear(ivHeadWear);
+        String headwearEffect = item.getHeadwearEffect();
         String headwearPic = item.getHeadwearPic();
         String micDecorate = item.getMicDecorate();
-        if (!TextUtils.isEmpty(headwearPic)) {
+        if (!TextUtils.isEmpty(headwearEffect)){
+            NobleUtil.loadHeadWear(headwearEffect, ivHeadWear);
+        } else if (!TextUtils.isEmpty(headwearPic)) {
             NobleUtil.loadHeadWear(headwearPic, ivHeadWear);
         } else if (!TextUtils.isEmpty(micDecorate)){
             NobleUtil.loadResource(micDecorate, ivHeadWear);
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
index 6f3b65867..18998b45b 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
@@ -23,6 +23,8 @@ public class BaseUserInfo implements Serializable {
 
     private String headwearPic;
 
+    private String headwearEffect;
+
     private long uid;
 
     private int nobleId;
diff --git a/nim_uikit/res/layout/nim_message_activity_text_layout.xml b/nim_uikit/res/layout/nim_message_activity_text_layout.xml
index 9792b3b76..2c10e2a6c 100644
--- a/nim_uikit/res/layout/nim_message_activity_text_layout.xml
+++ b/nim_uikit/res/layout/nim_message_activity_text_layout.xml
@@ -73,7 +73,7 @@
         android:textColorHint="#C6C6C6"
         android:paddingStart="@dimen/dp_10"
         android:paddingEnd="10dp"
-        android:background="@drawable/bg_message_input"
+        android:background="@color/white"
         android:minHeight="35dp"
         android:maxHeight="72dp"
         android:maxLines="4"