From ca914d7163d62db41fbe7604830f6f3008c73a37 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 27 Feb 2023 23:14:04 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E5=BE=A91.6.0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/im/MessageListPanelEx.java | 2 +- app/src/main/res/values/strings.xml | 2 +- .../hall/activity/SuperAdminAddActivity.kt | 2 +- .../im/msgholder/HallMsgViewHolder.java | 21 +++++++------------ .../res/layout/item_hall_exchange.xml | 4 ++++ .../module_hall/hall/bean/SuperAdminInfo.kt | 6 +++--- .../session/viewholder/MsgViewHolderBase.java | 8 +++---- 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java index 09fc008b2..43fef759e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java @@ -524,7 +524,7 @@ public class MessageListPanelEx { if (message.getAttachment() instanceof HallAttachment) { HallAttachment attachment = (HallAttachment) message.getAttachment(); HallImMsgInfo info = attachment.getHallImMsgInfo(); - if (info != null) { + if (info != null && info.getUrl() != null) { Uri uri = Uri.parse(info.getUrl()); String record = uri.getQueryParameter("recordId"); if (recordId.equals(record)) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6acb34ef9..4257c53b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4345,7 +4345,7 @@ 小澀瑤小澀瑤小澀瑤 什麽鬼 所屬公所屬公會昵稱會昵稱 - 女神沒有大長腿 + 女神沒有大長腿啊啊啊 設置為超管 忘忘忘忘憂閣憂閣憂閣憂閣 專屬銘牌 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt index 316bc7a06..223d8f481 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -85,7 +85,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity data.erbanNo?.isNotEmpty() == true }) }, { it.message.toast() }) diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java index af720e174..3e2f42cd6 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java @@ -262,22 +262,15 @@ public class HallMsgViewHolder extends MsgViewHolderBase { SingleToastUtil.showToast(error); if (error.equals("消息已過期")) { info.setType(HallImMsgInfo.MSG_TYPE_OUT_OF_DATE); - setMsgTypeView(info, second); - Map localExtension = HallImMsgInfo.convertToMap(info); - message.setLocalExtension(localExtension); - updateMessageToLocal(info); - if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) { - EventBus.getDefault().post(new HallInfoChangeEvent()); - } } else if (error.equals("消息已處理")) { info.setType(HallImMsgInfo.MSG_TYPE_HAS_HANDLE); - setMsgTypeView(info, second); - Map localExtension = HallImMsgInfo.convertToMap(info); - message.setLocalExtension(localExtension); - updateMessageToLocal(info); - if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) { - EventBus.getDefault().post(new HallInfoChangeEvent()); - } + } + setMsgTypeView(info, second); + Map localExtension = HallImMsgInfo.convertToMap(info); + message.setLocalExtension(localExtension); + updateMessageToLocal(info); + if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) { + EventBus.getDefault().post(new HallInfoChangeEvent()); } } diff --git a/app/src/module_labour_union/res/layout/item_hall_exchange.xml b/app/src/module_labour_union/res/layout/item_hall_exchange.xml index 6a7e0cea9..5591b39ad 100644 --- a/app/src/module_labour_union/res/layout/item_hall_exchange.xml +++ b/app/src/module_labour_union/res/layout/item_hall_exchange.xml @@ -23,6 +23,10 @@ android:layout_marginTop="@dimen/dp_6" android:textColor="@color/color_1F1A4E" android:textSize="@dimen/sp_15" + android:singleLine="true" + android:maxLines="1" + android:maxEms="8" + android:ellipsize="end" app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="@id/iv_avatar" tools:text="@string/layout_item_search_admin_01" /> diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt index 43883a24f..7b9688466 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt @@ -1,11 +1,11 @@ package com.yizhuan.xchat_android_core.module_hall.hall.bean data class SuperAdminInfo( - val avatar: String? = null, - val erbanNo: String? = null, + val avatar: String? = "", + val erbanNo: String? = "", val gender: Int = 0, var hasSet: Boolean = false, - val nick: String? = null, + val nick: String? = "", val uid: Long = 0, val roomList: List? = null ) \ No newline at end of file diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java index 166bb2c98..b7fdd203d 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java @@ -379,13 +379,13 @@ public abstract class MsgViewHolderBase extends RecyclerViewHolder