From c446c7bb49333fcb30706e8bfa5a5abb22d4ea23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 19 Sep 2025 18:19:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=8F=98=E6=9B=B4=E5=88=B0drawable?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=85=E6=99=B0=E5=BA=A6=202.=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=82=B9=E5=94=B1=E6=88=BF=E6=B2=A1=E4=BA=BA=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=81=AB=E7=83=AD=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen.webp                                  | Bin
 app/src/main/res/layout/activity_launch_page.xml |   2 +-
 gradle.properties                                |   2 +-
 .../giftLottery/TourClubDialogFragment.java      |   2 +-
 .../moduleutil/widget/RoomSingSongWheatView.java |  12 ++++++++----
 .../src/main/res/layout/room_view_sing_wheat.xml |   1 +
 .../res/mipmap-xxhdpi/common_et_clear_icon.webp  |   0
 .../res/mipmap-xxxhdpi/common_et_clear_icon.png  | Bin 0 -> 2958 bytes
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename app/src/main/res/{mipmap-xxxhdpi => drawable-xxxhdpi}/screen.webp (100%)
 delete mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/common_et_clear_icon.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/common_et_clear_icon.png

diff --git a/app/src/main/res/mipmap-xxxhdpi/screen.webp b/app/src/main/res/drawable-xxxhdpi/screen.webp
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/screen.webp
rename to app/src/main/res/drawable-xxxhdpi/screen.webp
diff --git a/app/src/main/res/layout/activity_launch_page.xml b/app/src/main/res/layout/activity_launch_page.xml
index 76372c3..233d679 100644
--- a/app/src/main/res/layout/activity_launch_page.xml
+++ b/app/src/main/res/layout/activity_launch_page.xml
@@ -94,7 +94,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clickable="true"
-            android:src="@mipmap/screen"
+            android:src="@drawable/screen"
             android:scaleType="centerCrop"
             android:visibility="visible" />
 
diff --git a/gradle.properties b/gradle.properties
index 0ffb268..54e8ad0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,7 @@ isBuildModule=false
 android.injected.testOnly=false
 
 APP_VERSION_NAME=1.0.2
-APP_VERSION_CODE=146
+APP_VERSION_CODE=147
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
index 028feb3..f1ff012 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
@@ -211,7 +211,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             if (!isDrawing) {
                 isDrawing = true;
                 prepareForNewLottery();
-                num = "20";
+                num = "100";
                 MvpPre.xlhChou(roomId, num);
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
index 74de874..5e6759d 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -73,7 +73,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
         }
 
         updateSexIcon();
-        updateCharmViewVisibility(bean);
+//        updateCharmViewVisibility(bean);
         updatePkState(bean);
     }
 
@@ -82,7 +82,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
         mIvRipple.setVisibility(VISIBLE);
         mTvName.setText(bean.getNickname());
         ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
-
+        mCharmView.setVisibility(VISIBLE);
         if (TextUtils.isEmpty(bean.getDress())) {
             mIvFrame.stopAll();
             mIvFrame.setVisibility(INVISIBLE);
@@ -98,7 +98,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
 
     private void handleOffState(RoomPitBean bean) {
         mTvName.setText(getPitNumberText());
-
+        mCharmView.setVisibility(GONE);
         if (showBoss && TextUtils.equals(WHEAT_BOSS, pitNumber)) {
             mIvTagBoss.setVisibility(VISIBLE);
             int resId = bean.getIs_lock() == 1 ? R.mipmap.room_ic_wheat_default_suo : R.mipmap.room_ic_wheat_default;
@@ -146,7 +146,11 @@ public class RoomSingSongWheatView extends BaseWheatView {
             }
         } else {
             tv_time_pk.setVisibility(GONE);
-            mCharmView.setVisibility(VISIBLE);
+            if (isOn()) {
+                mCharmView.setVisibility(VISIBLE);
+            }else {
+                mCharmView.setVisibility(GONE);
+            }
         }
     }
 
diff --git a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
index 517d414..692d942 100644
--- a/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
+++ b/moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
@@ -38,6 +38,7 @@
             android:scaleType="fitCenter"
             android:visibility="gone"
             tools:visibility="visible"
+            app:layout_constraintDimensionRatio="0.99:0.99"
             app:layout_constraintBottom_toBottomOf="@id/riv"
             app:layout_constraintEnd_toEndOf="@id/riv"
             app:layout_constraintStart_toStartOf="@id/riv"
diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/common_et_clear_icon.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/common_et_clear_icon.webp
deleted file mode 100644
index e69de29..0000000
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/common_et_clear_icon.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/common_et_clear_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3eeefacc8a54ae6b899ef43f8e79af55404d5dc1
GIT binary patch
literal 2958
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
Gjr0!=*(gT<

literal 0
HcmV?d00001