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

[Modify]修復1.6.0bug

Browse Source
This commit is contained in:
wushaocheng
2023-02-27 23:14:04 +08:00
parent 80f03bdcba
commit ca914d7163
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
View File

@@ -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)) {

2
app/src/main/res/values/strings.xml
View File

@@ -4345,7 +4345,7 @@
<string name="layout_item_member_01">小澀瑤小澀瑤小澀瑤</string>
<string name="layout_item_member_02">什麽鬼</string>
<string name="layout_item_member_03">所屬公所屬公會昵稱會昵稱</string>
<string name="layout_item_search_admin_01">女神沒有大長腿</string>
<string name="layout_item_search_admin_01">女神沒有大長腿啊啊啊</string>
<string name="layout_item_search_admin_02">設置為超管</string>
<string name="layout_item_single_room_income_01">忘忘忘忘憂閣憂閣憂閣憂閣</string>
<string name="layout_item_vip_auth_01">專屬銘牌</string>

2
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt
View File

@@ -85,7 +85,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
HallModel.get().searchSuperAdminInfo(searchId)
.compose(bindToLifecycle())
.subscribe({
rvDelegate.setNewData(listOf(it))
rvDelegate.setNewData(listOf(it).filter {data -> data.erbanNo?.isNotEmpty() == true })
}, {
it.message.toast()
})

21
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
View File

@@ -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<String, Object> 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<String, Object> 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<String, Object> localExtension = HallImMsgInfo.convertToMap(info);
message.setLocalExtension(localExtension);
updateMessageToLocal(info);
if (second == CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE) {
EventBus.getDefault().post(new HallInfoChangeEvent());
}
}

4
app/src/module_labour_union/res/layout/item_hall_exchange.xml
View File

@@ -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" />

6
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt
View File

@@ -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<SuperAdminHall>? = null
)

8
nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
View File

@@ -379,13 +379,13 @@ public abstract class MsgViewHolderBase extends RecyclerViewHolder<BaseMultiItem
if (isReceivedMessage()) {
setGravity(bodyContainer, Gravity.LEFT);
contentContainer.setBackgroundResource(leftBackground());
contentContainer.setAlpha(0);
contentContainer.animate().alpha(1f).setDuration(2000).start();
// contentContainer.setAlpha(0);
// contentContainer.animate().alpha(1f).setDuration(2000).start();
} else {
setGravity(bodyContainer, Gravity.RIGHT);
contentContainer.setBackgroundResource(rightBackground());
contentContainer.setAlpha(0);
contentContainer.animate().alpha(1f).setDuration(2000).start();
// contentContainer.setAlpha(0);
// contentContainer.animate().alpha(1f).setDuration(2000).start();
}
}
}