feat: 更新scrcpy-server 2.1.1

barry-ran · Feb 25, 2024 · e67ae04 · e67ae04
1 parent 4e4be93
commit e67ae04
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore
diff --git a/QtScrcpy/ui/dialog.cpp b/QtScrcpy/ui/dialog.cpp
@@ -2,6 +2,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QKeyEvent>
+#include <QRandomGenerator>
 #include <QTime>
 #include <QTimer>
 
@@ -320,6 +321,7 @@ void Dialog::on_startServerBtn_clicked()
     params.logLevel = Config::getInstance().getLogLevel();
     params.codecOptions = Config::getInstance().getCodecOptions();
     params.codecName = Config::getInstance().getCodecName();
+    params.scid = QRandomGenerator::global()->bounded(1, 10000) & 0x7FFFFFFF;
 
     qsc::IDeviceManage::getInstance().connectDevice(params);
 }
@@ -457,8 +459,10 @@ void Dialog::onDeviceConnected(bool success, const QString &serial, const QStrin
         videoForm->staysOnTop();
     }
 
+#ifndef Q_OS_WIN32
     // must be show before updateShowSize
     videoForm->show();
+#endif
     QString name = Config::getInstance().getNickName(serial);
     if (name.isEmpty()) {
         name = Config::getInstance().getTitle();
@@ -476,6 +480,11 @@ void Dialog::onDeviceConnected(bool success, const QString &serial, const QStrin
         videoForm->setGeometry(rc);
     }
 
+#ifdef Q_OS_WIN32
+    // windows是show太早可以看到resize的过程
+    QTimer::singleShot(200, videoForm, [videoForm](){videoForm->show();});
+#endif
+
     GroupController::instance().addDevice(serial);
 }
 

diff --git a/QtScrcpy/ui/videoform.cpp b/QtScrcpy/ui/videoform.cpp
@@ -513,6 +513,9 @@ void VideoForm::switchFullScreen()
 
 bool VideoForm::isHost()
 {
+    if (!m_toolForm) {
+        return false;
+    }
     return m_toolForm->isHost();
 }
 
@@ -719,7 +722,9 @@ void VideoForm::showEvent(QShowEvent *event)
 {
     Q_UNUSED(event)
     if (!isFullScreen()) {
-        showToolForm();
+        QTimer::singleShot(500, this, [this](){
+            showToolForm();
+        });
     }
 }
 

diff --git a/QtScrcpy/util/config.cpp b/QtScrcpy/util/config.cpp
@@ -18,7 +18,7 @@
 #define COMMON_PUSHFILE_DEF "/sdcard/"
 
 #define COMMON_SERVER_VERSION_KEY "ServerVersion"
-#define COMMON_SERVER_VERSION_DEF "1.24"
+#define COMMON_SERVER_VERSION_DEF "2.1.1"
 
 #define COMMON_SERVER_PATH_KEY "ServerPath"
 #define COMMON_SERVER_PATH_DEF "/data/local/tmp/scrcpy-server.jar"

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=1.24
+ServerVersion=2.1.1
 # scrcpy-server推送到安卓设备的路径
 ServerPath=/data/local/tmp/scrcpy-server.jar
 # 自定义adb路径，例如D:/android/tools/adb.exe
+1 −0		include/QtScrcpyCore.h
+2 −1		include/QtScrcpyCoreDef.h
+2 −1		src/device/controller/controller.cpp
+31 −7		src/device/controller/inputconvert/controlmsg.cpp
+15 −3		src/device/controller/inputconvert/controlmsg.h
+7 −4		src/device/controller/inputconvert/inputconvertgame.cpp
+28 −1		src/device/controller/inputconvert/inputconvertnormal.cpp
+1 −0		src/device/controller/inputconvert/inputconvertnormal.h
+24 −7		src/device/demuxer/demuxer.cpp
+1 −0		src/device/device.cpp
+0 −2		src/device/device.h
+16 −13		src/device/server/server.cpp
+2 −1		src/device/server/server.h
+0 −1		src/devicemanage/devicemanage.cpp
+0 −1		src/devicemanage/devicemanage.h
+ −		src/third_party/scrcpy-server