|
|
|
|
@ -203,7 +203,11 @@ void Dialog::execAdbCmd()
|
|
|
|
|
}
|
|
|
|
|
QString cmd = ui->adbCommandEdt->text().trimmed();
|
|
|
|
|
outLog("adb " + cmd, false);
|
|
|
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
|
|
|
|
|
m_adb.execute(ui->serialBox->currentText().trimmed(), cmd.split(" ", Qt::SkipEmptyParts));
|
|
|
|
|
#else
|
|
|
|
|
m_adb.execute(ui->serialBox->currentText().trimmed(), cmd.split(" ", QString::SkipEmptyParts));
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Dialog::delayMs(int ms)
|
|
|
|
|
@ -521,14 +525,13 @@ void Dialog::on_usbConnectBtn_clicked()
|
|
|
|
|
on_startServerBtn_clicked();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int Dialog::findDeviceFromeSerialBox(bool wifi) {
|
|
|
|
|
QRegExp regIP("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\:([0-9]|[1-9]\\d|[1-9]\\d{2}|[1-9]\\d{3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])\\b");
|
|
|
|
|
for (int i = 0; i < ui->serialBox->count(); ++i)
|
|
|
|
|
int Dialog::findDeviceFromeSerialBox(bool wifi)
|
|
|
|
|
{
|
|
|
|
|
QRegExp regIP("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\:([0-9]|[1-9]\\d|[1-9]\\d{2}|[1-9]\\d{3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])\\b");
|
|
|
|
|
for (int i = 0; i < ui->serialBox->count(); ++i) {
|
|
|
|
|
bool isWifi = regIP.exactMatch(ui->serialBox->itemText(i));
|
|
|
|
|
bool found = wifi ? isWifi : !isWifi;
|
|
|
|
|
if(found)
|
|
|
|
|
{
|
|
|
|
|
if (found) {
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -599,15 +602,12 @@ void Dialog::on_updateNameBtn_clicked()
|
|
|
|
|
|
|
|
|
|
void Dialog::on_useSingleModeCheck_clicked()
|
|
|
|
|
{
|
|
|
|
|
if(ui->useSingleModeCheck->isChecked())
|
|
|
|
|
{
|
|
|
|
|
if (ui->useSingleModeCheck->isChecked()) {
|
|
|
|
|
ui->configGroupBox->hide();
|
|
|
|
|
ui->adbGroupBox->hide();
|
|
|
|
|
ui->wirelessGroupBox->hide();
|
|
|
|
|
ui->usbGroupBox->hide();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
} else {
|
|
|
|
|
ui->configGroupBox->show();
|
|
|
|
|
ui->adbGroupBox->show();
|
|
|
|
|
ui->wirelessGroupBox->show();
|
|
|
|
|
|