From 1f0cf1e27494f9c8a8be0a69ce56b5e7011932b7 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Tue, 26 May 2020 16:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E9=93=AD=E7=89=8Cbugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/adapter/MicroViewAdapter.java | 2 +- .../avroom/adapter/OnlineUserAdapter.java | 20 +++++++++ .../fragment/RoomContributeFragment.java | 2 +- .../erban/avroom/widget/MessageView.java | 32 +++++++++++---- .../erban/home/adapter/HomePlayAdapter.java | 2 +- .../erban/home/fragment/GameHomeFragment.java | 15 +++---- .../erban/ui/widget/UserInfoDialog.java | 41 +++++++++++++++++-- app/src/main/res/layout/dialog_user_info.xml | 40 +++++++----------- app/src/main/res/layout/item_home_play.xml | 1 + .../main/res/layout/list_item_online_user.xml | 12 ++++++ .../res/layout/fragment_home_dynamic.xml | 2 +- .../manager/IMNetEaseManager.java | 15 +++++++ .../nameplate/bean/NamePlateInfo.java | 5 +++ .../xchat_android_core/noble/NobleUtil.java | 6 +++ .../room/model/AvRoomModel.java | 15 +++++++ .../user/bean/UserInfo.java | 8 ++-- gradle.properties | 4 +- 17 files changed, 168 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java index 4fff042b2..4bcda81be 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java @@ -321,7 +321,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter { if (!TextUtils.isEmpty(fixedWord) && !TextUtils.isEmpty(iconPic)) { inOfficialMask.setVisibility(View.VISIBLE); tvOfficialMask.setText(fixedWord); - ImageLoadUtils.loadImage(context,iconPic, ivOfficialMask); + NobleUtil.loadResource(iconPic, ivOfficialMask); } else { inOfficialMask.setVisibility(View.GONE); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java index c139f4a68..e2018f82f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java @@ -188,6 +188,26 @@ public class OnlineUserAdapter extends BaseMultiItemQuickAdapter AVRoomActivity.start(mContext,item.getUid())); + helper.getView(R.id.root_view).setOnClickListener(v -> AVRoomActivity.start(mContext,item.getUid())); } } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 9f117701b..9dd29bd23 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -243,9 +243,11 @@ public class GameHomeFragment extends BaseMvpFragment fragmentPos = new ArrayList<>(); - fragmentPos.add(TAB_TYPE_DYNAMIC); fragmentPos.add(TAB_TYPE_PLAY); + fragmentPos.add(TAB_TYPE_DYNAMIC); List tagList = new ArrayList<>(); mFragmentsBottom = new ArrayList<>(); - tagList.add(getResources().getString(R.string.home_tab_dynamic)); tagList.add(getResources().getString(R.string.home_tab_caht)); + tagList.add(getResources().getString(R.string.home_tab_dynamic)); - mFragmentsBottom.add(HomeDynamicFragment.newInstance()); mFragmentsBottom.add(HomePlayFragment.newInstance()); + mFragmentsBottom.add(HomeDynamicFragment.newInstance()); CommonNavigator commonNavigator = new CommonNavigator(getContext()); MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), tagList, false); @@ -300,11 +302,10 @@ public class GameHomeFragment extends BaseMvpFragment - + - - - - - - - + android:layout_gravity="center" + android:layout_marginEnd="5.5dp" + android:visibility="visible" /> diff --git a/app/src/main/res/layout/item_home_play.xml b/app/src/main/res/layout/item_home_play.xml index bc6376d3f..43a5a6cbf 100644 --- a/app/src/main/res/layout/item_home_play.xml +++ b/app/src/main/res/layout/item_home_play.xml @@ -10,6 +10,7 @@ android:paddingStart="@dimen/dp_15" android:paddingBottom="@dimen/dp_15" android:paddingEnd="@dimen/dp_15" + android:id="@+id/root_view" android:background="@drawable/bg_corner_shadow_12"> diff --git a/app/src/main/res/layout/list_item_online_user.xml b/app/src/main/res/layout/list_item_online_user.xml index 9a96ef4e0..31afed114 100644 --- a/app/src/main/res/layout/list_item_online_user.xml +++ b/app/src/main/res/layout/list_item_online_user.xml @@ -108,11 +108,23 @@ android:id="@+id/iv_user_charm" android:layout_width="wrap_content" android:layout_height="@dimen/dp_15" + android:layout_marginEnd="5.5dp" android:adjustViewBounds="true" tools:src="@mipmap/ic_user_level" android:visibility="visible" tools:visibility="visible" /> + + diff --git a/app/src/module_community/res/layout/fragment_home_dynamic.xml b/app/src/module_community/res/layout/fragment_home_dynamic.xml index eaea9ab3c..4ebaade2f 100644 --- a/app/src/module_community/res/layout/fragment_home_dynamic.xml +++ b/app/src/module_community/res/layout/fragment_home_dynamic.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/color_F9F9F9" - android:paddingBottom="@dimen/dp_60"/> + android:paddingBottom="@dimen/dp_50"/> \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java index 7e565396c..37cc96fff 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java @@ -51,6 +51,7 @@ import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; +import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; import com.yizhuan.xchat_android_core.exception.ErrorThrowable; import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; @@ -400,6 +401,17 @@ public final class IMNetEaseManager { }, true); } + + public Map toMap(Map map, String namePlateWord,String namePlatePic) { + if (map == null) { + map = new HashMap<>(); + } + map.put(UserInfo.NAMEPLATE_WORD, namePlateWord); + map.put(UserInfo.NAMEPLATE_PIC, namePlatePic); + + return map; + } + /** * 更新本人在聊天室内的信息 */ @@ -435,6 +447,9 @@ public final class IMNetEaseManager { if (headWearInfo != null && headWearInfo.getStatus() == HeadWearInfo.STATUS_IN_USED) { valueMap = headWearInfo.toMap(valueMap); } + + valueMap = toMap(valueMap,userInfo.getNameplateWord(),userInfo.getNameplatePic()); + if (valueMap != null && valueMap.size() > 0) { map.put(String.valueOf(userInfo.getUid()), valueMap); } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java index a1111c4ac..5c5767005 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java @@ -1,6 +1,11 @@ package com.yizhuan.xchat_android_core.decoration.nameplate.bean; +import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.yizhuan.xchat_android_core.user.bean.UserInfo; + +import java.util.HashMap; import java.util.List; +import java.util.Map; public class NamePlateInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java index 1d45469cc..4c2cfc2a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java @@ -724,6 +724,12 @@ public class NobleUtil { return extension.get(type).toString(); } + public static String getNamePlate(String type, ChatRoomMessage chatRoomMessage) { + Map extension = ExtensionUtil.getExtension(chatRoomMessage, ExtensionUtil.getAccount(chatRoomMessage)); + if (extension == null || extension.get(type) == null) return ""; + return extension.get(type).toString(); + } + /** * 是否为官方 * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java index a28d11f45..4ef2db5f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java @@ -98,6 +98,18 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel { return instance; } + + private Map toMap(Map map, String namePlateWord, String namePlatePic) { + if (map == null) { + map = new HashMap<>(); + } + map.put(UserInfo.NAMEPLATE_WORD, namePlateWord); + map.put(UserInfo.NAMEPLATE_PIC, namePlatePic); + + return map; + } + + /** * 进入云信聊天室 * @@ -127,6 +139,9 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel { if (carInfo != null) { valueMap = carInfo.toMap(valueMap, carInfo); } + + valueMap = toMap(valueMap,userInfo.getNameplateWord(),userInfo.getNameplatePic()); + //多个判断，头饰不过期才传pic if (headWearInfo != null && headWearInfo.getStatus() == HeadWearInfo.STATUS_IN_USED) { valueMap = headWearInfo.toMap(valueMap); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java index fdf0b72ab..ba5cc3f5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java @@ -269,6 +269,8 @@ public class UserInfo implements Serializable { public static String HAS_PRETTY = "hasPrettyErbanNo"; public static String OAC_NAME = "officialAnchorCertificationName"; public static String OAC_ICON = "officialAnchorCertificationIcon"; + public static String NAMEPLATE_WORD = "inRoomNameplateWord"; + public static String NAMEPLATE_PIC= "inRoomNameplatePic"; @Getter @Setter @@ -548,9 +550,9 @@ public class UserInfo implements Serializable { map.put(HAS_PRETTY, userInfo.isHasPrettyErbanNo()); // 官方认证文本，图标 - if (!TextUtils.isEmpty(userInfo.getNameplateWord()) && !TextUtils.isEmpty(userInfo.getNameplatePic())) { - map.put(OAC_NAME, userInfo.getNameplateWord()); - map.put(OAC_ICON, userInfo.getNameplatePic()); + if (userInfo.getNameplate() != null) { + map.put(OAC_NAME, userInfo.getNameplate().getFixedWord()); + map.put(OAC_ICON, userInfo.getNameplate().getIconPic()); } else { map.put(OAC_NAME, ""); map.put(OAC_ICON, ""); diff --git a/gradle.properties b/gradle.properties index cc210702d..6b78a0ea7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ with_jenkins=false #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528 ndk_abi_filters=arm -version_name=1.0.1 -version_code=101 \ No newline at end of file +version_name=1.0.3 +version_code=103 \ No newline at end of file