更新V12.1.1

修复无法连接时崩溃bug
mingzhixian · Jul 9, 2023 · f5c5074 · f5c5074
1 parent 5e16a77
commit f5c5074
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 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 121
-        versionName "12.1"
+        versionCode 1211
+        versionName "12.1.1"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {

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
@@ -81,19 +81,19 @@ class Scrcpy(private val device: Device) {
       } catch (e: Exception) {
         stop("连接错误", e)
       }
-//      try {
-      alert.cancel()
-      // 配置视频解码
-      setVideoDecodec()
-      // 配置音频解码
-      setAudioDecodec()
-      // 配置音频播放
-      if (canAudio) setAudioTrack()
-      // 设置被控端熄屏（默认投屏后熄屏）
-      setPowerOff()
-//      } catch (e: Exception) {
-//        stop("启动错误", e)
-//      }
+      try {
+        alert.cancel()
+        // 配置视频解码
+        setVideoDecodec()
+        // 配置音频解码
+        setAudioDecodec()
+        // 配置音频播放
+        if (canAudio) setAudioTrack()
+        // 设置被控端熄屏（默认投屏后熄屏）
+        setPowerOff()
+      } catch (e: Exception) {
+        stop("启动错误", e)
+      }
       // 投屏中
       device.status = 1
       // 视频解码

diff --git a/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -94,7 +94,6 @@ private void streamScreen() throws IOException, ConfigurationException {
         if (codeInfo.getCapabilitiesForType(codec.getMimeType()).getEncoderCapabilities().isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR)) {
           format.setInteger(MediaFormat.KEY_BITRATE_MODE, MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR);
         }
-//        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, COLOR_FormatYUV420Flexible);
 
         Surface surface = null;
         try {