From 5a1edb6c4a3b1e6a70a31d251ca4dd22e450e2ed Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Mon, 12 Jan 2026 09:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E4=BA=A4=E5=8F=8B=E6=88=BF?=
 =?UTF-8?q?=20=E8=BF=9B=E5=87=BA=E6=88=BF=E9=97=B4=E4=B8=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97Im=E6=B6=88=E6=81=AF=EF=BC=8C=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/base/CommonAppContext.java     |  2 +-
 .../com/xscm/moduleutil/utils/ImageUtils.java |  2 +-
 .../room/fragment/ChatRoomFragment.java       | 16 +++---
 .../user/fragment/UserHomepageFragment.java   |  9 +++-
 .../dialog/RoomUserInfoFragment.java          | 50 +++++++++++--------
 .../res/layout/fragment_room_user_info.xml    |  6 +--
 6 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index d312c4c2..ca0cd318 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -137,7 +137,7 @@ public class CommonAppContext extends MultiDexApplication implements Application
     @Getter
     public UnreadCountEvent unreadCountEvent;
 
-    public static int selectRelease = -1;
+    public static int selectRelease = 1;
 
     public int is_open = 0;//主题的开关
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
index 87e39798..69051aa1 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/ImageUtils.java
@@ -289,7 +289,7 @@ public class ImageUtils {
                         // 加载成功！resource 就是最终的 Bitmap 对象
                         int imageWidth = resource.getWidth();  // 图片原始宽度
                         int imageHeight = resource.getHeight(); // 图片原始高度
-                        params.width = (int) (imageWidth * 1.3);
+//                        params.width = (int) (imageWidth * 1.3);
                         // 这里可以使用宽高（如打印、适配布局等）
                         Log.d("GlideImageSize", "宽度：" + imageWidth + "，高度：" + imageHeight);
                         return false; // 返回 false，Glide 会继续执行默认的图片设置（显示到 mImageView）
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
index 47dc455b..11f0130e 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
@@ -298,7 +298,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         }
     }
 
-    public void setIsPriRoom(boolean isPriRoom,List<String> userIdList) {
+    public void setIsPriRoom(boolean isPriRoom, List<String> userIdList) {
         if (easeChatAdapter != null) {
             easeChatAdapter.isPriRoom = isPriRoom;
             easeChatAdapter.userIdList = userIdList;
@@ -481,9 +481,9 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
     }
 
 
-    public void sendPriMsg(int status,RoomInputEvent roomInputEvent,EmotionDeatils emotionDeatils,String roomId) {
+    public void sendPriMsg(int status, RoomInputEvent roomInputEvent, EmotionDeatils emotionDeatils, String roomId) {
         RoomMessageEvent.T t = new RoomMessageEvent.T();
-        if (status == 2){
+        if (status == 2) {
             EmotionDeatils event = new EmotionDeatils();
             if (emotionDeatils != null && emotionDeatils.getChildren() != null && !emotionDeatils.getChildren().isEmpty() && emotionDeatils.getChildren().size() > 0) {
                 int position = new Random().nextInt(emotionDeatils.getChildren().size());
@@ -495,7 +495,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
             }
             t.setFromUserInfo(SpUtil.getUserInfo());
             t.setEmoji(event);
-        }else {
+        } else {
             String message = roomInputEvent.text;
             t.setText(message);
             t.setFromUserInfo(SpUtil.getUserInfo());
@@ -537,7 +537,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         if (message.getRoomId() == null) {
             return;
         }
-        if (!mIsPriRoom){
+        if (!mIsPriRoom) {
             if (roomId == null || (!message.getRoomId().contains(roomId) && message.getMsgType() != 125)) {
                 return;
             }
@@ -612,13 +612,17 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
 //                            message.getRoomId(), text.getJia_jia(), 2);
 //                    EventBus.getDefault().post(roomJoinMountModel);
 //                }
-                postAndAddMessage(message);
+                if (!mIsPriRoom)
+                    postAndAddMessage(message);
                 break;
             case 123:
                 easeChatAdapter.clearData();
                 postAndAddMessage(message);
                 break;
             case 1002:
+                if (mIsPriRoom){
+                     break;
+                }
             case 1012:
             case 1011:
             case 1014:
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
index 9e00ed71..598a00fe 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
@@ -181,6 +181,13 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
 
         if (!userInfo.getIcon().isEmpty()) {
             mBinding.headerInfo.flexEntry.setVisibility(VISIBLE);
+
+            if (mBinding.headerInfo.rlCpAnim.getVisibility() == VISIBLE){
+                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mBinding.headerInfo.flexEntry.getLayoutParams();
+                params.endToStart = mBinding.headerInfo.rlCpAnim.getId();
+                mBinding.headerInfo.flexEntry.setLayoutParams(params);
+            }
+
             for (String url : userInfo.getIcon()) {
                 if (url != null && url.contains("http")) {
                     ImageView imageView1 = new ImageView(Application.getInstance());
@@ -188,7 +195,7 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
                             LinearLayout.LayoutParams.WRAP_CONTENT,
                             Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
                     );
-                    params.setMargins(0, 0, Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_10), 0); // 右边距
+                    params.setMargins(0, 0, Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
                     imageView1.setLayoutParams(params);
                     imageView1.setScaleType(ImageView.ScaleType.FIT_START);
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index ad1be16d..8a480d0b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -27,6 +27,8 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
+import com.google.android.flexbox.FlexDirection;
+import com.google.android.flexbox.JustifyContent;
 import com.xscm.modulemain.Application;
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
@@ -579,27 +581,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             mBinding.imRoomGz.setVisibility(VISIBLE);
         }
 
-        if (!userInfo.getIcon().isEmpty()) {
-            mBinding.flexEntry.setVisibility(VISIBLE);
-            for (String url : userInfo.getIcon()) {
-                if (url.contains("http")) {
-                    ImageView imageView1 = new ImageView(Application.getInstance());
-                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                            LinearLayout.LayoutParams.WRAP_CONTENT,
-                            Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
-                    );
-                    params.setMargins(0, 0, Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
-                    imageView1.setLayoutParams(params);
-                    imageView1.setScaleType(ImageView.ScaleType.FIT_START);
 
-                    // 使用 Glide 加载图片
-                    ImageUtils.loadHeadCC(url, imageView1, params);
-                    mBinding.flexEntry.addView(imageView1);
-                }
-            }
-        } else {
-            mBinding.flexEntry.setVisibility(GONE);
-        }
 
         if (userInfo.getProfile().isEmpty()) {
             mBinding.jianj.setText("");
@@ -696,6 +678,34 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             }
             mBinding.llCpAnimAvatar.setLayoutParams(params);
         }
+
+        if (!userInfo.getIcon().isEmpty()) {
+            mBinding.flexEntry.setVisibility(VISIBLE);
+            if (mBinding.rlCpAnim.getVisibility() == VISIBLE){
+                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mBinding.flexEntry.getLayoutParams();
+                params.endToStart = mBinding.rlCpAnim.getId();
+                mBinding.flexEntry.setLayoutParams(params);
+            }
+
+            for (String url : userInfo.getIcon()) {
+                if (url.contains("http")) {
+                    ImageView imageView1 = new ImageView(Application.getInstance());
+                    LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                            LinearLayout.LayoutParams.WRAP_CONTENT,
+                            Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_20)
+                    );
+                    params.setMargins(0, Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_10), Application.getInstance().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
+                    imageView1.setLayoutParams(params);
+                    imageView1.setScaleType(ImageView.ScaleType.FIT_START);
+
+                    // 使用 Glide 加载图片
+                    ImageUtils.loadHeadCC(url, imageView1, params);
+                    mBinding.flexEntry.addView(imageView1);
+                }
+            }
+        } else {
+            mBinding.flexEntry.setVisibility(GONE);
+        }
     }
 
     public void dianj(int type) {
diff --git a/MainModule/src/main/res/layout/fragment_room_user_info.xml b/MainModule/src/main/res/layout/fragment_room_user_info.xml
index 95c44b1f..df181625 100644
--- a/MainModule/src/main/res/layout/fragment_room_user_info.xml
+++ b/MainModule/src/main/res/layout/fragment_room_user_info.xml
@@ -116,19 +116,19 @@
                 android:layout_marginStart="@dimen/dp_5"
                 android:text="立即加入"
                 android:textColor="#FF52FF96"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/sp_14"
                 app:layout_constraintBottom_toBottomOf="@+id/tv_gh"
                 app:layout_constraintStart_toEndOf="@+id/tv_gh" />
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/flex_entry"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginStart="@dimen/dp_8"
                 app:alignContent="flex_start"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
+                app:layout_constraintEnd_toEndOf="@id/rl_cp_anim"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_join_guild" />