From 30522430a9c1218b68d0a1efbe146756e6bf6358 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 8 Jan 2026 17:15:33 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20-=200.1=E5=89=8D=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AAR$,=E7=84=B6=E5=90=8E=E6=97=81=E8=BE=B9=E7=9A=84?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=EF=BC=8C=E5=AD=97=E5=8F=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=A8=8D=E5=BE=AE=E5=B0=8F=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/layout_notification_resident.xml   |   6 +-
 .../layout_notification_resident_12.xml       |  65 +++++++++++++-----
 .../res/mipmap-xxhdpi/icon_cash_most.webp     | Bin 0 -> 1306 bytes
 .../res/mipmap-xxhdpi/icon_gold_most.webp     | Bin 0 -> 2076 bytes
 .../res/mipmap-xxhdpi/icon_gold_ss_new.webp   | Bin 0 -> 2586 bytes
 5 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 notification/src/main/res/mipmap-xxhdpi/icon_cash_most.webp
 create mode 100644 notification/src/main/res/mipmap-xxhdpi/icon_gold_most.webp
 create mode 100644 notification/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp

diff --git a/notification/src/main/res/layout/layout_notification_resident.xml b/notification/src/main/res/layout/layout_notification_resident.xml
index a2f56f2..3620854 100644
--- a/notification/src/main/res/layout/layout_notification_resident.xml
+++ b/notification/src/main/res/layout/layout_notification_resident.xml
@@ -30,7 +30,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:layout_marginTop="13dp"
-            android:textSize="9sp"
+            android:textSize="8sp"
             android:textColor="@color/white"
             android:text="0"
             />
@@ -58,7 +58,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:layout_marginTop="13dp"
-            android:textSize="9sp"
+            android:textSize="8sp"
             android:textColor="@color/white"
             android:text="0"
             />
@@ -86,7 +86,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:layout_marginTop="13dp"
-            android:textSize="9sp"
+            android:textSize="8sp"
             android:textColor="@color/white"
             android:text="0"
             />
diff --git a/notification/src/main/res/layout/layout_notification_resident_12.xml b/notification/src/main/res/layout/layout_notification_resident_12.xml
index ad2dbc1..3ac7eb7 100644
--- a/notification/src/main/res/layout/layout_notification_resident_12.xml
+++ b/notification/src/main/res/layout/layout_notification_resident_12.xml
@@ -23,17 +23,32 @@
             android:src="@mipmap/noti_gold"
             />
 
-        <TextView
-            android:id="@+id/tv_resident_gold"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
             android:layout_marginTop="16dp"
-            android:textSize="12sp"
-            android:textColor="@color/white"
-            android:text="0"
-            />
+            android:layout_gravity="center">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_gold_most"
+                android:layout_gravity="center_vertical"
+                android:scaleType="center"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="2dp"
+                />
+            <TextView
+                android:id="@+id/tv_resident_gold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:textSize="11sp"
+                android:textColor="@color/white"
+                android:text="0"
+                />
+        </LinearLayout>
+
+
     </FrameLayout>
 
 
@@ -51,17 +66,31 @@
             android:src="@mipmap/noti_cash"
             />
 
-        <TextView
-            android:id="@+id/tv_resident_cash"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
             android:layout_marginTop="16dp"
-            android:textSize="12sp"
-            android:textColor="@color/white"
-            android:text="0"
-            />
+            android:layout_gravity="center">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_cash_most"
+                android:layout_gravity="center_vertical"
+                android:scaleType="center"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="2dp"
+                />
+            <TextView
+                android:id="@+id/tv_resident_cash"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center_vertical"
+                android:textSize="11sp"
+                android:textColor="@color/white"
+                android:text="0"
+                />
+        </LinearLayout>
     </FrameLayout>
 
 
@@ -86,7 +115,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:layout_marginTop="16dp"
-            android:textSize="12sp"
+            android:textSize="11sp"
             android:textColor="@color/white"
             android:text="0"
             />
@@ -113,7 +142,7 @@
             android:gravity="center"
             android:singleLine="true"
             android:layout_marginTop="16dp"
-            android:textSize="12sp"
+            android:textSize="11sp"
             android:textColor="@color/white"
             android:text="@string/game"
             />
diff --git a/notification/src/main/res/mipmap-xxhdpi/icon_cash_most.webp b/notification/src/main/res/mipmap-xxhdpi/icon_cash_most.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d921ba1410f7498ce7443f9b8c187a87c770dffe
GIT binary patch
literal 1306
zcmWIYbaNA8Wnc(*bqWXzu!!JdU|=u+VsS9?baoCn!3g9sFrEOBEI_H;ypp0IcPE92
z$S4K&2Mmlr2nLDC#RU)+RuZV{+ck*V%eq)q;1}dfNi9wWD)|7!Dn&rcfo>83vPIG%
zYz+`Q3BtAkvCB&eN`PttK<uKBAZH*u1<2M&M`9--v6BmmK<aydYHV_IN<nsk0LXVd
zsd=HnK$-)HWf+PXf*9NxoIw5u@_`_K5d(w8R|W>=2?(*InG6iuTNxN6ZXv`}7BDdI
zw=ghlJC6`Ugh@eSQ6ktl79h!#md3#FX*mM}ZzKbQ@C612u4u3vkig+K1)!7+&|UdJ
zn9h*HkjkLI;K`83kj$V5WElY?)sVpq7{fj)%nS_r;s;m->{+cR<z79tru5v-?|a*K
zyE(|UI7~cun!VlO&eQX<cJt>{PgGfOZQI*bQQ7y!JGexexfU(rRrz~?f9-;ze_Em+
zdFR~PHqZ5WOwl<}jRngOvsrCukT2P=!r13kT5rb>%MKOKiIZ<0_c^cg^fk~!OZMK*
zd|wuMGjGk??~$`~yEnhKb!gD>6MwhQ-dw?9?yFlnzyB9r;8S|`WZLf#FEjpj>CUTP
zf2ptd#&>-7!kD<V|2j@T_s%+VCF6>?@8yL3ufM%kW-$}k#*}!NGsJ_#W8oU7l?9y3
zl~kOZI2GL$-23a}i*K6f_&od8zg&UEq0gbKWsbv*2^$&<m_oV}IG$)IF}j3tDmp}}
zglGpgtl1^T`mx`Fah1*@##4??3XNV8HylzJy;caZ<^Pjf%r<cX!wPv3jwc*nUTn8~
zl>;>J{?qv5i&R!E^UB(g7Z7`OrRc3To1DVnV4pOWS*5WTb6@h#cJQ-!=%Ll!aVLA_
zEG~1?rxh$qTNp~GdaVd?ShOuST{+bzczg3!)7KZPp3nC^wk`MescYG{?>)Epe(Jhy
zTgN}`oZH(1C%ub}Uzj;-o4FKUyYj``irH}*d)zOZXd5-v?YGb9{rvmyzuk`YyE=9>
z?_QS4#4zL8x=Mv}O8;(Ldv<Mh#J!xny!#Vk;$v%>HvX%q{2H~#_0ZMU_yg0Y{%oDA
zf8c$qHm8#24908ApV`&Uoq3Pp8P_A$pTZkV?0z#>*ly%_{BzQtK)b%46aOYo?C+5g
zRe8o|Y-z(|v-^8OMMclTn3+$$T(&p(aPZW8KAta^<||uXa!yZA|GwDX!QY?XcKXpR
zOT2SSwr)Fgc>jf}><Qnxjdor*@q1aC;iux@$JJ8jPk*-w=a(%l{l35U{p!`P8+L8}
zWV<=LVcM%%&-JtNwlQ42Iq7n!edBiC(9o^#8|F_<Px*YZt8453zu^n^{Fzd7UU+Hh
zQvKw|p_!R4KUQqKuyE3(N0TDFfPn9`*Rs49ZHW?X3t#VACtVe`=R$w+{GirV9(My<
yy;dr1y|4In+MA-^d*aq#fBiY~vCX<C^-fc|ytm$bYc~6A-uBy<ax|x{G64Y1qur<g

literal 0
HcmV?d00001

diff --git a/notification/src/main/res/mipmap-xxhdpi/icon_gold_most.webp b/notification/src/main/res/mipmap-xxhdpi/icon_gold_most.webp
new file mode 100644
index 0000000000000000000000000000000000000000..962a7642d089a822e92c692a6acba2b5add8f99e
GIT binary patch
literal 2076
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
KL!kvifWHAUL^sO-

literal 0
HcmV?d00001

diff --git a/notification/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp b/notification/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3d0b252731a301ec28d5f1e2814c55edf771e36e
GIT binary patch
literal 2586
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
I^b|eV-@`X0xc~qF

literal 0
HcmV?d00001