From f97d981ae8e01b051052fa3b70b0dfa277cf73cd Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Mon, 12 May 2025 13:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable-xxxhdpi/ic_more.png | Bin 0 -> 4123 bytes .../drawable-xxxhdpi/ic_password_input.png | Bin 2952 -> 3657 bytes .../res/layout/activity_canteen_operation.xml | 26 ++++++++++++------ app/src/main/res/layout/dialog_login.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_more.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_more.png b/app/src/main/res/drawable-xxxhdpi/ic_more.png new file mode 100644 index 0000000000000000000000000000000000000000..bf142bd2b5d7015e8d462cfacb0382b3949fb7e4 GIT binary patch literal 4123 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 MT{B#*woCMX0PWgl*8l(j literal 2952 zcmd5;XH%5P8toStau{Yuf}|m>fUE)n0!w%Y2N-g2K{6B|86-#+7(g6?L|G)GM3adnHgzoy>&wgji6u)J#El1Cb$j&o3=g<`$xFrX7Og=q6+dBi*%xdPQ(pXK!LF9e}Q+_B~?+`E}JD!#27cMz42Yho8**eD@U$si4lbWa{U&}Glj&GO8x&OgM)yy+r2g;Ed=N>y=Z%?3=q%?6ZTc5bYQhw zpq|wnz^we9=cY{|urr-zl_&);Y#d)mBvMpVP1yFU&e+Jv?`|i{e8JJ7-=|-f9;GjL zl^**p?h}uKpV$h8bu5R9Hl=ED5O6^dTaWjX?@Mt3c9tYN@S$WrzUj#uFlsM-ut<-G z{j_2Z!~Mz=$jlf1jFLuSCq0f>cw9#=PBli*vtxw6 zvm}=B<~I9@a1px``YU-}Gr)rOFhAe5hZIk21TEM8?#J=FEPz;he%B1-%WVxk2RSUR zOJU4}+et0+zFUbT-V3)5GODVRv^R9Jw%(hC>el!zKIE?Q=%ggST=Tr$R-V^YC&&FR z{v5wvn&a3)^O3gVH#=dVI^8pSn!NWt3NkMb>#OxD5J>s@`ZK^+_r{xdk70_By%zVc zDz7^oC?3u|bgDkt$}KM{`CGu%WY|K@bMu7l2zTtlZK@cNi-2otYRC(^X}cljqL+`~ zOxJoedCz{Z4%OPC9&}`Cds1pW;r5&%p4I!szK#54oVh-(w;iab4%G}y+fon`bb_ha z$*?o&48x6X_!NeUgtw)z=B$hb6xh1q6r?F{YNn; zw63#Xs~BbCSYwPr?QxwkmGAvAvJQOMUOi3VT&#bSf9nrcibC3Po9_I6{R#jZL(9H z^`D0<=0eCD$hIn`2DKuQ?Kasn9RkKygs<<$pG{_Dc_@z6IFEB6=hm`F&SS}Z(S92K zYBm}IgN(?GxVrs=XyrK(`t+vAp1tLKUw`#^l_a0dELSW)8!F?EvxWTivS5b~E+f(# zYc|=oEfF4riUyxTI-^&dXR0g7oH3eYvy4JB9&?-qrjm0>_8QfbvJ2#i{MvhjR-TWl z>;=SFCa=}Tn|eo6#eyI(f5B4A8LJ+xdnSE2e5Tr_1`0HO_&~!wb5bcJO>9BD*&DW> zK3fts!qnr+lCtrjUI=-2zSdXRaWrf7BunU096@*0_b>Kw_0>dol( zd6#Rd_7kDC%Eq=Imc%q5)TTRDphk`My0~fE2ek}6jqsJilfFQ5Kxg}mC_tG|Crbo( zomjt^>l|?gKsd5d?hx|}_T17-MF00HoHF8VR`9Q}e_D}?&;IK||Jt~GHa-3}wsof3 z)pPtqhp^%L?|bT!Gx4_K%;RuXWMI!*L62W7HQ5G*k@dUV+(&BGa{y&D^hl^}q>CPJ zy*VBge8U>gkbDsxyHBBG=3;r9p3)s^2vA{CF;q^Bp|nPfFyNo_+z|(EfrC+|%$T6Q zRT2thU62A|9~d(wO7%%vWw~u0`abIxaIXjYo?P=DAyR8khd=Z7vvS)io5t zGT0b+5qCjSf^`-bB6EQ5;5rvZv!>UJ9us)Im~@sfl6~IO6|l&B4Dbl`8>e+M-`j0l zPpR_X3Psoo2LE~?6F_PIz1gqBq25X>v}0MBB7GS3OJhNc-Iq`&OH%zw<%EJbLb$Lh zBJxB#)|sp1O& zbFC-Ds1Zn%1sklLh5;^KB;^T2BFg^rnvZJn8{^^&cd6h90O*ZXv;io*)yjG6l;En7@bhYb!h6*n0Dq#wUKpi zWaNX8v~mb;H`Q7^zm$G#QHMRPBr^e_*U{^|4(l5m8%L3y#~vxAKU!Hv_~#chl1_vB z(a5OA%Ox!D1vTmzX@?(h&g84n35vP%Ne4}Ho0P3FY}q7J0_}!-EZR*9H_U&y|7R;=m zcNV(4ez!L_}F`d3NEH(@Qy=jt}oBjL*&kL*CDevFPk^_160)U?e^vbJc`lI z490Q1kh@24LnL9c^_Uj3&jQRK5ztG}`2W+NL`p^*&7_J9vuIyyps!|w< diff --git a/app/src/main/res/layout/activity_canteen_operation.xml b/app/src/main/res/layout/activity_canteen_operation.xml index ebb9241..fc8b3a1 100644 --- a/app/src/main/res/layout/activity_canteen_operation.xml +++ b/app/src/main/res/layout/activity_canteen_operation.xml @@ -37,17 +37,25 @@ android:layout_gravity="center" android:textFontWeight="800" android:textSize="30sp"/> - + android:layout_gravity="end"> + + + diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml index b1ef76f..0eaac74 100644 --- a/app/src/main/res/layout/dialog_login.xml +++ b/app/src/main/res/layout/dialog_login.xml @@ -66,7 +66,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/btn_login_border_bg" - android:padding="20dp" + android:padding="10dp" android:visibility="gone" android:layout_marginTop="20dp" android:gravity="center_vertical"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b225e43..536c8b8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,7 +80,7 @@ 智慧双屏收银机 - 更 多 + 更多 键盘 未登录 返回