From 589fa734f52b672e5b728fe16b01280a0dd84bae Mon Sep 17 00:00:00 2001
From: fanhuitong <981964879@qq.com>
Date: Tue, 2 Aug 2022 15:40:29 +0800
Subject: [PATCH] =?UTF-8?q?version:3.6=20fix:=E4=BF=AE=E5=A4=8D=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E5=BA=94=E7=94=A8=E6=97=A0=E6=B3=95=E5=8D=B8=E8=BD=BD?=
 =?UTF-8?q?=20update:=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=A8=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=AE=89=E8=A3=85=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                               |  4 ++--
 .../com/uiui/sn/tpush/MessageReceiver.java     | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5bc5366..783c2b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,8 +67,8 @@ android {
     productFlavors {
         beta {
             flavorDimensions "default"
-            versionCode 25
-            versionName "3.4"
+            versionCode 27
+            versionName "3.6"
         }
 
         official {
diff --git a/app/src/main/java/com/uiui/sn/tpush/MessageReceiver.java b/app/src/main/java/com/uiui/sn/tpush/MessageReceiver.java
index 4e0f153..600196b 100644
--- a/app/src/main/java/com/uiui/sn/tpush/MessageReceiver.java
+++ b/app/src/main/java/com/uiui/sn/tpush/MessageReceiver.java
@@ -67,6 +67,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -477,6 +478,8 @@ public class MessageReceiver extends XGPushBaseReceiver {
     private static final String ACTION_DEFAULT_INPUT_METHOD = "78";
     /*家长管控开关*/
     private static final String ACTION_PARENTAL_CONTROL = "79";
+    /*更新白名单*/
+    private static final String UPDATE_WHITE_LIST = "83";
 
 
     private void processCustomMessage(Context context, XGPushTextMessage message) {
@@ -777,6 +780,9 @@ public class MessageReceiver extends XGPushBaseReceiver {
             case ACTION_PARENTAL_CONTROL:
                 NetInterfaceManager.getInstance().getSystemSettings();
                 break;
+            case UPDATE_WHITE_LIST:
+                NetInterfaceManager.getInstance().getAllappPackage();
+                break;
             default:
         }
     }
@@ -1016,6 +1022,8 @@ public class MessageReceiver extends XGPushBaseReceiver {
         int sn_id = (int) SPUtils.get(context, "sn_id", -1);
         JsonObject object = GsonUtils.getJsonObject(jsonString);
         String packageName = object.get("app_package").getAsString();
+        // 台电设备不删除无法静默卸载
+        removeForceSettings(context, packageName);
         ToastUtil.debugShow("收到应用卸载消息：包名" + packageName);
         if (!"".equals(packageName) && !packageName.equals(context.getApplicationContext().getPackageName())) {
             if (!ApkUtils.isAvailable(context.getApplicationContext(), packageName)) {
@@ -1026,6 +1034,16 @@ public class MessageReceiver extends XGPushBaseReceiver {
         }
     }
 
+    private boolean removeForceSettings(Context context, String pkg) {
+        String force_app = Settings.System.getString(context.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP);
+        if (!TextUtils.isEmpty(force_app)) {
+            Set<String> appSet = new HashSet<>(new ArrayList<>(Arrays.asList(force_app.split(","))));
+            appSet.remove(pkg);
+            return Settings.System.putString(context.getContentResolver(), CommonConfig.AOLE_ACTION_FORCE_APP, String.join(",", appSet));
+        }
+        return true;
+    }
+
     private Disposable subscribe;
     private long cutdownTime = 30;
     private CustomDialog dialog;