From 8ee0ba42a7d7f3cff7491840a26acf963d48fb0d Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Wed, 1 Dec 2021 12:32:59 +0800
Subject: [PATCH 01/10] fix_resolve

---
 Dockerfile     |  2 +-
 vite.config.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d1d3ceb8..020d9543 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx
+FROM nginx:1.20.0
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY dist/  /usr/share/nginx/html/
 COPY replace.sh /
diff --git a/vite.config.js b/vite.config.js
index 8d3485e2..3a64a2e3 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,13 +1,13 @@
-import { defineConfig } from 'vite';
-import path from 'path';
+import {defineConfig} from 'vite';
+import {join} from 'path';
 import vue from '@vitejs/plugin-vue';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue()],
-  resolve: {
-    alias: {
-      '@': path.resolve(__dirname, 'src'),
+    plugins: [vue()],
+    resolve: {
+        alias: {
+            '@': join(__dirname, 'src'),
+        },
     },
-  },
 });

From e57298381c27bf5e2d49a0a7771cc1f07eff2616 Mon Sep 17 00:00:00 2001
From: roy <cxhroy@hotmail.com>
Date: Wed, 1 Dec 2021 23:13:10 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=90=88=E5=B9=B6main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vite.config.js b/vite.config.js
index 8d3485e2..0068995e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,7 +7,7 @@ export default defineConfig({
   plugins: [vue()],
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, 'src'),
+      '@': path.join(__dirname, 'src'),
     },
   },
 });

From 07e09ab2a240ce79895f08004d12ff2d62589a31 Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Thu, 2 Dec 2021 21:07:38 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=92=8C=E5=B1=8F=E5=B9=95=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/RemoteEmulator/AndroidRemote.vue | 53 ----------------------
 1 file changed, 53 deletions(-)

diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 1a5269dc..9bc5f266 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -76,7 +76,6 @@ let isLongPress = false;
 // let isRotated = 0; // 是否转向 // 0 90 180 270
 let mouseMoveTime = 0;
 const pic = ref('中');
-const fixScreenTor = ref(0);
 const elementLoading = ref(false);
 const isShowImg = ref(false);
 const isDriverFinish = ref(false);
@@ -917,58 +916,6 @@ const scan = (url) => {
       }),
   );
 };
-const fixScreen = (type) => {
-  loading.value = true;
-  location.value = !location.value;
-  let pic;
-  switch (type) {
-    case '低':
-      pic = 'low';
-      break;
-    case '中':
-      pic = 'middle';
-      break;
-    case '高':
-      pic = 'high';
-      break;
-  }
-  if (fixScreenTor.value == 3) {
-    fixScreenTor.value = 0;
-  } else {
-    fixScreenTor.value++;
-  }
-  websocket.send(
-      JSON.stringify({
-        type: 'fixScreen',
-        s: fixScreenTor.value,
-        detail: pic,
-      }),
-  );
-};
-const screen = (type, p) => {
-  if (p !== 'abort') {
-    loading.value = true;
-  }
-  let pic;
-  switch (type) {
-    case '低':
-      pic = 'low';
-      break;
-    case '中':
-      pic = 'middle';
-      break;
-    case '高':
-      pic = 'high';
-      break;
-  }
-  websocket.send(
-      JSON.stringify({
-        type: 'screen',
-        s: p,
-        detail: pic,
-      }),
-  );
-};
 const sendText = (text) => {
   websocket.send(
       JSON.stringify({

From 841c2685924c0ea3fad0a248330ee01b882f2c49 Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Fri, 3 Dec 2021 23:39:09 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0lenovo=E5=92=8Chtc?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/HTC.jpg    | Bin 0 -> 833 bytes
 src/assets/img/Lenovo.jpg | Bin 0 -> 10484 bytes
 src/views/Devices.vue     |   8 +++++---
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/HTC.jpg
 create mode 100644 src/assets/img/Lenovo.jpg

diff --git a/src/assets/img/HTC.jpg b/src/assets/img/HTC.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..384c8edf1c74797ede68253dc28eacd11faa0d06
GIT binary patch
literal 833
zcmex=<NpH&0WUXCHwH#V28IM6WcYuZ!I^=X2?RhSGZ3(_v48*v8yhPdCkGc7CkH1d
z7Y{!V7dIa_Cnv8UFCV{vfS>>ukC3pCfH06P05XITq?4J21E^7eo0A(TN+S4wfI*Oh
zL4d)4nNg5|Nsy6Qkn#T!25ANcCPr2UB*4PPz{teR$^n!#5?}yY%LKHQ9jX8*!@|lY
z$iOZn>?o#a7$~BwVr(9sSXk0HW#gvJmp}$GGBC1&yblM=K=Xi_*g*yg0u2NP1P?n*
z0nk7}2B55vqLQ$Pp^>qvV^Ct@q=TY?p-DvxH(vaIi-Cuk5$If?Dtm@^y_@&wMTni!
zoFc8{8oJ}X&Q1l7r^`FtZIm@F6$G!Z+p}3G+5Fl!#%^n;2cAYN8`X1)s;`R4M7XFL
z`+fWO&}()~-tC>bD@8mn3B>fs6whdHV3{D=*xXR_$MovMpPk3w9qs+hI$cE7C`IC9
z<9m1KBdfhyq@=d*2#=L~`O3Ob^G3k5_gkydxxy}Sex31j4ij4m_nV^~H#H9*@pR(6
zca@>>_Sv`6nNvPpw%)CE%I<M&>14rgW%mNwbv=$uH1E`Ow9x)u`+)DS(`ln5^Ic-y
z!V3fUu1=A=munOkwYWT0GX9Qc!0L6k%kFMg+iGPb^rVlSIU_@WgXO`K2mSi8QAdo0
zdtz4|JKFTQQ)q<&%a4QKR_Z<yU8v;Ce!KU`&#3<luP6U2jefl2`sMR$>Zi(y-g_FJ
z!th2pzN`AXRHXDO_9v^V<NB6<{K$90wsO<{E|ZP-b{+n6{g24pmx4a!2h`54V=(fy
za{oFvFL_bH>5g~WKQj70^G{8<y&yRGq9co-pzLwS(+NFlcjR6yOJ6LqNZa@A-R}k7
z>km##3_GpwHs!Qy<|(I5lfRzo_|xvZt{`r?Ueb5HIK?QrOF;`%a^}w8fBnRT(gHn=
h)f28=dG9;LMl`@aW7W0Bb2sAezBIKnx?BJMCIAwb8sz{0

literal 0
HcmV?d00001

diff --git a/src/assets/img/Lenovo.jpg b/src/assets/img/Lenovo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2791b01e97d47fbae9f6d50af5474d9d8d82998c
GIT binary patch
literal 10484
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
K@hVZHp#K7uSDIJ=

literal 0
HcmV?d00001

diff --git a/src/views/Devices.vue b/src/views/Devices.vue
index b40f2c26..4034d39a 100644
--- a/src/views/Devices.vue
+++ b/src/views/Devices.vue
@@ -52,7 +52,9 @@ const manufacturer = ref([
   "Yulong",
   "LGE",
   "Sony",
-  "GIONEE"
+  "GIONEE",
+  "Lenovo",
+  "HTC"
 ]);
 const statusList = ref([
   {
@@ -470,7 +472,7 @@ onMounted(() => {
                       :src="getImg(man)"
                   />
                   <img
-                      v-else-if="man === 'Xiaomi' ||man === 'APPLE'|| man==='LGE'"
+                      v-else-if="man === 'Xiaomi' ||man === 'APPLE'|| man==='LGE' || man==='HTC'"
                       style="width: 30px"
                       :src="getImg(man)"
                   />
@@ -609,7 +611,7 @@ onMounted(() => {
                           :src="getImg(device.manufacturer)"
                       />
                       <img
-                          v-else-if="device.manufacturer === 'Xiaomi' ||device.manufacturer === 'APPLE'||device.manufacturer === 'LGE'"
+                          v-else-if="device.manufacturer === 'Xiaomi' ||device.manufacturer === 'APPLE'||device.manufacturer === 'LGE'||device.manufacturer === 'HTC'"
                           style="width: 30px"
                           :src="getImg(device.manufacturer)"
                       />

From 5b53c9ff74a1fe24bebf8ee88dfd755dc14926e5 Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Sat, 4 Dec 2021 23:03:26 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/common.css                      |  17 +-
 src/views/RemoteEmulator/AndroidRemote.vue | 240 +++++++++------------
 2 files changed, 117 insertions(+), 140 deletions(-)

diff --git a/src/assets/common.css b/src/assets/common.css
index e2e8b709..c84b7ec8 100644
--- a/src/assets/common.css
+++ b/src/assets/common.css
@@ -287,19 +287,26 @@ body,
 
 .remote-tab {
     border: 1px solid #EBEEF5 !important;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1)
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 
-.remote-tab .el-tabs__item{
+.remote-tab .el-tabs__item {
     border-bottom: 1px solid #EBEEF5 !important;
     padding: 0 15px;
+    color: #606266 !important;
 }
 
-.remote-tab .el-tabs__content{
+.remote-tab .el-tabs__item.is-active {
+    border-bottom: 1px solid #EBEEF5 !important;
+    padding: 0 15px;
+    color: #409EFF !important;
+}
+
+.remote-tab .el-tabs__content {
     padding: 15px;
     border-left: 1px solid #EBEEF5;
 }
 
-.remote-tab .el-tabs__header{
-    margin-right: 0px!important;
+.remote-tab .el-tabs__header {
+    margin-right: 0px !important;
 }
\ No newline at end of file
diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 9bc5f266..e5a1e9ae 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -11,9 +11,8 @@ import StepLog from '@/components/StepLog.vue';
 import ElementUpdate from '@/components/ElementUpdate.vue';
 import defaultLogo from '@/assets/logo.png';
 import {
-  Aim,
+  Delete,
   Place,
-  FullScreen,
   Download,
   Search,
   SwitchButton,
@@ -52,6 +51,7 @@ const caseList = ref(null);
 const loading = ref(false);
 const device = ref({});
 const agent = ref({});
+const screenUrls = ref([])
 const uploadUrl = ref('');
 const text = ref({content: ''});
 let imgWidth = 0;
@@ -230,8 +230,16 @@ const filterNode = (value, data) => {
   return (data.label.indexOf(value) !== -1) ||
       (data.detail['resource-id'] ? data.detail['resource-id'].indexOf(value) !== -1 : false);
 };
-const downloadImg = () => {
-  window.open(imgUrl.value, '_blank');
+const downloadImg = (url) => {
+  let time = new Date().getTime();
+  let link = document.createElement('a');
+  fetch(url).then(res => res.blob()).then(blob => {
+    link.href = URL.createObjectURL(blob);
+    link.download = time + ".jpg";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  })
 };
 const copy = (value) => {
   try {
@@ -245,17 +253,34 @@ const copy = (value) => {
     });
   }
 };
-const setImgData = (data) => {
-  const img = new Image();
-  if (data === undefined) {
+const removeScreen = () => {
+  screenUrls.value = [];
+}
+const quickCap = () => {
+  if (oldBlob) {
+    const img = new Image();
     const blob = new Blob([oldBlob], {type: 'image/jpeg'});
     const URL = window.URL || window.webkitURL;
     const u = URL.createObjectURL(blob);
-    imgUrl.value = u;
+    screenUrls.value.push(u);
     img.src = u;
   } else {
+    ElMessage.error({
+      message: '快速截图失败！',
+    });
+  }
+}
+const setImgData = (data) => {
+  const img = new Image();
+  if (data) {
     imgUrl.value = data;
     img.src = data;
+  } else {
+    const blob = new Blob([oldBlob], {type: 'image/jpeg'});
+    const URL = window.URL || window.webkitURL;
+    const u = URL.createObjectURL(blob);
+    imgUrl.value = u;
+    img.src = u;
   }
   const canvas = document.getElementById('debugPic');
   img.onload = function () {
@@ -1258,38 +1283,6 @@ onMounted(() => {
                     <el-dropdown-menu class="divider" v-loading="loading"
                                       element-loading-background="rgba(255, 255, 255, 1)">
                       <el-button-group>
-<!--                        <el-tooltip-->
-<!--                            effect="dark"-->
-<!--                            content="校准图像"-->
-<!--                            placement="top"-->
-<!--                        >-->
-<!--                          <el-button-->
-<!--                              size="small"-->
-<!--                              type="info"-->
-<!--                              circle-->
-<!--                              @click="fixScreen(pic)"-->
-<!--                          >-->
-<!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-<!--                              <FullScreen/>-->
-<!--                            </el-icon>-->
-<!--                          </el-button>-->
-<!--                        </el-tooltip>-->
-<!--                        <el-tooltip-->
-<!--                            effect="dark"-->
-<!--                            content="校准坐标"-->
-<!--                            placement="top"-->
-<!--                        >-->
-<!--                          <el-button-->
-<!--                              size="small"-->
-<!--                              type="info"-->
-<!--                              circle-->
-<!--                              @click="switchLocation"-->
-<!--                          >-->
-<!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-<!--                              <Aim/>-->
-<!--                            </el-icon>-->
-<!--                          </el-button>-->
-<!--                        </el-tooltip>-->
                         <el-tooltip
                             effect="dark"
                             content="修复黑屏"
@@ -1346,87 +1339,6 @@ onMounted(() => {
                 </el-button>
               </div>
             </el-tooltip>
-            <!--            <el-tooltip-->
-            <!--                :enterable="false"-->
-            <!--                effect="dark"-->
-            <!--                content="设备转向"-->
-            <!--                :placement="tabPosition == 'left' ? 'right' : 'left'"-->
-            <!--                :offset="15"-->
-            <!--            >-->
-            <!--              <div>-->
-            <!--                <el-dropdown-->
-            <!--                    :hide-on-click="false"-->
-            <!--                    trigger="click"-->
-            <!--                    placement="right"-->
-            <!--                    style="margin-top: 4px"-->
-            <!--                >-->
-            <!--                  <el-button-->
-            <!--                      size="small"-->
-            <!--                      type="primary"-->
-            <!--                      circle-->
-            <!--                  >-->
-            <!--                    <el-icon :size="12" style="vertical-align: middle;">-->
-            <!--                      <Wallet/>-->
-            <!--                    </el-icon>-->
-            <!--                  </el-button>-->
-            <!--                  <template #dropdown>-->
-            <!--                    <el-dropdown-menu class="divider" v-loading="loading"-->
-            <!--                                      element-loading-background="rgba(255, 255, 255, 1)">-->
-            <!--                      <el-button-group>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="左转90度"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'sub')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <RefreshLeft/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="取消自动旋转"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'abort')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <Refresh/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                        <el-tooltip-->
-            <!--                            effect="dark"-->
-            <!--                            content="右转90度"-->
-            <!--                            placement="top"-->
-            <!--                        >-->
-            <!--                          <el-button-->
-            <!--                              size="small"-->
-            <!--                              type="info"-->
-            <!--                              circle-->
-            <!--                              @click="screen(pic,'add')"-->
-            <!--                          >-->
-            <!--                            <el-icon :size="14" style="vertical-align: middle;">-->
-            <!--                              <RefreshRight/>-->
-            <!--                            </el-icon>-->
-            <!--                          </el-button>-->
-            <!--                        </el-tooltip>-->
-            <!--                      </el-button-group>-->
-            <!--                    </el-dropdown-menu>-->
-            <!--                  </template>-->
-            <!--                </el-dropdown>-->
-            <!--              </div>-->
-            <!--            </el-tooltip>-->
             <el-tooltip
                 :enterable="false"
                 effect="dark"
@@ -1619,7 +1531,7 @@ onMounted(() => {
         >
           <el-tab-pane label="远控面板" name="main">
             <el-row :gutter="20">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-card>
                   <template #header>
                     <strong>输入文本</strong>
@@ -1645,17 +1557,47 @@ onMounted(() => {
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-card>
+                  <template #header>
+                    <strong>远程连接ADB</strong>
+                  </template>
+                  <el-form size="small" :model="text">
+                    <el-form-item
+                    >
+                      <el-input
+                          clearable
+                          v-model="text.content"
+                          size="small"
+                          placeholder="请输入要发送的文本，支持简体中文"
+                      ></el-input>
+                    </el-form-item>
+                  </el-form>
+                  <div style="text-align: center;">
+                    <el-button
+                        size="mini"
+                        type="primary"
+                    >启用
+                    </el-button>
+                    <el-button
+                        size="mini"
+                        type="primary"
+                    >暂停
+                    </el-button>
+                  </div>
+                </el-card>
+              </el-col>
+              <el-col :span="8">
                 <el-card>
                   <template #header>
                     <strong>录制屏幕（即将开放）</strong>
                   </template>
                   <div style="text-align: center">
-                    <el-button size="mini" type="success" disabled>开始录制</el-button>
-                    <el-button size="mini" type="info" disabled>暂停录制</el-button>
-                    <el-button size="mini" type="danger" disabled>结束录制</el-button>
+                    <el-button size="mini" type="success" disabled>开始</el-button>
+                    <el-button size="mini" type="info" disabled>暂停</el-button>
+                    <el-button size="mini" type="danger" disabled>结束</el-button>
                     <div style="margin-top: 20px">
-                      <el-button size="mini" type="primary" disabled>下载录像</el-button>
+                      <el-button size="mini" type="primary" disabled>生成并下载录像</el-button>
                     </div>
                   </div>
                 </el-card>
@@ -1737,6 +1679,42 @@ onMounted(() => {
               </el-col>
             </el-row>
           </el-tab-pane>
+          <el-tab-pane label="快速截图" name="screenCap">
+            <el-button type="primary" size="small" @click="quickCap">
+              <el-icon :size="12" style="vertical-align: middle;">
+                <Camera/>
+              </el-icon>
+              截图
+            </el-button>
+            <el-button type="danger" size="small" @click="removeScreen">
+              <el-icon :size="12" style="vertical-align: middle;">
+                <Delete/>
+              </el-icon>
+              清空
+            </el-button>
+            <el-card style="height: 100%;margin-top: 10px" v-if="screenUrls.length===0">
+              <el-empty description="暂无截图"></el-empty>
+            </el-card>
+            <el-row :gutter="20" v-else>
+              <el-col :xs="8"
+                      :sm="8"
+                      :md="8"
+                      :lg="4"
+                      :xl="4" v-for="u in screenUrls" style="margin-top: 10px">
+                <el-card shadow="hover" :body-style="{padding:'10px'}">
+                  <el-image :src="u" :preview-src-list="screenUrls" hide-on-click-modal></el-image>
+                  <div style="text-align: center;margin-top: 5px">
+                    <el-button type="primary" plain size="mini" @click="downloadImg(u)">
+                      <el-icon :size="12" style="vertical-align: middle;">
+                        <Download/>
+                      </el-icon>
+                      保存图片
+                    </el-button>
+                  </div>
+                </el-card>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
           <el-tab-pane label="Terminal" name="terminal">
             <el-alert
                 title="注意事项"
@@ -1936,14 +1914,6 @@ onMounted(() => {
                     >
                       <canvas id="debugPic" @mousedown="touchstart"></canvas>
                     </div>
-                    <div style="text-align: center;margin-top: 10px">
-                      <el-button type="primary" plain size="mini" @click="downloadImg">
-                        <el-icon :size="12" style="vertical-align: middle;">
-                          <Download/>
-                        </el-icon>
-                        保存图片
-                      </el-button>
-                    </div>
                   </el-card>
                   <el-card
                       :body-style="{ padding: '12px' }"

From 5f9bdbcf8557dc4044741bd1190ced215341ddbc Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Tue, 7 Dec 2021 22:06:28 +0800
Subject: [PATCH 06/10] adbkit_finish

---
 src/views/RemoteEmulator/AndroidRemote.vue | 38 +++++++++-------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index e5a1e9ae..95794a7c 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -75,7 +75,7 @@ let time = 0;
 let isLongPress = false;
 // let isRotated = 0; // 是否转向 // 0 90 180 270
 let mouseMoveTime = 0;
-const pic = ref('中');
+const pic = ref('高');
 const elementLoading = ref(false);
 const isShowImg = ref(false);
 const isDriverFinish = ref(false);
@@ -114,6 +114,7 @@ const logcatScroll = ref(null);
 const cmdIsDone = ref(true);
 const uploadLoading = ref(false);
 const location = ref(false);
+const remoteAdbUrl = ref("");
 const logcatFilter = ref({
   level: 'E',
   filter: '',
@@ -413,6 +414,12 @@ const websocketOnmessage = (message) => {
     img.src = u;
   } else {
     switch (JSON.parse(message.data)['msg']) {
+      case 'adbkit': {
+        if (JSON.parse(message.data).isEnable) {
+          remoteAdbUrl.value = agent.value['host'] + ":" + JSON.parse(message.data).port
+        }
+        break;
+      }
       case 'rotation': {
         if (directionStatus.value !== -1) {
           loading.value = true;
@@ -1562,28 +1569,13 @@ onMounted(() => {
                   <template #header>
                     <strong>远程连接ADB</strong>
                   </template>
-                  <el-form size="small" :model="text">
-                    <el-form-item
-                    >
-                      <el-input
-                          clearable
-                          v-model="text.content"
-                          size="small"
-                          placeholder="请输入要发送的文本，支持简体中文"
-                      ></el-input>
-                    </el-form-item>
-                  </el-form>
-                  <div style="text-align: center;">
-                    <el-button
-                        size="mini"
-                        type="primary"
-                    >启用
-                    </el-button>
-                    <el-button
-                        size="mini"
-                        type="primary"
-                    >暂停
-                    </el-button>
+                  <div v-if="remoteAdbUrl.length>0">
+                    <el-card :body-style="{backgroundColor:'#000000'}">
+                      <strong style="color: #ffffff">adb connect {{ remoteAdbUrl }}</strong>
+                    </el-card>
+                  </div>
+                  <div v-else>
+                    Agent未开启该功能！
                   </div>
                 </el-card>
               </el-col>

From b6679a17e139763aaf1c3a8c6ccdcb05ddd1b9e7 Mon Sep 17 00:00:00 2001
From: roy <cxhroy@hotmail.com>
Date: Wed, 8 Dec 2021 00:26:03 +0800
Subject: [PATCH 07/10] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=B8=83=E5=B1=80=E5=8A=9F=E8=83=BD=E3=80=82=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8E=A7=E4=BB=B6=E9=80=89=E5=8F=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=203=E3=80=81=E5=8E=BB=E6=8E=89conso?=
 =?UTF-8?q?le.log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/RemoteEmulator/AndroidRemote.vue | 24 +++++++++++++---------
 src/views/RemoteEmulator/IOSRemote.vue     |  4 +---
 src/views/RemoteEmulator/index.vue         | 16 +++++++--------
 src/views/RemoteEmulator/indexIOS.vue      | 10 ++++-----
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index e5a1e9ae..276ea618 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -559,9 +559,7 @@ const getCurLocation = () => {
     );
     y = (directionStatus.value == 180) ? imgHeight - _y : _y;
   }
-  console.log('xy', {
-    x, y
-  });
+  // console.log('xy', { x, y });
   return ({
     x, y
   })
@@ -713,12 +711,14 @@ const touchstart = async (event) => {
   const debugPic = document.getElementById('debugPic');
   const rect = debugPic.getBoundingClientRect();
   const x = parseInt(
-      (event.clientX - rect.left * (debugPic.width / rect.width)) *
-      (imgWidth / rect.width),
+      (event.clientX - rect.left) * (imgWidth / debugPic.clientWidth)
   );
+  // _x = parseInt(
+  //     (event.clientY - rect.top) *
+  //     (imgWidth / canvas.clientHeight),
+  // );
   const y = parseInt(
-      (event.clientY - rect.top * (debugPic.height / rect.height)) *
-      (imgHeight / rect.height),
+      (event.clientY - rect.top) * (imgHeight / debugPic.clientHeight),
   );
   await nextTick(() => {
     tree['value'].setCurrentKey(
@@ -1095,7 +1095,7 @@ onMounted(() => {
           :span="tabPosition == 'left' ? 12 : 24"
           :style="{
             flexBasis: tabPosition == 'left' ? layoutSplitInfo.left + '%' : '',
-             maxWidth: 'none'
+             maxWidth: tabPosition == 'left' ? layoutSplitInfo.left + '%' : ''
           }"
       >
         <el-card v-loading="loading"
@@ -1519,7 +1519,7 @@ onMounted(() => {
           :span="tabPosition == 'left' ? 12 : 24"
           :style="{
             flexBasis: tabPosition == 'left' ?  100 - Number(layoutSplitInfo.left) + '%' : '',
-             maxWidth: 'none'
+             maxWidth: tabPosition == 'left' ?  100 - Number(layoutSplitInfo.left) + '%' : ''
           }"
       >
         <el-tabs
@@ -1909,7 +1909,7 @@ onMounted(() => {
                         :style="
                       'width: 100%;background-image: url(' +
                       imgUrl +
-                      ');background-size:cover;'
+                      ');background-size: 100% 100%;'
                     "
                     >
                       <canvas id="debugPic" @mousedown="touchstart"></canvas>
@@ -2308,4 +2308,8 @@ onMounted(() => {
     background-size: 100% 100%;
   }
 }
+#debugPic{
+  width: 100%;
+  height: auto;
+}
 </style>
diff --git a/src/views/RemoteEmulator/IOSRemote.vue b/src/views/RemoteEmulator/IOSRemote.vue
index 58edaa91..6a44aa27 100644
--- a/src/views/RemoteEmulator/IOSRemote.vue
+++ b/src/views/RemoteEmulator/IOSRemote.vue
@@ -350,9 +350,7 @@ const getCurLocation = () => {
     );
     y = (directionStatus.value == 180) ? imgHeight - _y : _y;
   }
-  console.log('xy', {
-    x, y
-  });
+  // console.log('xy', { x, y });
   return ({
     x, y
   })
diff --git a/src/views/RemoteEmulator/index.vue b/src/views/RemoteEmulator/index.vue
index dd9c7fd8..c6069de4 100644
--- a/src/views/RemoteEmulator/index.vue
+++ b/src/views/RemoteEmulator/index.vue
@@ -27,7 +27,7 @@ const layoutSplitInfo = ref(_layoutSplitInfo ?
       last_top: 316,
     });
 const swithLayout = () => {
-  console.log('swithLayout!!', tabPosition.value);
+  // console.log('swithLayout!!', tabPosition.value);
   if (tabPosition.value == 'left') {
     // 变竖屏
     tabPosition.value = 'top';
@@ -68,17 +68,17 @@ const lineMouseleave = (event) => {
   saveLastSplitObj();
 };
 const lineMousedown = (event) => {
-  console.log('lineMousedown', event.clientX, event.clientY);
-  event.preventDefault();
-  event.stopPropagation();
+  // console.log('lineMousedown', event.clientX, event.clientY);
+  // event.preventDefault();
+  // event.stopPropagation();
   isPress = true;
   startPosition.x = event.clientX;
   startPosition.y = event.clientY;
   parentNode = event.target.parentNode; // 记录分割线的父组件，防止移动的时候变化
 };
 const lineMousemove = (event) => {
-  event.preventDefault();
-  event.stopPropagation();
+  // event.preventDefault();
+  // event.stopPropagation();
   if (isPress) {
     // console.log('lineMousemove', event.clientX, event.clientY);
     if (mouseMoveTime < 2) {
@@ -111,7 +111,7 @@ const handleSplit = (variate) => {
     }
 
     layoutSplitInfo.value.left = layoutSplitInfo.value.last_left + Number(percent);
-    console.log('variate', percent, layoutSplitInfo.value.left);
+    // console.log('variate', percent, layoutSplitInfo.value.left);
   } else if (tabPosition.value == 'top') {
     const rect = parentNode.getBoundingClientRect();
     const percent = variate;
@@ -128,7 +128,7 @@ const handleSplit = (variate) => {
     layoutSplitInfo.value.top = layoutSplitInfo.value.last_top + Number(percent);
     // 直接应用
     canvasRectInfo.value.height = layoutSplitInfo.value.top + 'px';
-    console.log('variate', percent, layoutSplitInfo.value.top);
+    // console.log('variate', percent, layoutSplitInfo.value.top);
   }
 };
 const saveLastSplitObj = () => {
diff --git a/src/views/RemoteEmulator/indexIOS.vue b/src/views/RemoteEmulator/indexIOS.vue
index 7fa2bdf0..e12ae144 100644
--- a/src/views/RemoteEmulator/indexIOS.vue
+++ b/src/views/RemoteEmulator/indexIOS.vue
@@ -21,7 +21,7 @@ const layoutSplitInfo = ref(_layoutSplitInfo ?
     last_top: 316,
 });
 const swithLayout = () => {
-  console.log('swithLayout!!', tabPosition.value);
+  // console.log('swithLayout!!', tabPosition.value);
   if (tabPosition.value == 'left') {
     // 变竖屏
     tabPosition.value = 'top';
@@ -40,7 +40,7 @@ const swithLayout = () => {
   });
 }
 const lineMouseup = (event) => {
-  console.log('lineMouseup', event.clientX, event.clientY);
+  // console.log('lineMouseup', event.clientX, event.clientY);
   isPress = false;
   if (tabPosition.value == 'left') {
     layoutSplitInfo.value.last_left = layoutSplitInfo.value.left;
@@ -63,7 +63,7 @@ const lineMouseleave = (event) => {
   saveLastSplitObj();
 };
 const lineMousedown = (event) => {
-  console.log('lineMousedown', event.clientX, event.clientY);
+  // console.log('lineMousedown', event.clientX, event.clientY);
   event.preventDefault()
   event.stopPropagation()
   isPress = true;
@@ -107,7 +107,7 @@ const handleSplit = (variate) => {
     }
 
     layoutSplitInfo.value.left =  layoutSplitInfo.value.last_left + Number(percent);
-    console.log('variate', percent, layoutSplitInfo.value.left);
+    // console.log('variate', percent, layoutSplitInfo.value.left);
   }
   else if (tabPosition.value == 'top') {
     const rect = parentNode.getBoundingClientRect();
@@ -125,7 +125,7 @@ const handleSplit = (variate) => {
     layoutSplitInfo.value.top =  layoutSplitInfo.value.last_top + Number(percent);
     // 直接应用
     canvasRectInfo.value.height = layoutSplitInfo.value.top + 'px';
-    console.log('variate', percent, layoutSplitInfo.value.top);
+    // console.log('variate', percent, layoutSplitInfo.value.top);
   }
 }
 const saveLastSplitObj = () => {

From 6fb15456500253249d6c4a606ff33f5a81b7ef1f Mon Sep 17 00:00:00 2001
From: roy <cxhroy@hotmail.com>
Date: Wed, 8 Dec 2021 00:52:36 +0800
Subject: [PATCH 08/10] =?UTF-8?q?1=E3=80=81=E5=8A=A0=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8B=96=E6=8B=BD=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/RemoteEmulator/AndroidRemote.vue |  3 ++-
 src/views/RemoteEmulator/index.vue         | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 276ea618..23e52f2c 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -1095,7 +1095,8 @@ onMounted(() => {
           :span="tabPosition == 'left' ? 12 : 24"
           :style="{
             flexBasis: tabPosition == 'left' ? layoutSplitInfo.left + '%' : '',
-             maxWidth: tabPosition == 'left' ? layoutSplitInfo.left + '%' : ''
+             maxWidth: tabPosition == 'left' ? layoutSplitInfo.left + '%' : '',
+             transition: !isSplitPressing ? 'flex-basis 0.3s,max-width 0.3s' : ''
           }"
       >
         <el-card v-loading="loading"
diff --git a/src/views/RemoteEmulator/index.vue b/src/views/RemoteEmulator/index.vue
index c6069de4..2271da8d 100644
--- a/src/views/RemoteEmulator/index.vue
+++ b/src/views/RemoteEmulator/index.vue
@@ -3,10 +3,13 @@ import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue';
 import AndroidRemote from './AndroidRemote.vue';
 import { ElMessage } from 'element-plus';
 
-let isPress = false;
+// let isPress = false;
 let mouseMoveTime = 0;
 let startPosition = { x: 0, y: 0 };
 let parentNode = null;
+
+const isPress = ref(false);
+
 const _layoutSplitInfo = window.localStorage.getItem('layoutSplitInfo');
 const _tabPosition = window.localStorage.getItem('tabPosition');
 
@@ -47,7 +50,7 @@ const swithLayout = () => {
 };
 const lineMouseup = (event) => {
   // console.log('lineMouseup', event.clientX, event.clientY);
-  isPress = false;
+  isPress.value = false;
   if (tabPosition.value == 'left') {
     layoutSplitInfo.value.last_left = layoutSplitInfo.value.left;
   } else if (tabPosition.value == 'top') {
@@ -56,30 +59,30 @@ const lineMouseup = (event) => {
   saveLastSplitObj();
 };
 const lineMouseleave = (event) => {
-  if (!isPress) {
+  if (!isPress.value) {
     return;
   }
   // console.log('lineMouseleave', event.clientX, event.clientY);
   // 由于左右滑动有可能误触发该事件，所以只处理上下滑动的情况
   if (tabPosition.value == 'top') {
-    isPress = false;
+    isPress.value = false;
     layoutSplitInfo.value.last_top = layoutSplitInfo.value.top;
   }
   saveLastSplitObj();
 };
 const lineMousedown = (event) => {
   // console.log('lineMousedown', event.clientX, event.clientY);
-  // event.preventDefault();
+  event.preventDefault();
   // event.stopPropagation();
-  isPress = true;
+  isPress.value = true;
   startPosition.x = event.clientX;
   startPosition.y = event.clientY;
   parentNode = event.target.parentNode; // 记录分割线的父组件，防止移动的时候变化
 };
 const lineMousemove = (event) => {
-  // event.preventDefault();
+  event.preventDefault();
   // event.stopPropagation();
-  if (isPress) {
+  if (isPress.value) {
     // console.log('lineMousemove', event.clientX, event.clientY);
     if (mouseMoveTime < 2) {
       mouseMoveTime++;

From 879da8eb420a7f8bbbed697435472b3b62b03b81 Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Wed, 8 Dec 2021 23:59:18 +0800
Subject: [PATCH 09/10] save

---
 src/views/RemoteEmulator/AndroidRemote.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 4fb68f41..47097613 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -293,7 +293,7 @@ const setImgData = (data) => {
 const openSocket = (host, port, udId, key) => {
   if ('WebSocket' in window) {
     websocket = new WebSocket(
-        'ws://' + host + ':' + port + '/websockets/android/' + udId + '/' + key,
+        'ws://' + host + ':' + port + '/websockets/android/' + udId + '/' + key + '/' + localStorage.getItem('SonicToken'),
     );
     terminalWebsocket = new WebSocket(
         'ws://' + host + ':' + port + '/websockets/terminal/' + udId + '/' + key,
@@ -1570,9 +1570,9 @@ onMounted(() => {
                   <template #header>
                     <strong>远程连接ADB</strong>
                   </template>
-                  <div v-if="remoteAdbUrl.length>0">
-                    <el-card :body-style="{backgroundColor:'#000000'}">
-                      <strong style="color: #ffffff">adb connect {{ remoteAdbUrl }}</strong>
+                  <div v-if="remoteAdbUrl.length>0" style="margin-top: 8px;margin-bottom: 8px">
+                    <el-card :body-style="{backgroundColor:'#303133'}">
+                      <strong style="color: #F2F6FC">adb connect {{ remoteAdbUrl }}</strong>
                     </el-card>
                   </div>
                   <div v-else>
@@ -1595,7 +1595,7 @@ onMounted(() => {
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12" style="margin-top: 20px">
+              <el-col :span="12" style="margin-top: 15px">
                 <el-card>
                   <template #header>
                     <strong>扫描二维码</strong>
@@ -1622,7 +1622,7 @@ onMounted(() => {
                   </div>
                 </el-card>
               </el-col>
-              <el-col :span="12" style="margin-top: 20px">
+              <el-col :span="12" style="margin-top: 15px">
                 <el-card>
                   <template #header>
                     <strong>安装APK</strong>
@@ -2301,7 +2301,8 @@ onMounted(() => {
     background-size: 100% 100%;
   }
 }
-#debugPic{
+
+#debugPic {
   width: 100%;
   height: auto;
 }

From e8a29b377d14aaa655cf35452dffe39202b9f144 Mon Sep 17 00:00:00 2001
From: ZhouYixun <291028775@qq.com>
Date: Fri, 10 Dec 2021 01:14:42 +0800
Subject: [PATCH 10/10] save

---
 src/components/ElementSelect.vue           |  21 +++
 src/components/RenderStatus.vue            |   3 +-
 src/views/Devices.vue                      |  57 ++++++--
 src/views/ProjectIndex.vue                 |   5 +
 src/views/RemoteEmulator/AndroidRemote.vue |  10 +-
 src/views/RemoteEmulator/IOSRemote.vue     | 159 +--------------------
 src/views/Results.vue                      |  36 ++++-
 7 files changed, 122 insertions(+), 169 deletions(-)

diff --git a/src/components/ElementSelect.vue b/src/components/ElementSelect.vue
index 7dcf9501..7e9cbd2b 100644
--- a/src/components/ElementSelect.vue
+++ b/src/components/ElementSelect.vue
@@ -15,6 +15,21 @@ const pageData = ref({
 });
 const pageSize = ref(10);
 const currentPage = ref(0)
+const findByName = (name) => {
+  props.step.elements[props.index] = null
+  axios.get("/controller/elements/list", {
+    params: {
+      name,
+      projectId: props.projectId,
+      type: props.type,
+      page: 1,
+      pageSize: pageSize.value,
+    }
+  }).then(resp => {
+    pageData.value = resp.data
+    currentPage.value = pageData.value['number'] + 1
+  })
+}
 const findByProjectIdAndEleType = (event, pageNum, pSize) => {
   if (event) {
     props.step.elements[props.index] = null
@@ -46,12 +61,17 @@ onMounted(() => {
       :prop="'elements['+index+']'"
   >
     <el-select
+        filterable
+        remote
+        :remote-method="findByName"
         value-key="id"
         v-model="step.elements[index]"
         :placeholder="place"
+        placeholder="请输入控件名称筛选"
         @visible-change="findByProjectIdAndEleType"
     >
       <el-option
+          v-if="pageData['content']!==null"
           v-for="item in pageData['content']"
           :key="item.id"
           :label="item['eleName']"
@@ -59,6 +79,7 @@ onMounted(() => {
       ></el-option>
       <div style="text-align: center;margin-top: 5px">
         <el-pagination small layout="prev, pager, next"
+                       hide-on-single-page
                        v-model:current-page="currentPage"
                        :total="pageData['totalElements']"
                        :page-size="pageSize"
diff --git a/src/components/RenderStatus.vue b/src/components/RenderStatus.vue
index fe948b6f..3bae4e0f 100644
--- a/src/components/RenderStatus.vue
+++ b/src/components/RenderStatus.vue
@@ -30,6 +30,7 @@ const statusList = {
 const props = defineProps(
     {
       status: String,
+      user: String
     }
 );
 const selObj = statusList[props.status] || {type: 'danger', text: '加载中'}
@@ -37,6 +38,6 @@ const selObj = statusList[props.status] || {type: 'danger', text: '加载中'}
 
 <template>
   <el-tag :type="selObj.type" size="mini" style="float: right">
-    {{ selObj.text }}
+    {{ status === 'DEBUGGING' ? user + " " + selObj.text : selObj.text }}
   </el-tag>
 </template>
\ No newline at end of file
diff --git a/src/views/Devices.vue b/src/views/Devices.vue
index 4034d39a..51b22887 100644
--- a/src/views/Devices.vue
+++ b/src/views/Devices.vue
@@ -297,9 +297,12 @@ const getAllAgents = () => {
     agentList.value = resp.data
   })
 }
-const savePwd = (device) => {
+const saveDetail = (device) => {
   axios
-      .put("/controller/devices/savePwd", {id: device.id, password: device.password}).then((resp) => {
+      .put("/controller/devices/saveDetail", {
+        id: device.id, password: device.password,
+        nickName: device.nickName
+      }).then((resp) => {
     if (resp['code'] === 2000) {
       ElMessage.success({
         message: resp['message'],
@@ -372,7 +375,18 @@ const updateImg = (id, imgUrl) => {
         }
       });
 }
+const getFilterOption = () => {
+  axios
+      .get("/controller/devices/getFilterOption")
+      .then((resp) => {
+        if (resp['code'] === 2000) {
+          cpus.value =resp['data'].cpu
+          sizes.value =resp['data'].size
+        }
+      });
+}
 onMounted(() => {
+  getFilterOption();
   findAll();
   getAllAgents();
 })
@@ -564,11 +578,11 @@ onMounted(() => {
             >
               <template #header>
               <span v-if="device.model">{{
-                  device.model.length > 25
-                      ? device.model.substring(0, 17) + "..."
+                  (device['nickName'] && device['nickName'].length > 0)
+                      ? device['nickName']
                       : device.model
                 }}</span>
-                <RenderStatus :status="device.status"></RenderStatus>
+                <RenderStatus :status="device.status" :user="device.user"></RenderStatus>
               </template>
               <el-row>
                 <el-col :span="10">
@@ -599,6 +613,14 @@ onMounted(() => {
                       label-width="70px"
                       style="margin: 0 0 15px 10px"
                   >
+                    <el-form-item label="设备型号" v-if="device.model">
+                      <div>{{
+                          device.model.length > 25
+                              ? device.model.substring(0, 17) + "..."
+                              : device.model
+                        }}
+                      </div>
+                    </el-form-item>
                     <el-form-item label="设备名称">
                       <div>{{ device.name }}</div>
                     </el-form-item>
@@ -631,9 +653,6 @@ onMounted(() => {
                     <el-form-item label="系统版本">
                       <div>{{ device.version }}</div>
                     </el-form-item>
-                    <el-form-item label="分辨率">
-                      <div>{{ device.size }}</div>
-                    </el-form-item>
                     <el-form-item label="所在位置">
                       <div>{{ findAgentById(device.agentId) }}</div>
                     </el-form-item>
@@ -669,6 +688,26 @@ onMounted(() => {
                         >
                       </el-upload>
                     </el-form-item>
+                    <el-form-item label="设备备注">
+                      <el-input
+                          show-word-limit
+                          v-model="device['nickName']"
+                          type="text"
+                          size="mini"
+                          placeholder="输入设备备注信息"
+                          maxlength="30"
+                          style="position: absolute; top: 7px; bottom: 7px"
+                      >
+                        <template #append>
+                          <el-button
+                              size="mini"
+                              @click="saveDetail(device)"
+                          >保存
+                          </el-button
+                          >
+                        </template>
+                      </el-input>
+                    </el-form-item>
                     <el-form-item label="设备名称">
                       <span>{{ device.name }}</span>
                     </el-form-item>
@@ -697,7 +736,7 @@ onMounted(() => {
                         <template #append>
                           <el-button
                               size="mini"
-                              @click="savePwd(device)"
+                              @click="saveDetail(device)"
                           >保存
                           </el-button
                           >
diff --git a/src/views/ProjectIndex.vue b/src/views/ProjectIndex.vue
index bc826199..1af757bf 100644
--- a/src/views/ProjectIndex.vue
+++ b/src/views/ProjectIndex.vue
@@ -269,6 +269,11 @@ const getData = () => {
   })
 }
 onMounted(() => {
+  let chart = echarts.getInstanceByDom(document.getElementById('projectChart'));
+  if (chart == null) {
+    chart = echarts.init(document.getElementById('projectChart'));
+  }
+  chart.dispose();
   const end = moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
   const start = moment(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 7)).format("YYYY-MM-DD HH:mm:ss")
   times.value = [start, end];
diff --git a/src/views/RemoteEmulator/AndroidRemote.vue b/src/views/RemoteEmulator/AndroidRemote.vue
index 47097613..46de3fda 100644
--- a/src/views/RemoteEmulator/AndroidRemote.vue
+++ b/src/views/RemoteEmulator/AndroidRemote.vue
@@ -1575,8 +1575,14 @@ onMounted(() => {
                       <strong style="color: #F2F6FC">adb connect {{ remoteAdbUrl }}</strong>
                     </el-card>
                   </div>
-                  <div v-else>
-                    Agent未开启该功能！
+                  <div v-else v-loading="remoteAdbUrl.length===0"
+                       element-loading-spinner="el-icon-lock"
+                       element-loading-background="rgba(255, 255, 255, 1)"
+                       element-loading-text="所在Agent未开启该功能！"
+                       style="margin-top: 8px;margin-bottom: 8px">
+                    <el-card>
+                      <strong>所在Agent未开启该功能！</strong>
+                    </el-card>
                   </div>
                 </el-card>
               </el-col>
diff --git a/src/views/RemoteEmulator/IOSRemote.vue b/src/views/RemoteEmulator/IOSRemote.vue
index 6a44aa27..87941cb5 100644
--- a/src/views/RemoteEmulator/IOSRemote.vue
+++ b/src/views/RemoteEmulator/IOSRemote.vue
@@ -826,8 +826,9 @@ onMounted(() => {
           </template>
           <div style="margin-right: 40px; text-align: center">
             <img
+                v-if="isDriverFinish"
                 id="iosCap"
-                :src="'http://' + agent['host'] + ':'+  agent['port']+'/iosScreen?s_id='+sid"
+                :src="'http://' + agent['host'] + ':'+  sid"
                 width="100%"
                 draggable="false"
                 @mousedown="mousedown"
@@ -1172,76 +1173,7 @@ onMounted(() => {
               </el-col>
             </el-row>
           </el-tab-pane>
-          <el-tab-pane label="Terminal" name="terminal" disabled>
-            <el-alert
-                title="注意事项"
-                type="warning"
-                description="该功能仍处于Beta测试中，暂时屏蔽reboot、rm、su等风险指令"
-                show-icon
-                :closable="false"
-                style="margin-bottom: 10px"
-            />
-            <el-tabs stretch type="border-card">
-              <el-tab-pane label="Shell">
-                <el-card
-                    style="border: 0px"
-                    :body-style="{color:'#FFFFFF',backgroundColor:'#303133',lineHeight:'1.5'}">
-                  <el-scrollbar noresize ref="terScroll" :style="'height:'+terminalHeight+'px;min-height:450px'">
-                    <div v-html="c" v-for="c in cmdOutPut" style="white-space: pre-wrap">
-                    </div>
-                  </el-scrollbar>
-                  <div style="display: flex;margin-top: 10px">
-                    <el-input @keyup.enter="sendCmd" size="mini" v-model="cmdInput" placeholder="输入指令后，点击Send或回车发送">
-                      <template #prepend>{{ cmdUser + ':/ $' }}</template>
-                    </el-input>
-                    <el-button size="mini" @click="sendCmd" :disabled="cmdInput.length===0||!cmdIsDone"
-                               style="margin-left: 5px" type="primary">Send
-                    </el-button>
-                    <el-button size="mini" @click="stopCmd" :disabled="cmdIsDone"
-                               style="margin-left: 5px" type="danger">Stop
-                    </el-button>
-                    <el-button size="mini" @click="clearCmd"
-                               style="margin-left: 5px" type="warning">Clear
-                    </el-button>
-                  </div>
-                </el-card>
-              </el-tab-pane>
-              <el-tab-pane label="Logcat">
-                <el-card
-                    style="border: 0px"
-                    :body-style="{color:'#FFFFFF',backgroundColor:'#303133',lineHeight:'1.5'}">
-                  <div style="display: flex;margin-bottom: 10px">
-                    <el-select size="mini" v-model="logcatFilter.level">
-                      <el-option label="VERBOSE" value="V"></el-option>
-                      <el-option label="DEBUG" value="D"></el-option>
-                      <el-option label="INFO" value="I"></el-option>
-                      <el-option label="WARN" value="W"></el-option>
-                      <el-option label="ERROR" value="E"></el-option>
-                      <el-option label="FATAL" value="F"></el-option>
-                      <el-option label="SILENT" value="S"></el-option>
-                    </el-select>
-                    <el-input style="margin-left: 5px" size="mini" v-model="logcatFilter.filter"
-                              placeholder="请输入输入过滤文本">
-                      <template #prepend>| grep</template>
-                    </el-input>
-                    <el-button size="mini" @click="sendLogcat"
-                               style="margin-left: 5px" type="primary">Search
-                    </el-button>
-                    <el-button size="mini" @click="stopLogcat"
-                               style="margin-left: 5px" type="danger">Stop
-                    </el-button>
-                    <el-button size="mini" @click="clearLogcat"
-                               style="margin-left: 5px" type="warning">Clear
-                    </el-button>
-                  </div>
-                  <el-scrollbar noresize ref="logcatScroll" :style="'height:'+terminalHeight+'px;min-height:450px'">
-                    <div v-html="l" v-for="l in logcatOutPut" style="white-space: pre-wrap">
-                    </div>
-                  </el-scrollbar>
-                </el-card>
-              </el-tab-pane>
-            </el-tabs>
-          </el-tab-pane>
+
           <el-tab-pane label="UI自动化" name="auto" disabled>
             <div v-if="testCase['id']">
               <el-collapse accordion style="margin-bottom: 20px">
@@ -1582,91 +1514,6 @@ onMounted(() => {
               </el-result>
             </el-card>
           </el-tab-pane>
-          <el-tab-pane label="网页调试" name="webview" disabled>
-            <div v-if="isWebView">
-              <div v-if="webViewListDetail.length==0">
-                <el-result icon="info" title="提示" subTitle="暂无webView进程">
-                  <template #extra>
-                    <el-button
-                        type="primary"
-                        size="mini"
-                        :loading="webViewLoading"
-                        @click="getWebViewForward"
-                    >
-                      <el-icon :size="12" style="vertical-align: middle;">
-                        <Search/>
-                      </el-icon>
-                      获取webView进程
-                    </el-button
-                    >
-                  </template>
-                </el-result>
-              </div>
-              <div v-else>
-                <el-button @click="getWebViewForward" :loading="webViewLoading" type="primary" size="mini">
-                  重新获取webView进程
-                </el-button>
-                <el-card style="margin-top: 15px" v-for="web in webViewListDetail" class="device-card"
-                         :body-style="{ padding: '0px 10px 10px 10px' }">
-                  <template #header>
-                    <div>
-                      <div style="display: flex;align-items: center;">
-                        <img :src="getImg('chrome')" width="20"/> <strong style="margin-left: 10px">{{
-                          web['package']
-                        }}
-                        ({{ web['version'] }})</strong>
-                      </div>
-                    </div>
-                  </template>
-                  <el-card :body-style="{ padding: '15px' }" v-for="w in web.children"
-                           style="margin-top: 10px; word-wrap: break-word;overflow: hidden;">
-                    <div style="display: flex;align-items: center;justify-content: space-between">
-                      <div>
-                        <div style="display: flex;align-items: center;">
-                          <img :src="w.favicon" v-if="w.favicon" width="15" style="margin-right: 5px"/>
-                          <strong>{{ w.title.length > 0 ? w.title : '无标题' }}</strong>
-                        </div>
-                        <div style="color: #909399">{{
-                            w.url.length > 50 ? w.url.substring(0, 50) + '...' : w.url
-                          }}
-                        </div>
-                      </div>
-                      <el-button type="primary" size="mini"
-                                 @click="tabWebView(web.port,w.id,(w.title.length > 0 ? w.title : '无标题'))">马上调试
-                      </el-button>
-                    </div>
-                  </el-card>
-                </el-card>
-              </div>
-            </div>
-            <div v-else>
-              <div style="display: flex;align-items: center;">
-                <el-page-header icon="el-icon-arrow-left" @back="switchIsWebView">
-                  <template #title>
-                    <span style="color: #606266">返回</span>
-                  </template>
-                  <template #content>
-                    当前页面：<strong>{{ title }}</strong>
-                  </template>
-                </el-page-header>
-              </div>
-              <el-alert type="info" show-icon style="margin-top: 15px" close-text="Get!">
-                <template #title>
-                  <div style="display: flex;align-items: center;">
-                    <span>如果您的浏览器不兼容该功能，请您及时反馈到</span>
-                    <el-link style="font-size: 13px;margin-left: 5px" type="primary" target="_blank"
-                             href="https://github.com/ZhouYixun/sonic-agent/issues/47">
-                      这里
-                    </el-link>
-                  </div>
-                </template>
-              </el-alert>
-              <iframe v-if="!isWebView"
-                      :style="'border:1px solid #C0C4CC;;width: 100%;height: '+iFrameHeight+'px;margin-top:15px'"
-                      :src="iframeUrl">
-              </iframe>
-            </div>
-          </el-tab-pane>
         </el-tabs>
       </el-col>
     </el-row>
diff --git a/src/views/Results.vue b/src/views/Results.vue
index 34955978..c1eb94f5 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -35,6 +35,20 @@ const delResult = (id) => {
     }
   })
 }
+const forceStopSuite = (id) => {
+  axios.get("/controller/testSuites/forceStopSuite", {
+    params: {
+      resultId: id
+    }
+  }).then(resp => {
+    if (resp['code'] === 2000) {
+      ElMessage.success({
+        message: resp['message'],
+      });
+      getResultList();
+    }
+  })
+}
 onMounted(() => {
   getResultList()
 })
@@ -93,8 +107,28 @@ onMounted(() => {
         </div>
       </template>
     </el-table-column>
-    <el-table-column fixed="right" label="操作" width="120" align="center">
+    <el-table-column fixed="right" label="操作" width="220" align="center">
       <template #default="scope">
+        <el-popconfirm
+            style="margin-left: 10px"
+            confirmButtonText="确认"
+            cancelButtonText="取消"
+            @confirm="forceStopSuite(scope.row.id)"
+            icon="el-icon-warning"
+            iconColor="red"
+            title="确定中断本次测试吗？"
+        >
+          <template #reference>
+            <el-button
+                :disabled="scope.row.status !== 0"
+                type="warning"
+                size="mini"
+                icon="el-icon-video-pause"
+            >中断
+            </el-button
+            >
+          </template>
+        </el-popconfirm>
         <el-popconfirm
             style="margin-left: 10px"
             confirmButtonText="确认"