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 pkgSet = new HashSet<>(new ArrayList<>(Arrays.asList(pkgString.split(",")))); + Set 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 0ee1422..f66956c 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_add.png and b/app/src/main/res/drawable-hdpi/icon_add.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_close.png b/app/src/main/res/drawable-hdpi/icon_close.png index 6dbbbb6..a66c73d 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_close.png and b/app/src/main/res/drawable-hdpi/icon_close.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_location.png b/app/src/main/res/drawable-hdpi/icon_location.png index 3923551..ab55c2a 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_location.png and b/app/src/main/res/drawable-hdpi/icon_location.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_more.png b/app/src/main/res/drawable-hdpi/icon_more.png index 07862e5..e41c9d8 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_more.png and b/app/src/main/res/drawable-hdpi/icon_more.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_reduce.png b/app/src/main/res/drawable-hdpi/icon_reduce.png index 9f7a713..ab3e50b 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_reduce.png and b/app/src/main/res/drawable-hdpi/icon_reduce.png differ 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 @@ + app:layout_constraintTop_toTopOf="parent" + tools:text="" /> 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 @@ - AIOS系统 + 爱来伴 %d款应用 连接到 \"%s\"