更新V12.7.4

优化兼容性
mingzhixian · Jul 22, 2023 · 05773f8 · 05773f8
1 parent 6797232
commit 05773f8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 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 1273
-        versionName "12.7.3"
+        versionCode 1274
+        versionName "12.7.4"
         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
@@ -271,7 +271,8 @@ class Scrcpy(private val device: Device) {
             " ls -l /data/local/tmp/scrcpy_android_server_${appData.versionCode}.jar ",
             true
           )
-        if (!(isHaveServer.contains("No such file or directory") || isHaveServer.contains("Invalid argument"))) return
+      } else {
+        return
       }
     }
     stop("发送Server失败")

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
@@ -206,9 +206,13 @@ public Point getPhysicalPoint(Position position) {
     }
     Rect contentRect = screenInfo.getContentRect();
     Point point = devicePosition.getPoint();
-    int convertedX = contentRect.left + point.getX() * contentRect.width() / unlockedVideoSize.getWidth();
-    int convertedY = contentRect.top + point.getY() * contentRect.height() / unlockedVideoSize.getHeight();
-    return new Point(convertedX, convertedY);
+    try {
+      int convertedX = contentRect.left + point.getX() * contentRect.width() / unlockedVideoSize.getWidth();
+      int convertedY = contentRect.top + point.getY() * contentRect.height() / unlockedVideoSize.getHeight();
+      return new Point(convertedX, convertedY);
+    } catch (Exception e) {
+      return null;
+    }
   }
 
   public static String getDeviceName() {