修复tunnelForward连接失败问题

This commit is contained in:
Barry 2018-11-22 22:31:25 +08:00
commit f9b31f420e

View file

@ -178,6 +178,8 @@ bool Server::connectTo()
return true; return true;
} }
// device server need time to start
QTimer::singleShot(600, this, [this](){
QString deviceName; QString deviceName;
QSize deviceSize; QSize deviceSize;
bool success = false; bool success = false;
@ -220,7 +222,9 @@ bool Server::connectTo()
stop(); stop();
} }
emit connectToResult(success, deviceName, deviceSize); emit connectToResult(success, deviceName, deviceSize);
return success; });
return true;
} }
void Server::timerEvent(QTimerEvent *event) void Server::timerEvent(QTimerEvent *event)
@ -354,7 +358,13 @@ void Server::onWorkProcessResult(AdbProcess::ADB_EXEC_RESULT processResult)
case SSS_PUSH: case SSS_PUSH:
if (AdbProcess::AER_SUCCESS_EXEC == processResult) { if (AdbProcess::AER_SUCCESS_EXEC == processResult) {
m_serverCopiedToDevice = true; m_serverCopiedToDevice = true;
#if 1
m_serverStartStep = SSS_ENABLE_TUNNEL_REVERSE; m_serverStartStep = SSS_ENABLE_TUNNEL_REVERSE;
#else
// test tunnelForward
//m_tunnelForward = true;
//m_serverStartStep = SSS_ENABLE_TUNNEL_FORWARD;
#endif
startServerByStep(); startServerByStep();
} else if (AdbProcess::AER_SUCCESS_START != processResult){ } else if (AdbProcess::AER_SUCCESS_START != processResult){
qCritical("adb push"); qCritical("adb push");