From 78960dd758d0bf7f67b50250fe90e8ee3d776ed2 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 14 Jan 2025 18:15:58 +0800 Subject: [PATCH] fix: bug fix --- .../chwl/app/avroom/adapter/UpMicAdapter.java | 35 ++++++++++--------- .../chwl/app/avroom/widget/MessageView.java | 14 +++++++- .../home/fragment/HomeRecommendFragment.kt | 8 +++-- .../chwl/app/ui/widget/GiftAvatarAdapter.java | 21 +++++++---- .../com/chwl/app/ui/widget/GiftDialog.java | 12 +++---- .../main/java/com/chwl/app/view/EffectView.kt | 11 +++--- .../layout/item_bonsella_join_attack_view.xml | 2 +- .../chwl/core/manager/AvRoomDataManager.java | 2 ++ .../session/actions/PickImageActionNew.kt | 4 +-- .../uikit/business/uinfo/UserInfoHelper.java | 26 +++++++++++++- 10 files changed, 92 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java index b14dbc466..c95bfa712 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java @@ -40,23 +40,24 @@ public class UpMicAdapter extends BaseQuickAdapter { this.upUid = upUid; List list = new ArrayList<>(); int size; - if (AvRoomDataManager.get().isCpRoom()) { - size = 2; - } else if (AvRoomDataManager.get().isSingleRoom()) { - size = 4; - } else if (AvRoomDataManager.get().isOpenGame()) { - size = 6; - } else if (AvRoomDataManager.get().isPartyRoom()) { - size = 10; - } else if (AvRoomDataManager.get().isRevelryRoom()) { - size = 15; - }else if (AvRoomDataManager.get().is19Room()) { - size = 19; - } else if (AvRoomDataManager.get().is20Room()) { - size = 20; - } else { - size = 9; - } + size = AvRoomDataManager.get().getMicSize(); +// if (AvRoomDataManager.get().isCpRoom()) { +// size = 2; +// } else if (AvRoomDataManager.get().isSingleRoom()) { +// size = 4; +// } else if (AvRoomDataManager.get().isHomeParty()) { +// size = 9; +// }else if (AvRoomDataManager.get().isPartyRoom()) { +// size = 10; +// } else if (AvRoomDataManager.get().isRevelryRoom()) { +// size = 15; +// }else if (AvRoomDataManager.get().is19Room()) { +// size = 19; +// } else if (AvRoomDataManager.get().is20Room()) { +// size = 20; +// } else { +// size = 9; +// } for (int i = 0; i < size; i++) { list.add(""); } diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 284593956..b218b1f83 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java @@ -2225,6 +2225,17 @@ public class MessageView extends FrameLayout { TextSpannableBuilder text = new TextSpannableBuilder(tvContent); addCommonTag(chatRoomMessage, text, tvContent); String nickName = extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_0116) : RegexUtil.getPrintableString(extension.getSenderNick()); + + if (UserInfoHelper.isDefNick(nickName)) { + HashMap map = UserInfoHelper.getChatRoomMessageUserInfo(chatRoomMessage, chatRoomMessage.getFromAccount()); + if (map != null) { + Object nick = map.get(UserInfo.NICK); + if (nick != null && nick instanceof String) { + nickName = nick.toString(); + } + } + } + text.append(nickName, new ForegroundColorSpan(greyColor)) .append(": " + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white))); List atUids = ExtensionUtil.getListExtension(chatRoomMessage, UserInfo.AT_UIDS); @@ -2250,9 +2261,10 @@ public class MessageView extends FrameLayout { if (Objects.equals(chatRoomMessage.getFromAccount(), String.valueOf(AuthModel.get().getCurrentUid()))) { tvContent.setOnLongClickListener(null); } else { + String finalNickName = nickName; tvContent.setOnLongClickListener(v -> { if (onLongClickListener != null) { - onLongClickListener.onLongClick(v, chatRoomMessage.getFromAccount(), nickName); + onLongClickListener.onLongClick(v, chatRoomMessage.getFromAccount(), finalNickName); } return true; }); diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt index ae4943f0a..3ca6d07e2 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt @@ -99,9 +99,11 @@ class HomeRecommendFragment : BaseViewBindingFragment 0) { - if (uid == AuthModel.get().getCurrentUid()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.send_gift_to_self_tips)); - sendGiftButton.setText(ResUtil.getString(R.string.ui_widget_giftdialog_026)); - sendGiftButton.setEnabled(true); - return; - } +// if (uid == AuthModel.get().getCurrentUid()) { +// SingleToastUtil.showToast(ResUtil.getString(R.string.send_gift_to_self_tips)); +// sendGiftButton.setText(ResUtil.getString(R.string.ui_widget_giftdialog_026)); +// sendGiftButton.setEnabled(true); +// return; +// } ArrayList targetUids = new ArrayList<>(); MicMemberInfo micMemberInfo = new MicMemberInfo(); micMemberInfo.setAccount(String.valueOf(uid)); diff --git a/app/src/main/java/com/chwl/app/view/EffectView.kt b/app/src/main/java/com/chwl/app/view/EffectView.kt index 5a1a2bf34..4bc12fc63 100644 --- a/app/src/main/java/com/chwl/app/view/EffectView.kt +++ b/app/src/main/java/com/chwl/app/view/EffectView.kt @@ -150,8 +150,8 @@ class EffectView : FrameLayout { private fun loadImg(resource: File) { "EffectView loadImg() ".doLog(mNeedLog) - try { - this@EffectView.post { + this@EffectView.post { + try { val fis = FileInputStream(resource) val bitmap = BitmapFactory.decodeStream(fis) @@ -186,12 +186,13 @@ class EffectView : FrameLayout { imageView.setImageBitmap(bitmap) } + } catch (e: Exception) { + playCallBack(false) + "EffectView loadImg() false".doLog(mNeedLog) } - } catch (e: Exception) { - playCallBack(false) - "EffectView loadImg() false".doLog(mNeedLog) } + } private fun loadMp4(resource: File) { diff --git a/app/src/main/res/layout/item_bonsella_join_attack_view.xml b/app/src/main/res/layout/item_bonsella_join_attack_view.xml index c67432c9d..f4fe48f1d 100644 --- a/app/src/main/res/layout/item_bonsella_join_attack_view.xml +++ b/app/src/main/res/layout/item_bonsella_join_attack_view.xml @@ -98,7 +98,7 @@ android:textStyle="bold" android:textSize="36sp" app:layout_constraintBottom_toBottomOf="@+id/sentUserAvatar" - app:layout_constraintStart_toEndOf="@+id/giftImg" + app:layout_constraintStart_toEndOf="@+id/bagImg" app:layout_constraintTop_toTopOf="@id/sentUserAvatar" tools:text="x1111111" /> diff --git a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java index acca0a774..6ebe00fe3 100644 --- a/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java @@ -858,6 +858,8 @@ public final class AvRoomDataManager { } } + public int getMicSize(){ return mMicQueueMemberMap.size();} + /** * 是否是房主或管理员 * diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt b/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt index 4b9a19903..8b2f09348 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/actions/PickImageActionNew.kt @@ -7,7 +7,7 @@ import android.net.Uri import android.provider.MediaStore import android.text.TextUtils import com.chwl.library.common.application.BaseApp -import com.chwl.library.common.base.BaseDialogFragment +import com.chwl.library.common.base.BaseCommonDialogFragment import com.chwl.library.common.util.PhotoCompressUtil import com.chwl.library.common.util.PhotosCompressCallback import com.chwl.library.utils.ResUtil @@ -39,7 +39,7 @@ abstract class PickImageActionNew protected constructor( } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (resultCode == BaseDialogFragment.RESULT_OK) { + if (resultCode == BaseCommonDialogFragment.RESULT_OK) { when (requestCode) { NimPhotoPickActivity.PICK_ACT_RESULT and 0xff -> { try { diff --git a/nim_uikit/src/com/netease/nim/uikit/business/uinfo/UserInfoHelper.java b/nim_uikit/src/com/netease/nim/uikit/business/uinfo/UserInfoHelper.java index d5d44397c..3cc9abed5 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/uinfo/UserInfoHelper.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/uinfo/UserInfoHelper.java @@ -2,12 +2,17 @@ package com.netease.nim.uikit.business.uinfo; import android.text.TextUtils; +import com.chwl.library.utils.ResUtil; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.team.helper.TeamHelper; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessageExtension; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.uinfo.model.UserInfo; -import com.chwl.library.utils.ResUtil; + +import java.util.HashMap; +import java.util.Map; public class UserInfoHelper { @@ -65,4 +70,23 @@ public class UserInfoHelper { return getUserDisplayName(account); } + + public static HashMap getChatRoomMessageUserInfo(ChatRoomMessage chatRoomMessage, String uid) { + try { + ChatRoomMessageExtension chatRoomMessageExtension = chatRoomMessage.getChatRoomMessageExtension(); + if (chatRoomMessageExtension != null) { + Map senderExtension = chatRoomMessageExtension.getSenderExtension(); + if (senderExtension != null) { + return (HashMap) senderExtension.get(uid); + } + } + } catch (Exception e) { + } + return null; + } + + public static boolean isDefNick(String nick) { + return nick.equals("Platform New User"); + } + }