修复悬浮球在旋转后位置移动导致溢出的问题，修复可能未正确旋转的问题，每2~3秒主动检测一次是否旋转

mingzhixian · Apr 20, 2023 · a58c0b2 · a58c0b2
1 parent 1e3475d
commit a58c0b2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 28 deletions.
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 60
-        versionName "6.0"
+        versionCode 61
+        versionName "6.1"
         resConfigs "zh"
         ndk {
             abiFilter "arm64-v8a"

diff --git a/scrcpy_android/app/release/output-metadata.json b/scrcpy_android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 60,
-      "versionName": "6.0",
+      "versionCode": 61,
+      "versionName": "6.1",
       "outputFile": "app-release.apk"
     }
   ],

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
@@ -363,36 +363,20 @@ class MainActivity : AppCompatActivity() {
     var outIndex: Int
     val bufferInfo = BufferInfo()
     if (mode == "video") {
+      var decodeNum = 0
       while (true) {
         // 找到已完成的输出缓冲区
         outIndex = configs.videoDecodec.dequeueOutputBuffer(bufferInfo, 0)
         if (outIndex >= 0) {
+          // 每120帧(两秒)检查一次是否旋转，防止未收到旋转信息
+          decodeNum++
+          if (decodeNum > 119) {
+            decodeNum = 0
+            ifRotation(configs.videoDecodec.getOutputFormat(outIndex))
+          }
           configs.videoDecodec.releaseOutputBuffer(outIndex, true)
         } else if (outIndex == INFO_OUTPUT_FORMAT_CHANGED) {
-          val fomat = configs.videoDecodec.outputFormat
-          configs.remoteWidth = fomat.getInteger("width")
-          configs.remoteHeight = fomat.getInteger("height")
-          // 检测是否旋转
-          if ((configs.remoteWidth > configs.remoteHeight && configs.localWidth < configs.localHeight) || (configs.remoteWidth < configs.remoteHeight && configs.localWidth > configs.localHeight)) {
-            // surface
-            var tmp = configs.localWidth
-            configs.localWidth = configs.localHeight
-            configs.localHeight = tmp
-            configs.surfaceLayoutParams.apply {
-              width = configs.localWidth
-              height = configs.localHeight
-            }
-            // 导航球
-            tmp = configs.navLayoutParams.x
-            configs.navLayoutParams.x = configs.localWidth - configs.navLayoutParams.y
-            configs.navLayoutParams.y = tmp
-            runOnUiThread {
-              windowManager.updateViewLayout(configs.surfaceView, configs.surfaceLayoutParams)
-              windowManager.updateViewLayout(configs.navView, configs.navLayoutParams)
-            }
-            requestedOrientation =
-              if (configs.remoteWidth > configs.remoteHeight) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-          }
+          ifRotation(configs.videoDecodec.outputFormat)
         } else {
           Thread.sleep(8)
           continue
@@ -449,6 +433,39 @@ class MainActivity : AppCompatActivity() {
     }
   }
 
+  // 判断是否旋转
+  private fun ifRotation(format: MediaFormat) {
+    configs.remoteWidth = format.getInteger("width")
+    configs.remoteHeight = format.getInteger("height")
+    // 检测是否旋转
+    if ((configs.remoteWidth > configs.remoteHeight && configs.localWidth < configs.localHeight) || (configs.remoteWidth < configs.remoteHeight && configs.localWidth > configs.localHeight)) {
+      // surface
+      var tmp = configs.localWidth
+      configs.localWidth = configs.localHeight
+      configs.localHeight = tmp
+      configs.surfaceLayoutParams.apply {
+        width = configs.localWidth
+        height = configs.localHeight
+      }
+      // 导航球，旋转不改变位置
+      if (configs.remoteWidth > configs.remoteHeight) {
+        tmp = configs.navLayoutParams.y
+        configs.navLayoutParams.y = configs.localHeight - configs.navLayoutParams.x - 170
+        configs.navLayoutParams.x = tmp
+      } else {
+        tmp = configs.navLayoutParams.x
+        configs.navLayoutParams.x = configs.localWidth - configs.navLayoutParams.y - 170
+        configs.navLayoutParams.y = tmp
+      }
+      runOnUiThread {
+        windowManager.updateViewLayout(configs.surfaceView, configs.surfaceLayoutParams)
+        windowManager.updateViewLayout(configs.navView, configs.navLayoutParams)
+      }
+      requestedOrientation =
+        if (configs.remoteWidth > configs.remoteHeight) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+    }
+  }
+
   // 悬浮控制
   @SuppressLint("ClickableViewAccessibility", "InflateParams")
   private fun setFloatNav() {