From 112bb15eb4d2bf9e2944fcdb4f53fe53d11cdf1b Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Wed, 8 May 2024 16:56:54 +0800
Subject: [PATCH] =?UTF-8?q?version:5.4=20fix:=20update:=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A0=8F=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 .../uiuios/aios/activity/AddressActivity.java |   2 +-
 .../uiuios/aios/activity/DetailsActivity.java |   2 +-
 .../uiuios/aios/activity/ExpressActivity.java |   2 +-
 .../activity/InformationDetailsActivity.java  |   2 +-
 .../uiuios/aios/activity/OrderActivity.java   |   2 +-
 .../aios/activity/OrderListActivity.java      |   2 +-
 .../com/uiuios/aios/activity/PayActivity.java |   2 +-
 .../java/com/uiuios/aios/utils/ApkUtils.java  |  10 ++++-
 app/src/main/res/drawable-hdpi/icon_add.png   | Bin 2455 -> 1594 bytes
 app/src/main/res/drawable-hdpi/icon_close.png | Bin 1184 -> 1171 bytes
 .../main/res/drawable-hdpi/icon_location.png  | Bin 2857 -> 1226 bytes
 app/src/main/res/drawable-hdpi/icon_more.png  | Bin 1121 -> 840 bytes
 .../main/res/drawable-hdpi/icon_reduce.png    | Bin 781 -> 1461 bytes
 app/src/main/res/layout/activity_order.xml    |  36 ++++++++++--------
 app/src/main/res/layout/activity_weather.xml  |   4 +-
 app/src/main/res/values/strings.xml           |   2 +-
 17 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4954c53..4d58d48 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.uiuios.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 43
-        versionName "5.2"
+        versionCode 45
+        versionName "5.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/uiuios/aios/activity/AddressActivity.java b/app/src/main/java/com/uiuios/aios/activity/AddressActivity.java
index 0596c08..5c37fc2 100644
--- a/app/src/main/java/com/uiuios/aios/activity/AddressActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/AddressActivity.java
@@ -38,7 +38,7 @@ public class AddressActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/DetailsActivity.java b/app/src/main/java/com/uiuios/aios/activity/DetailsActivity.java
index dd4cb71..93f403c 100644
--- a/app/src/main/java/com/uiuios/aios/activity/DetailsActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/DetailsActivity.java
@@ -97,7 +97,7 @@ public class DetailsActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/ExpressActivity.java b/app/src/main/java/com/uiuios/aios/activity/ExpressActivity.java
index 437882f..1de44ca 100644
--- a/app/src/main/java/com/uiuios/aios/activity/ExpressActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/ExpressActivity.java
@@ -39,7 +39,7 @@ public class ExpressActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java b/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
index e256cea..c67d91f 100644
--- a/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/InformationDetailsActivity.java
@@ -29,7 +29,7 @@ public class InformationDetailsActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/OrderActivity.java b/app/src/main/java/com/uiuios/aios/activity/OrderActivity.java
index 6e65768..ebc3855 100644
--- a/app/src/main/java/com/uiuios/aios/activity/OrderActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/OrderActivity.java
@@ -69,7 +69,7 @@ public class OrderActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/OrderListActivity.java b/app/src/main/java/com/uiuios/aios/activity/OrderListActivity.java
index 0c63d69..c87c0d7 100644
--- a/app/src/main/java/com/uiuios/aios/activity/OrderListActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/OrderListActivity.java
@@ -37,7 +37,7 @@ public class OrderListActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/activity/PayActivity.java b/app/src/main/java/com/uiuios/aios/activity/PayActivity.java
index 2d2dfcc..4779092 100644
--- a/app/src/main/java/com/uiuios/aios/activity/PayActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/PayActivity.java
@@ -42,7 +42,7 @@ public class PayActivity extends BaseDataBindingActivity {
 
     @Override
     protected boolean setNightMode() {
-        return false;
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
index 52e60f7..5a974f7 100644
--- a/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/ApkUtils.java
@@ -14,6 +14,7 @@ import android.os.Binder;
 import android.os.Build;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.ArraySet;
 import android.util.Log;
 
 import androidx.annotation.RequiresApi;
@@ -196,12 +197,17 @@ public class ApkUtils {
             allowPackages.add(resolveInfo.activityInfo.packageName);
         }
         String pkgString = Settings.Global.getString(context.getContentResolver(), CommonConfig.UIUI_APPSTORE_PACKAGE_LIST);
-        Set<String> pkgSet = new HashSet<>(new ArrayList<>(Arrays.asList(pkgString.split(","))));
+        Set<String> pkgSet;
+        if (TextUtils.isEmpty(pkgString)) {
+            pkgSet = new ArraySet<>();
+        } else {
+            pkgSet = new HashSet<>(new ArrayList<>(Arrays.asList(pkgString.split(","))));
+        }
         Log.e(TAG, "queryFilterAppInfo: pkgSet = " + pkgSet);
         int frist = mmkv.decodeInt(CommonConfig.UIUI_FIRST_OPEN, 0);
         for (ResolveInfo resolveInfo : resolveinfoList) {
             String pkg = resolveInfo.activityInfo.packageName;
-            if (hideApp.contains(pkg)){
+            if (hideApp.contains(pkg)) {
                 Log.e(TAG, "queryFilterAppInfo: hideApp = " + pkg);
                 continue;
             }
diff --git a/app/src/main/res/drawable-hdpi/icon_add.png b/app/src/main/res/drawable-hdpi/icon_add.png
index 0ee142222c04040822c8a81d8b1b90542a9240b3..f66956c019a18123f3d3da339bab7f437f547534 100644
GIT binary patch
literal 1594
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

literal 2455
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

diff --git a/app/src/main/res/drawable-hdpi/icon_close.png b/app/src/main/res/drawable-hdpi/icon_close.png
index 6dbbbb6d48c5f04da4899cbf5ff91b50c643812e..a66c73dc4de40cf436ea9c31139755763aa4b17c 100644
GIT binary patch
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px(O-V#SRCr$P-CdHRFc1LXq{f5HJV2GFnDHj=Np?Jm?n!h{VHJ5;_Z~yBh6M*v
zAb*{7L-RC038DHUogf6I=xj=<Pa(v6RaLLepHF33?$+z|rCW}Fc8kFIe12W6R@<={
zOTBBQ)JIiSdnsiLaci-vs*9BJSC(ZOi#Nvz=onuij?b#=7z-hGd7d9y5M5ALc)Br)
zqe4?{45Qt%j&WI*8(9>^R!X^_YLZc=BJ}+KCK#QXI}M^!mCkFE8>38y=&pbzhOT>(
zN~zIw)jtGAF+*{{5Or*ALG<A;$~cM(MzhD0@fgBA1+Hgw2KIw&=EizZADm_J>?;b!
zCC~G>dfKZ|US3{~&#ptJ4u#X#{|I@csW!x$EXz(c2%}7$c3@-19ftnp2Er(AD4}{r
z+xi^{qu8N@#(3x<oW9IKATS0&xTnM$Gx{w(q^xcMo_#&SK=q8lF{FP8jPe~3XpGU6
z#XaTz)Qo{)46^hwB^HJi$Wl>aVpxML4J9^)6Ub6fQeZfP%pD~ah8M_OQBq=fgUk&j
zHAWDSxu9Uc2nIqO1q(({5UMDcFoJ_nL&1gt0zw4^BL)}<b`-1_pdeULFk^s&U_-%<
z5d{Pb3I&X4AgNKPU_=E;g+d7<I!J63Y8XjCVxdsPNCpCpLKPz^2owrsjN~ApQK(~}
z011Vn7fcSV1J`XBZ1wsKgL0rnMjs^wZMnDe08dChy!620_)%b>=^<_4d{8Wc-!F;=
z109HO`f@-)g@F<zA__VTv>*{sP-3740YpKIfgS_^1vLf<kbo%YG01@UUV&43xdECB
z!=WjwFGjmxDk!KyLSaxsK?@QZg9-{t5GV`^DCj_-F|ebc0*Qrz83hf9FGe$qvi=Aj
z+w2Pkh%bf^V)OO&b(zCU*ph>Uz-aIE`P@&z(o>Rxgv1DOlM4e%G7t!iIiMr~fyAJW
z5*;K424$3}ATcqhqC^8pfk6=^3P?%}YAE0!7%(WIfP!Gcpn?Jhf)RrP3J3^h4D2Yu
zK`3BgMhOZ+2?HxiFc69u7*T?NP{zQ9;tetf3`{6qAalaNg5nG^M+^)oP9Sr}NR46*
zvILBjC{`d#!bpW;46;Ow6eva@OU8(eG6}*M-z!&QJohyU!WfUsh@ephK^S9bO&9EU
z2R{X2jA0DuG35b-F{UvfQSLw(!yE$&<p#nS_81T-H3(z4V}wGvewF$z&+|hKQWV7>
zDW&!5qvl{pydl9q<kNfbof4O2xsgh#Pa(w5>E@o6V2oZ^d{Fdj3T06gdnx7C0faFI
zg64`+FBnov9j`JUmLQBV5il1NR}jW9JbP_Xs;WBZl(m&o?hV^u48uUV%)V+6t+-mP
zG{{uiVhl?R8x)<c@;ra5r@dn+&C1jt7+x~$7!MTH#?n_e#<wf=rh@Jz@11Ls-&vOF
lX)$jBBG8X<1M#;T<9`vHBFVt5-YEb8002ovPDHLkV1nkK+*<$u

literal 1184
zcmchX`%hB`6vxlKy+B)D_lnQf*-PDoif#nZ;;UYuXxU<6&Me@g)L}Lmp<qP8isiO(
ztRib`mN?LDt<(701es)38Kn+HOo56dQ()mypw2NUSB+d;W$Tjt4g2Ao@As$kO+Lx@
zoXApc4d)B^01%#`kZ%tt{qJyt1G`nW*A)=t;P$PlP}jZmDFC)JL!PpuOf~siPvHO+
z)_#D0f7u~vhBTwn=zsj;zVWm|n!n}gij~JdR1_p%k&BLu&GZxnl{c9G&V9#16j-!b
znQGhMu|gFe))~+&=!l^luh%1dn8iA7=EhJ6X@%LB6Id*aMUg|gZy<;+N5=;0qikTw
zq|5(0gwBU&JWElFl13>R@@(=E@4q8&$2gO=&5S1NVyv$>4^-%My7kM<nS+T3LgKge
zMiRHqKAGKR4nG=M=9<{n`$8<95kEV)^qzayuZ>z$9KB}ll{Zx1k;^=4u#1a1#mido
z-PJymGst<AsU>!^)(YL#rmrzC%q_AKcPd#;j9x-tV`}j~jXr}j%sI%0apyB#L=9xu
zJx||vtMUC!czr~jv88+Zj^{>H6u361WRDkDj(q<vZ6u?Of{OgSU>okgC|c)O2Zynq
z(I!x*TcRC8Sc~O&noxC$MdH{1C0L)Q6rrogJii7W;QPK9S^#`QC)32~Fp)?7IQ%H4
zjG|y_Ef&k9Asq&g=#rs_u-%R1kt@+Qb}u4NqXnCj=vc00^z)DhLPYDI587z8(Hcxk
z(bMb|D2rBCStIB*=ufN!$&OZ6TNhFV*bmGHoc*7v7guIhXu7Za6<w`k!VPDn-{s`J
zx{G%S`<uM|MdakM<{M8gnXGeIc3w%UMJ5ZQ7q&zk{uaZTbC4{iPeg_|5oAZX0xG$~
zo>nxTf+ZpWm4;nsMvx@-c;p|-x4x<?d02tJ7#!bqlAUmGxxJ@r_Gc1ltTvk<f=(~r
zhh@R4(eq*&874#of`Oae&wa@Goe=R-K80}4=FaEkYRCEfov_+dKQq|;(#K1vP+I0u
zF812o<u~IDC9ukqxLgtBOpwJHl3=4JQLI3mi87&K8nkVnq~Zd~&9379f*NrvlA?f9
zp7YDOA>>Da<Z~c5nXAY!I*cKR<6x1<1coU{Xy2OpU;*W2W4X5x%4nu-p>ToiBkUZi
z+PXv^2V-mwVMhXl34JJBWc%<MP5>%TF99!`gV!LJ*`lE~v%i@W1&=h@@?ni@-k}vM
zKzXTm#Ow8@%cr`1iiVM)Vn*m+U-rg5##PxjsjK4A<9lKWXL}2(&+(6MsztI$+FVbm
z1w%`n5m*vaO2(UgsG5V`W`(%Dt&}s3p#7|fEI#Su52NTSb`frGFAcdawl_C#+9;Db
zrW_w5sz5hhYg_s5!ZWI%GR+0mds01WJ1gwGio%!MZ=U);eePs~yY6!1>LY=d0~zT`
Jd0nd7@DG`>_00eP

diff --git a/app/src/main/res/drawable-hdpi/icon_location.png b/app/src/main/res/drawable-hdpi/icon_location.png
index 3923551591cf12887600a593a87f1c0a425ca9d6..ab55c2abb0af1b4428b6d5646df7b5d9b5ab6355 100644
GIT binary patch
literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px(gh@m}RCr$PodI&wFc3xMo6wU$PXav&a1z>+04Je05!sB=@pR%;>*)Xe>yc-e
zFrYZ{KK=bGSx%NR52*+&QoWg-DHDj;AecZV5U~h|b!RGM0uhUVSa+sECJ?a*h;?Tw
zWC9rzfm-XQQp)9zoz(vRr=9)PUYBJ#zh*kpD5Tc<t(5Y)lwz-*!yvsFtPFspfiwtT
zPr>}+A#kIu!TEbq)3YiZNg%b>UptiGW%hi^YCqM$NCBy}{wSq<_eS>4_D@RbOae%)
z)l!nF!i+iMF!MLHm})|ga3Ddd*b2HqF_nfLp+IV_zXuxjs33-VO9+rQhp-eis(Km)
z<8mIW#-1V!pAMwKFl9vfMK3(_l}9#|2q21SY6}uQeNlms<`=yR=xs+edK!>6>o(uW
zc+j9wfHdFumyyJ(&kqbgVFAhH8(ZVX7AGIkg9;9$&B6`H5e~RY7(gslsh7CDg9WY<
zC=jt_k=~$x)XpZ1ur)6<kRz$%Z5EI85*Uz!R90JRfq4lMNW{I3kJ8Pk|A(b5B#<MN
zy7Uql0wgG1*<v8GnuDY*6cF1Pf?g&$-{o81er<CeThh0U5okD&w1onK_7B@NV)w!~
z55htwWPK|mknTW$=RqG1iaiws3JA*3-81D{D{3y}?n@7#Y(U&b3M?>E0jWKs!P(|@
zS(XRqd(O>4D%stiTi1Y62m;9N5s5PR<+NvL&j2|JkliLafnbdE9)%!^j8rKLQrYZH
z5%pC6j!rG7&ETnkpmwh-Rav`JXoQELX6o+EYoH3tV%j}H^{8`rmC(veTTepWNAC^<
z%FJ7UZCB&v5js!IZ?=U10oML+ckOQNy(R1&hWLkF91;l1N7f_kyxMC9yLte0&vS_0
z5#Fs*?}?E>7)$Wp>mAh|lCGc%A*8KQ!S$X8maZ5;7-`EJ(0kj%(iH;;vf8>guzTJQ
zRR<i%0n-*#9V{S6Q3+ff6d+9{NAME3I+#Fg2S|qJ3b%ZPq7E96rV`Zp)*f^AzK5a?
zDv-nmPg6$(kc=vU&C0LI6t;A-l@ox=;odaV(|-3|%AS*}0Lf(V?i*rzL0sNPS4bj*
zry2PgVhE4~22V9|6(Gt6AEFL=mGwTqiW+>FIuw8?u5(e#-1mbt%tJ060dGX`7CrPb
zR}qL(8B8y8<$ws4!C^)&QDuo4e5jGD0*NexCDajKWr?UnMjeVkBKC5HmbsFqzU~zH
zyL`jT+zddNWpH?zD-VQN2Fn<^WR*oWcqt>#0t8tGOR7Vz$|9*mRvj6DAj)8=GB<^(
zzbk`BKG7>z=4J#kvJ93hbJGDCSO&`)d5S7)u)#|kc~&6z{BW4Gk*5T*N?qRXQ%nOx
zzU;krL)`fjd#PZg1ag7YHb+<*yY}s)DGdDDfD7Msa;;OIe`|`dG-ij~PpNvYCAC7l
z7n-GgdWB>ObZ<W=klsj<+D#y&K=*#k1kxKRQo9L+6zJZMnLv6YMQS&JkOJNNF%w8{
oq)6>15K^FfKV|~yjTEWffAwbKbX+OY>i_@%07*qoM6N<$f}yY`cmMzZ

literal 2857
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
B5tRS{

diff --git a/app/src/main/res/drawable-hdpi/icon_more.png b/app/src/main/res/drawable-hdpi/icon_more.png
index 07862e53899a0c597ad86191dceb5b32d7f5102b..e41c9d87c15365952902ca0a4979de2aea8931d9 100644
GIT binary patch
literal 840
zcmV-O1GoH%P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px&0!c(cRCr$P-G5HPFcb&yHtZn&Qxa~WCs9u#oCH0I+=8V20}ryLTEVCYtW(>*
zAK(46kTj#b&mQaEO0lN!=DlAVW3H{WS8w}`F=pkQOM7f5B4A5JWxL&8bzQeRbNqy|
zEcM=;k6R2Rgz%g)<3ezNQY%A7vg2zvfO3RVBtt?7DKk=r<ZM9s5+w>CsXME_?;jV7
z#Y>K$<Tgb>Qoy|TyTiyTH-12QJ2Q)cq_3?Q;~FTr=i|OzF_3id5W+IXcng$#l%gO&
z$%pu8SsVl?(@?5_03{!#8VFGGP^y9eWgMkC2v9DgGywt1d6Z@#Ksk-l6y#81xiiK*
z;O4Qyo%;ACY~KQ9md{8v&ybI<0EJM70EJ+N0EJ+N`~@Y(_&5y1iu*$@GS`sf0l+V>
zDVx6U?>VE81^L71i!};q5REA0LA0T;0MUfP21E-AD-aDR>_DWWumq8e!WKj-3TqIF
zDC|L`p@;yHgdzqcp`;%Q&1SRbiI0Ox)xJc5NI($>!W~5<2xk<rAiqV4F}@7LaMS7`
zmuL`<DB?l5p{M}igrWw73yLZb4k+qCsH3O^p^Tyyger<^5Q-@3K_;$T^giP?%_E-A
z=l93cU;pE^Y7lA|2~;fzMGUndR54V7P{vRPLLEaD2nP%`AY3q1fN;VP55f&YGzdow
zu^?PAM1pX}5C_5?LllSv3^5>5Fhqbz!e9>~4TCj^L=3hdQZZP9NXB3XA{~Pjhz1Nc
zAX+e3fM~)X526i&G>AqFvLIS9NP=j_AP1rygA@ob_H*Y+OtuEb9)ko3Fg`Jwg8<_@
zMpF=A{KRMm0*uobO+bKg9-}%4FfL<M1p&r5Ml}#%<Y80+0Y*MXaS&ik!zc=p*3j*`
zZa1Y%C09t8(vOyHi`BBc_q!<z8Uv$XEo*9a0Hbhm(R+VqtzGA&J}@d27jrWN7!`|)
zW7iO1R4y)#{8PcoIk(LDO4HV+*eELn@__PSjJZxDu9Owl+9&7SMq8kBKkq9Ywz852
S{A=R?0000<MNUMnLSTY(8dqBY

literal 1121
zcmZWoYfO_@7=F&z%f1${7l{@ymSGDxkxOK#5%AMg5F|*bb0UtFxgQ;{fp&@-FQ1h=
zxG^JHnKEm{#LGlBG2qO!(Ov55Se-cLh0&5uqJk}MgC?wW$Nk-p^Sn>adC&Wt^StLY
z7UXA#Nh75I!gAK?3TfnD4pvO@W@f2_24X7AUX8B)c~1agRE}=dhFvA&LwB}~B+I{_
zxaVXCC1*7`ie)$TN8-eKU0-fuho;RHr7iu)A=DhwUg$Y+edNyC=|F-c<G1|2yf<y_
z^D_?3g({ntR$b&L+)D(o?Gm-fPDB7{i=0z|j)wFm`xafv8c+4$juqwil9vlA(vHQA
z9+w5Lm#gYV1N*NRU)bo~7;O=Bms}jZbboAogY8$jMNswh$x3ml<lu6=T^?L#Z0a@J
z=JDe@ud3?Y>sdZH#4sl8?M`vn$l7OY9^-RQ?(;4+&m<XqWf2F95bgi4G7>C&6XBam
zX5Ic7^<n%QLM(g0Y}SFV43aNig-v#VSxiHt9*bC1JyzKn2Eu+)oDJT!s_NmW5Djp?
zC{-Ya^fUnr(9=MX^wa@!VU!Rg3Y}60TZmO8M4yryXOT?!&lE7k;BpLXH7KKEjbwms
zkYJz&XvBb-ax%bEPK;D26sZfq#bUDp(F<^xMQa3~CPX~A*$l!NtB63#IB9w<IhqBC
zkQ)PDiPLg$3SP;=8p?ejL;)Ke#~@zR8bS~*upb0|B%N8{rRbz5$i)`3%k6eAOif44
zYn@|LDc%I-C)3XQZdemsmgg;;@4=3tpRS}4xqe&il#VLg7>j*UI6O6TX=yXJ)%(_9
z;2p80)3YbCF?6`v62Yynxck?;I{(P=t3`>Q&YV9Jmo$mHo+GE*Qryk<u4i9Q7yJPE
zxz;1Y`WkP&7+P}TS=KopF{JNB{41?5ZmkUM&~gjS^XP+7$<&Y%&z=`W3>!SfjFF?9
zJ>Xd)h?o3ceQJaMHl*^Sq3V~{pQVO~7+K1x`IN&bRim94L)3^MMw-(OV;JQy(oE_u
zEli!3XF^HNX!k;c0=*v=75BbdU|5aU>tsA_M`R{qQDE}_*FU$wCB@<z86QG=l$l6`
zv(OKf#Cq9Bk{PbqEr?cf=P5FrgCeYd`$(0TucgTFZ9d`?U>z+Hg>s54{~etX*~<Kg
z|7Uw$!`22*uVw$5mOtWx(T)V%2x<&UxP!$-x5=i9gMZ$yn4EK^FYBA_8DA}K>uncw
z->>-mxaniXd#UPcx3pI8^a{mp36d4pa`13`XG-XypzD{jjy!)X@vk~jB+jd?oWraA
zgN0R#VoZwN)%_Xuncd-ER-So2$8^m0RGIsz6q>~D$;ZT+aq`=MfE!`TE9c|E?A%8y
c|GzMk6tG*n{3kE(qaPbNYw~qns}1IV0XI&f-T(jq

diff --git a/app/src/main/res/drawable-hdpi/icon_reduce.png b/app/src/main/res/drawable-hdpi/icon_reduce.png
index 9f7a71316b84e0df6ee6ba72d9a1df25bb1de343..ab3e50b8ed798d8b882b9bf790bc139d810b5b57 100644
GIT binary patch
literal 1461
zcmV;m1xosfP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px)Z%IT!RCr$Pon3OHFbsh4BnN39V5X;Ndy;NWvYV4Mdy=N7=nOox2O+~E)@Gc9
zU}0q00p%$_#D5>MWLXv}OZ@fq_4NQv+-x>4N-22%44<2(>Au(Bb-ies=ErnLDfMH0
z{)EqYo*xtMZl+ReAOP5Ix4(3|ep9zkLjo|LMNu56%b#0b5<m=urfJ^nJAQ8GF#iWY
zN~ynDmK{@&plCp1LbwIWz{&Ic4+dt4YuJHUQxf@fL^VJLOkLN9r>Cc0FHx00Rt_7G
zdjN4cP)6UJPNzK=nBYL}5yTJ}&@&uUSx_KVRlT%k>Ia9YbJW41V}bzDQt{qeE&yb4
zF935oonAvsW8^@VCKcQk87Yves=!=K)_Mvgs(VV^LIPyzQ<MuN<rFp>$l75TSX5AE
z0nsqNU3bu0ey4!q4P-6Kd+N=kP2-)fU(5@Lz!=9g2g+n1GEL!R#&`Of1Vj`#4#pfs
zKM6=xRp16$<m!9cP~)!#Nhylr5&I7`kd-d_u;Vy-UAx_UD2if-DGUWflsIN6or->k
z*)nzl5hXq!29$tR@=hS4H)w$9QefZy)qBUVEX!X?DR869i)aLzrWu{OMkS;y%Wv)|
z5Tbr3Ta3%<x(TE#%l9_8%*00}+rfKm*qGHd2t*WlSj=Otl|djP9btiJt7~v=G6<xq
zswRAs)?LFbGx!RKNC)4IGNencfQWRk0=e>YodJ<`2OkW}BYd_lIRhfAa(*B>>b_sS
z_dvwdjRM0|`f9d(dmy6BqXOw;yKErhCW*wvcBk|}#JY+^LswhZ^&`XzcR<9tiVH*6
z-suqoL>!6nnRI(428ig7$Uux9>41p-h)l!MBT51o(tu&~h!TaK4iMPh1qoT>A)9n4
zoVR2T5+W8>I(UvCArc;%5)h`yl0A4e>$+ymia<5a+wB%I4?#?G(DResUONMj-jhi+
zK(WdR?GX<S#1#}4YhdTp8`3K6fP`EW8i(1O0Z8q?p`|1!kTyx!Vx}u|V+02hSci}v
zs!u^$LQYxGzo1GT8-kz0Kx5hvS~`pl3AzrkQ|R5R*$c3A9?0-!uPh8PvcYzZtkl_t
z8c`8MGKzB%F;I+`>}5ZMakO1k8Tb35((t)Do$~LnkXE5hxs(SWwYGIYpiyFJrGX~T
zb0t91U;*dYyAxFgi0F~XV2o$H10s4PGL0<D&O%8=kHiN8`lE9$nx;tfNjxa_SwlIn
z6OTh*v%QfgN7~{8IZH?*hdv_%xr{qF10vQIKb_0C14$gf&!Ddnl{i48gpbfrRE{K{
z;T!+6nr@|NlJrcGfZU2%yP3dD7K-6WO-^8D{9BvN=0j5a(Sq?#@dwQa9TY~})w?Ne
zG@4V=#PV{SmnK$R^R%=u!RJm1k*SLe3M%j%1w`+c$l*|bHt3*pG!S`qh&K(V-mptX
z0})erIuMtMJ5=H%AOZys#rHW>lYxlkg@%Gs;+Lg)0TC!pC|)q2RBs?MeO*KGou<5%
z`p|s=)|dFa{y#xSDdqh@Ni(*yB*YZ5b|^m9)U8R61c;?m;CUlK&*3>|Z~hC=i#|-#
z$bgv2){+p7YKkJWvc_nyU{w!^bas%|6?4~5xrSUq?8;$31*Wj2Y;u8Aw3g`}^E|>S
z5J;^oSH)UdmY`cmbwzNczF;u>x~>l)rY90#mTTZ$zu%F>ut)@pQg=bIR{1YVskc;~
zKyA{1<arKzKT%#ml{&UZmef3R!!Zyzr=_uRNdk!7K)vdRGmp>OIwO64yOj(lizx}w
zl{!{hF0a$l^UwyDK_W_!pv;)j`aAn`zb<H>Qfl6R>M~*H?&#YNuK)c5K8i~|h@%_&
P00000NkvXXu0mjfntPVd

literal 781
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U^?#U;uum9
z_x9GoLTN_<=fKX1m5)E1l++Maf8Y~QBEWY-F@wK(Qb2``f8&e$`+seDpI>*G<=*n;
z=6|FakEtp!FdpOV>3`28kTB=Kj~{wNi~FFMY5n!r$Dgm?^TUs2-Rob~%g?Xn{!n9A
zZ!6btU(U4mrx;6J{PnMe%Q+d}1-z<uZrC?hHrJ<NvBmF092d54Ufj!BAd((0!T77J
zY>Odd-=jC&$`1F>^_i(12%J-!$nxU$&5OraEV?%9_b}92Ti=?&;9mHxRd7Lmy1TUS
z1C4Y044A&WeUtIHgTcN(Ok|qMhxaeo6;CePw13)xwfar_wk@jn7gBJTl;>#1$Te-s
z8jl8*yG=PvB08Fp6B#^rvEF3ShzQ!G#5k#hdlP5Ch9xPkOe!zMQiK;Ic%JNH@wlXW
zLe1geq)DQj6P83z@NH;PRn-<!@Z7F2n}OBaD@<ir8T_B|)~UG0h3e;|f$5vU)78&q
Iol`;+062;|tN;K2

diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml
index 23458a6..a2b9b77 100644
--- a/app/src/main/res/layout/activity_order.xml
+++ b/app/src/main/res/layout/activity_order.xml
@@ -25,7 +25,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintLayout15"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_32"
+            android:layout_height="wrap_content"
             android:background="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -33,20 +33,27 @@
 
             <TextView
                 android:id="@+id/tv_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_marginStart="@dimen/dp_24"
+                android:layout_marginEnd="@dimen/dp_4"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
+                android:layout_marginTop="@dimen/dp_4"
+                android:layout_marginBottom="@dimen/dp_4"
+                android:maxLines="2"
+                android:gravity="center"
                 android:text='@{goodsInfo.goods_name}'
                 android:textColor="@color/black"
+                android:textSize="@dimen/sp_14"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/iv_close"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="" />
 
             <ImageView
                 android:id="@+id/iv_close"
-                android:layout_width="@dimen/dp_16"
-                android:layout_height="@dimen/dp_16"
+                android:layout_width="@dimen/dp_12"
+                android:layout_height="@dimen/dp_12"
                 android:layout_marginEnd="@dimen/dp_8"
                 android:src="@drawable/icon_close"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -157,8 +164,8 @@
 
             <ImageView
                 android:id="@+id/imageView14"
-                android:layout_width="@dimen/dp_16"
-                android:layout_height="@dimen/dp_16"
+                android:layout_width="@dimen/dp_12"
+                android:layout_height="@dimen/dp_12"
                 android:layout_marginEnd="@dimen/dp_8"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
@@ -227,9 +234,8 @@
                 <ImageView
                     android:id="@+id/iv_reduce"
                     android:layout_width="@dimen/dp_20"
-                    android:layout_height="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_20"
                     android:adjustViewBounds="true"
-                    android:background="@drawable/number"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_reduce"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -247,17 +253,17 @@
                     android:maxLines="1"
                     android:minEms="1"
                     android:text="1"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/iv_reduce"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
                     android:id="@+id/iv_add"
                     android:layout_width="@dimen/dp_20"
-                    android:layout_height="@dimen/dp_16"
+                    android:layout_height="@dimen/dp_20"
                     android:layout_marginStart="@dimen/dp_4"
                     android:adjustViewBounds="true"
-                    android:background="@drawable/number"
                     android:scaleType="centerCrop"
                     android:src="@drawable/icon_add"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -307,9 +313,9 @@
                 android:layout_marginTop="@dimen/dp_8"
                 android:layout_marginEnd="@dimen/dp_8"
                 android:background="@drawable/edittext_background"
-                android:textSize="@dimen/sp_10"
                 android:gravity="start"
                 android:singleLine="true"
+                android:textSize="@dimen/sp_10"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView9" />
diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml
index 4547d34..68ae0ef 100644
--- a/app/src/main/res/layout/activity_weather.xml
+++ b/app/src/main/res/layout/activity_weather.xml
@@ -42,8 +42,8 @@
 
             <ImageView
                 android:id="@+id/imageView16"
-                android:layout_width="@dimen/dp_12"
-                android:layout_height="@dimen/dp_12"
+                android:layout_width="@dimen/dp_16"
+                android:layout_height="@dimen/dp_16"
                 android:layout_marginStart="@dimen/dp_4"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0a54e53..4deee1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">AIOS系统</string>
+    <string name="app_name">爱来伴</string>
 
     <string name="app_size">%d款应用</string>
     <string name="connect_wifi_ssid">连接到 \"%s\"</string>