diff --git a/QtAdb/pagemaker.cpp b/QtAdb/pagemaker.cpp index db79191..83bb895 100644 --- a/QtAdb/pagemaker.cpp +++ b/QtAdb/pagemaker.cpp @@ -77,8 +77,16 @@ basePage* pageMaker::createPageWithKey(int key, QWidget *parent, device dev) return createPage_recovery(parent, dev); break; case 5: - return createPage_advanced(parent,dev); + if(dev.state == "[未响应]" || dev.state == "[REC]" || dev.state == "[侧载]" || dev.state == "[未知]") + { + return createPage_disabled(parent); + } + else + { + return createPage_advanced(parent,dev); + } break; + case 6: return createPage_about(parent); break; diff --git a/QtAdb/sonPages/advanced/sp_accounts.cpp b/QtAdb/sonPages/advanced/sp_accounts.cpp index 7ace3a7..40f3c24 100644 --- a/QtAdb/sonPages/advanced/sp_accounts.cpp +++ b/QtAdb/sonPages/advanced/sp_accounts.cpp @@ -40,7 +40,7 @@ sp_accounts::sp_accounts(QWidget *parent) : QFile file("://qss/scrollbar.qss"); file.open(QFile::ReadOnly); ui->listView->verticalScrollBar()->setStyleSheet(file.readAll()); - on_refreshBtn_clicked(); + //on_refreshBtn_clicked(); } sp_accounts::~sp_accounts() diff --git a/QtAdb/sonPages/advanced/sp_captive_portal.cpp b/QtAdb/sonPages/advanced/sp_captive_portal.cpp index a338b4f..fd37311 100644 --- a/QtAdb/sonPages/advanced/sp_captive_portal.cpp +++ b/QtAdb/sonPages/advanced/sp_captive_portal.cpp @@ -37,7 +37,7 @@ sp_captive_portal::sp_captive_portal(QWidget *parent) : ui->comboBox->addItems(serverLists); - refresh(); + //process->run("adb shell settings get secure android_id", dev).simplified(); } @@ -49,6 +49,7 @@ sp_captive_portal::~sp_captive_portal() void sp_captive_portal::setDev(device device) { dev = device; + refresh(); } void sp_captive_portal::setShadow(QWidget* wgt) diff --git a/QtAdb/sonPages/advanced/sp_scales.cpp b/QtAdb/sonPages/advanced/sp_scales.cpp index 4c0c750..538f3ca 100644 --- a/QtAdb/sonPages/advanced/sp_scales.cpp +++ b/QtAdb/sonPages/advanced/sp_scales.cpp @@ -30,7 +30,8 @@ sp_scales::sp_scales(QWidget *parent) : ui->lineEdit_animator->setValidator(new QRegularExpressionValidator(QRegularExpression("^(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*))$"))); ui->lineEdit_window->setValidator(new QRegularExpressionValidator(QRegularExpression("^(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*))$"))); - refresh(); + + } sp_scales::~sp_scales() @@ -41,6 +42,8 @@ sp_scales::~sp_scales() void sp_scales::setDev(device device) { dev = device; + qDebug() << "//////////////////////////////////////////////" << dev.model; + refresh(); } diff --git a/QtAdb/sonPages/advanced/sp_status_bar.cpp b/QtAdb/sonPages/advanced/sp_status_bar.cpp index 300db4a..7df006b 100644 --- a/QtAdb/sonPages/advanced/sp_status_bar.cpp +++ b/QtAdb/sonPages/advanced/sp_status_bar.cpp @@ -130,8 +130,6 @@ void sp_status_bar::on_pushButton_2_clicked() QMessageBox::information(NULL, "同时隐藏","已将导航栏与状态栏同时全局隐藏"); } - - void sp_status_bar::refreshBtns() { ui->airplane->setChecked(false);