From ea82b59b0a36270cc19d1d3d53a2e3be69da57b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 24 Sep 2025 17:16:05 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=8B=8D=E5=8D=96=E6=88=BF?=
 =?UTF-8?q?=E9=AD=85=E5=8A=9B=E6=B8=85=E9=99=A4=202:=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=91=E7=8E=B0=E7=AD=89=E5=BE=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xscm/moduleutil/widget/RoomMakeWheatView.java  |  5 +++++
 .../activity/DynamicDetailActivity.java            |  2 +-
 .../fragment/CircleCategoryFragment.java           |  2 +-
 .../moduleroom/dialog/RoomSettingFragment.java     | 10 +++++-----
 .../moduleroom/fragment/RoomAuctionFragment.java   | 14 +++++++-------
 .../src/main/res/layout/activity_my_money.xml      |  8 ++++----
 .../main/res/layout/room_fragment_my_room_list.xml |  1 +
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
index 38c687b..eda90ab 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
@@ -174,6 +174,11 @@ public class RoomMakeWheatView extends BaseWheatView {
 //        });
 
     }
+
+    public void setmTvTime(String charm){
+        mTvTime.setText(StringUtil.toWan2(pitBean.getCharm(),1));
+    }
+
     private onCharmClickListener mOnCharmClickListener;
 //
     public void setmOnCharmClickListener(onCharmClickListener mOnCharmClickListener) {
diff --git a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java b/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
index faef724..ba52272 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
@@ -249,7 +249,7 @@ public class DynamicDetailActivity extends BaseMvpActivity<CirclePresenter, Acti
         if (type == 1){
             finish();
         }else {
-            MvpPre.topicId(zone_id, 2);
+//            MvpPre.topicId(zone_id, 2);
         }
 //        finish();
     }
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
index 1c90029..8440a1e 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
@@ -244,7 +244,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
 
     @Override
     public void setLikeZone(int type) {
-        MvpPre.getCircleList(page + "", "10");
+//        MvpPre.getCircleList(page + "", "10");
     }
 
     @Override
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index acf982a..4a12791 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -341,11 +341,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 房主显示全部
         if (roleLevel == 1) {
             if (onMic) {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
                     return false;
                 }
             }else {
-                if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
                     return false;
                 }
             }
@@ -357,11 +357,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
                         return false;
                     }
                 }else {
-                    if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                    if (type==RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
                         return false;
                     }
                 }
@@ -372,7 +372,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                    ) {
                 return true;
             }else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic){
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
                     return false;
                 }
             }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
index 213bc9c..7ad0f57 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
@@ -1060,7 +1060,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         if (pitBean3!=null){
         if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
             pitBean3.setCharm("");
-            mBinding.ivAuction1.setCharm("0");
+            mBinding.ivAuction1.setmTvTime("0");
             return;
         }
         }
@@ -1068,7 +1068,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         if (pitBean4!=null) {
             if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean4.setCharm("");
-                mBinding.ivAuction2.setCharm("0");
+                mBinding.ivAuction2.setmTvTime("0");
                 return;
             }
         }
@@ -1076,7 +1076,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         if (pitBean5!=null) {
             if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
                 pitBean5.setCharm("");
-                mBinding.ivAuction3.setCharm("0");
+                mBinding.ivAuction3.setmTvTime("0");
                 return;
             }
         }
@@ -1229,17 +1229,17 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         if (mBinding.ivAuction1.pitBean != null) {
             RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
             pitBean3.setCharm("");
-            mBinding.ivAuction1.setCharm("0");
+            mBinding.ivAuction1.setmTvTime("0");
         }
         if (mBinding.ivAuction2.pitBean != null) {
             RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
             pitBean4.setCharm("");
-            mBinding.ivAuction2.setCharm("0");
+            mBinding.ivAuction2.setmTvTime("0");
         }
         if (mBinding.ivAuction3.pitBean != null) {
             RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
             pitBean5.setCharm("");
-            mBinding.ivAuction3.setCharm("0");
+            mBinding.ivAuction3.setmTvTime("0");
         }
     }
 
@@ -1399,7 +1399,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 
         if (targetWheatView != null) {
             targetWheatView.pitBean.setCharm(charm);
-            targetWheatView.setCharm(charm);
+            targetWheatView.setmTvTime(charm);
         }
     }
 
diff --git a/modulevocal/src/main/res/layout/activity_my_money.xml b/modulevocal/src/main/res/layout/activity_my_money.xml
index 6888ca8..49b3f60 100644
--- a/modulevocal/src/main/res/layout/activity_my_money.xml
+++ b/modulevocal/src/main/res/layout/activity_my_money.xml
@@ -136,7 +136,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tv_zd">
 
             <TextView
-                android:layout_width="@dimen/dp_56"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_21"
                 android:layout_alignParentStart="true"
                 android:layout_centerHorizontal="true"
@@ -168,7 +168,7 @@
             app:layout_constraintTop_toBottomOf="@+id/r_1">
 
             <TextView
-                android:layout_width="@dimen/dp_56"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_21"
                 android:text="@string/diamond_income_expense"
                 android:layout_centerInParent="true"
@@ -212,7 +212,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tv_qt">
 
             <TextView
-                android:layout_width="@dimen/dp_56"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_21"
                 android:text="@string/diamond_to_coin"
                 android:layout_centerInParent="true"
@@ -245,7 +245,7 @@
             app:layout_constraintTop_toBottomOf="@+id/r_3">
 
             <TextView
-                android:layout_width="@dimen/dp_56"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_21"
                 android:text="@string/diamond_to_bangka"
                 android:layout_centerInParent="true"
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml b/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
index 4d5dc6b..277dca8 100644
--- a/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
+++ b/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
@@ -179,6 +179,7 @@
                     app:layout_constraintStart_toEndOf="@+id/rl_mx"
                     android:gravity="center"
                     android:text="房间补贴"
+                    android:visibility="gone"
                     />