Merge pull request #944 from barry-ran/dev

sync dev
barry-ran · Apr 8, 2024 · ae1851a · ae1851a
2 parents 6147963 + 971e94b
commit ae1851a
Show file tree

Hide file tree

Showing 55 changed files with 2 additions and 5,382 deletions.
diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
diff --git a/config/config.ini b/config/config.ini
@@ -10,7 +10,7 @@ RenderExpiredFrames=0
 # 视频解码方式：-1 自动，0 软解，1 dx硬解，2 opengl硬解
 UseDesktopOpenGL=-1
 # scrcpy-server的版本号（不要修改）
-ServerVersion=2.1.1
+ServerVersion=2.4
 # scrcpy-server推送到安卓设备的路径
 ServerPath=/data/local/tmp/scrcpy-server.jar
 # 自定义adb路径，例如D:/android/tools/adb.exe

diff --git a/server/.gitignore b/server/.gitignore
diff --git a/server/build.gradle b/server/build.gradle
diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.sh
diff --git a/server/meson.build b/server/meson.build
diff --git a/server/proguard-rules.pro b/server/proguard-rules.pro
diff --git a/server/scripts/build-wrapper.sh b/server/scripts/build-wrapper.sh
diff --git a/server/src/main/AndroidManifest.xml b/server/src/main/AndroidManifest.xml
diff --git a/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl b/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl
diff --git a/server/src/main/aidl/android/view/IRotationWatcher.aidl b/server/src/main/aidl/android/view/IRotationWatcher.aidl