From 05924747005c567e5d03b45d7011718386fff5f7 Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Thu, 5 Feb 2026 19:21:44 +0800
Subject: [PATCH] =?UTF-8?q?version:1.1.8=20fix:=E4=BF=AE=E5=A4=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9C=8B=E4=B8=8D=E5=88=B0=E7=89=88=E6=9C=AC=20update?=
 =?UTF-8?q?:=E9=9A=90=E8=97=8F=E5=AD=A6=E5=8E=86=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  4 ++--
 .../com/xwad/os/activity/home/HomeActivity.java    |  5 ++---
 .../main/java/com/xwad/os/mdm/AdminManager.java    | 14 ++++++++++++--
 app/src/main/res/layout/fragment_mine.xml          |  1 +
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6baf668..4cfa6e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
 
-        versionCode 18
-        versionName "1.1.7"
+        versionCode 19
+        versionName "1.1.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java
index d4afc41..34be4fd 100644
--- a/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java
+++ b/app/src/main/java/com/xwad/os/activity/home/HomeActivity.java
@@ -237,7 +237,7 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
                 } else {
                     if (ApkUtils.isUpdate(HomeActivity.this, appInfo)) {
                         Intent intent = new Intent(HomeActivity.this, UpdateActivity.class);
-                        intent.putExtra("appInfo", appInfo);
+                        intent.putExtra("appUpdateInfo", appInfo);
                         startActivity(intent);
                         Toaster.show("有新的版本需要更新");
                     } else {
@@ -573,7 +573,6 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
         AdminManager.getInstance().setSystemBrowserDisabled(false);
         AdminManager.getInstance().setMultiWindowDisabled(true);
         AdminManager.getInstance().setVoiceAssistantButtonDisabled(true);
-        AdminManager.getInstance().addAlertWindowApps(forceAppList);
 
 //        AdminManager.getInstance().setRestoreFactoryDisabled(true);
         AdminManager.getInstance().setDefaultLauncher("com.xwad.os", "com.xwad.os.activity.home.HomeActivity");
@@ -651,7 +650,7 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
             //设置可信任应用列表
             AdminManager.getInstance().removeSuperTrustListForHwSystemManger(AdminManager.getInstance().getSuperTrustListForHwSystemManger());
             // TODO: 2026/1/13 有闪退但是没有报错信息
-//            AdminManager.getInstance().setSuperTrustListForHwSystemManger(forceAppList);
+            AdminManager.getInstance().setSuperTrustListForHwSystemManger(forceAppList);
             Log.e(TAG, "setDisallowUninstall: getSuperTrustListForHwSystemManger = " + AdminManager.getInstance().getSuperTrustListForHwSystemManger());
 //            AdminManager.getInstance().addDisabledDeactivateMdmPackages(forceAppList);
             Log.e(TAG, "setDisallowUninstall: getSerial: " + Utils.getSerial(this));
diff --git a/app/src/main/java/com/xwad/os/mdm/AdminManager.java b/app/src/main/java/com/xwad/os/mdm/AdminManager.java
index 017f177..89c3915 100644
--- a/app/src/main/java/com/xwad/os/mdm/AdminManager.java
+++ b/app/src/main/java/com/xwad/os/mdm/AdminManager.java
@@ -602,16 +602,26 @@ public class AdminManager {
      * 设置可信任应用列表
      * 3.11.9 ~ 3.11.23 接口为拆分了以上功能的各个接口，该接口和 3.11.9 ~ 3.11.23 接
      * 口不可同时使用。
+     * addProjectMediaApps/
+     * addNotificationApps/
+     * addDisallowCloseInternetApps/
+     * addAlertWindowApps/
+     * addDisallowCloseBootCompletedApps/
+     * addDisallowBatteryOptimizeApps
+     *
+     * 几个接口任意一个调用过，都无法再次调用这个接口
      *
      * @param packageNames
      */
-    public void setSuperTrustListForHwSystemManger(ArrayList<String> packageNames) {
+    public boolean setSuperTrustListForHwSystemManger(ArrayList<String> packageNames) {
         Log.e(TAG, "setSuperTrustListForHwSystemManger: " + packageNames);
         try {
-            mDeviceHwSystemManager.setSuperTrustListForHwSystemManger(mAdminName, packageNames);
+            return mDeviceHwSystemManager.setSuperTrustListForHwSystemManger(mAdminName, packageNames);
         } catch (Exception e) {
             Log.e(TAG, "setSuperTrustListForHwSystemManger: " + e.getMessage());
+            addAlertWindowApps(packageNames);
         }
+        return false;
     }
 
     public ArrayList<String> getSuperTrustListForHwSystemManger() {
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
index 889b3ea..7f6bbdc 100644
--- a/app/src/main/res/layout/fragment_mine.xml
+++ b/app/src/main/res/layout/fragment_mine.xml
@@ -137,6 +137,7 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="14dp"
+                            android:visibility="gone"
                             android:gravity="center_vertical"
                             android:orientation="horizontal">