moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

头饰动效

Browse Source
This commit is contained in:
oujunhui
2020-05-14 15:08:53 +08:00
parent 99b5c6a067
commit 96d1ba7f8e
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -229,7 +229,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
private void updateNobleView(ChatRoomMember chatRoomMember) { private void updateNobleView(ChatRoomMember chatRoomMember) {
String nobleHeadWear = (String) NobleUtil.getResource(NobleResourceType.KEY_HEAD_WEAR, 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)) { if (!TextUtils.isEmpty(headWear)) {
// 头饰 // 头饰
ivHeadWear.setVisibility(View.VISIBLE); ivHeadWear.setVisibility(View.VISIBLE);

3
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
View File

@@ -227,7 +227,8 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
mBinding.ivUserNobleLevel.setVisibility(View.GONE); mBinding.ivUserNobleLevel.setVisibility(View.GONE);
// mBinding.tvNobleRemainTime.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) { } else if (nobleInfo != null) {
mBinding.ivUserNobleLevel.setVisibility(View.VISIBLE); mBinding.ivUserNobleLevel.setVisibility(View.VISIBLE);
NobleUtil.loadResource(NobleUtil.getBadgeByLevel(nobleInfo.getLevel()), mBinding.ivUserNobleLevel); NobleUtil.loadResource(NobleUtil.getBadgeByLevel(nobleInfo.getLevel()), mBinding.ivUserNobleLevel);

2
app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
View File

@@ -589,7 +589,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
// 设置普通人 // 设置普通人
if (userHeadwear != null && !TextUtils.isEmpty(userHeadwear.getPic())) { if (userHeadwear != null && !TextUtils.isEmpty(userHeadwear.getPic())) {
havaHead = true; havaHead = true;
NobleUtil.loadHeadWear(userHeadwear.getPic(), ivAvatarHeadWear); NobleUtil.loadHeadWear(userHeadwear.getEffect()!=null?userHeadwear.getEffect():userHeadwear.getPic(), ivAvatarHeadWear);
} }
if (nobleInfo == null || TextUtils.isEmpty(nobleInfo.getCardBg())) { if (nobleInfo == null || TextUtils.isEmpty(nobleInfo.getCardBg())) {

5
app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
View File

@@ -102,9 +102,12 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
//头饰 贵族头饰 //头饰 贵族头饰
ImageView ivHeadWear = helper.getView(R.id.iv_head_wear); ImageView ivHeadWear = helper.getView(R.id.iv_head_wear);
GlideApp.with(ivHeadWear.getContext()).clear(ivHeadWear); GlideApp.with(ivHeadWear.getContext()).clear(ivHeadWear);
String headwearEffect = item.getHeadwearEffect();
String headwearPic = item.getHeadwearPic(); String headwearPic = item.getHeadwearPic();
String micDecorate = item.getMicDecorate(); 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); NobleUtil.loadHeadWear(headwearPic, ivHeadWear);
} else if (!TextUtils.isEmpty(micDecorate)){ } else if (!TextUtils.isEmpty(micDecorate)){
NobleUtil.loadResource(micDecorate, ivHeadWear); NobleUtil.loadResource(micDecorate, ivHeadWear);

2
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
View File

@@ -23,6 +23,8 @@ public class BaseUserInfo implements Serializable {
private String headwearPic; private String headwearPic;
private String headwearEffect;
private long uid; private long uid;
private int nobleId; private int nobleId;

2
nim_uikit/res/layout/nim_message_activity_text_layout.xml
View File

@@ -73,7 +73,7 @@
android:textColorHint="#C6C6C6" android:textColorHint="#C6C6C6"
android:paddingStart="@dimen/dp_10" android:paddingStart="@dimen/dp_10"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:background="@drawable/bg_message_input" android:background="@color/white"
android:minHeight="35dp" android:minHeight="35dp"
android:maxHeight="72dp" android:maxHeight="72dp"
android:maxLines="4" android:maxLines="4"