更新12.7.6

修复偶尔连续熄亮屏的bug 增加稳定性
mingzhixian · Jul 23, 2023 · 0b77e3f · 0b77e3f
1 parent 00fcf9d
commit 0b77e3f
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 39 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 1275
-        versionName "12.7.5"
+        versionCode 1276
+        versionName "12.7.6"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {

diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/MainActivity.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/MainActivity.kt
@@ -86,7 +86,7 @@ class MainActivity : Activity(), ViewModelStoreOwner {
       asSlave()
     }
     // 检查更新
-    if (appData.setValue.checkUpdate) checkUpdate()
+    if (appData.setValue.checkUpdate) appData.publicTools.checkUpdate(this,false)
   }
 
   // 作为控制端
@@ -225,17 +225,6 @@ class MainActivity : Activity(), ViewModelStoreOwner {
     }
   }
 
-  // 检查更新
-  private fun checkUpdate() {
-    appData.netHelper.getJson("https://github.saymzx.top/api/repos/mingzhixian/scrcpy/releases/latest") {
-      val newVersionCode = it?.getInt("tag_name")
-      if (newVersionCode != null) {
-        if (newVersionCode > appData.versionCode)
-          Toast.makeText(this, "已发布新版本，可前往更新", Toast.LENGTH_LONG).show()
-      }
-    }
-  }
-
   // 作为被控端
   private fun asSlave() {
     // 防止多次调用

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
@@ -1,5 +1,6 @@
 package top.saymzx.scrcpy.android
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
@@ -53,9 +54,12 @@ class SetActivity : Activity() {
     // 关于
     setIndexListener()
     setPrivacyListener()
+    // 底栏
+    setVersionName()
   }
 
   // 设置默认值
+  @SuppressLint("SetTextI18n")
   private fun setValue() {
     setActivity.setDefaultVideoCodec.adapter =
       ArrayAdapter(this, R.layout.spinner_item, resources.getStringArray(R.array.videoCodecItems))
@@ -105,6 +109,7 @@ class SetActivity : Activity() {
     }
     setActivity.setShowFps.isChecked = appData.setValue.showFps
     setActivity.setCheckUpdate.isChecked = appData.setValue.checkUpdate
+    setActivity.setVersionName.text = "当前版本: ${BuildConfig.VERSION_NAME}"
   }
 
   // 设置返回按钮监听
@@ -319,6 +324,13 @@ class SetActivity : Activity() {
     }
   }
 
+  // 底栏
+  private fun setVersionName() {
+    setActivity.setVersionName.setOnClickListener {
+      appData.publicTools.checkUpdate(this,true)
+    }
+  }
+
   // 检查存储权限
   private fun openDirectory(mode: Int) {
     val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)

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
@@ -146,18 +146,18 @@ class Scrcpy(private val device: Device) {
           stop("投屏停止", e)
         }
       }.start()
-      // 显示刷新率
-      if (appData.setValue.showFps) {
-        launch {
-          try {
-            floatVideo.floatVideo.floatVideoFps.text = "0"
-            while (device.status == 1) {
-              delay(1000)
-              floatVideo.floatVideo.floatVideoFps.text = fps.toString()
-              fps = 0
-            }
-          } catch (_: Exception) {
+      launch {
+        // 显示刷新率
+        if (appData.setValue.showFps) floatVideo.floatVideo.floatVideoFps.text = "0"
+        while (device.status == 1) {
+          delay(1000)
+          // 显示刷新率
+          if (appData.setValue.showFps) {
+            floatVideo.floatVideo.floatVideoFps.text = fps.toString()
+            fps = 0
           }
+          // 熄屏检测
+          checkScreenOff()
         }
       }
     }
@@ -463,7 +463,6 @@ class Scrcpy(private val device: Device) {
   private fun decodeInputThread(mode: String) {
     val stream = if (mode == "video") videoStream else audioStream
     val codec = if (mode == "video") videoDecodec else audioDecodec
-    var zeroFrameNum = 0
     // 开始解码
     while (device.status == 1) {
       val buffer = readFrame(stream)
@@ -472,14 +471,6 @@ class Scrcpy(private val device: Device) {
         codec.getInputBuffer(inIndex)!!.put(buffer.third)
         // 提交解码器解码
         codec.queueInputBuffer(inIndex, 0, buffer.second, buffer.first, 0)
-        // 连续8个空包检测是否熄屏了
-        if (buffer.second < 150) {
-          zeroFrameNum++
-          if (zeroFrameNum > 7) {
-            zeroFrameNum = 0
-            checkScreenOff()
-          }
-        }
       }
     }
   }
@@ -607,7 +598,6 @@ class Scrcpy(private val device: Device) {
           }
           isScreenOning = false
         } catch (_: Exception) {
-
         }
       }
     }

diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/helper/PublicTools.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy/android/helper/PublicTools.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
+import android.widget.Toast
 import top.saymzx.scrcpy.android.R
 import top.saymzx.scrcpy.android.appData
 import top.saymzx.scrcpy.android.databinding.LoadingBinding
@@ -73,4 +74,17 @@ class PublicTools {
 
   // DP转PX
   fun dp2px(dp: Float): Float = dp * appData.main.resources.displayMetrics.density
+
+  // 检查更新
+  fun checkUpdate(context: Context, isNeedShowWhenLatest: Boolean) {
+    appData.netHelper.getJson("https://github.saymzx.top/api/repos/mingzhixian/scrcpy/releases/latest") {
+      val newVersionCode = it?.getInt("tag_name")
+      if (newVersionCode != null) {
+        if (newVersionCode > appData.versionCode)
+          Toast.makeText(context, "已发布新版本，可前往更新", Toast.LENGTH_LONG).show()
+        else if (isNeedShowWhenLatest)
+          Toast.makeText(context, "当前已是最新版本", Toast.LENGTH_LONG).show()
+      }
+    }
+  }
 }
diff --git a/scrcpy_android/app/src/main/res/layout/activity_set.xml b/scrcpy_android/app/src/main/res/layout/activity_set.xml
@@ -578,7 +578,6 @@
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="20dp"
-                android:layout_marginBottom="40dp"
                 android:background="@drawable/background"
                 android:backgroundTint="@color/cardBackground"
                 android:paddingStart="20dp"
@@ -589,6 +588,19 @@
                 android:textColor="@color/onCardBackground"
                 android:textSize="@dimen/middleFont" />
 
+            <TextView
+                android:id="@+id/set_version_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:layout_marginBottom="10dp"
+                android:gravity="center"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:text="当前版本:1.1.1"
+                android:textColor="@color/onCardBackground"
+                android:textSize="@dimen/smallFont" />
+
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/scrcpy_android/app/src/main/res/raw/scrcpy_server.jar b/scrcpy_android/app/src/main/res/raw/scrcpy_server.jar
diff --git a/scrcpy_android/app/src/main/res/values/size.xml b/scrcpy_android/app/src/main/res/values/size.xml
@@ -3,6 +3,7 @@
     <!--字体-->
     <dimen name="largeFont">24sp</dimen>
     <dimen name="middleFont">18sp</dimen>
+    <dimen name="smallFont">14sp</dimen>
     <!--floatVideo界面-->
     <dimen name="floatVideoBackground">20dp</dimen>
     <dimen name="floatVideoTitle">34dp</dimen>

diff --git a/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/Device.java b/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -235,8 +235,11 @@ public static boolean injectEvent(InputEvent inputEvent, int displayId, int inje
     if (displayId != 0 && !InputManager.setDisplayId(inputEvent, displayId)) {
       return false;
     }
-
-    return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
+    try {
+      return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
+    } catch (Exception ignored) {
+      return false;
+    }
   }
 
   public boolean injectEvent(InputEvent event, int injectMode) {