From 60bc80e58680a041ec1f3612c3abe0d72e73278a Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Thu, 7 Nov 2024 15:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/layout/dialog_loading.xml | 1 + .../com/yunbao/main/activity/MainActivity.java | 13 +++++++++---- main/src/main/res/layout/view_homemain.xml | 9 +++++---- .../src/main/res/mipmap-hdpi/ic_yola_msg_red1.png | Bin 0 -> 414 bytes .../src/main/res/mipmap-hdpi/ic_yola_msg_red2.png | Bin 0 -> 432 bytes .../src/main/res/mipmap-mdpi/ic_yola_msg_red1.png | Bin 0 -> 266 bytes .../src/main/res/mipmap-mdpi/ic_yola_msg_red2.png | Bin 0 -> 276 bytes .../main/res/mipmap-xhdpi/ic_yola_msg_red1.png | Bin 0 -> 464 bytes .../main/res/mipmap-xhdpi/ic_yola_msg_red2.png | Bin 0 -> 486 bytes .../main/res/mipmap-xxhdpi/ic_yola_msg_red1.png | Bin 0 -> 841 bytes .../main/res/mipmap-xxhdpi/ic_yola_msg_red2.png | Bin 0 -> 863 bytes .../main/res/mipmap-xxxhdpi/ic_yola_msg_red1.png | Bin 0 -> 770 bytes .../main/res/mipmap-xxxhdpi/ic_yola_msg_red2.png | Bin 0 -> 789 bytes 13 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 main/src/main/res/mipmap-hdpi/ic_yola_msg_red1.png create mode 100644 main/src/main/res/mipmap-hdpi/ic_yola_msg_red2.png create mode 100644 main/src/main/res/mipmap-mdpi/ic_yola_msg_red1.png create mode 100644 main/src/main/res/mipmap-mdpi/ic_yola_msg_red2.png create mode 100644 main/src/main/res/mipmap-xhdpi/ic_yola_msg_red1.png create mode 100644 main/src/main/res/mipmap-xhdpi/ic_yola_msg_red2.png create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red1.png create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red2.png create mode 100644 main/src/main/res/mipmap-xxxhdpi/ic_yola_msg_red1.png create mode 100644 main/src/main/res/mipmap-xxxhdpi/ic_yola_msg_red2.png diff --git a/common/src/main/res/layout/dialog_loading.xml b/common/src/main/res/layout/dialog_loading.xml index ad2fb6dea..71ffccbc3 100644 --- a/common/src/main/res/layout/dialog_loading.xml +++ b/common/src/main/res/layout/dialog_loading.xml @@ -25,6 +25,7 @@ android:gravity="center" android:paddingStart="10dp" android:paddingEnd="10dp" + android:paddingBottom="5dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/loading" diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java index ed80e7d3d..0edf218a7 100644 --- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java @@ -1544,12 +1544,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene messageNumber = event.getNumber(); if (event.getNumber() > 0) { v_table_redpoint.setVisibility(View.VISIBLE); - if (event.getNumber() > 99) { - v_table_redpoint.setText("99+"); - } else { + if (event.getNumber()>9){ + v_table_redpoint.setBackgroundResource(R.mipmap.ic_yola_msg_red2); + if (event.getNumber() > 99) { + v_table_redpoint.setText("99+"); + }else{ + v_table_redpoint.setText(event.getNumber() + ""); + } + }else { + v_table_redpoint.setBackgroundResource(R.mipmap.ic_yola_msg_red1); v_table_redpoint.setText(event.getNumber() + ""); } - } else { v_table_redpoint.setVisibility(View.GONE); v_table_redpoint.setText(""); diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml index 88ea4998b..24c64a4b2 100644 --- a/main/src/main/res/layout/view_homemain.xml +++ b/main/src/main/res/layout/view_homemain.xml @@ -105,12 +105,13 @@ Px$SV=@dR5(wql+Q{6Q543%?>LLvT5A_B+Efl0Jwk+UB4`!#1Vw>9 zLZDQS5Vh#friBaF=CX*!bK*{pjGCe0g}b=idp^E7=lcyYuxx!X3D3*JPzEgvFbP;2 z#s>gZBtGiAdTqta7(ZBkc?*;Sc#?)1!W}Ik;C9eyLiLFC=Zom7Ct~@`35Y#V1QshE zv`PY|3d1RDkNfUA6tUdWHbl+<%3#gtvnkAWSbMsp6&L2AGxwmR{&euGBWoZCR%u1Q z1d$2?9p6Os(i7lQOSFQ21L0a<6UUWvjqcbjZ6niyacLs9XnWiEp8x;=07*qo IM6N<$f&=QY&Hw-a literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_msg_red2.png b/main/src/main/res/mipmap-hdpi/ic_yola_msg_red2.png new file mode 100644 index 0000000000000000000000000000000000000000..c23d80d5fe3dc8d24961524d5253c6d241978179 GIT binary patch literal 432 zcmV;h0Z;ykP)Px$YDq*vR5(wymAy&>Q4oc{v%95*5JW9}0f}pZuV7=Mwh9(T(At2th*%3+D`+F= z1DF*03Zew@1uPUaV39&`cSklMKN`r7B)7W5oH=vn&fIgwpJfZ_F`RG>V+D}}jr_&@ zwylEkh;fC2OBJ48Tm5P^EaPt@c5&SVk%3uf?z&e3M-WCIM7FPD>8RnVZ!F`VAZ-$- z?2)%Edp*|dRE5%3?5|c}Sw9at1f1TE+!Ymp?dZC6BwJ376S((?$*y7j0E}nMnUgKe zUgP@1sVvLR#&`2;T>B&G zfHrKn6{uRluzQg8*YVtQf+0-Ncd((V_9(hTObzVrYeX-6hUwwI*7)rp-#GCy=*_v;rhCI{ycv0`Y%fS48fGiuZ4= az5D?y+KGD7SBvie0000%A=bDAwsS|WK}`*IWv)naCKDb0DDMOzJ?-S_QFdtjG6`K*4) z$Jg7onsq7dtLhVGimOOlku!Pz!_UcD_ZxpRO}}Tav7b#XDwkjMGq>4I_lZX?>Rt!> Ohr!d;&t;ucLK6T)*J)?~ literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-mdpi/ic_yola_msg_red2.png b/main/src/main/res/mipmap-mdpi/ic_yola_msg_red2.png new file mode 100644 index 0000000000000000000000000000000000000000..651605173515c53fcd7b925dbc7ff58a917e2494 GIT binary patch literal 276 zcmV+v0qg#WP)Px#&PhZ;R47xel09z1KoEt$w|12iKpW8^$H%aNjvK%+poUvOZa{~ykAV;!N(r2R z%HBbkABiGSu-Im`vomkrXg+Z}){8!YG3Gj84J6(Fs@u#!NAMY?pDN$(F5xQ4(sn`+ zE`X1xqTe4U%A&7qo6C}Ri!fZjP<)p?fsbU}XpY?ApPir6yr0Xu@gC8vC14z6y{{7F zY6)Qe9S))yxM3{^=D&5_zuVN>LQ%vw4&sD>7dfD>Y@I)7t9S_92weIniSjF8qUGl2 aGWHofq)U+z*?6D;00000WbcEP)Px$ib+I4R7gv;mCY^#Q5462r#{jkSXht{T?vV_^#-*oH7l1*@Jd)hi!%qnL{!wG0Abmqyph-l6za3mT#6&pY^*JTEqFEbT2iC=zNu_F+wA%r@ER-%<6yv3?;2kczGfAFmHOdASW;PrXVE{h9J zg!e#_f6BCh&5mTxQ=-dLBb0+TErn|LR8^BwU`%u=ypGC#yZ^Nnr@A4Uh@61atKKce z5KV+{K*qhJ+M;o5XZ#Lydkp^Y6YN7Na7*Enc)qopZI6A{owpCfoN%A?VkC{Q?M-J$ zMvn8F{+f`Jbvzm(pr`+`O-ts*$QNy1z0uq7F6*Ro`_uyEz(N(;0Iu=oG|E~_L2V~P zGL)Wnn~tVh@fv*f;&t_4PF9=lFL8-B>E@0qNdhP-nmTx0000@P)Px$ph-kQR7gwBmd`FjQ4q#|Q-9KwU|~T*bR{HGyg}`%-mB88RwcKsvpi?ceBaD`=gbHVmIfC_7&O;02?2A6 zi~+rk?7!`oP<;Y!0E2wtR1$a3Ki!q@n;P_c@eS{QMiKG02-w_AwSaI;E*q0Xx=?Lg zLqNl`Q%IiyGUEzxofA!=#gLre-dB#k2-x8CClLJY0sr)>q~SeSAz>4+(>^eC)xOB< z3Y{XCU9`&K5Qqd0K%#Apyp98Va(*2XU7a4K?9I3)xK^XEgqin@i>?GVQ8{Y$o~w4M zTcVNq3$WjM=a*uLMgkd-iO!>2;^V=}K=BVhoVz@g(tjY(#S-9@pvxlc`ZKiJuFrhz z&PP<3biU&7d>modU5WqZO%CNOx&1$yk)4Imf*+4wcBCDfvLr?_ZQ<4qBo>Jt^P+ui zSyPlf%N6iC0#&m?9A(2bVOpIJIVAtO-*hCamW|z})w_m@GnB&LhEi~bQc;69&xs_G cFF(oh15W6u)~U6eR{#J207*qoM6N<$f*-BllK=n! literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red1.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red1.png new file mode 100644 index 0000000000000000000000000000000000000000..0a2ba0c4058ed8273eae25de8abba68654ca6e75 GIT binary patch literal 841 zcmV-P1GfB$P)Px&14%?dR9HvNn9oa8Q545N=e-dP`>_zp!ZuRbrkNqhHtmW?9Smz>P(dj{yIQo! z{(x-JqFq5{K?Mb66yq3Zt5zA3+NPphgp>&_N+o~HdnfN3$41kck$KK^VR(ys?>XQ5 zz4x5+JtJf}w4rJp?wWF3>JWDyD!Z}Rh_V)#0EU1ssCEHeBB zil@#XG$K-iC7?R@OW7>~#+vz>;kd66eTKt5=^7kP=O--)jf9$JPkI%o$OJac{0J(o z66?Ra+?pjpXmxcF4p|!yZEO`TzXWH-M{4kTnVR_m6 zBLN~3Y(?d=j}EdkrL;mI@U)9IBY?ksaVuxrX zd=5*l6$FHBnIv{zv_9C0W!2&OkQrBcQzl9reIgnO4T9|Qic-FZxeaAVv_3Qrl;+!i ziobCKq5u@6KrjkGBcZW5VNxhECJYmw5h^JJA4UMFzB5cbM&xM0qQfQjpX7;1csua1 zAR%g!70%9N?dSn&3h*)$wZp5Tb)kz0ZFvVFdP$;#Z3z&KHDyds_2;OnS9*pKT-{^Z zfxpVCHq=CsJj{!-vW@!Ybg~Utq%lLcv90D+t*GWPI&QmkE}=2KYcXnjbG!pxMYSzN z`Ibg)dq56UZ=fW8AIs;y!!Y2wQ6>W?q^IxavVBK#BGG}xZ(vKaFK@)W0Y}>z$+81W zMd-Bwq9$~6QQ^Y~7n1URsSwKCm78|J<|HbIv8{v{_PX-9Z_;YABR56Ks5I4Hl&4G; z-!!s5UHoPQF@Hryl~cS0*E)o95YeqDm7X9H#!(qX^exD%+3Xv``aP2E{}X=zgc~4> TLB7$n00000NkvXXu0mjfXoPwJ literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red2.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_msg_red2.png new file mode 100644 index 0000000000000000000000000000000000000000..395c2ae386b931a071319dec7800acac72299cc8 GIT binary patch literal 863 zcmV-l1EBngP)Px&8A(JzR9Hvdna^)bQ545N=e?03ek~-Fuxb3-n3-sdjh#lceW_qUf&`7kj)jH# z1F*2LBSA@!kWeAhR#H}0Dh;g-LKo6d5(~7^Y3IG8_f3aU?aUi(GjH5v@)q~rbI_9%e3SwDLzGZ<$K~!01dIr z*mhHBEI$#g@x+MNA{{+Vxv5_Ov_5f=2v^G<^Tk}0&4PO+)pOe{^#N#IY$cXF1FDMc z56OH#!_kC1?)s7i;KZ6yIUN$^f~lc2OMA~*@n2YXZYQug*v`cSqb6>W^I1N&8I zFYc5tm>)cAMV-VkEID6s0Bp-VaK}X(Vr^JfJzkk#+)^XcWFuGaiaPOLkPUu;R!PG| zkkTjG5FZ5QSCZ~|x(*ru6=wQ8^-UG7PW<}}G$rM7;E?gaJA`T~%@3yeQGIDVa0ijy z6`6%R+W&)hz)7qD-c(!~H4ho?`dlsa2uPOeCjR5O*;>f2M(g7z5zhRhpz>@JJte8$ zGg$yTlS>#$zbGU7P^u9I@N|=*Tz+?Cb@4sSkz1kf$ZW$>a41K$Oz4T@SFo+ap{-2K z#dWNJA;rf6tb`Auwq`MNGdHk8#0weAdtQp+$bNa${Wbr> z6kz5u7qR7V+3$pjc~@H)2*}Lkqw}d2QIlTF#a8qqoXAlqlclQS?6jd=Y!0BZ1KY|r z{ysZB{w*~DPNjvPx%yh%hsR9HvVncs2KKoG{i&*0(Jbl@})T`ItNgV@YC6+kLTQi1IX2o(So#LUDF zZ-@$Vp@EnRqE{x4mfXp5B0KtL%UIeOJxRCs)7{?g-Y&6*NLMxR7cJEMHxM=fDAdq^ zpkdV#9t0Br9v~Wi?H69bnu6L<0jKr5@_oZo5GdB~wQ=94I?z|z@0e%OfqN?V^c zd-S~rp95a%v!r2(z;dwL1KH0v@0wqW^f~@Lh|>}aycO7xG6DKo;H|=@KraDXn-wP7 z(VCl{eYnrlMVpQQTW>IxtN(DovO;^PbMLA5hyu5rD;urKB`!zT`ytXCSPs-j(E8f) ziO<6@Dn0_Yotpw9SkXT{;plqDD7C=yUUlKidC{{Js*l{~g?0nrj&lw{x6lcSS7vRQ zHbuOX+v4>XuF-gm9ah2|!hbi1Pde%hBFBZV$0igCKU3Py&kd%H#bOJ;Q#y``Y-I}; zaX&gSz_%p|#c4a@8IzE-ugdhkg1{9ti8AL9i`J;kp{qhz4!}vbf`Ow7nOY0*kb zr`{lL=Q9C^gJ%^^a~O+jdj&=7%>BAtz;keuk_tXRB!4~5Y(1zS&X4f|ZeB;U67U?{ zq^9?1*{22vFfChYMq9V^Kxp{*gBNhkvrg;w9|gcKzgzfhSpWb407*qoM6N<$f&nsO ADgXcg literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_msg_red2.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_msg_red2.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7ff9331323994669afe570e97287720c25898b GIT binary patch literal 789 zcmV+w1M2*VP)Px%&q+iybC{-TbO{|3S;0EH4N z5LA|!HvCh}qe(|8bEIrK#!=X@O8{Q#Q@Q1YHQf@ltowd}hX` z0zlp=2POFg!0dJwWdLD^ef>4*;t~NMj;i8Lz5u8vo%or@X_R@$t~TxxDX{=ZbNBe( zP}-R=^*C*&-+S=c;iW!{`YaLvIoNH1Y^VEg#zu>@+5g=MTU96kxln$jbp!}c0+1`^ zV?dY#!1}x}(r+?m>QOaWk{{ZOtpFyJKx!9$sQlc&Qp0FBy}Wpnu!m%Z!# zk&0sg=YSSN)ev&qwa_Lc7)i zq**(Mz{&K2SHCzL3usf?JGou`{F$H8oCrHCr1_8b#souYsxycjXMVrdu|VNxN~893 zgVNm9!XW%kY1Rz$%RBiA18!gdxXm&3jk6ffxPZis%Jcgz09zL*Rt_-h&DsRPBGTXh z2-4jWp)D0Q$y32MWn-q2KTk|a35fcohBzJjyzn8ZLh>eTVAMOC_EZf zkY}&O3y>O9v#0mwuElLIe5nd8EU=`a~`k3SyE=JTbohB^Uk6GRS$r|eCa%bzZe zHdWiUz~o8D4lndvsXx3to+l7Ol(*?X)Fw+FK!{L27Jz^ysuNIJ8%LFGOC3A2K0mwR zu{}Z)r-MnGH{n^h5xR$x={3Ho-BwZE`^qMB;wIQ~*q|M!^S&JbyjW zm^!HMh>w22ACFEsje+v1b*#-(D3mGFW{PInO52V=b|sa TPl5r_00000NkvXXu0mjfZcS}- literal 0 HcmV?d00001