From bb00fb9dfba5ea68ff80b528f7b1d340ec1c8966 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Thu, 8 Jan 2026 17:02:02 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20-=20=E6=8E=A8=E9=80=81=E7=9A=84?= =?UTF-8?q?=E9=92=B1=E8=BF=99=E9=87=8C=EF=BC=8C=E9=9C=80=E8=A6=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=B8=80=E4=B8=8B=EF=BC=8C=E6=9C=80=E5=A4=9A=E6=98=BE?= =?UTF-8?q?=E7=A4=BA2=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=88=E4=B8=8D?= =?UTF-8?q?=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/proguard-rules.pro | 1 + .../vididin/main/fragments/HomeFragment.kt | 2 +- .../main/res/mipmap-xxhdpi/icon_gold_ss_new.webp | Bin 0 -> 2586 bytes .../builder/NotificationDataFactory.kt | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp diff --git a/app/build.gradle b/app/build.gradle index 72e6c19..c36c64e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 293b300..7c2ddbd 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -141,6 +141,7 @@ # 这将保护该包（及其子包）下所有类的类名、字段名和方法名不被更改。 -keep class com.gamedog.vididin.beans.** { *; } +-keep class com.gamedog.vididin.VidiDinApp # 如果模型类实现了Serializable接口，建议额外保留序列化版本UID和特定方法 diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt index 9bac521..5414ac2 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/HomeFragment.kt @@ -85,7 +85,7 @@ class HomeFragment : AppViewsFragment(), OnSwit Router.Benefit.startActivity(requireActivity()) StatisticUtil.reportEvents(StatisticUtil.KEY_Chest_Claim_Click) }, - PopMenuView.MenuItem(R.mipmap.home_menu_2,R.mipmap.icon_gold_ss, 0) { + PopMenuView.MenuItem(R.mipmap.home_menu_2,R.mipmap.icon_gold_ss_new, 0) { WatchAdDialog(requireActivity(), VidiConst.WATCH_AD_FOR_DAILY_EARN_GOLD, WatchAdDialog.FROM_HOME_MENU,null).show() }, PopMenuView.MenuItem(R.mipmap.home_menu_3,0, 0) { diff --git a/app/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp b/app/src/main/res/mipmap-xxhdpi/icon_gold_ss_new.webp new file mode 100644 index 0000000000000000000000000000000000000000..3d0b252731a301ec28d5f1e2814c55edf771e36e GIT binary patch literal 2586 zcmbtVdpML^7vIwi8id@Y+(wr(x=d;!Q4K1NXila%MsBIbEi^{sT2a!4T*^t4`!&}= zb0nk4B{d{7B&CyanGhj_Fb2(e)$=`_KhF34^X>hvwSRl<-?P_Rd+%qxB+FlaRg?zc znE3&sEz!^pf?x+E8@_**2M-coz@RCBy;#-=Xo>3MPbXO%(6+O8(3TPa7}USFQ!akK zKhVEwh&9{sgWJCCUm5?~h;()HbAc#dAlXQVoI^1wLs;442i~-dDL?SOWgO)1>kn~= z%b0FMItXD`2ygQE2d4Z3yZF+V`7sb@AN5SYvajW~oSm$j5BYa!TnUK=@B<`Z0S+wZ z56z)Q%Lc%31^{^6Pa7o(fQoAXtm*t|+n5P}{8a$htv_u)&&2l>{nYpE5RhKs?he3I zJ^-ui0Z@7cfVAWHHAwxJ*tDS~4Ja-e)IGo%;0CmTCGY_*Ko>$gp-aU91L%ec8=)+= zZ>U?Tuqt3(wiq_TrmDy11dO95ISGO8kEwh%bKZ?r#rP+i*x|toBlBT7|VT!xrcFv-5$m%C1yu2!T@yDrmY5PRUH2gx?v z-{Cz72c8(}y^eN9jR7Ij)(xRAZ`?aI{Pk(Rwd(k^m}L_5@Zy7|_z;}IjWz_aq*LtY z=Fa@6MJdQRq!-!b(CwvCke%u>u$tYo-v~u^Cs;fB3HmiNR5PaLE94zn=n3INJFb)| z2V;O!67#MgC6jl)lEoiC+h+QlYi2`rE9Mb6Z~Q|_B^<{o)A+&0h;@ul`X4bcP_NZ({C4TtbB+L>L0#Ik@SJrq z`2Bi1%MGI}W$|L-aH;dN!3&|GW1#QgX-+r2f_9OF!mfnon@8GB``w2Z6#Peh@KEBYckc&gmaLq zDdE_)lj~sMdV29OyCF=6t#?}W_%?-Fc!7#EpzBhsE^%C%XY`px|678ZfPbwVUU?_^Dy z(LFC+=pRH>LDzpB=-}qOBzi;jkZ_~~8_Nq>2~3Szos@BjYlP;qWV}A^&m2>u3Ftt> z6ry@n2^xzNiU4RImZWb-`s@A!H>_;2 zAj7Uje;Rp5xn|NS`m1{Tm;?YK$7rY79^6|iw%DY|ocHQeYVjwbf@xi)NCgEm0*J=P z1;iOkB{9N0+U<(fqM)wBXSo&kub99~`JcOkcnrzHVTgDDrM2QGmZH!$Ypezo${%Y3hUIN2g?wW%=u* zB%A4VurO*B{-|ZNS9zAS(nQT9gI1%e!NkJk5XTbzXP4$;t&&ULE`TuOl=Gpz@VVm) z&84;2vfeR{s4|p+ElhZjTbfq5S?^LyiqNgi45c?#DsdX^sVN-V`c&nq3Lx{gIk3)6 zcRfwGnc6KiPAXwnUf9rhap6tX!ft6@07AKKxZlyAgV$Fm{DL&MjEV|)dB6YQp{PC~ zE5k~6dObjurJ&kD$l3638No^ZAD3DJVJN=&H9AA3C%N;W=ktf5WksZ8Rfy z+WGnV7!T|8bf5YduU#pLM(zAz=!GYY2M<=>NScmmbvSvxbKhvW7OEsPr@fas7U1nA zoQy%*Hn0bE$_Z8{vlURychpZj)(?_$5$7dr=Z1`MlkQX8aB=v(xqm2URVB#k=N}P{ zNZ>#nz>tbur{mR{`}aImp~%_HG?~v-&gaTh1sO(kiR$OaTGI^E(-!o5%-~_4<}J4= zon7rYsJ)pKi4506OGEXd4vn*|JK0yVeer9c4kj6LJEi!g>qh_kSduJk1~3sGZ?~+I zxSB{~He7$5X@9Xf`kht-(mP)cSf}n~$lr$#q{OWP)#TU+=9RKJC-H}my1bAIlc34r I^b|eV-@`X0xc~qF literal 0 HcmV?d00001 diff --git a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt index aa4fd17..7173a7c 100644 --- a/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt +++ b/notification/src/main/java/com/remax/notification/builder/NotificationDataFactory.kt @@ -372,7 +372,7 @@ class ResidentModelManger { R.layout.layout_notification_resident_12, R.layout.layout_notification_resident ).setTextViewText(R.id.tv_resident_gold, NotificationDatas.getResidentDatas().getGoldNumber().toString()) - .setTextViewText(R.id.tv_resident_cash, NotificationDatas.getResidentDatas().getCashNumber().toString()) + .setTextViewText(R.id.tv_resident_cash, String.format("%.2f", NotificationDatas.getResidentDatas().getCashNumber())) .setTextViewText(R.id.tv_resident_box, NotificationDatas.getResidentDatas().getBoxRestTimeStr()) .setOnClickPendingIntent( R.id.resident_gold, entryPointPendingIntent(context,