version:5.4

fix:
update:优化订单支付页面，修改部分页面状态栏颜色

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.uiuios.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 43
+        versionCode 45
-        versionName "5.2"
+        versionName "5.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

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

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

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

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

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

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

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;
             }

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_width="@dimen/dp_12"
-                android:layout_height="@dimen/dp_16"
+                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_width="@dimen/dp_12"
-                android:layout_height="@dimen/dp_16"
+                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" />

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_width="@dimen/dp_16"
-                android:layout_height="@dimen/dp_12"
+                android:layout_height="@dimen/dp_16"
                 android:layout_marginStart="@dimen/dp_4"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"

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>