From 8c03903d8cd9764bb50b1935d9deac5efffb51f1 Mon Sep 17 00:00:00 2001
From: Lappland <DXLin666@outlook.com>
Date: Mon, 29 Aug 2022 18:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E6=B7=BB=E5=8A=A0=E5=AD=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=A8=E7=94=BB=EF=BC=8C=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E5=8D=B1=E9=99=A9=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=81=9A=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=A4=87=E4=BB=BD=EF=BC=9B=E6=AD=A4=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=8A=E6=88=90=E5=93=81=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?release?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QtAdb/about.cpp                               |  10 +-
 QtAdb/about.h                                 |   2 +
 QtAdb/about.ui                                |  27 ++-
 QtAdb/animationwidget.cpp                     |  19 ++
 QtAdb/basepage.cpp                            |  60 +++++-
 QtAdb/basepage.h                              |   1 +
 QtAdb/indexlistitem.ui                        |  14 +-
 QtAdb/mainwindow.cpp                          |  18 +-
 QtAdb/mainwindow.ui                           |  67 ++++--
 QtAdb/pagelistitem.cpp                        |  12 +-
 QtAdb/pagelistitem.h                          |   1 +
 QtAdb/pagelistitem.ui                         |  23 ++-
 QtAdb/sonPages/advanced/sp_captive_portal.cpp |   7 +
 QtAdb/sonPages/advanced/sp_scales.cpp         |  48 ++++-
 QtAdb/sonPages/advanced/sp_scales.h           |   7 +
 QtAdb/sonPages/advanced/sp_scales.ui          |  20 +-
 QtAdb/sonPages/apps/sp_permissions.cpp        |   5 +
 QtAdb/sonPages/links.cpp                      |  15 ++
 QtAdb/sonPages/links.h                        |   3 +
 QtAdb/sonPages/links.ui                       |  82 +++++---
 QtAdb/sonPages/sonpagebase.ui                 | 194 +-----------------
 21 files changed, 344 insertions(+), 291 deletions(-)

diff --git a/QtAdb/about.cpp b/QtAdb/about.cpp
index a5dc116..f93afd0 100644
--- a/QtAdb/about.cpp
+++ b/QtAdb/about.cpp
@@ -64,8 +64,8 @@ about::about(QWidget *parent) :
     ui->btn_money_3->hide();
     ui->btn_money_4->hide();
 
-    this->setStyleSheet("QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;}");
-
+    //this->setStyleSheet("QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;}");
+    //this->setStyleSheet("QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;}");
 }
 
 about::~about()
@@ -105,3 +105,9 @@ void about::on_btn_links_clicked()
     linksPage->show();
 }
 
+
+void about::on_btn_version_clicked()
+{
+    QDesktopServices::openUrl(QUrl("https://lapplandsp.github.io/QtAdb-Pages/qa/", QUrl::TolerantMode));
+}
+
diff --git a/QtAdb/about.h b/QtAdb/about.h
index 92a3059..57dd9fc 100644
--- a/QtAdb/about.h
+++ b/QtAdb/about.h
@@ -32,6 +32,8 @@ private slots:
 
     void on_btn_links_clicked();
 
+    void on_btn_version_clicked();
+
 private:
     Ui::about *ui;
 };
diff --git a/QtAdb/about.ui b/QtAdb/about.ui
index 07b9c2b..432884b 100644
--- a/QtAdb/about.ui
+++ b/QtAdb/about.ui
@@ -14,6 +14,12 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QWidget" name="widget" native="true">
      <property name="sizePolicy">
@@ -72,13 +78,17 @@ background-color: rgba(255, 255, 255, 0);</string>
             <property name="font">
              <font/>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>版本号</string>
             </property>
             <property name="styleSheet">
              <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
 QPushButton:hover{background-color:rgba(255,255,255,0.7);}
-QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
+QPushButton:pressed{background-color:rgba(255,255,255,0.6);}
+QToolTip{border:1px solid #BDBDBD; background-color: #ffffff; color:rgba(117, 117, 117, 0.9);font-family: MiSans Medium; font-size:12px;border-radius:4px;}</string>
             </property>
             <property name="text">
              <string/>
@@ -135,6 +145,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
             <property name="font">
              <font/>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>网址</string>
             </property>
@@ -198,6 +211,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
             <property name="font">
              <font/>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>酷安</string>
             </property>
@@ -261,6 +277,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
             <property name="font">
              <font/>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>Github</string>
             </property>
@@ -327,6 +346,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
               <height>50</height>
              </size>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="styleSheet">
              <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
 QPushButton:hover{background-color:rgba(255,255,255,0.7);}
@@ -412,6 +434,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
             <property name="font">
              <font/>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>请我吃可乐（3元）</string>
             </property>
diff --git a/QtAdb/animationwidget.cpp b/QtAdb/animationwidget.cpp
index b77d6c5..2ffc1df 100644
--- a/QtAdb/animationwidget.cpp
+++ b/QtAdb/animationwidget.cpp
@@ -56,7 +56,26 @@ void animationWidget::playLoadAnimation(int h)
 
 void animationWidget::playExitAnimation()
 {
+    animation->setDuration(750);
+    //animation->setEndValue(QPoint(301,117));
+    qDebug() << "wgtHeight = " << wgtHeight;
+    if(parent->width() <= 600)
+    {
+        animation->setEndValue(QRect(301 - 30, 117 - 6 - 11 + 50, parent->width(),wgtHeight));
+    }
+    else
+    {
+        animation->setEndValue(QRect(301 - 30, 117 - 6 - 11 + 50, parent->width(),wgtHeight));
+    }
+    //animation->setStartValue(QPoint(301 + 50,117));
+    //animation->setStartValue(QRect(301 + 50 - 30, 117 - 6 - 11, parent->width()-50,wgtHeight));
+    animation->setStartValue(QRect(301 - 30, 117 - 6 - 11, parent->width(),wgtHeight));
 
+    animation->setEasingCurve(QEasingCurve::OutQuart);
+
+    this->show();
+    animation->start();
+    emit animationEnd();
 }
 
 animationWidget::~animationWidget()
diff --git a/QtAdb/basepage.cpp b/QtAdb/basepage.cpp
index 994d1a8..1a6bd6b 100644
--- a/QtAdb/basepage.cpp
+++ b/QtAdb/basepage.cpp
@@ -117,23 +117,53 @@ void basePage::setFather(QWidget *parent)
 
 void basePage::slot_createSonPage(int key)
 {
-    this->setDisabled(true);
-
-    listTimer = new QTimer(this);
-    connect(listTimer, SIGNAL(timeout()), this, SLOT(unlock()));
-    listTimer->setSingleShot(true);
-    listTimer->start(500);
-
-    emit creatingSonPage();
     if(isEnable(key) && key >= 0)
     {
+        this->setDisabled(true);
+
+        listTimer = new QTimer(this);
+        connect(listTimer, SIGNAL(timeout()), this, SLOT(slot_spgAnimationEnd()));
+        listTimer->setSingleShot(true);
+        listTimer->start(500);
+        emit creatingSonPage();
+
         ui->listWidget->setCurrentRow(-1);
         //qDebug() << "dev of basePage = " << dev.addr;
         sonPage = SPManager->selector(this,whoAmI(),key,dev);
         if(sonPage != NULL)
         {
-            ui->listWidget->setVisible(false);
-            ui->mainLayout->addWidget(sonPage);
+            //ui->listWidget->setVisible(false);
+
+            /**/
+            //sonPage->setVisible(false);
+            QPropertyAnimation *animation = new QPropertyAnimation(ui->listWidget,"geometry");
+
+            animation->setDuration(750);
+            animation->setEndValue(QRect(ui->listWidget->geometry().x(),ui->listWidget->geometry().y() + 50, parent->width(),wgtHeight));
+            animation->setStartValue(ui->listWidget->geometry());
+            animation->setEasingCurve(QEasingCurve::OutQuart);
+            animation->start();
+            //animation->deleteLater();
+
+            /*
+    qDebug() << "wgtHeight = " << wgtHeight;
+    if(parent->width() <= 600)
+    {
+        animation->setEndValue(QRect(301 - 30, 117 - 6 - 11, 600,wgtHeight));
+    }
+    else
+    {
+        animation->setEndValue(QRect(301 - 30, 117 - 6 - 11, parent->width(),wgtHeight));
+    }
+    //animation->setStartValue(QPoint(301 + 50,117));
+    animation->setStartValue(QRect(301 + 50 - 30, 117 - 6 - 11, parent->width()-50,wgtHeight));
+
+    animation->setEasingCurve(QEasingCurve::OutQuart);
+
+    this->show();
+    animation->start();
+            */
+            /**/
         }
     }
     ui->listWidget->setCurrentRow(-1);
@@ -141,13 +171,13 @@ void basePage::slot_createSonPage(int key)
 
 void basePage::slot_destroySonPage()
 {
-
     if(sonPage == NULL)
         throw "trying to destroy sonPage, but sonPage == NULL;";
 
     delete sonPage;
     sonPage = NULL;
     ui->listWidget->setVisible(true);
+    playLoadAnimation();
 }
 
 QString basePage::whoAmI()
@@ -195,3 +225,11 @@ void basePage::unlock()
 {
     this->setDisabled(false);
 }
+
+void basePage::slot_spgAnimationEnd()
+{
+    ui->listWidget->setVisible(false);
+    unlock();
+    ui->mainLayout->addWidget(sonPage);
+    //sonPage->setVisible(true);
+}
diff --git a/QtAdb/basepage.h b/QtAdb/basepage.h
index 6fb1d6e..50b93e6 100644
--- a/QtAdb/basepage.h
+++ b/QtAdb/basepage.h
@@ -67,6 +67,7 @@ private slots:
     void slot_createSonPage(int key);
     void slot_destroySonPage();
     void unlock();
+    void slot_spgAnimationEnd();
 };
 
 #endif // BASEPAGE_H
diff --git a/QtAdb/indexlistitem.ui b/QtAdb/indexlistitem.ui
index 750c103..61813e3 100644
--- a/QtAdb/indexlistitem.ui
+++ b/QtAdb/indexlistitem.ui
@@ -22,6 +22,9 @@
     <height>35</height>
    </size>
   </property>
+  <property name="cursor">
+   <cursorShape>PointingHandCursor</cursorShape>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -50,14 +53,14 @@ border-color: rgb(152, 152, 152);</string>
     <widget class="QLabel" name="stick">
      <property name="minimumSize">
       <size>
-       <width>5</width>
-       <height>20</height>
+       <width>4</width>
+       <height>16</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>5</width>
-       <height>25</height>
+       <width>4</width>
+       <height>16</height>
       </size>
      </property>
      <property name="autoFillBackground">
@@ -118,13 +121,14 @@ border-radius:4px;*/</string>
      <property name="font">
       <font>
        <family>MiSans Normal</family>
+       <pointsize>10</pointsize>
       </font>
      </property>
      <property name="styleSheet">
       <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
      </property>
      <property name="text">
-      <string>TextLabel</string>
+      <string/>
      </property>
     </widget>
    </item>
diff --git a/QtAdb/mainwindow.cpp b/QtAdb/mainwindow.cpp
index bad8b27..885105e 100644
--- a/QtAdb/mainwindow.cpp
+++ b/QtAdb/mainwindow.cpp
@@ -26,7 +26,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     /*devList 中的当前设备索引*/
     current_device = 0;
-    ui->comboBox->setPlaceholderText("请先选择设备");
+    ui->comboBox->setPlaceholderText("点击此处选择设备");
 
     /*连接信号与槽*/
     connect(this->ui->comboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(setCurrentDevice(int)));  //更改当前设备
@@ -352,6 +352,11 @@ void MainWindow::initBasePage(int key)              //槽：生成basePages
             currentPage = NULL;
         }
 
+        /*动画*/
+        //ui->indexList[key]
+
+        /**/
+
         currentPage = new basePage(this);
         //qDebug() << "height in initBasePage()" << ui->widget_height->height();
         currentPage->wgtHeight = ui->widget_height->height();
@@ -372,6 +377,7 @@ void MainWindow::initBasePage(int key)              //槽：生成basePages
         ui->verticalLayout_2->addWidget(currentPage);
 
         currentPage->playLoadAnimation(ui->widget_height->height());
+        //currentPage->playExitAnimation();
         //currentPage->setVisible(true);
         taiChiTimer = new QTimer(this);
         connect(taiChiTimer, SIGNAL(timeout()), this, SLOT(slot_taiChi()));
@@ -470,7 +476,7 @@ void MainWindow::setStyles()                        //方法：设置样式
                                  "QListView::item{height:35px;}"
                                  );
 
-    ui->comboBox->setStyleSheet("QComboBox{color:black;border-bottom:1px solid #BDBDBD;border-radius:0px;background-color:transparent;}"
+    ui->comboBox->setStyleSheet("QComboBox{color:black; border:0px; border-bottom:1px solid #BDBDBD; border-radius:0px; background-color:transparent;}"
                                 "QComboBox::drop-down{border: 0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);border-bottom-right-radius: 0px;}"
                                 "QComboBox QAbstractItemView{border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;outline: 0px;}"
                                 "QComboBox QAbstractItemView::item{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;}"
@@ -478,9 +484,10 @@ void MainWindow::setStyles()                        //方法：设置样式
                                 "QComboBox QAbstractItemView::item:selected{height:30px;border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
                                 );
 
+    /*
     ui->refreshButton->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;}"
                                      "QPushButton:hover{background-color:rgba(255,255,255,0.7);}"
-                                     "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}");
+                                     "QPushButton:pressed{background-color:rgba(255,255,255,0.6);}");*/
     //ui->iconLabel->setStyleSheet("background-color:transparent;");
     ui->fakeSpacer->setStyleSheet("background-color:transparent;");
 
@@ -509,17 +516,18 @@ void MainWindow::setStyles()                        //方法：设置样式
     shadowEffect_cmdBtn->setColor(Qt::gray);
     shadowEffect_cmdBtn->setBlurRadius(5);
 
+    /*
     QGraphicsDropShadowEffect *shadowEffect_monitor = new QGraphicsDropShadowEffect(this);
     shadowEffect_monitor->setOffset(0,0);
     shadowEffect_monitor->setColor(Qt::gray);
-    shadowEffect_monitor->setBlurRadius(5);
+    shadowEffect_monitor->setBlurRadius(5);*/
 
     ui->refreshButton->setGraphicsEffect(shadowEffect_refreshButton);
     ui->adbKillerBtn->setGraphicsEffect(shadowEffect_killAdbBtn);
     ui->WIFIBtn->setGraphicsEffect(shadowEffect_testBtn);
     ui->WSABtn->setGraphicsEffect(shadowEffect_WSABtn);
     ui->cmdBtn->setGraphicsEffect(shadowEffect_cmdBtn);
-    ui->widget_monitor->setGraphicsEffect(shadowEffect_monitor);
+    //ui->widget_monitor->setGraphicsEffect(shadowEffect_monitor);
 }
 
 void MainWindow::initSonPage(int key)               //槽：生成子页面
diff --git a/QtAdb/mainwindow.ui b/QtAdb/mainwindow.ui
index 650dcb1..d791777 100644
--- a/QtAdb/mainwindow.ui
+++ b/QtAdb/mainwindow.ui
@@ -51,17 +51,17 @@
             </size>
            </property>
            <property name="styleSheet">
-            <string notr="true">background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}\nQPushButton:hover{background-color:rgba(255,255,255,0.7);</string>
+            <string notr="true">background-color:rgba(255,255,255,0.9);border-radius:4px;border:1px solid #BDBDBD;</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_7">
             <property name="leftMargin">
-             <number>5</number>
+             <number>14</number>
             </property>
             <property name="topMargin">
              <number>5</number>
             </property>
             <property name="rightMargin">
-             <number>5</number>
+             <number>14</number>
             </property>
             <property name="bottomMargin">
              <number>5</number>
@@ -78,13 +78,13 @@
                   <property name="minimumSize">
                    <size>
                     <width>0</width>
-                    <height>30</height>
+                    <height>20</height>
                    </size>
                   </property>
                   <property name="maximumSize">
                    <size>
                     <width>16777215</width>
-                    <height>30</height>
+                    <height>20</height>
                    </size>
                   </property>
                   <property name="font">
@@ -93,7 +93,7 @@
                    </font>
                   </property>
                   <property name="styleSheet">
-                   <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
+                   <string notr="true">background-color: rgba(255, 255, 255, 0);border:0px;</string>
                   </property>
                   <property name="text">
                    <string>CPU</string>
@@ -102,10 +102,16 @@
                 </item>
                 <item>
                  <widget class="QLabel" name="label_RAM">
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>20</height>
+                   </size>
+                  </property>
                   <property name="maximumSize">
                    <size>
                     <width>16777215</width>
-                    <height>30</height>
+                    <height>20</height>
                    </size>
                   </property>
                   <property name="font">
@@ -114,7 +120,7 @@
                    </font>
                   </property>
                   <property name="styleSheet">
-                   <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
+                   <string notr="true">background-color: rgba(255, 255, 255, 0);border:0px;</string>
                   </property>
                   <property name="text">
                    <string>RAM</string>
@@ -153,15 +159,15 @@
                   <property name="styleSheet">
                    <string notr="true">QProgressBar{
 	font:9pt;
-	border-radius:10px;
+	border-radius:4px;
 	text-align:center;
 	/*border:1px solid #E8EDF2;*/
     border:0px solid #E8EDF2;
-	background-color: rgba(255,255,255,0);
+	background-color: #E0E0E0;
 }
 QProgressBar:chunk{
-	border-radius:10px;
-	background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #11998e, stop:1 #38ef7d);
+	border-radius:4px;
+	background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #38ef7d, stop:1 #11998e);
 }
 </string>
                   </property>
@@ -198,15 +204,15 @@ QProgressBar:chunk{
                   <property name="styleSheet">
                    <string notr="true">QProgressBar{
 	font:9pt;
-	border-radius:10px;
+	border-radius:4px;
 	text-align:center;
 	/*border:1px solid #E8EDF2;*/
     border:0px solid #E8EDF2;
-	background-color: rgba(255,255,255,0);
+	background-color: #E0E0E0;
 }
 QProgressBar:chunk{
-	border-radius:10px;
-	background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #11998e, stop:1 #38ef7d);
+	border-radius:4px;
+	background-color:qlineargradient(x1:0,y1:1,x1:1,y1:0,stop:0 #38ef7d, stop:1 #11998e);
 }
 </string>
                   </property>
@@ -228,7 +234,7 @@ QProgressBar:chunk{
                <widget class="QComboBox" name="comboBox">
                 <property name="minimumSize">
                  <size>
-                  <width>210</width>
+                  <width>0</width>
                   <height>30</height>
                  </size>
                 </property>
@@ -238,6 +244,9 @@ QProgressBar:chunk{
                   <height>30</height>
                  </size>
                 </property>
+                <property name="cursor">
+                 <cursorShape>PointingHandCursor</cursorShape>
+                </property>
                </widget>
               </item>
               <item>
@@ -254,11 +263,16 @@ QProgressBar:chunk{
                   <height>30</height>
                  </size>
                 </property>
+                <property name="cursor">
+                 <cursorShape>PointingHandCursor</cursorShape>
+                </property>
                 <property name="toolTip">
                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;刷新设备列表&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="styleSheet">
-                 <string notr="true"/>
+                 <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
+QPushButton:hover{background-color:rgba(255,255,255,0.7);}
+QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
                 </property>
                 <property name="text">
                  <string/>
@@ -353,6 +367,9 @@ QProgressBar:chunk{
                <height>64</height>
               </size>
              </property>
+             <property name="cursor">
+              <cursorShape>PointingHandCursor</cursorShape>
+             </property>
              <property name="toolTip">
               <string>无线调试</string>
              </property>
@@ -393,6 +410,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
              <property name="font">
               <font/>
              </property>
+             <property name="cursor">
+              <cursorShape>PointingHandCursor</cursorShape>
+             </property>
              <property name="toolTip">
               <string>杀死ADB进程</string>
              </property>
@@ -437,7 +457,13 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
               </size>
              </property>
              <property name="font">
-              <font/>
+              <font>
+               <family>MiSans Medium</family>
+               <pointsize>10</pointsize>
+              </font>
+             </property>
+             <property name="cursor">
+              <cursorShape>PointingHandCursor</cursorShape>
              </property>
              <property name="styleSheet">
               <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
@@ -479,6 +505,9 @@ WSA</string>
              <property name="font">
               <font/>
              </property>
+             <property name="cursor">
+              <cursorShape>PointingHandCursor</cursorShape>
+             </property>
              <property name="styleSheet">
               <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
 QPushButton:hover{background-color:rgba(255,255,255,0.7);}
diff --git a/QtAdb/pagelistitem.cpp b/QtAdb/pagelistitem.cpp
index c29c4f6..8e3da44 100644
--- a/QtAdb/pagelistitem.cpp
+++ b/QtAdb/pagelistitem.cpp
@@ -9,7 +9,8 @@ pageListItem::pageListItem(QWidget *parent) :
     ui->enableLight->setVisible(false);
 
     ui->widget->setStyleSheet("QWidget{background-color:transparent; border-radius:4px; border-color:gray;border:0px;}");
-    ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;}");
+    ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,255);border-radius:4px;border:1px solid #BDBDBD;}");
+
 
     setStyles();
 }
@@ -56,9 +57,10 @@ void pageListItem::on_copyButton_clicked()
 
 void pageListItem::setSelectable()
 {
-    //ui->enableLight->setVisible(true);
+    ui->enableLight->setVisible(true);
+    isSelectable = true;
     //shadowEffect_icon->setColor(Qt::green);
-    ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}");
+    //ui->pic->setStyleSheet("QPushButton{background-color:rgba(255,255,255,255);border-radius:4px;border:1px solid #BDBDBD;}");
 }
 
 void pageListItem::slot_setText(QString t, QString p)
@@ -84,7 +86,7 @@ void pageListItem::setStyles()
     shadowEffect->setColor(Qt::gray);
     shadowEffect->setBlurRadius(5);
     ui->enableLight->setGraphicsEffect(shadowEffect);
-
+/*
     QGraphicsOpacityEffect *graphicsOpacityEffect = new QGraphicsOpacityEffect(this);
     graphicsOpacityEffect->setOpacity(1.0);
     ui->pic->setGraphicsEffect(graphicsOpacityEffect);
@@ -93,7 +95,7 @@ void pageListItem::setStyles()
     shadowEffect_icon->setOffset(0,0);
     shadowEffect_icon->setColor(Qt::gray);
     shadowEffect_icon->setBlurRadius(5);
-    ui->pic->setGraphicsEffect(shadowEffect_icon);
+    ui->pic->setGraphicsEffect(shadowEffect_icon);*/
 }
 
 void pageListItem::slot_setStyles()
diff --git a/QtAdb/pagelistitem.h b/QtAdb/pagelistitem.h
index e10b7ee..bdd22b8 100644
--- a/QtAdb/pagelistitem.h
+++ b/QtAdb/pagelistitem.h
@@ -30,6 +30,7 @@ public:
     void setSelectable();
 
     void setStyles();
+    bool isSelectable = false;
 
     //void emitSignal();
 
diff --git a/QtAdb/pagelistitem.ui b/QtAdb/pagelistitem.ui
index 9e298df..b2fee3f 100644
--- a/QtAdb/pagelistitem.ui
+++ b/QtAdb/pagelistitem.ui
@@ -30,7 +30,7 @@
     <number>0</number>
    </property>
    <property name="rightMargin">
-    <number>0</number>
+    <number>11</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
@@ -43,6 +43,9 @@
        <height>70</height>
       </size>
      </property>
+     <property name="cursor">
+      <cursorShape>ArrowCursor</cursorShape>
+     </property>
      <property name="styleSheet">
       <string notr="true">border-color: rgb(0, 255, 0);
 border-width:1px;</string>
@@ -66,7 +69,7 @@ border-width:1px;</string>
       <item>
        <widget class="QPushButton" name="pic">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="minimumSize">
          <size>
@@ -81,10 +84,12 @@ border-width:1px;</string>
          </size>
         </property>
         <property name="cursor">
-         <cursorShape>OpenHandCursor</cursorShape>
+         <cursorShape>ForbiddenCursor</cursorShape>
         </property>
         <property name="styleSheet">
-         <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}/*
+         <string notr="true">QPushButton{background-color:rgba(255,255,255,1);border-radius:4px;border:1px solid #BDBDBD;}
+/*QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}*/
+/*
 QPushButton:hover{background-color:rgba(255,255,255,0.7);}
 QPushButton:pressed{background-color:rgba(255,255,255,0.6);}*/</string>
         </property>
@@ -119,13 +124,16 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}*/</string>
            </size>
           </property>
           <property name="font">
-           <font/>
+           <font>
+            <family>MiSans Normal</family>
+            <pointsize>11</pointsize>
+           </font>
           </property>
           <property name="styleSheet">
            <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
           </property>
           <property name="text">
-           <string>TextLabel</string>
+           <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -145,6 +153,9 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}*/</string>
               <height>20</height>
              </size>
             </property>
+            <property name="cursor">
+             <cursorShape>PointingHandCursor</cursorShape>
+            </property>
             <property name="toolTip">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;复制到剪贴板&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
diff --git a/QtAdb/sonPages/advanced/sp_captive_portal.cpp b/QtAdb/sonPages/advanced/sp_captive_portal.cpp
index fd37311..301778b 100644
--- a/QtAdb/sonPages/advanced/sp_captive_portal.cpp
+++ b/QtAdb/sonPages/advanced/sp_captive_portal.cpp
@@ -35,6 +35,13 @@ sp_captive_portal::sp_captive_portal(QWidget *parent) :
     serverLists.append("dl.google.com/generate_204");
     serverLists.append("google.com");
     ui->comboBox->addItems(serverLists);
+    ui->comboBox->setStyleSheet("QComboBox{color:black; border:0px; border-bottom:1px solid #BDBDBD; border-radius:0px; background-color:rgba(255,255,255,255);}"
+                                "QComboBox::drop-down{border: 0px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);border-bottom-right-radius: 0px;}"
+                                "QComboBox QAbstractItemView{border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;outline: 0px;}"
+                                "QComboBox QAbstractItemView::item{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;}"
+                                "QComboBox QAbstractItemView::item:hover{height:30px;border:0px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
+                                "QComboBox QAbstractItemView::item:selected{height:30px;border:1px solid #BDBDBD;border-radius:0px 0px 0px 0px;color:black}"
+                                );
 
 
 
diff --git a/QtAdb/sonPages/advanced/sp_scales.cpp b/QtAdb/sonPages/advanced/sp_scales.cpp
index 538f3ca..a7bd98a 100644
--- a/QtAdb/sonPages/advanced/sp_scales.cpp
+++ b/QtAdb/sonPages/advanced/sp_scales.cpp
@@ -58,9 +58,36 @@ void sp_scales::setShadow(QWidget* wgt)
 
 void sp_scales::refresh()
 {
-    ui->current_animator->setText("当前：" + process->run("adb shell settings get global animator_duration_scale",dev).simplified());
-    ui->current_transition->setText("当前：" + process->run("adb shell settings get global transition_animation_scale",dev).simplified());
-    ui->current_window->setText("当前：" + process->run("adb shell settings get global window_animation_scale",dev).simplified());
+    /*
+    pageListItemStruct *screen_resolution = initStruct(devInfo);
+    screen_resolution->item->setText_title("屏幕分辨率");
+    screen_resolution->item->setPic(":/ico/image/ico/fullscreen-line.svg");
+    screen_resolution->thread->initThread("adb shell wm size", dev, ": ");
+    QEventLoop::connect(screen_resolution->thread,SIGNAL(signal_output(QString)),screen_resolution->item,SLOT(slot_setText_profile(QString)));
+    screen_resolution->thread->start();
+    screen_resolution->item->setSelectable();
+    devInfo->addItemsToList(screen_resolution->item);
+    */
+
+
+    adbThread *thread_animator = new adbThread(this);
+    thread_animator->initThread("adb shell settings get global animator_duration_scale", dev);
+    QEventLoop::connect(thread_animator,SIGNAL(signal_output(QString)),this,SLOT(setText_animator(QString)));
+    thread_animator->start();
+
+    adbThread *thread_transition = new adbThread(this);
+    thread_transition->initThread("adb shell settings get global transition_animation_scale", dev);
+    QEventLoop::connect(thread_transition,SIGNAL(signal_output(QString)),this,SLOT(setText_transition(QString)));
+    thread_transition->start();
+
+    adbThread *thread_window = new adbThread(this);
+    thread_window->initThread("adb shell settings get global window_animation_scale", dev);
+    QEventLoop::connect(thread_window,SIGNAL(signal_output(QString)),this,SLOT(setText_window(QString)));
+    thread_window->start();
+
+    //ui->current_animator->setText("当前：" + process->run("adb shell settings get global animator_duration_scale",dev).simplified());
+    //ui->current_transition->setText("当前：" + process->run("adb shell settings get global transition_animation_scale",dev).simplified());
+    //ui->current_window->setText("当前：" + process->run("adb shell settings get global window_animation_scale",dev).simplified());
     ui->lineEdit_transition->clear();
     ui->lineEdit_window->clear();
     ui->lineEdit_animator->clear();
@@ -84,3 +111,18 @@ void sp_scales::on_pushButton_window_clicked()
     process->run("adb shell settings put global window_animation_scale " + ui->lineEdit_window->text().simplified(), dev);
     refresh();
 }
+
+void sp_scales::setText_animator(QString s)
+{
+    ui->current_animator->setText("当前：" + s.simplified());
+}
+
+void sp_scales::setText_transition(QString s)
+{
+    ui->current_transition->setText("当前：" + s.simplified());
+}
+
+void sp_scales::setText_window(QString s)
+{
+    ui->current_window->setText("当前：" + s.simplified());
+}
diff --git a/QtAdb/sonPages/advanced/sp_scales.h b/QtAdb/sonPages/advanced/sp_scales.h
index f87d455..fdc5c3e 100644
--- a/QtAdb/sonPages/advanced/sp_scales.h
+++ b/QtAdb/sonPages/advanced/sp_scales.h
@@ -6,6 +6,7 @@
 #include <QRegularExpressionValidator>
 //#include <QRegularExpressionValidator>
 #include "../../adbprocess.h"
+#include "../../threads/adbthread.h"
 
 namespace Ui {
 class sp_scales;
@@ -37,6 +38,12 @@ private:
 
     void setShadow(QWidget* wgt);
     void refresh();
+
+private slots:
+    void setText_animator(QString);
+    void setText_transition(QString);
+    void setText_window(QString);
+
 };
 
 #endif // SP_SCALES_H
diff --git a/QtAdb/sonPages/advanced/sp_scales.ui b/QtAdb/sonPages/advanced/sp_scales.ui
index df0471e..8a9e97f 100644
--- a/QtAdb/sonPages/advanced/sp_scales.ui
+++ b/QtAdb/sonPages/advanced/sp_scales.ui
@@ -125,7 +125,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="label_animator">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -156,7 +156,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="label_transition">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -187,7 +187,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="label_window">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -222,7 +222,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="current_animator">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -242,7 +242,7 @@ border:0px solid #BDBDBD;</string>
                <string notr="true">background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;</string>
               </property>
               <property name="text">
-               <string>NULL</string>
+               <string>未知</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -253,7 +253,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="current_transition">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -273,7 +273,7 @@ border:0px solid #BDBDBD;</string>
                <string notr="true">background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;</string>
               </property>
               <property name="text">
-               <string>NULL</string>
+               <string>未知</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -284,7 +284,7 @@ border:0px solid #BDBDBD;</string>
              <widget class="QLabel" name="current_window">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>100</width>
                 <height>40</height>
                </size>
               </property>
@@ -304,7 +304,7 @@ border:0px solid #BDBDBD;</string>
                <string notr="true">background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;</string>
               </property>
               <property name="text">
-               <string>NULL</string>
+               <string>未知</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignCenter</set>
@@ -576,7 +576,7 @@ QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
              </font>
             </property>
             <property name="styleSheet">
-             <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
+             <string notr="true">QPushButton{background-color:rgba(255,255,255,0.6);border-radius:4px;border:0px;}
 QPushButton:hover{background-color:rgba(255,255,255,0.7);}
 QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
             </property>
diff --git a/QtAdb/sonPages/apps/sp_permissions.cpp b/QtAdb/sonPages/apps/sp_permissions.cpp
index 979e856..c38df45 100644
--- a/QtAdb/sonPages/apps/sp_permissions.cpp
+++ b/QtAdb/sonPages/apps/sp_permissions.cpp
@@ -44,6 +44,11 @@ sp_permissions::sp_permissions(QWidget *parent) :
     ui->back_to_basePage_2->setGraphicsEffect(shadowEffect_settingsBtn);
     ui->open_another_window->setGraphicsEffect(shadowEffect_openBtn);
 
+    QFile file("://qss/scrollbar.qss");
+    file.open(QFile::ReadOnly);
+    ui->tableView->verticalScrollBar()->setStyleSheet(file.readAll());
+    ui->tableView->horizontalScrollBar()->setStyleSheet(file.readAll());
+
 }
 
 sp_permissions::~sp_permissions()
diff --git a/QtAdb/sonPages/links.cpp b/QtAdb/sonPages/links.cpp
index 0a747bc..d31d298 100644
--- a/QtAdb/sonPages/links.cpp
+++ b/QtAdb/sonPages/links.cpp
@@ -1,4 +1,5 @@
 #include "links.h"
+#include "qgraphicseffect.h"
 #include "qicon.h"
 #include "qscrollbar.h"
 #include "ui_links.h"
@@ -17,9 +18,23 @@ links::links(QWidget *parent) :
     file.open(QFile::ReadOnly);
     ui->scrollArea->verticalScrollBar()->setStyleSheet(file.readAll());
     ui->scrollArea->horizontalScrollBar()->setStyleSheet(file.readAll());
+
+    setShadow(ui->widget_11);
+    setShadow(ui->widget_12);
+    setShadow(ui->widget_14);
+    setShadow(ui->widget_15);
 }
 
 links::~links()
 {
     delete ui;
 }
+
+void links::setShadow(QWidget* wgt)
+{
+    QGraphicsDropShadowEffect *shadowEffect_widget = new QGraphicsDropShadowEffect(this);
+    shadowEffect_widget->setOffset(0,0);
+    shadowEffect_widget->setColor(Qt::gray);
+    shadowEffect_widget->setBlurRadius(5);
+    wgt->setGraphicsEffect(shadowEffect_widget);
+}
diff --git a/QtAdb/sonPages/links.h b/QtAdb/sonPages/links.h
index 67a8d3c..38f8575 100644
--- a/QtAdb/sonPages/links.h
+++ b/QtAdb/sonPages/links.h
@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QFile>
+#include <QGraphicsDropShadowEffect>
 
 namespace Ui {
 class links;
@@ -18,6 +19,8 @@ public:
 
 private:
     Ui::links *ui;
+
+    void setShadow(QWidget* wgt);
 };
 
 #endif // LINKS_H
diff --git a/QtAdb/sonPages/links.ui b/QtAdb/sonPages/links.ui
index 2b6d468..f1b3481 100644
--- a/QtAdb/sonPages/links.ui
+++ b/QtAdb/sonPages/links.ui
@@ -18,6 +18,18 @@
 /*background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:1, stop:0 rgba(238, 154, 229, 255), stop:1 rgba(89, 97, 249, 255));*/</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>30</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>30</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="styleSheet">
@@ -30,12 +42,18 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>-1495</y>
-        <width>797</width>
-        <height>1981</height>
+        <y>0</y>
+        <width>759</width>
+        <height>1969</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="topMargin">
+        <number>5</number>
+       </property>
+       <property name="bottomMargin">
+        <number>5</number>
+       </property>
        <item>
         <widget class="QWidget" name="widget_11" native="true">
          <property name="styleSheet">
@@ -51,7 +69,7 @@
              </font>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
             </property>
             <property name="text">
              <string>ADB</string>
@@ -67,7 +85,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_15">
              <item>
@@ -85,7 +103,8 @@
                 </size>
                </property>
                <property name="styleSheet">
-                <string notr="true">border:0px;image:url(:/linkIcons/image/webicons/android.png);</string>
+                <string notr="true">border:0px;image:url(:/linkIcons/image/webicons/android.png);border-radius:4px;
+background-color: rgba(255, 255, 255, 0);</string>
                </property>
                <property name="text">
                 <string/>
@@ -138,7 +157,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_2">
              <item>
@@ -209,7 +228,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_4">
              <item>
@@ -283,7 +302,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_5">
              <item>
@@ -301,7 +320,8 @@
                 </size>
                </property>
                <property name="styleSheet">
-                <string notr="true">border:0px;image:url(:/linkIcons/image/webicons/jamcz.png);</string>
+                <string notr="true">border:0px;image:url(:/linkIcons/image/webicons/jamcz.png);border-radius:4px;
+background-color: rgba(255, 255, 255, 0);</string>
                </property>
                <property name="text">
                 <string/>
@@ -366,7 +386,7 @@
              </font>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
             </property>
             <property name="text">
              <string>Recovery</string>
@@ -382,7 +402,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_10">
              <item>
@@ -453,7 +473,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_11">
              <item>
@@ -533,7 +553,7 @@
              </font>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
             </property>
             <property name="text">
              <string>模块</string>
@@ -549,7 +569,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout">
              <item>
@@ -620,7 +640,7 @@
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_3">
              <item>
@@ -701,7 +721,7 @@ border-radius:4px;</string>
              </font>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:0px;border:0px;border-bottom:1px solid #BDBDBD;</string>
             </property>
             <property name="text">
              <string>ROMs</string>
@@ -717,7 +737,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_16">
              <item>
@@ -788,7 +808,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_23">
              <item>
@@ -859,7 +879,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_19">
              <item>
@@ -930,7 +950,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_7">
              <item>
@@ -1001,7 +1021,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_8">
              <item>
@@ -1072,7 +1092,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_20">
              <item>
@@ -1143,7 +1163,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_21">
              <item>
@@ -1214,7 +1234,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_9">
              <item>
@@ -1285,7 +1305,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_12">
              <item>
@@ -1356,7 +1376,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_13">
              <item>
@@ -1427,7 +1447,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_14">
              <item>
@@ -1498,7 +1518,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_22">
              <item>
@@ -1569,7 +1589,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_18">
              <item>
@@ -1640,7 +1660,7 @@ border-radius:4px;</string>
              </sizepolicy>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color:rgba(255,255,255,0.8);border-radius:4px;border:0px solid #BDBDBD;</string>
+             <string notr="true">background-color:rgba(255,255,255,0);border-radius:4px;border:0px solid #BDBDBD;</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_6">
              <item>
diff --git a/QtAdb/sonPages/sonpagebase.ui b/QtAdb/sonPages/sonpagebase.ui
index a56cdad..22e0889 100644
--- a/QtAdb/sonPages/sonpagebase.ui
+++ b/QtAdb/sonPages/sonpagebase.ui
@@ -26,200 +26,8 @@
    <property name="bottomMargin">
     <number>30</number>
    </property>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="styleSheet">
-      <string notr="true">border-radius: 4px;
-border:1px solid #BDBDBD;</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="leftMargin">
-       <number>11</number>
-      </property>
-      <property name="topMargin">
-       <number>11</number>
-      </property>
-      <property name="rightMargin">
-       <number>11</number>
-      </property>
-      <property name="bottomMargin">
-       <number>11</number>
-      </property>
-      <item row="2" column="0">
-       <layout class="QVBoxLayout" name="mainLayout">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QPushButton" name="back_to_basePage">
-            <property name="minimumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
-QPushButton:hover{background-color:rgba(255,255,255,0.7);}
-QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../ico.qrc">
-              <normaloff>:/ico/image/ico/arrow-left-line.svg</normaloff>:/ico/image/ico/arrow-left-line.svg</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>18</width>
-              <height>18</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="refreshBtn">
-            <property name="minimumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
-QPushButton:hover{background-color:rgba(255,255,255,0.7);}
-QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../ico.qrc">
-              <normaloff>:/ico/image/ico/refresh-line.svg</normaloff>:/ico/image/ico/refresh-line.svg</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>18</width>
-              <height>18</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="showOutputBtn">
-            <property name="minimumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>30</width>
-              <height>30</height>
-             </size>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}QPushButton:hover{background-color:rgba(255,255,255,0.7);}QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="../ico.qrc">
-              <normaloff>:/ico/image/ico/terminal-box-line.svg</normaloff>:/ico/image/ico/terminal-box-line.svg</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>18</width>
-              <height>18</height>
-             </size>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QPushButton" name="runBtn">
-          <property name="minimumSize">
-           <size>
-            <width>50</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>50</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QPushButton{background-color:rgba(255,255,255,0.9);border-radius:4px;border:0px;}
-QPushButton:hover{background-color:rgba(255,255,255,0.7);}
-QPushButton:pressed{background-color:rgba(255,255,255,0.6);}</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../ico.qrc">
-            <normaloff>:/ico/image/ico/play-line.svg</normaloff>:/ico/image/ico/play-line.svg</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>30</width>
-            <height>30</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
- <resources>
-  <include location="../ico.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>