From f22d47a1c5d9835e0bb57f1c6e6bb23828ba902b Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Thu, 20 Jun 2019 13:56:55 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89adb=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/dialog.cpp | 25 +++++ QtScrcpy/dialog.h | 7 ++ QtScrcpy/dialog.ui | 217 ++++++++++++++++++++++++++++++++------------ 3 files changed, 193 insertions(+), 56 deletions(-) diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index 0d9fb39..a74dfe9 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -81,6 +81,16 @@ void Dialog::initUI() ui->formatBox->addItem("mkv"); } +void Dialog::execAdbCmd() +{ + if (checkAdbRun()) { + return; + } + QString cmd = ui->adbCommandEdt->text().trimmed(); + outLog("adb " + cmd, false); + m_adb.execute("", cmd.split(" ", QString::SkipEmptyParts)); +} + void Dialog::on_updateDevice_clicked() { if (checkAdbRun()) { @@ -258,3 +268,18 @@ void Dialog::on_closeScreenCheck_stateChanged(int arg1) m_device->getController()->setScreenPowerMode(ControlMsg::SPM_NORMAL); } } + +void Dialog::on_adbCommandBtn_clicked() +{ + execAdbCmd(); +} + +void Dialog::on_stopAdbBtn_clicked() +{ + m_adb.kill(); +} + +void Dialog::on_clearOut_clicked() +{ + ui->outEdit->clear(); +} diff --git a/QtScrcpy/dialog.h b/QtScrcpy/dialog.h index 5eced17..f2a8f03 100644 --- a/QtScrcpy/dialog.h +++ b/QtScrcpy/dialog.h @@ -45,9 +45,16 @@ private slots: void on_closeScreenCheck_stateChanged(int arg1); + void on_adbCommandBtn_clicked(); + + void on_stopAdbBtn_clicked(); + + void on_clearOut_clicked(); + private: bool checkAdbRun(); void initUI(); + void execAdbCmd(); private: Ui::Dialog *ui; diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/dialog.ui index 18ceff5..5948860 100644 --- a/QtScrcpy/dialog.ui +++ b/QtScrcpy/dialog.ui @@ -7,7 +7,7 @@ 0 0 685 - 600 + 762 @@ -26,60 +26,6 @@ QtScrcpy - - - - USB line - - - - - - get device ip - - - - - - - stop server - - - - - - - update device - - - - - - - start adbd - - - - - - - device serial: - - - - - - - - - - start server - - - - - - @@ -130,6 +76,9 @@ wireless connect + + false + @@ -137,13 +86,25 @@ wireless disconnect + + false + - + + + + 0 + 320 + + + + Qt::ClickFocus + @@ -197,6 +158,9 @@ record save path: + + recordPathEdt + @@ -211,6 +175,9 @@ select path + + false + @@ -240,9 +207,147 @@ + + + + USB line + + + + + + get device ip + + + false + + + + + + + stop server + + + false + + + + + + + update device + + + false + + + + + + + start adbd + + + false + + + + + + + device serial: + + + + + + + + + + start server + + + false + + + + + + + + + + adb + + + + + + adb command: + + + adbCommandEdt + + + + + + + terminate + + + + + + + execute + + + + + + + devices + + + + + + + clear + + + + + + + + updateDevice + getIPBtn + startAdbdBtn + deviceIpEdt + devicePortEdt + wirelessConnectBtn + wirelessDisConnectBtn + adbCommandEdt + adbCommandBtn + bitRateBox + videoSizeBox + formatBox + recordPathEdt + selectRecordPathBtn + alwaysTopCheck + closeScreenCheck + serialBox + startServerBtn + stopServerBtn + outEdit +