version:

fix: update:更新图标
2022-08-31 10:36:17 +08:00
parent 0b69c9294a
commit 0b8f3b8f5e
13 changed files with 50 additions and 34 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,12 +43,6 @@ android {

    //多版本
    productFlavors {
-        beta {
-            flavorDimensions "default"
-            versionCode 23
-            versionName "3.2"
-        }
-
        official {
            flavorDimensions "default"
            versionCode 1
--- a/app/src/main/java/com/uiui/appstore/activity/MainActivity.java
+++ b/app/src/main/java/com/uiui/appstore/activity/MainActivity.java
@@ -150,7 +150,7 @@ public class MainActivity extends BaseActivity {

    @Override
    protected void initData() {
-        getAllAppPackageName();
+//        getAllAppPackageName();
    }

    @Override
@@ -297,10 +297,10 @@ public class MainActivity extends BaseActivity {
                            if (s.endsWith(",")) {
                                s = s.substring(0, s.length() - 1);
                            }
-                            String qch_app_forbid_before = Settings.System.getString(getContentResolver(), "qch_app_forbid");
+                            String qch_app_forbid_before = Settings.System.getString(getContentResolver(), "aole_app_forbid");
                            Log.e("getAllAppPackageName:", "qch_app_forbid_before" + qch_app_forbid_before);
-                            boolean qch_app_forbid = Settings.System.putString(getContentResolver(), "qch_app_forbid", s);
-                            Log.e("getAllAppPackageName", "qch_app_forbid:" + qch_app_forbid + ":" + s);
+//                            boolean aole_app_forbid = Settings.System.putString(getContentResolver(), "aole_app_forbid", s);
+//                            Log.e("getAllAppPackageName", "aole_app_forbid:" + aole_app_forbid + ":" + s);
                        }
                    }

--- a/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java
+++ b/app/src/main/java/com/uiui/appstore/adapter/AppAdapter.java
@@ -26,6 +26,7 @@ import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.inf.IEntity;
 import com.arialyy.aria.core.task.DownloadTask;
 import com.bumptech.glide.Glide;
+import com.uiui.appstore.utils.Utils;


 import java.io.File;
@@ -107,6 +108,7 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.Holder> {
                if (installed && !update) {
                    ApkUtils.openApp(mContext, appInfo.getApp_package());
                } else {
+                    Utils.addPackageToWhiteList(mContext, appInfo.getApp_package());
                    DownloadEntity entity = Aria.download(this).getFirstDownloadEntity(appInfo.getApp_url());
                    if (null != entity) {
                        switch (entity.getState()) {
@@ -136,6 +138,7 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.Holder> {
                                }

                                break;
+                            default:
                        }
                    } else {
 //                    downloadApk(appInfo);
--- a/app/src/main/java/com/uiui/appstore/network/UrlAddress.java
+++ b/app/src/main/java/com/uiui/appstore/network/UrlAddress.java
@@ -1,7 +1,7 @@
 package com.uiui.appstore.network;

 public class UrlAddress {
-    public final static String ROOT_URL = "https://led.aolelearn.cn/android/";
+    public final static String ROOT_URL = "https://led.zuoyepad.com/android/";

    /*获取批次*/
    public static final String GET_BATCH = "sn/getBatch";
--- a/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/appstore/utils/ApkUtils.java
@@ -656,6 +656,9 @@ public class ApkUtils {
        intent.addCategory(Intent.CATEGORY_LAUNCHER);
        List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(intent, 0);
        String aole_force_app = Settings.System.getString(context.getContentResolver(), "aole_force_app");
+        if (TextUtils.isEmpty(aole_force_app)) {
+            return appList;
+        }
        Set<String> forceAppSet = new HashSet<>(Arrays.asList(aole_force_app.split(",")));
        forceAppSet.addAll(fuxiaoyingApp);

--- a/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java
+++ b/app/src/main/java/com/uiui/appstore/utils/JGYUtils.java
@@ -144,16 +144,16 @@ public class JGYUtils {
            }


-            String olddeselectViewArray = Settings.System.getString(mContext.getContentResolver(), "qch_app_forbid_id");
+            String olddeselectViewArray = Settings.System.getString(mContext.getContentResolver(), "aole_app_forbid_id");
            Log.e("writeDeselectIDtoSystem", "olddeselectViewArray: " + olddeselectViewArray);

-            Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid_id", packageStringBuilder.toString());
+            Settings.System.putString(mContext.getContentResolver(), "aole_app_forbid_id", packageStringBuilder.toString());
            Settings.System.putString(mContext.getContentResolver(), "DeselectViewArray", idStringBuilder.toString());
-            Log.e("writeDeselectIDtoSystem", "qch_app_forbid_id: " + packageStringBuilder.toString());
+            Log.e("writeDeselectIDtoSystem", "aole_app_forbid_id: " + packageStringBuilder.toString());
            Log.e("writeDeselectIDtoSystem", "deselectViewArray: " + idStringBuilder.toString());
        } else {
            Log.e("writeDeselectIDtoSystem", "writeDeselectIDtoSystem is null:");
-            Settings.System.putString(mContext.getContentResolver(), "qch_app_forbid_id", "");
+            Settings.System.putString(mContext.getContentResolver(), "aole_app_forbid_id", "");
            Settings.System.putString(mContext.getContentResolver(), "DeselectViewArray", "");
        }
    }
--- a/app/src/main/java/com/uiui/appstore/utils/Utils.java
+++ b/app/src/main/java/com/uiui/appstore/utils/Utils.java
@@ -42,9 +42,12 @@ import java.io.Reader;
 import java.lang.reflect.Method;
 import java.net.NetworkInterface;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;

 public class Utils {
@@ -586,23 +589,23 @@ public class Utils {
     */
    @SuppressLint({"MissingPermission", "NewApi"})
    public static String getSerial() {
-        return JGYUtils.getInstance().getIMEI();
-//        String serial = "unknow";
-//        try {
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
-//                serial = Build.getSerial();
-//            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
-//                serial = Build.SERIAL;
-//            } else {//8.0-
-//                Class<?> c = Class.forName("android.os.SystemProperties");
-//                Method get = c.getMethod("get", String.class);
-//                serial = (String) get.invoke(c, "ro.serialno");
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            Log.e("e", "读取设备序列号异常：" + e.toString());
-//        }
-//        return serial;
+//        return JGYUtils.getInstance().getIMEI();
+        String serial = "unknow";
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+
+                serial = Build.getSerial();
+            } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+
+                serial = Build.SERIAL;
+            } else {//8.0-
+                Class<?> c = Class.forName("android.os.SystemProperties");
+                Method get = c.getMethod("get", String.class);
+                serial = (String) get.invoke(c, "ro.serialno");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("e", "读取设备序列号异常：" + e.toString());
+        }
+        return serial;
    }

    public static final long A_GB = 1073741824;
@@ -708,5 +711,18 @@ public class Utils {
        return bitmap;
    }

-
+    public static boolean addPackageToWhiteList(Context context, String pkg) {
+        String old = Settings.System.getString(context.getContentResolver(), "aole_app_forbid");
+        Log.e("addPackageToWhiteList", "pkgList: " + old);
+        if (TextUtils.isEmpty(old)) {
+            return Settings.System.putString(context.getContentResolver(), "aole_app_forbid", pkg);
+        } else {
+            if (old.contains(pkg)) {
+                return true;
+            }
+            HashSet<String> hashSet = new HashSet<>(new ArrayList<>(Arrays.asList(old.split(","))));
+            hashSet.add(pkg);
+            return Settings.System.putString(context.getContentResolver(), "aole_app_forbid", String.join(",", hashSet));
+        }
+    }
 }
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name='合作平台应用市场'
+rootProject.name='UIUI应用市场'