From 2e2632391312f162620181c60c58a81544508911 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@mail.com>
Date: Sat, 2 Aug 2025 11:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml                 |  4 ++--
 app/build.gradle.kts                               | 14 ++++++++++++++
 .../java/com/android/grape/job/OpenAppService.kt   |  1 -
 .../main/java/com/android/grape/util/AppUtils.kt   | 13 ++++---------
 .../main/java/com/android/grape/util/ShellUtils.kt |  5 ++---
 .../main/java/com/android/grape/util/TaskUtils.kt  |  2 +-
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 2a4b91d..fb80ee2 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-07-07T06:37:35.266033300Z">
+        <DropdownSelection timestamp="2025-08-02T03:09:35.609697900Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=8.217.74.194:8924;connection=1af33e42" />
+              <DeviceId pluginId="Default" identifier="serial=8.217.74.194:8924;connection=5f91b786" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 489971e..fe99d78 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.android.build.gradle.internal.api.ApkVariantOutputImpl
 
 plugins {
     alias(libs.plugins.android.application)
@@ -49,6 +50,19 @@ android {
         viewBinding = true
         buildConfig = true
     }
+
+    applicationVariants.all {
+        val variant = this
+        variant.outputs.all {
+            val versionName = variant.versionName
+            val versionCode = variant.versionCode
+            val outputFileName = "app-${variant.applicationId}-v${versionName}-${versionCode}.apk"
+
+            if (this is ApkVariantOutputImpl) {
+                this.outputFileName = outputFileName
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/android/grape/job/OpenAppService.kt b/app/src/main/java/com/android/grape/job/OpenAppService.kt
index 69659a3..a9e668b 100644
--- a/app/src/main/java/com/android/grape/job/OpenAppService.kt
+++ b/app/src/main/java/com/android/grape/job/OpenAppService.kt
@@ -40,7 +40,6 @@ class OpenAppService : JobIntentService() {
 //                            FileUtils.writePackageName(recordPackageName?:"")
                             FileUtils.writeDevice(recordPackageName?:"", deviceInfo?: "")
                             FileUtils.runPlugin(recordPackageName?:"")
-                            MockTools.exec("pm grant ${AUTO_JSPACKAGENAME} android.permission.READ_EXTERNAL_STORAGE") //sdcard权限
                             MockTools.exec("pm grant ${AUTO_JSPACKAGENAME} android.permission.SYSTEM_ALERT_WINDOW") //悬浮窗权限
                             MockTools.exec("settings put secure enabled_accessibility_services ${AUTO_JSPACKAGENAME}/${AUTO_JSPACKAGENAME}.core.accessibility.AccessibilityService")
                             doScript(this@OpenAppService, AUTO_JSPACKAGENAME) //autojs
diff --git a/app/src/main/java/com/android/grape/util/AppUtils.kt b/app/src/main/java/com/android/grape/util/AppUtils.kt
index f6d91ab..67136b9 100644
--- a/app/src/main/java/com/android/grape/util/AppUtils.kt
+++ b/app/src/main/java/com/android/grape/util/AppUtils.kt
@@ -213,7 +213,7 @@ object AppUtils {
     fun installRecord(context: Context): Boolean {
         var installRet = false
         startInstallTime = System.currentTimeMillis()
-        if (CheckAppNeedUpgrade(context) || !checkAppInstalled(
+        if (!checkAppInstalled(
                 context,
                 recordPackageName
             )
@@ -232,10 +232,8 @@ object AppUtils {
 
                 if (installRet && !videoProxy.contains("123.56.44.45")) {
                     //检查是否有新版本
-                    if (!CheckAppNeedUpgrade(context)) {
-                        file.delete()
-                        extraFile?.delete()
-                    }
+                    file.delete()
+                    extraFile?.delete()
                 }
             } catch (e: Exception) {
                 e.printStackTrace()
@@ -604,10 +602,7 @@ object AppUtils {
         try {
             var url = "http://39.103.73.250/tt/upload/ddj/$recordFileName"
             var ret = false
-            ret = if (checkAppInstalled(
-                    context,
-                    recordPackageName
-                ) || !CheckAppNeedUpgrade(context)
+            ret = if (checkAppInstalled(context, recordPackageName)
             ) {
                 true
             } else {
diff --git a/app/src/main/java/com/android/grape/util/ShellUtils.kt b/app/src/main/java/com/android/grape/util/ShellUtils.kt
index deb6be2..5993264 100644
--- a/app/src/main/java/com/android/grape/util/ShellUtils.kt
+++ b/app/src/main/java/com/android/grape/util/ShellUtils.kt
@@ -208,9 +208,8 @@ object ShellUtils {
                     } catch (e: IOException) {
                         LogUtils.e(
                             Log.ERROR,
-                            "ShellUtils",
-                            "Error while reading process error stream: ${e.message}",
-                            e
+                            "cmd:$cmd",
+                            "Error while reading process error stream: ${e.message}"
                         )
                     }
                 }
diff --git a/app/src/main/java/com/android/grape/util/TaskUtils.kt b/app/src/main/java/com/android/grape/util/TaskUtils.kt
index 7a6a313..6784b15 100644
--- a/app/src/main/java/com/android/grape/util/TaskUtils.kt
+++ b/app/src/main/java/com/android/grape/util/TaskUtils.kt
@@ -199,7 +199,7 @@ object TaskUtils {
                 " ".toByteArray(charset = Charsets.UTF_8),
                 "$url?$params"
             )
-            LogUtils.e("IOSTQ:execReloginTask->result:$result")
+            LogUtils.d("IOSTQ:execReloginTask->result:$result")
             if (result != null && result.isNotEmpty()) {
                 taskJson = JSONObject(result).apply {
                     val code = getInt("code")