From 97d0e52f32d98e606538031306cdb2d191f3c7b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Thu, 21 Aug 2025 19:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BC=E7=89=A9=E5=A2=99?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BC=9A=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modulemain/src/main/AndroidManifest.xml       |  1 -
 .../dialog/RoomUserInfoFragment.java          | 72 ++++++++++---------
 .../adapter/UserGiftWallAdapter.java          |  5 ++
 .../res/layout/me_item_user_gift_wall.xml     |  1 +
 4 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index b091a49c..a729dc2f 100644
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -12,7 +12,6 @@
             android:name=".activity.MainActivity"
             android:launchMode="singleTask"
             android:exported="true"
-            android:taskAffinity="com.qxcm.modulemain.main"
             >
         </activity>
     </application>
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
index 27c69b77..be47c5d7 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
@@ -1,6 +1,7 @@
 package com.example.moduleroom.dialog;
 
 import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -127,7 +128,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
         if (type == 0) {
             mBinding.roomDian.setVisibility(GONE);
         } else {
-            mBinding.roomDian.setVisibility(View.VISIBLE);
+            mBinding.roomDian.setVisibility(VISIBLE);
         }
 
 
@@ -379,19 +380,22 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
             close_type=4;
         }
 
-        if (user_id.equals(SpUtil.getUserId()+"")){
-            mBinding.tvGh.setVisibility(GONE);
-        }else {
+//        if (user_id.equals(SpUtil.getUserId()+"")){
+//            mBinding.tvGh.setVisibility(GONE);
+//        }else {
             if (userInfo!=null) {
-                if (userInfo.getRed_status().equals("1")) {
-                    mBinding.tvGh.setVisibility(View.VISIBLE);
-                } else {
-                    mBinding.tvGh.setVisibility(GONE);
-                }
+                mBinding.tvGh.setVisibility(VISIBLE);
+                mBinding.tvGh.setText("所属公会："+((userInfo.getGuild()!=null && !userInfo.getGuild().isEmpty()) ? userInfo.getGuild() : "无"));
+
+//                if (userInfo.getRed_status().equals("1")) {
+//                    mBinding.tvGh.setVisibility(View.VISIBLE);
+//                } else {
+//                    mBinding.tvGh.setVisibility(GONE);
+//                }
             }else {
                 mBinding.tvGh.setVisibility(GONE);
             }
-        }
+//        }
         mBinding.tvTs.setText(String.format("90天内累计收到 %s 个礼物", userInfo.getGift_num()));
 
         updateUIBasedOnTypeAndUser();
@@ -453,7 +457,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 //            isSelf=false;
 //        }
         if (userInfo.getIs_in_pit() == 1){
-            mBinding.roomMCz.setVisibility(View.VISIBLE);
+            mBinding.roomMCz.setVisibility(VISIBLE);
         }else {
             mBinding.roomMCz.setVisibility(GONE);
         }
@@ -463,94 +467,94 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
 
         switch (type) {
             case 1: // 房主
-                mBinding.roomDian.setVisibility(View.VISIBLE);
+                mBinding.roomDian.setVisibility(VISIBLE);
                 mBinding.roomJb.setVisibility(View.GONE);
                 mBinding.roomLh.setVisibility(View.GONE);
-                mBinding.roomBo.setVisibility(View.VISIBLE);
+                mBinding.roomBo.setVisibility(VISIBLE);
                 if (isSelf){
                     mBinding.roomDian.setVisibility(GONE);
                     mBinding.roomJb.setVisibility(View.GONE);
                     mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
 
                 break;
             case 2://管理员
                 if (close_type==1){ //管理员查看房主信息
                     mBinding.roomDian.setVisibility(View.GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+                    mBinding.roomJb.setVisibility(VISIBLE);
+                    mBinding.roomLh.setVisibility(VISIBLE);
                     mBinding.roomBo.setVisibility(View.GONE);
                     mBinding.roomMCz.setVisibility(GONE);
 
                 }else {
-                    mBinding.roomDian.setVisibility(View.VISIBLE);
+                    mBinding.roomDian.setVisibility(VISIBLE);
                     mBinding.roomJb.setVisibility(GONE);
                     mBinding.roomLh.setVisibility(GONE);
-                    mBinding.roomBo.setVisibility(View.VISIBLE);
+                    mBinding.roomBo.setVisibility(VISIBLE);
 //                    if (isNum==1){
 //                        mBinding.roomMCz.setVisibility(View.VISIBLE);
 //                    }else {
 //                        mBinding.roomMCz.setVisibility(GONE);
 //                    }
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
                 if (isSelf){
                     mBinding.roomDian.setVisibility(GONE);
                     mBinding.roomJb.setVisibility(View.GONE);
                     mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
                 break;
             case 3:
                 if (close_type==1 ||close_type==2){ //主持查看房主或者管理员信息
                     mBinding.roomDian.setVisibility(View.GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
-                    mBinding.roomBo.setVisibility(View.VISIBLE);
+                    mBinding.roomJb.setVisibility(VISIBLE);
+                    mBinding.roomLh.setVisibility(VISIBLE);
+                    mBinding.roomBo.setVisibility(VISIBLE);
                     mBinding.roomMCz.setVisibility(GONE);
                 }else {
-                    mBinding.roomDian.setVisibility(View.VISIBLE);
+                    mBinding.roomDian.setVisibility(VISIBLE);
                     mBinding.roomJb.setVisibility(GONE);
                     mBinding.roomLh.setVisibility(GONE);
-                    mBinding.roomBo.setVisibility(View.VISIBLE);
+                    mBinding.roomBo.setVisibility(VISIBLE);
 //                    if (isNum==1){
 //                        mBinding.roomMCz.setVisibility(View.VISIBLE);
 //                    }else {
 //                        mBinding.roomMCz.setVisibility(GONE);
 //                    }
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
                 if (isSelf){
                     mBinding.roomDian.setVisibility(GONE);
                     mBinding.roomJb.setVisibility(View.GONE);
                     mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
                 break;
             case 4:
                 if (close_type==1 ||close_type==2 ||close_type==3) {
                     mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+                    mBinding.roomJb.setVisibility(VISIBLE);
+                    mBinding.roomLh.setVisibility(VISIBLE);
                     mBinding.roomMCz.setVisibility(GONE);
-                    mBinding.roomBo.setVisibility(View.VISIBLE);
+                    mBinding.roomBo.setVisibility(VISIBLE);
                 }else {
                     mBinding.roomDian.setVisibility(GONE);
-                    mBinding.roomJb.setVisibility(View.VISIBLE);
-                    mBinding.roomLh.setVisibility(View.VISIBLE);
+                    mBinding.roomJb.setVisibility(VISIBLE);
+                    mBinding.roomLh.setVisibility(VISIBLE);
                     mBinding.roomMCz.setVisibility(GONE);
-                    mBinding.roomBo.setVisibility(View.VISIBLE);
+                    mBinding.roomBo.setVisibility(VISIBLE);
                 }
                 if (isSelf){
                     mBinding.roomDian.setVisibility(GONE);
                     mBinding.roomJb.setVisibility(View.GONE);
                     mBinding.roomLh.setVisibility(View.GONE);
                     mBinding.roomBo.setVisibility(GONE);
-                    mBinding.roomMCz.setVisibility(View.VISIBLE);
+                    mBinding.roomMCz.setVisibility(VISIBLE);
                 }
                 break;
             default:
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
index 31b8975e..cea1ee0b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
@@ -1,5 +1,8 @@
 package com.example.modulevocal.adapter;
 
+import android.graphics.Color;
+import android.media.Ringtone;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -28,6 +31,7 @@ public class UserGiftWallAdapter extends BaseQuickAdapter<CombinedGiftBean, Base
             ImageLoader.loadImage(mContext, helper.getView(R.id.iv_gift_pic), item.getBase_image());
 
             if (item.is_liang()) {
+                helper.getView(R.id.cl_iv_down_on).setBackgroundColor(Color.parseColor("#E6E6E6"));
                 // 点亮的礼物显示高亮和送礼物的用户
                 helper.setText(R.id.tv_number, "x" + item.getTop_users_count());
                 helper.setVisible(R.id.tv_number, true);
@@ -38,6 +42,7 @@ public class UserGiftWallAdapter extends BaseQuickAdapter<CombinedGiftBean, Base
                 recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
                 TopUsersAdapter topUsersAdapter = new TopUsersAdapter(item.getTop_users());
                 recyclerView.setAdapter(topUsersAdapter);
+
             } else {
                 // 未点亮的礼物只显示图片、名称和金额，不高亮
                 helper.setVisible(R.id.tv_number, false);
diff --git a/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml b/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
index 15d5867a..a5b170a9 100644
--- a/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
+++ b/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
@@ -6,6 +6,7 @@
     android:layout_height="@dimen/dp_129"
     android:layout_marginTop="@dimen/dp_10"
     android:background="@mipmap/gift_bj"
+    android:id="@+id/cl"
     android:gravity="center_horizontal"
     android:orientation="vertical">