From 775f76ddc6f471e7917e7c49020d7c7d6b8bd7cf Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Wed, 15 Nov 2023 09:26:31 +0800
Subject: [PATCH] =?UTF-8?q?version:1.6.9=20fix:=20update:=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=80=80=E5=87=BA=E6=A1=8C=E9=9D=A2=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  4 ++--
 app/src/main/AndroidManifest.xml                   |  5 -----
 .../main/java/com/uiui/zyos/utils/ApkUtils.java    |  2 +-
 app/src/main/java/com/uiui/zyos/utils/Utils.java   |  4 ++--
 app/tpns-configs.json                              | 14 --------------
 5 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 app/tpns-configs.json

diff --git a/app/build.gradle b/app/build.gradle
index f8eab38..dc8956f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 60
-        versionName "1.6.8"
+        versionCode 61
+        versionName "1.6.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d1a27a..bf0e367 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,12 +28,7 @@
     <!-- 允许读设备等信息，用于问题排查 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
-    <!-- 【必须】 移动推送 TPNS SDK VIP版本所需权限 -->
-    <permission
-        android:name="${applicationId}.permission.XGPUSH_RECEIVE"
-        android:protectionLevel="signature" />
 
-    <uses-permission android:name="${applicationId}.permission.XGPUSH_RECEIVE" />
     <!-- 【必须】 移动推送 TPNS SDK 所需权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
diff --git a/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java b/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java
index af0984f..596d392 100644
--- a/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/ApkUtils.java
@@ -610,7 +610,7 @@ public class ApkUtils {
 
     public static void gotoLauncher(Context context) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
-            if ("U807".equals(BuildConfig.platform)) {
+            if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) {
                 Intent homeIntent = new Intent(Intent.ACTION_MAIN);
                 homeIntent.setPackage("com.uiuipad.os");
                 homeIntent.addCategory(Intent.CATEGORY_HOME);
diff --git a/app/src/main/java/com/uiui/zyos/utils/Utils.java b/app/src/main/java/com/uiui/zyos/utils/Utils.java
index 59d797f..2a44c4a 100644
--- a/app/src/main/java/com/uiui/zyos/utils/Utils.java
+++ b/app/src/main/java/com/uiui/zyos/utils/Utils.java
@@ -239,14 +239,14 @@ public class Utils {
     }
 
     public static void exitDesktop(Activity context) {
-        if ("U807".equals(BuildConfig.platform)) {
+        if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) {
             RemoteManager.getInstance().setDefaultDesktop("com.uiuipad.os");
         } else {
             RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME);
         }
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
-            if ("U807".equals(BuildConfig.platform)) {
+            if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) {
                 if (!ApkUtils.openPackage(context, "com.uiuipad.os", "com.uiuipad.os.Launcher")) {
                     ApkUtils.gotoLauncher(context);
                 }
diff --git a/app/tpns-configs.json b/app/tpns-configs.json
deleted file mode 100644
index 50d827b..0000000
--- a/app/tpns-configs.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "tpns": {
-        "access_id": "1500030457",
-        "access_key": "AZZXANJF4HBD"
-    },
-    "com.uiui.zyos": {
-        "channel": {
-            "enable": true
-        }
-    },
-    "debug": false,
-    "version": "1.3.3.3-release",
-    "upgrade": true
-}
\ No newline at end of file