更新V12.7.5

修复兼容性问题
mingzhixian · Jul 22, 2023 · 2ff5882 · 2ff5882
1 parent 05773f8
commit 2ff5882
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/scrcpy_android/.idea/deploymentTargetDropDown.xml b/scrcpy_android/.idea/deploymentTargetDropDown.xml
diff --git a/scrcpy_android/app/build.gradle b/scrcpy_android/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "top.saymzx.scrcpy.android"
         minSdk 23
         targetSdk 33
-        versionCode 1274
-        versionName "12.7.4"
+        versionCode 1275
+        versionName "12.7.5"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {

diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/SetActivity.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/SetActivity.kt
@@ -256,6 +256,7 @@ class SetActivity : Activity() {
   private fun setRenewKeyListener() {
     setActivity.setRenewKey.setOnClickListener {
       AdbKeyPair.generate(appData.privateKey, appData.publicKey)
+      appData.keyPair = AdbKeyPair.read(appData.privateKey, appData.publicKey)
       Toast.makeText(this, "已刷新", Toast.LENGTH_SHORT).show()
     }
   }

diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/entity/Scrcpy.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/entity/Scrcpy.kt
@@ -472,10 +472,10 @@ class Scrcpy(private val device: Device) {
         codec.getInputBuffer(inIndex)!!.put(buffer.third)
         // 提交解码器解码
         codec.queueInputBuffer(inIndex, 0, buffer.second, buffer.first, 0)
-        // 连续4个空包检测是否熄屏了
+        // 连续8个空包检测是否熄屏了
         if (buffer.second < 150) {
           zeroFrameNum++
-          if (zeroFrameNum > 4) {
+          if (zeroFrameNum > 7) {
             zeroFrameNum = 0
             checkScreenOff()
           }
@@ -598,13 +598,14 @@ class Scrcpy(private val device: Device) {
     if (!isScreenOning) {
       appData.mainScope.launch {
         try {
+          isScreenOning = true
           if (!runAdbCmd("dumpsys deviceidle | grep mScreenOn", true).contains("mScreenOn=true")) {
-            isScreenOning = true
             runAdbCmd("input keyevent 26", false)
             delay(1000)
             setPowerOff()
-            isScreenOning = false
+            delay(1000)
           }
+          isScreenOning = false
         } catch (_: Exception) {
 
         }

diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/helper/AppData.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/helper/AppData.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.MainScope
 import top.saymzx.scrcpy.adb.AdbKeyPair
 import top.saymzx.scrcpy.android.BuildConfig
 import top.saymzx.scrcpy.android.MainActivity
-import top.saymzx.scrcpy.android.appData
 import top.saymzx.scrcpy.android.entity.Device
 import top.saymzx.scrcpy.android.entity.SetValue
 import java.io.File
@@ -126,7 +125,7 @@ class AppData : ViewModel() {
     if (!privateKey.isFile || !publicKey.isFile) {
       AdbKeyPair.generate(privateKey, publicKey)
     }
-    keyPair = AdbKeyPair.read(appData.privateKey, appData.publicKey)
+    keyPair = AdbKeyPair.read(privateKey, publicKey)
   }
 
 }