mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-02 21:58:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix:forward增加自动重启server尝试

Browse source
This commit is contained in:
rankun 2019-07-12 12:18:01 +08:00
commit 4573add9d1
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
QtScrcpy/device/server/server.cpp
View file

@ -10,7 +10,8 @@
#define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar" #define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
#define DEVICE_NAME_FIELD_LENGTH 64 #define DEVICE_NAME_FIELD_LENGTH 64
#define SOCKET_NAME "qtscrcpy" #define SOCKET_NAME "qtscrcpy"
#define MAX_CONNECT_COUNT 20 #define MAX_CONNECT_COUNT 30
#define MAX_RESTART_COUNT 1
Server::Server(QObject *parent) : QObject(parent) Server::Server(QObject *parent) : QObject(parent)
{ {
@ -385,6 +386,7 @@ result:
// we don't need the adb tunnel anymore // we don't need the adb tunnel anymore
disableTunnelForward(); disableTunnelForward();
m_tunnelEnabled = false; m_tunnelEnabled = false;
m_restartCount = 0;
emit connectToResult(success, deviceName, deviceSize); emit connectToResult(success, deviceName, deviceSize);
return; return;
} }
@ -399,7 +401,13 @@ result:
if (MAX_CONNECT_COUNT <= m_connectCount++) { if (MAX_CONNECT_COUNT <= m_connectCount++) {
stopConnectTimeoutTimer(); stopConnectTimeoutTimer();
stop(); stop();
emit connectToResult(false); if (MAX_RESTART_COUNT > m_restartCount++) {
qWarning("restart server auto");
start(m_params);
} else {
m_restartCount = 0;
emit connectToResult(false);
}
} }
} }

1
QtScrcpy/device/server/server.h
View file

@ -86,6 +86,7 @@ private:
quint32 m_acceptTimeoutTimer = 0; quint32 m_acceptTimeoutTimer = 0;
quint32 m_connectTimeoutTimer = 0; quint32 m_connectTimeoutTimer = 0;
quint32 m_connectCount = 0; quint32 m_connectCount = 0;
quint32 m_restartCount = 0;
QString m_deviceName = ""; QString m_deviceName = "";
QSize m_deviceSize = QSize(); QSize m_deviceSize = QSize();
ServerParams m_params; ServerParams m_params;