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