Browse Source

解决奥迪bug

zhangmingyan 9 months ago
parent
commit
db07d8a432
3 changed files with 93 additions and 42 deletions
  1. 9 2
      src/service/ws.js
  2. 79 39
      src/views/ordinaryPage/index.vue
  3. 5 1
      src/views/ordinaryPage/origin.less

+ 9 - 2
src/service/ws.js

@@ -1,4 +1,5 @@
 import bus from "./bus";
+import { Message } from "element-ui";
 export default class wsService {
     constructor() {
         // const wsUrl = ref("ws://172.16.50.3/websocket");
@@ -13,7 +14,7 @@ export default class wsService {
 
     open() {
         return new Promise((resolve, reject) => {
-            console.warn(this.address);
+            console.log(this.address);
             if (typeof this._websocket === "undefined") {
                 this._websocket = new WebSocket(this.address);
                 this._websocket.onopen = e => {
@@ -74,7 +75,13 @@ export default class wsService {
                             }
                         } else {
                             let err = { action, data: JSON.stringify(data) };
-                            console.error(err);
+                            console.log(err);
+                            console.log(err.data);
+                            Message({
+                                message: err.data,
+                                // message: "",
+                                type: "error",
+                            });
                             // req.reject(err);
                         }
                     }

+ 79 - 39
src/views/ordinaryPage/index.vue

@@ -269,6 +269,59 @@
             </div>
           </Transition>
           <img :src="mainSnapshot" />
+          <el-row v-show="isConnected && !isOpenSquare && !isOpen" class="bench-button">
+            <el-col :span="5" class="btn-item" style="text-align: center">
+              {{currentBench && currentBench.name}}
+            </el-col>
+            <el-col
+              :span="3"
+              class="btn-item"
+              :class="{ benchBtnActive: isPlaying }"
+            >
+              <el-tooltip class="item" effect="dark" content="音量" placement="top-start">
+                <img
+                  @click="connectAudioDevice('collectAudio')"
+                  src="../../images/sound.png"
+                />
+              </el-tooltip>
+            </el-col>
+            <el-col
+              :span="3"
+              class="btn-item"
+              :class="{ benchBtnActive: isRecording }"
+            >
+              <el-tooltip class="item" effect="dark" content="麦克风" placement="top-start">
+                  <img
+                    @click="connectAudioDevice('playAudio')"
+                    src="../../images/mic.png"
+                  />
+              </el-tooltip>
+            </el-col>
+            <el-col
+              :span="3"
+              class="btn-item"
+              :class="{ benchBtnActive: displayTapMode }"
+            >
+              <el-tooltip class="item" effect="dark" content="点击" placement="top-start">
+                  <img @click="tapModeControl" src="../../images/pointer.png" />
+              </el-tooltip>
+            </el-col>
+            <el-col :span="3" class="btn-item" v-show="false">
+              <el-tooltip class="item" effect="dark" content="日志" placement="top-start">
+                  <img @click="showLogBox" src="../../images/book.png" />
+              </el-tooltip>
+            </el-col>
+            <el-col :span="3" class="btn-item">
+              <el-tooltip class="item" effect="dark" content="唤醒语音助手按钮" placement="top-start">
+                  <img @click="pressPtt" src="../../images/robot.png" />
+              </el-tooltip>
+            </el-col>
+            <el-col :span="3" class="btn-item">
+              <el-tooltip class="item" effect="dark" content="断开远程控制按钮" placement="top-start">
+                  <img @click="disconnectBench" src="../../images/disconnect.png" />
+              </el-tooltip>
+            </el-col>
+          </el-row>
         </div>
         <image-list
           v-show="isConnected && !isOpenSquare && !isOpen"
@@ -281,7 +334,7 @@
           @next-page="nextPage"
           class="image-container"
         />
-        <el-row v-show="isConnected && !isOpenSquare && !isOpen" class="bench-button">
+        <!-- <el-row v-show="isConnected && !isOpenSquare && !isOpen" class="bench-button">
           <el-col :span="5" class="btn-item" style="text-align: center">{{
             currentBench && currentBench.name
           }}</el-col>
@@ -290,62 +343,50 @@
             class="btn-item"
             :class="{ benchBtnActive: isPlaying }"
           >
-			<el-tooltip class="item" effect="dark" content="音量" placement="top-start">
-		        <img
-		          @click="connectAudioDevice('collectAudio')"
-		          src="../../images/sound.png"
-		        />
-		    </el-tooltip>
-            
+			      <el-tooltip class="item" effect="dark" content="音量" placement="top-start">
+              <img
+                @click="connectAudioDevice('collectAudio')"
+                src="../../images/sound.png"
+              />
+            </el-tooltip>
           </el-col>
           <el-col
             :span="3"
             class="btn-item"
             :class="{ benchBtnActive: isRecording }"
           >
-		  <el-tooltip class="item" effect="dark" content="麦克风" placement="top-start">
-		      <img
-		        @click="connectAudioDevice('playAudio')"
-		        src="../../images/mic.png"
-		      />
-		  </el-tooltip>
-            
+            <el-tooltip class="item" effect="dark" content="麦克风" placement="top-start">
+                <img
+                  @click="connectAudioDevice('playAudio')"
+                  src="../../images/mic.png"
+                />
+            </el-tooltip>
           </el-col>
           <el-col
             :span="3"
             class="btn-item"
             :class="{ benchBtnActive: displayTapMode }"
           >
-		  <el-tooltip class="item" effect="dark" content="点击" placement="top-start">
-		      <img @click="tapModeControl" src="../../images/pointer.png" />
-		  </el-tooltip>
-            
+            <el-tooltip class="item" effect="dark" content="点击" placement="top-start">
+                <img @click="tapModeControl" src="../../images/pointer.png" />
+            </el-tooltip>
           </el-col>
           <el-col :span="3" class="btn-item" v-show="false">
-			  <el-tooltip class="item" effect="dark" content="日志" placement="top-start">
-			      <img @click="showLogBox" src="../../images/book.png" />
-			  </el-tooltip>
-            
+            <el-tooltip class="item" effect="dark" content="日志" placement="top-start">
+                <img @click="showLogBox" src="../../images/book.png" />
+            </el-tooltip>
           </el-col>
           <el-col :span="3" class="btn-item">
-            
-			<el-tooltip class="item" effect="dark" content="唤醒语音助手按钮" placement="top-start">
-			    <img @click="pressPtt" src="../../images/robot.png" />
-			</el-tooltip>
+            <el-tooltip class="item" effect="dark" content="唤醒语音助手按钮" placement="top-start">
+                <img @click="pressPtt" src="../../images/robot.png" />
+            </el-tooltip>
           </el-col>
-          <!-- <el-col :span="3" class="btn-item" @click="clickBenchList">
-		  <el-tooltip class="item" effect="dark" content="最小化按钮" placement="top-start">
-		      <img @click="gotoGrid" src="../../images/grid.png" />
-		  </el-tooltip>
-            
-          </el-col> -->
           <el-col :span="3" class="btn-item">
-			  <el-tooltip class="item" effect="dark" content="断开远程控制按钮" placement="top-start">
-			      <img @click="disconnectBench" src="../../images/disconnect.png" />
-			  </el-tooltip>
-            
+            <el-tooltip class="item" effect="dark" content="断开远程控制按钮" placement="top-start">
+                <img @click="disconnectBench" src="../../images/disconnect.png" />
+            </el-tooltip>
           </el-col>
-        </el-row>
+        </el-row> -->
         
       </div>
 
@@ -2285,7 +2326,6 @@ export default {
           }
         }
       }
-
       var source = audioCtx.createBufferSource();
       source.buffer = myArrayBuffer;
       source.connect(audioCtx.destination);

+ 5 - 1
src/views/ordinaryPage/origin.less

@@ -39,11 +39,15 @@
         );
         border-radius: 79px 79px 79px 79px;
         position: absolute;
-        margin-top: 81.9vh;
+        bottom: 0;
+        left: 50%;
+        margin-left: -20.57vw;
+        // margin-top: 81.9vh;
         z-index: 3;
         color: #fff;
         display: flex;
         align-items: center;
+        justify-content: space-around;
         .btn-item {
           height: 100%;
           img {