From 2183cc9c31ac5980f3d44b61c065fabe70f0852c Mon Sep 17 00:00:00 2001
From: blaze <1063796544@qq.com>
Date: Sun, 29 Jun 2025 17:44:29 +0800
Subject: [PATCH 01/65] =?UTF-8?q?feat(=E8=AF=AD=E9=9F=B3=E5=AF=B9=E8=AE=B2?=
 =?UTF-8?q?):=20=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E5=AF=B9=E8=AE=B2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增语音对讲功能，包含以下主要变更：
- 添加语音对讲弹窗组件talk.vue
- 新增talkRequest.ts和talk.ts处理对讲API请求
- 添加对讲相关图标资源
- 在App.vue中集成对讲功能
- 添加md5依赖用于密码加密
---
 package-lock.json             |  50 ++++++++++
 package.json                  |   1 +
 src/App.vue                   |  62 +++++-------
 src/api/talk.ts               |  29 ++++++
 src/assets/images/icon_gb.png | Bin 0 -> 342 bytes
 src/assets/images/icon_ht.png | Bin 0 -> 7966 bytes
 src/components/talk.vue       | 173 ++++++++++++++++++++++++++++++++++
 src/http/talkRequest.ts       |  12 +++
 8 files changed, 291 insertions(+), 36 deletions(-)
 create mode 100644 src/api/talk.ts
 create mode 100644 src/assets/images/icon_gb.png
 create mode 100644 src/assets/images/icon_ht.png
 create mode 100644 src/components/talk.vue
 create mode 100644 src/http/talkRequest.ts

diff --git a/package-lock.json b/package-lock.json
index 1e2d48f..c68a971 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@vueuse/core": "^13.4.0",
         "axios": "^1.10.0",
         "dayjs": "^1.11.13",
+        "md5": "^2.3.0",
         "pinia": "^3.0.3",
         "primevue": "^4.3.5",
         "vue": "^3.5.13",
@@ -20,6 +21,7 @@
       },
       "devDependencies": {
         "@types/node": "^24.0.3",
+        "@vitejs/plugin-basic-ssl": "^2.0.0",
         "@vitejs/plugin-vue": "^5.2.3",
         "@vue/tsconfig": "^0.7.0",
         "sass-loader": "^16.0.5",
@@ -1395,6 +1397,19 @@
         "vite": "^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0"
       }
     },
+    "node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.0.0.tgz",
+      "integrity": "sha512-gc9Tjg8bUxBVSTzeWT3Njc0Cl3PakHFKdNfABnZWiUgbxqmHDEn7uECv3fHVylxoYgNzAcmU7ZrILz+BwSo3sA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^6.0.0"
+      }
+    },
     "node_modules/@vitejs/plugin-vue": {
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz",
@@ -1790,6 +1805,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -1866,6 +1890,15 @@
         "url": "https://github.com/sponsors/mesqueeb"
       }
     },
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/css-tree": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
@@ -2304,6 +2337,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "license": "MIT"
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -2402,6 +2441,17 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.12.2",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
diff --git a/package.json b/package.json
index 45a5d77..95dbc00 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@vueuse/core": "^13.4.0",
     "axios": "^1.10.0",
     "dayjs": "^1.11.13",
+    "md5": "^2.3.0",
     "pinia": "^3.0.3",
     "primevue": "^4.3.5",
     "vue": "^3.5.13",
diff --git a/src/App.vue b/src/App.vue
index acdce28..b92f658 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,9 +5,11 @@ import { onMounted, ref } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
 import { lockDoorApi, openDoorApi } from "@/api/api";
+import talkVue from "@/components/talk.vue";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
 const token = ref("");
+const isTalking = ref(false)
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async () => {
   const player = new ZLMRTCClient.Endpoint({
@@ -82,15 +84,21 @@ const openDoor = async (port: number) => {
 const lockDoor = async (type: number, sid: number) => {
   await lockDoorApi(type, sid, token.value);
 };
+
+
+//点击对讲按钮 
+const talkHandle = () => {
+  console.log('开始对讲')
+  isTalking.value = true;
+}
 </script>
 
 <template>
+  <talkVue v-model="isTalking" id="202309001"></talkVue>
   <div class="flex-col w-screen">
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex gap-2">
-        <Button
-          pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
-        >
+        <Button pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2">
           <div class="flex gap-2">
             <div class="h-36px w-36px">
               <img src="@/assets/images/icon_cs@2x.png" alt="" />
@@ -101,8 +109,7 @@ const lockDoor = async (type: number, sid: number) => {
           </div>
         </Button>
         <Button
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -112,9 +119,8 @@ const lockDoor = async (type: number, sid: number) => {
             </div>
           </div>
         </Button>
-        <Button
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="talkHandle"
+          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_dj@2x.png" alt="" />
@@ -125,8 +131,7 @@ const lockDoor = async (type: number, sid: number) => {
           </div>
         </Button>
         <Button
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -136,10 +141,8 @@ const lockDoor = async (type: number, sid: number) => {
             </div>
           </div>
         </Button>
-        <Button
-          @click="openDoor(1)"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="openDoor(1)"
+          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -149,10 +152,8 @@ const lockDoor = async (type: number, sid: number) => {
             </div>
           </div>
         </Button>
-        <Button
-          @click="openDoor(2)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="openDoor(2)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -162,10 +163,8 @@ const lockDoor = async (type: number, sid: number) => {
             </div>
           </div>
         </Button>
-        <Button
-          @click="lockDoor(0, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="lockDoor(0, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -175,10 +174,8 @@ const lockDoor = async (type: number, sid: number) => {
             </div>
           </div>
         </Button>
-        <Button
-          @click="lockDoor(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="lockDoor(1, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -190,21 +187,14 @@ const lockDoor = async (type: number, sid: number) => {
         </Button>
       </div>
       <div class="flex flex-1 justify-end">
-        <Input
-          readonly
+        <Input readonly
           pt:root="outline-none text-center text-white bg-[rgba(255,255,255,0.1)] rounded-full max-w-500px px-2 min-w-200px placeholder-[rgba(255,255,255,0.8)]"
-          value="1111111/xxxxxxx"
-        />
+          value="1111111/xxxxxxx" />
       </div>
     </div>
 
     <div class="w-full">
-      <video
-        class="w-full aspect-ratio-video h-50vh"
-        id="video"
-        autoplay
-        muted
-      ></video>
+      <video class="w-full aspect-ratio-video h-50vh" id="video" autoplay muted></video>
       <div class="h-1 bg-white"></div>
       <div class="h-50vh">
         <div class="w-full flex h-50%">
diff --git a/src/api/talk.ts b/src/api/talk.ts
new file mode 100644
index 0000000..0a746de
--- /dev/null
+++ b/src/api/talk.ts
@@ -0,0 +1,29 @@
+import talkRequest from "@/http/talkRequest";
+
+export function talkLogin(params) {
+  return talkRequest({
+    url: '/api/user/login',
+    method: 'get',
+    params: params
+  })
+}
+
+export function broadcastStart({deviceId, channelId, broadcastMode}, accessToken) {
+  return talkRequest({
+    method: 'get',
+    url: '/api/play/broadcast/' + deviceId + '/' + channelId + "?timeout=30&broadcastMode=" + broadcastMode,
+    headers:{
+      'access-token': accessToken
+    }
+  })
+}
+
+export function broadcastStop({deviceId, channelId, accessToken}) {
+  return talkRequest({
+    method: 'get',
+    url: '/api/play/broadcast/stop/' + deviceId + '/' + channelId,
+    headers:{
+      'access-token': accessToken
+    }
+  })
+}
\ No newline at end of file
diff --git a/src/assets/images/icon_gb.png b/src/assets/images/icon_gb.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c00c4f15b36d54b80b1c0955aeded931b2611ba
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$5J^NqR5(w))J;mnKokVvsw@@v9$@qoB7z$c@eq=9<B238cnT4hB3@z~7w&W~
zx=hI%Cc_MNr#lkN`tkK&rRcpsmDB?GCV5@g^%F*X&bcE1w*dAec{=Cj01nNN^d;${
zZQI8jvn<OKl6NF`SMwjNs%k-U)&sd{05f7i@BMMtb@v;qBzGFZY$GJkXl!gCbo|up
z63j(Ym^o`Og)WD;A0T)&Ti_770{hpD-t#XohHl1aC<#Gu2u;Q6f51p+*QXwJ<XANR
z^e96)8y%aR(B{lc|La+wNqU%~9Ezeiw?2FUa4<!ENqRN#9l-uX1^Z?Ndr7he@Co3m
oX`1Jpw(e)FPbJ*|*dbZ|0P6ExI>%>=wEzGB07*qoM6N<$f+a7G!~g&Q

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon_ht.png b/src/assets/images/icon_ht.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a42158922b03f2253d45a0fa5ba41fde6d8a465
GIT binary patch
literal 7966
zcmV+(AK~DMP)<h;3K|Lk000e1NJLTq005u>005u}1^@s6i_d2*00001b5ch_0Itp)
z=>Py8*hxe|RCr$Poq2pz<<-Z3=S~ukH7kpX)z+mdl_d#V-B1y2YpWmYf>leaRoN3Z
z1$`B3MM0K?0E$(jQd^a`wC`Je6{(6#F+f&Cw2IYM1tFQq7{Zoh?s>Vh&t2v|cQPT9
znLB?$?(;n7Jm-AxdG_ZL?4NCcPP71ZqHJ5VZ2{N-+7NWA1#AF2)%><_8$g?ZPPKpy
zV5gej7H$J*Gtj9PumS8;^V`C00Br_3)dDtvooaqtxDBAqK&M*32C!4jZwt2pv>E7B
z3)lcgG5`4G2M0PN#}Ihrvp_fn;66;;i&&Bvd>DiS0P30Ole9MZqn8i#`~V9`?o^L<
zG2u3VDu-RU;?O8~_$Fc+2Z_%DYuC$Jl_z9Gc7y3{mUzSA#zPx6KiIFii}7&W)wKZx
zaNPr(aiH&^i3FYn(3z%NGy()hvmWCh0qfd4t&3lulll2^_iPstnDPK#vHZ{kVqOg3
zWWYGKS@UODIYg~sJT0T`-i<T+x~!Fx{HaqGz{{692RYEK9E3{|40&n*)c^#{Wdv%}
z{Pi-VsT*hZcq#d@60c!O0(iyJgFgcCb716%n@UOPGgk=1NZ`o-gjJC={O?5c1k!pG
zy*izaT9ciesZ$QX@yib0MU0gIJ37&&Z&CWut6!a-)6|JNB!uXc0&x72=D9@lD3~Kd
zS-=%$EpR+tMpWI_+T)VH-$UQVv)HayR>}Z)`D0DDk>vP21>m#bDKjo(H6jD=9BuA7
ze)9r4VnLmxN*b%}x|9*dFFSkzWcf{i)ASTK8d?}uQgjR=VqL~_8|U=;WtTE&9F-L@
zQ5?k`|DrBl(v+LQQY`@|9e?S<5`VpMPOoy|)Jc>u=>fcaaq}OD@Cy;21p}M^A9Vbz
z(<IAu_NKdg?h(;5nbI6T6L*5u#xFWBmL+;4u$*SOsg1MFQRNd}czsT<32_#g@WmxH
zfR`_Bt^jysXy(q$A68dF;@BA^utTE!S7-ICG1D@co+mAU;~#6jjAh;w;jBQL$|`Ww
zZLPX3HuAV8pUHUHR6hUt^|`%&o=kw5)g@^G9JlDe{}Av~p8<T;)UHrOn#U~u#UAg(
z<OAesfpqHTyL)_P=D1{eo|FJyu<$@$cL#k9=JYWBgng!2QnNY{Xhw2WP3WFYclTN(
ztZWxgn3Mos_UOUi5acJjrf;Zf(>=Wkx~A^dwN6R^$35EoCxCCXZVs^=BHIDQO43aw
zALd@U@6Dsec9hX&vL+{hk2LRL@WA$Z!D!6T-g3?I6H7naG{5Knnx#vI=Sc_P`H#4>
zy2H_>H-0i`{u}dpJ(3K7nbjfb0K9Zz(`W*1iKuwIXP~X_OSLGU!Oy-izt2Q7=Ox4Q
zqyzAhN1Co7rVV<|G2=#^r@ez;b$J%#Z~XiG-d7|8U}kklIsnHlY`#SXKc`!9v+0po
zpPNl=2b2*nf6E*9_Wq%n^OE6t(gAqs!lv7pu{@e{LX{?ES9A}}VWi;b!+;!;4l>KZ
z^S>5bSk0k3Etm9x4PY|7UM6+8^tVl;;lLL0LrJ~@Wyw+S*1VooDPW=wuVT_gKr0qg
z0Axu4(Atk>N5Nb7+W=a#nto~<KpVh#a1?VHHh>gE1Y|n`#!Q?lV@d;f(QlhZOBMhO
z4mNB6<HeupEhupll!yf>eLxx5VrT`!i9kC7#><~c7XdGM$o)NLN4|)G2so3$4~e7=
zPeZ^w2K~!wKGF0<<bLzNdc7{1zAL9oLI4j;V&>Jy!zqFJ=lCC9qPn;4?>+Q*)S<Iw
zBprYkJ$PUe!5V;_wd*C|e2sjfy3IC#o&9daCO;BDqfT6`YZq2G<;N)B3t%5R0>*|w
z=jQSP$Z}*89Bd=~Kxnuy05V>o(W-m}zz1vqJC~#wrC;=*dlHy*`+#P<QAFcgjH(&l
zLa5e@Yye|5ap&jr0w}8h6z%D@cmI_c;b!Iu+{gf`+x(y%0nN;nkk2o=-#rPW9|03m
zVO^!D?rj^uuH&w7O@H`+yC4npBQfo15Wu&Kr46NGqBX>{2k4kDGB8W~-uZ3sHCFZN
zis?lgr><BxQ=KpRucpyVtl14?HujL23*LJu)839{YGLyPHh?++nwiZ8(9A;O&usvq
zjeut6lVL|dGaHFMPk8`k@Rrcv)#%pyNOQ6cpeSFa>1+U5-U7p0tJL=Mnac*ylq=x`
zDGlJ5dCt)ehr_~_d_RC>H^IV$nIueT0MEbA{UQOUY3jhV=iP_<UaeQRG55N!br9|r
zG7wWQ2A^%To5grunm#1(At4#j5(Q>)By|%{pT76IzM5-=FSxg9E=bnDKTvM{*}Dt#
z_O@H6<6J;u19<PZy8u30ry=~}-G?)^U;?<{KKCSM9GC4_9p)=S-Fv^w)NDpL|K4v`
z0X$hxZkvZst9Uf)iw@JNg9`4F05ao?e=JO50D-#q9<~AOAm+u3J%7G?7XVEJWJCdQ
zo_i9LK?D?i-OSd6#j6mRQdGVnfbLab=tn@=j)1Yc#W0@&AnO1KB?3O89|6bAb59~8
z0OPEo)m??c;t6&C(20O!=6}12!kXZ4`5qfUVe<+nGy+g*g11Bi5UL2Mjy$6KuEZmj
zdK3{o@|nx8`^O{NCV0$z_bP&Z1hfGZ#!5WlnECEq#QIIJB>=@mCQ3?U01cX858F*}
z+?_Y(9``O#2*9u=Cu#(Q>P$%B(s45d)wk%Yzb~Q*q^eu7$UmQB^u1sU^6R!dlBF31
zdm~^NfE*@Y2JBI=nSrf7_X4Oh4FlkdEstjDPQzTh;H|U+d(O%bk#$0L?-4TE-U_aS
z1TvX?CqyR4`K`|84*Q@?@0O$T=4VdRd_i-}J#N)BOz4%6VMjm_pIb^Z=58edYUcr?
z0cb^lvJwK8EUbk1O80;Ywmy3Nw_|Am4As_-fL1&&n0EBt?p>r40hMW(_ZR6$K*6HD
z$;Qlfj)p@AK$8uD9_mB@IW!R+yse+STVw4eSkL(*?{QyC;0q;|>W?06dAh1Ze7Q&g
z(5MOSNC3^I0p(5vki!5Bw>MLK0L(9{AK0y1#%&<v0sPLEM>GFy<)yZoHr9y-Avt5_
zx?W(=4Pl90vWG6;x>T(B8a>w!pmrMNi}x3|KLU=Jt!ze+w!my!L?yqo030>fy^4q@
z2lWlpD;@xjoaN4!9Q-;6*<PQqcjwQG6^pYw?3*hc2H>dK?(0e77qz5P_4|u6h3;+%
z0;nw{egI0=`+&04IZdz^K!delmf9ZyN6&Rv0X$r7ZYH{+Vo~NxLQ%(JqK*S_uKRI-
z?+Vu^AgqNrvuaWHw`RH;0jTr=D-0swu(|aocIUJ+%*s}t%f#mrNSWLXyzmj(jEo~Q
z-zkCqDIz15G_p+1daXnNK)rz7UI6p&cJ)nXa_jkvK~GdH&YToWUCi=yAb^c)!T6P)
z0^HIvU~6greP+syn&a99kY+7d83k87rr!jQn&Y0No(D9OlW@-obrp-X^MIpfyH`PJ
zg7to_IIW^2_T4ZeXYA`w85!T`mQ5(HSe*6ij<8e50XVyHEyxBiCZ{p#DwZS=fQ<5r
zC0!9f7y#HR7y)M+L_ji$fTGv4#cel%*#|%jFf^8L44`fwkbyR8e*{c7h=AyV0FG25
zAXwD|`z<aA;K(3=DhD&Z*t#@ZcO^t=f?0hzQPBTJ0pIK}lG((J*=~n`0>bij0UW6`
z!H{*DU;?$ZzX?Wqy0-}qeJ?p^xbm%CEduHT=&w*~t56@%2cUK{g0daU5WtzP(0)MS
z4u-{0Xf|zQ#+xP}s^wGNR-Gm|2%wI9ibDhp0H}@ElsEv6F6I+Fj>f6PbPhrKtToM3
zrZ=MX0?6tJ=&xFv1psw+!zhCgApm3QfLY085nSP-sc!31Z69#tEOi77$tO?yn_#5*
zBA_mSOSOGK@5s5$F^wUA4@@6Q+;`Rc%jvLiHNDZ+!f)g>XCI_fMfeUC0AIFwx{a(V
z=^1e#rf^o{TJkr+8X=+p&U8iWh6$+3puO9cW}T>~`pDUhzhdUK;m^z(NDW4TTdFKs
zCnV9VM`#v6iD}!`WmzND^&2s(@o56<jz;4FAO`@{)St??ssPL{Iyf-R(XtibK|wtk
zAEA{;Z7s`b62;1riAT<AT*Az=)P)o14_lXI-4g!yk+T}tvOxqSk5~j8G1FBGV2F;q
z=B>-Jdg}r>%l&g^dA+Cs5;GmWv29t_Wf}lyHogS#b$U9tws=meS(&#d*7_*ZFznEe
zfJ{`rT?Js_OxHRBZr1pQXzA9aS+hm;ums?UVwV#AG;gNTByL+4IVkW(z;*&ySnPU_
z2zp<Q<ZXRcq+!7V&Gl3xX1gzeEWaUYfW%Bk>$fe-x?T&Q>s0`{pK+yD?rSCTsLQqr
z;K-ScpELMWjr|x~w=K^eC2H3ofJ*bq>GA+ibMEI=Pg1L10V9fC${x7TMoE8e2KH`W
zmL1U~78Zw^V9i@13r4^q*J~h*5AOO1E6Bs16ZJMW6wY)GBBuX{7$AH%Nkn?hpxgIU
z^R}9`?IubX%7^suwq=?3X#gy4tN~bKe}H(~mz&bD{(6r{y>(lT@Cc}>Kb3D^9@z&h
zEOzc8qJcVgtKGIddzhY#{5v>3t$Wj{;I@5%mxXX0J4T$;xR8m80Zs={uk5&}EXnzA
zbs>dn0D}p5@Al<68UVG^Fun|uAb^F%#!U`0jjb%n+N`Z8(}?26CI)($IisV75N2`%
z&yD0W)2)>yS?eOpVJa+cZ1#O#Hu6V6^S0&Lx?K`cU6cqYOU8o`Er2eixsL=;5yq(9
zUZMrCpvd`i@?9L72cT8?q;BQcS@Wr&xM4m)dN^EB0@?s+^tR=hmEnIcEK)_lpe1zx
zoT03Q_(#F2NFfT~h+@}b2IgpXt0?u9q`NAYW$IqySXkuT1W>3CWvQc~<FfWn16q_X
zx3!*LRo4Hra82^3yH1fL{M!Jio!d*Ye;^8*Q3SLEU{M%=;q}u2a73}YfFZvRAWao9
z=Tl*LL7|AI_<U_;NzQFT0D|{!FHuFnZ~#>`mRPI_E+}%{LEtrdgLMMdY%9r**z6Dx
zQ&{Ah2Vi0B4lx_Y#$K{nP6qx{S(5!7b-MhbhN~q=f6>d&z+Wp%vac~KJKA$^1f)O&
zRJXxW`Swy(6I|rn1E`u{p8!n+98u(ann8M__q|k5<dOl7ct@50Fw_54mS+DrT<L-t
z&KeMg1|m|}A)LLHIsh`sx|<Ok+$J;;oj<d2EXnelnh#2|_b;DrFU>hq&!~mP&U3-E
zQ+vqBmpU}luOHg9O{3~B!D$NL-;E9-#U!73Wo2pZG<CfSi=Cy+nC=(ot4HWkn<d*z
zvgfo1z`-;2_3ut;{*@44Nui@LQhB8cz=9c}KA@_ewUs3~5q-dd8Ln53byI`aCWo!G
zFcr*bJOXexl}M#}f2}Nye5(p(C{1u!Cpc8&y_Kbr5wKu}Q<;nN0~qPRBWN42Q(!kt
z{vCUA>4fh4)h|duY>SLRJIZpt(ldNPk*f+E*xP2-+cS7>c2}>k$HnCn(nf4A?YmuF
zbioYg2LJ}^i6o+%x0hr;FRYGELN9>u0T}%G>rYIY2&e$4+Xn<{D@#=X7P<a%tZ#UA
z7}9<b(orgy;ru&*OVv6tFuSTWXK7>vv;v^A7OWouMFCV~=g)8{H&LCVXIutNsVdFZ
zy@)7(y6Y|?e!M+SIo^2*RJ*-Y+kr1Ec7K;;&u*iI15cZDYR#%FqyC{#HFN<C<t(o(
z&53A2tpJ!m!#Rt9B|3_{LBl6EoGqnG?|?ZsG~Gd44(;7DcGvpBEs+2^Yrq&9n2!iM
zmb$lUg(?D0cdliB1XO=0=m?2LKt*=JbeCphYfwJ0wW>5nch2ebY22+Zxs)$jo~V{@
z<PqVXUts!4mBHwPNW${TaeY;3re+d-_;lw3$8K<25Q<Fx_DboB5Pex$nth58Wl<6-
z0CwZZ2pHBcE3aIk1&}#%6zs33CIX&w-Oh|2C!Y8gn8$=g*9N&&zR)XU@QmjE-MM8N
z6Q9J)m3^{v)@)utZEAh<r#mC(0sRRG*jpI|Ky^7sEdV%ts`Cbt@PfYWh}%4A->+NM
z=M%l>1v46^GE<qEbJ{tbXZQsqGr581-aa?5qbmDY^jkoh$@Tmhu1~>yx_){5Y}Ja~
ziK4QM(s?7GA3&WKQ3GK9^iUHV-oYTH30@J|1S>KxUchNhF6W&DDkRWXM<}CgXKAl}
zmL>@Dr@5*D4s|d?lJ``V<(w2=x#82DYe~Hy&|kBol6V9>XY&4DCpa9+?rF{Zm(TOG
zx@txC6kWq!$Bu%5joUe(vss8Un{H7HG3weGS=D$EnBk!dt5#>frxr1Mit8sN@!xdo
zM*w@|tEyM!y&Mk!yUD6PpubQilvk@FVE#1c*C6=jek1BdHC1KVnsX&a`dI|fsZ=y#
zWbBt;SzVS>r~%MmOTHBVl``|EIhAHf|7K9|5gg_3Rz0bI+;iyUhC)Z0^d6XnZcFgi
z!EDUXUT<qarYEXaWb2-}$e-p^=Fjw(wg~RSd$arRT2B#OrC8MSHo*Y^)q{Q=01Ku$
zw=+<nBkPr_vYelY>R<`LVbdBeBPQk8UgWe5%fF~vnfJ$z0&v(==d}_cxH6*?s7k8K
za*B;Aoj=_<6O4!fRWt)x4U|>`VYqCi>D~X$p;2G0AEepFlt0aRIRhJ`bP?88mqpIi
ziaK7ME*wCOef1*X)cTv4B=5*OSbtV#@A&eXvRq|gEA+Djpi<)SsSP)Sq-9`MmQ<P;
zd|%DVTunb~_|))em`Gh(9O6x|Hv-;KnU0Lp{>8w_2DNHs!qA$s9AyKm?r+%ChUW=%
zlaN)8TO!^MS^i=5>VC=yH{z$Pn{tM$PIp7DKc$B}!|TfW#pRBg!ME@0pV3{v2?kJJ
zy)tqTqNp%zYQr=F{SH7Mfa(ExX7$S4KUguJWdOZ}U&oGN{TupAExGkZ8y9>41~#Nd
zifK90Helyd=BMH!BI?wJxd1IPt{lHzy)yS=!zk!;sM41jubq!-PYlzOC=f##2jJkb
z)hqIJKlwFmYQsGQdc?TC^mg^iY{U9mfj~*?1JI$`kQ(%xE`Yw^!0B>ELtf3k+<jP2
zmN!Gh2B1Lgya1}VWBJGFu>d%<s4-J&m6csCy^R2pnWogP)}I$tR6cbgchBnSe1U+U
zMOHzy(`N>%$tWf`A4B!BEdRK6b*^T@S<!3A6z91P@HXwhD@;C1KdoM!tv@&s@Q*r)
z7r<_600XJ0yn2;30>&UllcmD|96CiA1^XhPdg-h6sK;^y^oIN?&ijuQ_h85kkq#%&
z5s$|+rtXO-&5{zm^PD9hnqsuV5+&+*A4QSxeI9*jjz0Ft^3^*Y&(l5Fe%>wL^mOz|
z-v-^u_n^DB)U3+U+b0<_6AFOo1^_asytYdMsEL3+`@{-h{vCUI$m!kw31(kkP``J+
z`!F3D_3^5cozc88bdvKrlJF#$GYt<Wm`%%Aoj_!)J4*88U90;k+p2VaOhczMt|Q34
zZ-nT|CuX#rU%R@$<!j}l*+UmVzkFp!be98g*ktEZ07vYm2^!#VYrmTEf%UPxuEQob
z+zQ~?=y|C^YRkT~>Pd?FF`08FHxJ05BTI>Cg7s)<L3_eykfmugk7p}8nhk$LCpRo2
zV6I8sUaVQ26Zgx4hW%=99!^N#uP>XPu34R9`Mb&@7V5Yrcv8bWP~?^<-;6&s*7nQJ
z)tm7bQP|rQPilCL3FAY%aw2moFD@~?dLYep&F-=@j+&J_<gSJh65(D3u2T97!hub5
zc*iFx6u9VfVp@D4%~@`y$Iwajb3nA%IIw$*t|v#gb8E_a$Mo_>wZj6IhVFMY0Gy?%
zKVyFF<GE1=L}nH?e%^5a7Byz#sAngDh!qk7rq?{Kowl)3g<(?<p2(gf9{}vTM$Gv4
zR&yF%y<6~<){x)SpGgk76~s3Iq<ipPKu;y=z9JK^+p#P6RczKSX{yT@Hp%%A6W^!b
z<c3lc(RDSewL8@XbP`H3WRfzif)%R7U!$92aBWFe#KlEI1qvkUFaW)gYD(jGSoV|v
zbRmQ5S(YE$v8LbC0(zMy8FH8NdLm_wIC3wePR1H$Tvhi(?$@S;h9ww$hx>bJQtKs5
zG=zY&06K-ieU9zwP`3IjUw2a`jt?kN35-u5;Uf<@-u3LytPow9P!{Pka{I3WNThiy
zuYEkXLoNskx665xowrHMa{%&QP)U-bsJ%OFqS?Je0kq=qSkexe)bJ>=_QQmlSvW$y
zEYqz!*5tevi=2+gGxV;;QvuJ542&?G-0?qP#<qj$IT!9OBh&6gN9fv-Wp-%*v4Eu^
zdmH`=qN@aqBp(~`mhd6Z{X5nTI4F?5!;+kLXTz;TRHF2^%!DXAjTk7j8o|xVO_b+d
z8$bZcZkcr1u@NkfG5+v$sG1CXNsOYpHMtv(w-bi^#(6GF@@gWw&?{Rr&7%H;)WAez
zcRZ1;^re&X*X03JymI<4oPB!s=8a%BIS?Jz*b!AQ^THi#^5V9dU_^)l9weRzq8q@R
zX1o*_QG%P9FWvEEUUgEE=dV;!0I1aEyLY(y_9lLXA!}9$qAj2?(+41W8i!i{v}4@>
zgLyFP2q-(Ud$hQ&B9<pI(Uk<2jJE@-%cpPH!$0}pDgAX~>)Ir4j-&z58wsazw-Z{N
zPZP7|YvblFP;P_ZH<+-=A@iHHzt5{vW)scxg;ETj>>MPu@g-nf0tr`v&HH%T^64W<
zYW-2|69c>4$EU5>Dv&m*01Q;>2X{8ycMP2c06StaiZ2f-m#BXX#y=VS84<f##sMZA
zbU^CHKyQ}Nn;72#;Vj7f{ooGaScNiP=Ct%%KX^Q|G1elwTE3(NP;tT!?%aPNvGgo+
z=mMR1RW^8dD>O|K;diq=Gipc}e3XE@cl^FzX;%ZNz52$>C+*dvL-H$wlM{M)N&)(%
z)w>YAG0?A-rFPhIO{hZlc<%aeZGUC+Y0CYQ8o+=z&%50@iiwqZH{aEAqN4#L>xkx8
z;}kv!2kK?;yq!<wt+m?MOeRWG0zjX`n9jSs;YJ4T0dQVCoM^W1*+51;Gc7-IgjVf-
zUi>D}c<7smWuy>*A@iSm+x{zvNV(}%8L>+0?JuHDuJEoIZ*$H&nemj=B0tsHD=~=#
zVoCxS)-<0ivwR~66Tnc;JI81bqgY7)CX!!fnV#9XHZS6;yF`MZGj)m4;GL;*$H+cs
z;{E|r8ZLrN7lXX#aFv_4{D<MqVxrfK9xy%yp$_2p$s=w2;F;WyJ4V~&Db)th(3ec-
z+|oEmN^89yM303h)5be#qx-<&YxK_cCJ!ndQxh9N6T6;0(K$|%Jg@5~3r+-X_^`a+
zwH@Q4<Sx|)(8RxkCpyQmA%OnO3>&~0-xC`^kqAge5ipq92G9mDMhgf4NGbq>^T~l@
zi@=7Dp0S(YSUg}yKoI~DJp!@~U@Yu;^Vk5|0LBbYJTlq<3IGT;=>wA81jh=a4PZO~
zWNi58IlB)S3xqa+W&qy2ZyX$moCnly2;A_|bN%gkz!(U$0W<?}qH`SNHiL=i&@_w<
zU<~xxgAjA0oqhAZaV)7Kpf=lvkL?I(ZcLpNb_6twfC_*l0N^^i366z88$cVtSh$H>
z9veUtQ=W12zHt)tBVf>Ygbg3t5ilkwZ2;Q=U?3|qHhl8D-2}%%pbcOw0ID_wDob%T
zfU)3bFU6T!&D#WXWD^{m2K48)0W>wEVFEh>DyGS=Oh3I}zH;fL=I6+%AIr>9?{)@b
zgWT9p_aitNy}+UuR>tneuA4Ju0aOmHOWgK=|3K0J-<+t>*$)c`i+x})q(*}0Z!%@v
zyZd?l4{Uc`gxaThN&@JI?_Gc`o)0!Vh#7YBJi;%&zcY9rfyR9D$NtK9jO|~lu7sRE
zVc!x0E9Zi}Kcj2$P2-`8$FL80>%!$rPOp9Pr~X&k^!aU{iiS92!oIHnj<~)5xY>b7
zKHS=p_tpAAuHz;%fd!>t6U=nRg#B#*>kc|}ePtR7Rk=*=?BF&&clY{%hF|tfU|!;`
zS_%RPoN?nfN*^rN?|`(=2}G^zPRrf>s(mkvw?ooCYj(}tr{B2ufn!x)5VQ8GFC>`-
zNR^zIcE2#-hL~k1S;o`^@XAlSp-*pRZf|T<e;N&HV}^h};TFE&v%kdeF6x+7Nsx>w
z382^ZcX0aYP5Y)YV*&xE0BFZ`zEQoY43576<8RCvi~qGgTe<qz{`oDCx&Yb;B!mTQ
z029IusjGwyVCwolA!=>|m=JDAT_tP)Q`h$iQF9x>gm6RZDq#bdy1q|{n%e*-gd0*<
z2^+xF^?gFr+y*cq+>p9T*Z`)k?-QctHh>A?hSXKU1~7GfpAa>-0Za%tq^=VG5668a
UNMhHA_y7O^07*qoM6N<$f}bKCA^-pY

literal 0
HcmV?d00001

diff --git a/src/components/talk.vue b/src/components/talk.vue
new file mode 100644
index 0000000..1d58669
--- /dev/null
+++ b/src/components/talk.vue
@@ -0,0 +1,173 @@
+<template>
+  <Dialog :visible="modelValue" @update:visible="handleVisibleChange" pt:root="bg-white w-500px h-500px relative"
+    pt:mask="bg-[rgba(0,0,0,0.5)]" pt:header="w-full flex flex-row-reverse p-28px" pt:content="h-full">
+    <template #closeicon>
+      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 20px; height: 20px; " />
+    </template>
+    <div class="flex relative align-center justify-center w-full h-full">
+      <div class="flex flex-col items-center justify-end">
+        <img class="h-160px w-160px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
+        <span class="mt-60px mb-128px w-160px text-center text-20px text-[#222222] weight-500">{{
+          getStatusText(broadcastStatus) }}</span>
+      </div>
+    </div>
+  </Dialog>
+</template>
+
+<script lang='ts' setup>
+import { ref, onMounted } from 'vue';
+import Dialog from 'primevue/dialog';
+import Button from 'primevue/button';
+import { talkLogin, broadcastStart, broadcastStop } from "@/api/talk";
+import md5 from 'md5';
+
+const visible = ref(false);
+const broadcastStatus = ref(-1)  // -2 正在释放资源 -1 默认状态 0 等待接通 1 接通成功
+const broadcastRtc = ref(null)
+
+
+const props = defineProps({
+  modelValue: Boolean,
+  id: {
+    type: String,
+    required: true
+  }
+});
+
+const deviceId = ref('')
+const channelId = ref('')
+const broadcastMode = ref('')
+const userInfo = ref({
+  accessToken: '',
+  pushKey: ''
+})
+
+const deviceInfo = ref({
+  deviceId: '44010200492000000004',
+  channelId: '34020000001310000001',
+  broadcastMode: false
+})
+
+const emit = defineEmits(['update:modelValue']);
+
+const handleVisibleChange = (val: boolean) => {
+  emit('update:modelValue', val);
+}
+
+const getStatusText = (status: number) => {
+  switch (status) {
+    case -2:
+      return '正在释放资源'
+    case -1:
+      return '点击按钮对讲'
+    case 0:
+      return '等待接通'
+    case 1:
+      return '请讲话'
+    default:
+      return '未知状态'
+  }
+}
+
+const getUserInfo = () => {
+  talkLogin({
+    username: 'admin',
+    password: md5('admin')
+  }).then(res => {
+    console.log(res)
+    if (res.status === 200) {
+      userInfo.value.accessToken = res.data.data.accessToken
+      userInfo.value.pushKey = res.data.data.pushKey
+    }
+    console.log(userInfo.value)
+  })
+}
+
+const broadcastStatusClick = () => {
+  if (broadcastStatus.value === -1) {
+    // 默认状态， 开始
+    broadcastStatus.value = 0
+    // 发起语音对讲+
+    console.log(deviceInfo.value.deviceId)
+    broadcastStart({
+      deviceId: deviceInfo.value.deviceId,
+      channelId: deviceInfo.value.channelId,
+      broadcastMode: deviceInfo.value.broadcastMode
+    }, userInfo.value.accessToken).then(data => {
+
+      console.log(data)
+      let res = data.data.data
+      console.log(res)
+      const streamInfo = res.streamInfo
+      if (document.location.protocol.includes('https')) {
+        startBroadcast(streamInfo.rtcs)
+      } else {
+        startBroadcast(streamInfo.rtc)
+      }
+    })
+  } else if (broadcastStatus.value === 1) {
+    broadcastStatus.value = -1
+    broadcastRtc.value.close()
+  }
+}
+
+
+const startBroadcast = (url) => {
+
+  url += '&sign=' + md5(userInfo.value.pushKey)
+
+  console.log('开始语音喊话： ' + url)
+  broadcastRtc.value = new ZLMRTCClient.Endpoint({
+    debug: true, // 是否打印日志
+    zlmsdpUrl: url, // 流地址
+    simulecast: false,
+    useCamera: false,
+    audioEnable: true,
+    videoEnable: false,
+    recvOnly: false
+  })
+
+  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, (e) => { // 获取到了本地流
+    console.error('不支持webrtc', e)
+    broadcastStatus.value = -1
+  })
+
+  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, (e) => { // ICE 协商出错
+    console.error('ICE 协商出错')
+    broadcastStatus.value = -1
+  })
+
+  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, (e) => { // offer anwser 交换失败
+    console.error('offer anwser 交换失败', e)
+    broadcastStatus.value = -1
+  })
+  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, (e) => { // offer anwser 交换失败
+    console.log('状态改变', e)
+    if (e === 'connecting') {
+      broadcastStatus.value = 0
+    } else if (e === 'connected') {
+      broadcastStatus.value = 1
+    } else if (e === 'disconnected') {
+      broadcastStatus.value = -1
+    }
+  })
+  broadcastRtc.value.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED, (e) => { // offer anwser 交换失败
+    console.log('捕获流失败', e)
+    broadcastStatus.value = -1
+  })
+}
+
+const stopBroadcast = () => {
+  broadcastRtc.value.close()
+  broadcastStatus.value = -1
+  broadcastStop({
+    deviceId: deviceInfo.value.deviceId,
+    channelId: deviceInfo.value.channelId,
+  })
+}
+
+onMounted(() => {
+  getUserInfo()
+})
+</script>
+<style scoped></style>
\ No newline at end of file
diff --git a/src/http/talkRequest.ts b/src/http/talkRequest.ts
new file mode 100644
index 0000000..d4d58be
--- /dev/null
+++ b/src/http/talkRequest.ts
@@ -0,0 +1,12 @@
+import axios from 'axios'
+
+const talkUrl = 'http://webrtc.test.7games.store:18080'
+
+// create an axios instance
+const service = axios.create({
+  baseURL: talkUrl, // url = base url + request url
+  // withCredentials: true, // send cookies when cross-domain requests
+  timeout: 30000 // request timeout
+})
+
+export default service
\ No newline at end of file
-- 
2.34.1


From d0fa263fc2ff2b6aab771d5e5ecec442748191a0 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 10:02:57 +0800
Subject: [PATCH 02/65] =?UTF-8?q?fix(talk):=20=E4=BF=AE=E5=A4=8D=E5=B9=BF?=
 =?UTF-8?q?=E6=92=AD=E5=81=9C=E6=AD=A2=E6=97=B6=E6=9C=AA=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?accessToken=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除未使用的broadcastRtc ref，改为直接使用变量
在stopBroadcast调用时添加accessToken参数
---
 src/components/talk.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/talk.vue b/src/components/talk.vue
index 1d58669..d8198e2 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -14,7 +14,7 @@
   </Dialog>
 </template>
 
-<script lang='ts' setup>
+<script lang='ts' setup>``
 import { ref, onMounted } from 'vue';
 import Dialog from 'primevue/dialog';
 import Button from 'primevue/button';
@@ -23,7 +23,8 @@ import md5 from 'md5';
 
 const visible = ref(false);
 const broadcastStatus = ref(-1)  // -2 正在释放资源 -1 默认状态 0 等待接通 1 接通成功
-const broadcastRtc = ref(null)
+// const broadcastRtc = ref(null)
+let broadcastRtc;
 
 
 const props = defineProps({
@@ -127,6 +128,7 @@ const startBroadcast = (url) => {
     recvOnly: false
   })
 
+
   broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, (e) => { // 获取到了本地流
     console.error('不支持webrtc', e)
     broadcastStatus.value = -1
@@ -163,6 +165,7 @@ const stopBroadcast = () => {
   broadcastStop({
     deviceId: deviceInfo.value.deviceId,
     channelId: deviceInfo.value.channelId,
+    accessToken: userInfo.value.accessToken
   })
 }
 
-- 
2.34.1


From c583ca78e85bb7db52d6722310bb425e827275a6 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Mon, 30 Jun 2025 11:34:59 +0800
Subject: [PATCH 03/65] merge

---
 pnpm-lock.yaml | 27 +++++++++++++++++++++++++++
 src/App.vue    | 22 +++++++++++++++++++---
 src/api/api.ts | 15 +++++++++++++++
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9b3e475..a07ef3f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
       dayjs:
         specifier: ^1.11.13
         version: 1.11.13
+      md5:
+        specifier: ^2.3.0
+        version: 2.3.0
       pinia:
         specifier: ^3.0.3
         version: 3.0.3(typescript@5.8.3)(vue@3.5.17(typescript@5.8.3))
@@ -638,6 +641,9 @@ packages:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
 
+  charenc@0.0.2:
+    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
+
   chokidar@3.6.0:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
@@ -663,6 +669,9 @@ packages:
     resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
     engines: {node: '>=12.13'}
 
+  crypt@0.0.2:
+    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
+
   css-tree@3.1.0:
     resolution: {integrity: sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
@@ -813,6 +822,9 @@ packages:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
 
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -847,6 +859,9 @@ packages:
     resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
     engines: {node: '>= 0.4'}
 
+  md5@2.3.0:
+    resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
+
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
@@ -1669,6 +1684,8 @@ snapshots:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
+  charenc@0.0.2: {}
+
   chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
@@ -1697,6 +1714,8 @@ snapshots:
     dependencies:
       is-what: 4.1.16
 
+  crypt@0.0.2: {}
+
   css-tree@3.1.0:
     dependencies:
       mdn-data: 2.12.2
@@ -1846,6 +1865,8 @@ snapshots:
     dependencies:
       binary-extensions: 2.3.0
 
+  is-buffer@1.1.6: {}
+
   is-extglob@2.1.1: {}
 
   is-glob@4.0.3:
@@ -1872,6 +1893,12 @@ snapshots:
 
   math-intrinsics@1.1.0: {}
 
+  md5@2.3.0:
+    dependencies:
+      charenc: 0.0.2
+      crypt: 0.0.2
+      is-buffer: 1.1.6
+
   mdn-data@2.12.2: {}
 
   mime-db@1.52.0: {}
diff --git a/src/App.vue b/src/App.vue
index b92f658..30bce76 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@ import Input from "primevue/inputtext";
 import { onMounted, ref } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
-import { lockDoorApi, openDoorApi } from "@/api/api";
+import { lockDoorApi, openDoorApi, exitServerApi } from "@/api/api";
 import talkVue from "@/components/talk.vue";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
@@ -84,13 +84,16 @@ const openDoor = async (port: number) => {
 const lockDoor = async (type: number, sid: number) => {
   await lockDoorApi(type, sid, token.value);
 };
+const exitServer = async (clienId: number, storeId: number) => {
+  await exitServerApi(clienId, storeId, token.value);
+  // token.value = ""
+};
 
-
-//点击对讲按钮 
 const talkHandle = () => {
   console.log('开始对讲')
   isTalking.value = true;
 }
+
 </script>
 
 <template>
@@ -185,6 +188,19 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
+        <Button
+          @click="exitServer(1, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
+          <div class="flex gap-1 items-center">
+            <div class="h-24px w-24px">
+              <img src="@/assets/images/icon_sy@2x.png" alt="" />
+            </div>
+            <div class="text-white font-bold text-md flex items-center">
+              <span>结束服务</span>
+            </div>
+          </div>
+        </Button>
       </div>
       <div class="flex flex-1 justify-end">
         <Input readonly
diff --git a/src/api/api.ts b/src/api/api.ts
index b9b3efe..d64fc5e 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -38,3 +38,18 @@ export const lockDoorApi = async (type: number, sid: number, token: string) => {
     }
   );
 };
+export const exitServerApi = async (
+  client_id: number,
+  store_id: number,
+  token
+) => {
+  return request.post(
+    "/pc/v1/end/service",
+    { client_id, store_id },
+    {
+      headers: {
+        Authorization: "Bearer " + token,
+      },
+    }
+  );
+};
-- 
2.34.1


From dc88a3c37e15bacdc0260b5e8d239105f529578a Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 12:44:36 +0800
Subject: [PATCH 04/65] =?UTF-8?q?feat(=E8=AF=AD=E9=9F=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?):=20=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8C=E8=AE=BE=E7=BD=AE=E8=AF=AD=E9=9F=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在api.ts中添加voiceList和setVoiceApi接口
- 在App.vue中实现语音列表弹窗和选择功能
- 优化talk.vue中的广播状态管理和日志输出
---
 src/App.vue             | 27 +++++++++++++++++++++------
 src/api/api.ts          | 21 +++++++++++++++++++++
 src/components/talk.vue | 19 +++++++++++--------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 30bce76..cc3a315 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
 import Button from "primevue/button";
 import Input from "primevue/inputtext";
+import Dialog from "primevue/dialog";
 import { onMounted, ref } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
-import { lockDoorApi, openDoorApi, exitServerApi } from "@/api/api";
+import { lockDoorApi, openDoorApi, exitServerApi, voiceList as voiceListApi, setVoiceApi } from "@/api/api";
 import talkVue from "@/components/talk.vue";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
 const token = ref("");
 const isTalking = ref(false)
+const visible = ref(false)
+const voiceList = ref<any[]>([])
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async () => {
   const player = new ZLMRTCClient.Endpoint({
@@ -65,6 +68,11 @@ const startPlay = async () => {
     console.log("rtc datachannel 关闭 :", event);
   });
 };
+const getVoiceList = async () => {
+  const { data: { data } } = await voiceListApi(token.value);
+  voiceList.value = data
+  visible.value = true
+}
 ws.once("SHOP_INFO", (data) => {
   console.log("商店登录", data);
 });
@@ -84,6 +92,10 @@ const openDoor = async (port: number) => {
 const lockDoor = async (type: number, sid: number) => {
   await lockDoorApi(type, sid, token.value);
 };
+const setVoice = async (id: number) => {
+  return await setVoiceApi(1, id)
+}
+
 const exitServer = async (clienId: number, storeId: number) => {
   await exitServerApi(clienId, storeId, token.value);
   // token.value = ""
@@ -97,6 +109,11 @@ const talkHandle = () => {
 </script>
 
 <template>
+
+  <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
+    pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
+    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">{{ item.content }}</div>
+  </Dialog>
   <talkVue v-model="isTalking" id="202309001"></talkVue>
   <div class="flex-col w-screen">
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
@@ -133,7 +150,7 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button
+        <Button @click='getVoiceList'
           pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -188,10 +205,8 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button
-          @click="exitServer(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
+        <Button @click="exitServer(1, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
diff --git a/src/api/api.ts b/src/api/api.ts
index d64fc5e..a932988 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -38,6 +38,27 @@ export const lockDoorApi = async (type: number, sid: number, token: string) => {
     }
   );
 };
+export const voiceList = async (
+  token
+) => {
+  return request.post(
+    "/pc/operate/intercom",
+    {  },
+    {
+      headers: {
+        Authorization: "Bearer " + token,
+      },
+    }
+  );
+};
+export const setVoiceApi = async (sid,id) => {
+  return request.get(
+    "/pc/voice/set",
+    {
+      params:{sid,id}
+    },
+  );
+};
 export const exitServerApi = async (
   client_id: number,
   store_id: number,
diff --git a/src/components/talk.vue b/src/components/talk.vue
index d8198e2..58f2d42 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -85,6 +85,7 @@ const getUserInfo = () => {
 }
 
 const broadcastStatusClick = () => {
+  console.log(broadcastStatus.value)
   if (broadcastStatus.value === -1) {
     // 默认状态， 开始
     broadcastStatus.value = 0
@@ -107,8 +108,10 @@ const broadcastStatusClick = () => {
       }
     })
   } else if (broadcastStatus.value === 1) {
+    console.log('1')
     broadcastStatus.value = -1
-    broadcastRtc.value.close()
+    stopBroadcast()
+    // broadcastRtc.close()
   }
 }
 
@@ -118,7 +121,7 @@ const startBroadcast = (url) => {
   url += '&sign=' + md5(userInfo.value.pushKey)
 
   console.log('开始语音喊话： ' + url)
-  broadcastRtc.value = new ZLMRTCClient.Endpoint({
+  broadcastRtc = new ZLMRTCClient.Endpoint({
     debug: true, // 是否打印日志
     zlmsdpUrl: url, // 流地址
     simulecast: false,
@@ -129,21 +132,21 @@ const startBroadcast = (url) => {
   })
 
 
-  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, (e) => { // 获取到了本地流
+  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_NOT_SUPPORT, (e) => { // 获取到了本地流
     console.error('不支持webrtc', e)
     broadcastStatus.value = -1
   })
 
-  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, (e) => { // ICE 协商出错
+  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, (e) => { // ICE 协商出错
     console.error('ICE 协商出错')
     broadcastStatus.value = -1
   })
 
-  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, (e) => { // offer anwser 交换失败
+  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, (e) => { // offer anwser 交换失败
     console.error('offer anwser 交换失败', e)
     broadcastStatus.value = -1
   })
-  broadcastRtc.value.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, (e) => { // offer anwser 交换失败
+  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ON_CONNECTION_STATE_CHANGE, (e) => { // offer anwser 交换失败
     console.log('状态改变', e)
     if (e === 'connecting') {
       broadcastStatus.value = 0
@@ -153,14 +156,14 @@ const startBroadcast = (url) => {
       broadcastStatus.value = -1
     }
   })
-  broadcastRtc.value.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED, (e) => { // offer anwser 交换失败
+  broadcastRtc.on(ZLMRTCClient.Events.CAPTURE_STREAM_FAILED, (e) => { // offer anwser 交换失败
     console.log('捕获流失败', e)
     broadcastStatus.value = -1
   })
 }
 
 const stopBroadcast = () => {
-  broadcastRtc.value.close()
+  broadcastRtc.close()
   broadcastStatus.value = -1
   broadcastStop({
     deviceId: deviceInfo.value.deviceId,
-- 
2.34.1


From 173175742ff638c0f78a6502f4400838ac74e17c Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Mon, 30 Jun 2025 14:23:17 +0800
Subject: [PATCH 05/65] =?UTF-8?q?feat:=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production |  2 +-
 src/api/api.ts  | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.env.production b/.env.production
index 8ce19de..8cb9be6 100644
--- a/.env.production
+++ b/.env.production
@@ -1 +1 @@
-VITE_API_BASE_URL = "http://localhost:4444"
\ No newline at end of file
+VITE_API_BASE_URL = "https://smapi.test.7games.store"
\ No newline at end of file
diff --git a/src/api/api.ts b/src/api/api.ts
index a932988..4103ef1 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -1,15 +1,4 @@
 import request from "@/http/request";
-export const getStreamAnswer = async (streamName: string, data: string) => {
-  return request.post(
-    `/index/api/webrtc?app=live&stream=${streamName}&type=play`,
-    data,
-    {
-      headers: {
-        "Content-Type": "text/plain;charset=UTF-8",
-      },
-    }
-  );
-};
 export const openDoorApi = async (port: number, sid: number, token: string) => {
   return request.post(
     "/pc/v1/operate/open/door",
-- 
2.34.1


From 30d3347f0d8a1ac2cf5266b5e981a1a993348afd Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Mon, 30 Jun 2025 14:24:03 +0800
Subject: [PATCH 06/65] =?UTF-8?q?feat:=E6=8E=A5=E5=8F=A3=E5=92=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E5=A4=9A=E7=9A=84=E8=B0=83=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 134 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 95 insertions(+), 39 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index cc3a315..6df7125 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,14 +5,25 @@ import Dialog from "primevue/dialog";
 import { onMounted, ref } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
-import { lockDoorApi, openDoorApi, exitServerApi, voiceList as voiceListApi, setVoiceApi } from "@/api/api";
+import {
+  lockDoorApi,
+  openDoorApi,
+  exitServerApi,
+  voiceList as voiceListApi,
+  setVoiceApi,
+} from "@/api/api";
 import talkVue from "@/components/talk.vue";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
 const token = ref("");
-const isTalking = ref(false)
-const visible = ref(false)
-const voiceList = ref<any[]>([])
+const isTalking = ref(false);
+const visible = ref(false);
+const storeData = ref<any | null>(null);
+// const customerServiceId = ref("")
+// const storeName = ref("")
+// const storeId = ref("")
+// const cameras = ref<string[]>([])
+const voiceList = ref<any[]>([]);
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async () => {
   const player = new ZLMRTCClient.Endpoint({
@@ -69,12 +80,18 @@ const startPlay = async () => {
   });
 };
 const getVoiceList = async () => {
-  const { data: { data } } = await voiceListApi(token.value);
-  voiceList.value = data
-  visible.value = true
-}
+  const {
+    data: { data },
+  } = await voiceListApi(token.value);
+  voiceList.value = data;
+  visible.value = true;
+};
 ws.once("SHOP_INFO", (data) => {
   console.log("商店登录", data);
+  storeData.value = data;
+});
+ws.on("SHOP_ORDER", (data) => {
+  console.log("商店订单", data);
 });
 ws.once("TOKEN", (data) => {
   console.log("token获取", data.token);
@@ -87,14 +104,17 @@ onMounted(async () => {
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
 const openDoor = async (port: number) => {
-  await openDoorApi(port, 1, token.value);
+  if (!storeData?.data?.store_id) return;
+  await openDoorApi(port, storeData?.data?.store_id, token.value);
 };
 const lockDoor = async (type: number, sid: number) => {
-  await lockDoorApi(type, sid, token.value);
+  if (!storeData?.data?.store_id) return;
+  await lockDoorApi(type, storeData?.data?.store_id, token.value);
 };
 const setVoice = async (id: number) => {
-  return await setVoiceApi(1, id)
-}
+  if (!storeData?.data?.store_id) return;
+  return await setVoiceApi(storeData?.data?.store_id, id);
+};
 
 const exitServer = async (clienId: number, storeId: number) => {
   await exitServerApi(clienId, storeId, token.value);
@@ -102,34 +122,47 @@ const exitServer = async (clienId: number, storeId: number) => {
 };
 
 const talkHandle = () => {
-  console.log('开始对讲')
+  console.log("开始对讲");
   isTalking.value = true;
-}
-
+};
 </script>
 
 <template>
-
-  <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
-    pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
-    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">{{ item.content }}</div>
+  <Dialog
+    v-model:visible="visible"
+    modal
+    header="要发布的语音"
+    pt:mask="bg-[rgba(0,0,0,0.5)]"
+    pt:root="bg-white w-80vw rounded"
+    pt:header="flex justify-between items-center p-4 items-center"
+  >
+    <div
+      v-for="item in voiceList"
+      class="px-4 py-2 hover:bg-[#f5f5f5]"
+      @click="setVoice(item.id)"
+    >
+      {{ item.content }}
+    </div>
   </Dialog>
   <talkVue v-model="isTalking" id="202309001"></talkVue>
   <div class="flex-col w-screen">
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex gap-2">
-        <Button pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2">
+        <Button
+          pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
+        >
           <div class="flex gap-2">
             <div class="h-36px w-36px">
               <img src="@/assets/images/icon_cs@2x.png" alt="" />
             </div>
             <div class="text-white font-bold text-2xl flex items-center">
-              <span>幸福小超市</span>
+              <span>{{ storeData?.data?.store_name || "等待加入" }}</span>
             </div>
           </div>
         </Button>
         <Button
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -139,8 +172,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="talkHandle"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="talkHandle"
+          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_dj@2x.png" alt="" />
@@ -150,8 +185,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click='getVoiceList'
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="getVoiceList"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -161,8 +198,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="openDoor(1)"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="openDoor(1)"
+          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -172,8 +211,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="openDoor(2)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="openDoor(2)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -183,8 +224,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="lockDoor(0, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="lockDoor(0, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -194,8 +237,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="lockDoor(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="lockDoor(1, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -205,8 +250,10 @@ const talkHandle = () => {
             </div>
           </div>
         </Button>
-        <Button @click="exitServer(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center">
+        <Button
+          @click="exitServer(1, 1)"
+          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
               <img src="@/assets/images/icon_sy@2x.png" alt="" />
@@ -218,14 +265,23 @@ const talkHandle = () => {
         </Button>
       </div>
       <div class="flex flex-1 justify-end">
-        <Input readonly
+        <Input
+          readonly
           pt:root="outline-none text-center text-white bg-[rgba(255,255,255,0.1)] rounded-full max-w-500px px-2 min-w-200px placeholder-[rgba(255,255,255,0.8)]"
-          value="1111111/xxxxxxx" />
+          :value="`${storeData?.data?.user_nickname || ''}/${
+            storeData?.data?.user_mobile || ''
+          }`"
+        />
       </div>
     </div>
 
     <div class="w-full">
-      <video class="w-full aspect-ratio-video h-50vh" id="video" autoplay muted></video>
+      <video
+        class="w-full aspect-ratio-video h-50vh"
+        id="video"
+        autoplay
+        muted
+      ></video>
       <div class="h-1 bg-white"></div>
       <div class="h-50vh">
         <div class="w-full flex h-50%">
-- 
2.34.1


From 1134cd44c6dbf6708b39b8c26b3a7e34a56c17b9 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 16:48:23 +0800
Subject: [PATCH 07/65] =?UTF-8?q?feat:=E6=91=84=E5=83=8F=E5=A4=B4=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue        | 163 +++++++++++++++++++++++++++++++--------------
 src/utils/utils.ts |  10 +++
 2 files changed, 122 insertions(+), 51 deletions(-)
 create mode 100644 src/utils/utils.ts

diff --git a/src/App.vue b/src/App.vue
index 6df7125..def4da4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
 import Button from "primevue/button";
 import Input from "primevue/inputtext";
 import Dialog from "primevue/dialog";
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
 import {
@@ -13,21 +13,59 @@ import {
   setVoiceApi,
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
+import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
 const storeData = ref<any | null>(null);
+const videoRef1 = ref<HTMLVideoElement|null>()
+const videoRef2 = ref<HTMLVideoElement|null>()
+const videoRef3 = ref<HTMLVideoElement|null>()
+const videoRef4 = ref<HTMLVideoElement|null>()
+const videoRef5 = ref<HTMLVideoElement|null>()
+const videoRef6 = ref<HTMLVideoElement|null>()
+const videoRef7 = ref<HTMLVideoElement|null>()
+const videoRef8 = ref<HTMLVideoElement|null>()
+const videoRef9 = ref<HTMLVideoElement|null>()
 // const customerServiceId = ref("")
 // const storeName = ref("")
 // const storeId = ref("")
 // const cameras = ref<string[]>([])
 const voiceList = ref<any[]>([]);
+const cameraList = ref<any[]>([])
+const cameraGroup = computed(()=>{
+  const videoDom = [videoRef1.value,videoRef2.value,videoRef3.value,videoRef4.value,videoRef5.value,videoRef6.value,videoRef7.value,videoRef8.value,videoRef9.value]
+  if(cameraList.value.length){
+    const _i = cameraList.value[0]
+    videoRef1.value!.srcObject = _i
+    chunkArray(cameraList.value.slice(1),4).forEach((e,i)=>{
+      e.forEach((el,j)=>{
+        switch (i) {
+          case 0:
+            console.log(videoDom[j+1]!.srcObject)
+            videoDom[j+1]!.srcObject = el
+            break;
+          case 1:
+            console.log(videoDom[j+5]!.srcObject)
+            videoDom[j+5]!.srcObject = el
+            break;
+          default:
+            break;
+      }
+      })
+    })
+    return [[_i],...chunkArray(cameraList.value.slice(1),4)]
+  }else{
+    return []
+  }
+})
+const goodsList = ref<any[]>([])
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
-const startPlay = async () => {
+const startPlay = async (url:string) => {
   const player = new ZLMRTCClient.Endpoint({
-    element: document.getElementById("video"),
+    element:document.querySelector("#video"),
     debug: true,
     recvOnly: "play",
     audioEnable: true,
@@ -36,8 +74,7 @@ const startPlay = async () => {
       w: 1280,
       h: 720,
     },
-    zlmsdpUrl:
-      "https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=test001&type=play",
+    zlmsdpUrl:url,
   });
   player.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, function (e) {
     // ICE 协商出错
@@ -48,7 +85,8 @@ const startPlay = async () => {
     //获取到了远端流，可以播放,如果element 为null 或者不传,可以在这里播放(如下注释代码)
     // console.log(document.getElementById("video"))
     // (document.getElementById("video")! as HTMLVideoElement).srcObject = s;
-    console.log("播放成功", s);
+    cameraList.value.push(s)
+    console.log("播放成功", s,cameraList.value);
   });
   player.on(
     ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,
@@ -89,9 +127,19 @@ const getVoiceList = async () => {
 ws.once("SHOP_INFO", (data) => {
   console.log("商店登录", data);
   storeData.value = data;
+  if(data?.data?.store_device?.camera?.length){
+    // chunkArray(data?.data?.store_device?.camera,3)
+    data.data.store_device.camera.forEach((e:string)=>{
+      startPlay(e)
+    })
+  }
+ 
+  console.log(data.data.store_device.camera)
 });
 ws.on("SHOP_ORDER", (data) => {
-  console.log("商店订单", data);
+  console.log("商店订单接口数据", data);
+  goodsList.value = data.data.order_info.goods_list
+  console.log("商店订单",goodsList.value)
 });
 ws.once("TOKEN", (data) => {
   console.log("token获取", data.token);
@@ -99,21 +147,21 @@ ws.once("TOKEN", (data) => {
 });
 onMounted(async () => {
   // await connectionRtc();
-  startPlay();
+  // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
 const openDoor = async (port: number) => {
-  if (!storeData?.data?.store_id) return;
-  await openDoorApi(port, storeData?.data?.store_id, token.value);
+  if (!storeData.value?.data?.store_id) return;
+  await openDoorApi(port, storeData.value?.data?.store_id, token.value);
 };
 const lockDoor = async (type: number, sid: number) => {
-  if (!storeData?.data?.store_id) return;
-  await lockDoorApi(type, storeData?.data?.store_id, token.value);
+  if (!storeData.value?.data?.store_id) return;
+  await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
 const setVoice = async (id: number) => {
-  if (!storeData?.data?.store_id) return;
-  return await setVoiceApi(storeData?.data?.store_id, id);
+  if (!storeData.value?.data?.store_id) return;
+  return await setVoiceApi(storeData.value?.data?.store_id, id);
 };
 
 const exitServer = async (clienId: number, storeId: number) => {
@@ -128,6 +176,7 @@ const talkHandle = () => {
 </script>
 
 <template>
+  
   <Dialog
     v-model:visible="visible"
     modal
@@ -145,7 +194,10 @@ const talkHandle = () => {
     </div>
   </Dialog>
   <talkVue v-model="isTalking" id="202309001"></talkVue>
-  <div class="flex-col w-screen">
+  <div class="flex-col w-screen relative">
+    <video src="" id="video" class="w-100px" muted></video>
+    <div class="z-100 fixed right-4 h-80% w-xl bg-[rgba(0,0,0,0.5)] rounded top-50% transform-translate-y-[-50%]" v-if="goodsList.length">
+    </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex gap-2">
         <Button
@@ -276,55 +328,64 @@ const talkHandle = () => {
     </div>
 
     <div class="w-full">
-      <video
-        class="w-full aspect-ratio-video h-50vh"
-        id="video"
-        autoplay
-        muted
-      ></video>
+      <div class="w-full h-50vh">
+          <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!cameraGroup[0]||!cameraGroup[0][0]">
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          </div>
+        <video
+        ref="videoRef1"
+        v-show="cameraGroup[0]&&cameraGroup[0][0]"
+          class="w-full aspect-ratio-video h-50vh"
+          autoplay
+          muted
+        ></video>
+      </div>
       <div class="h-1 bg-white"></div>
       <div class="h-50vh">
         <div class="w-full flex h-50%">
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][0]" />
+            <video autoplay
+          muted ref="videoRef2" src="" v-show="cameraGroup[1]&&cameraGroup[1][0]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][1]"/>
+            <video autoplay
+          muted ref="videoRef3" src="" v-show="cameraGroup[1]&&cameraGroup[1][1]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][2]"/>
+            <video autoplay
+          muted ref="videoRef4" src="" v-show="cameraGroup[1]&&cameraGroup[1][2]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][3]"/>
+            <video autoplay
+          muted ref="videoRef5" src="" v-show="cameraGroup[1]&&cameraGroup[1][3]"></video>
           </div>
-          <!-- <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video> -->
         </div>
         <div class="w-full flex h-50%">
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][0]"/>
+            <video autoplay
+          muted ref="videoRef6" src="" v-show="cameraGroup[2]&&cameraGroup[2][0]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][1]"/>
+            <video autoplay
+          muted ref="videoRef7" src="" v-show="cameraGroup[2]&&cameraGroup[2][1]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center"  >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][2]"/>
+            <video autoplay
+          muted ref="videoRef8" src="" v-show="cameraGroup[2]&&cameraGroup[2][2]"></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+          <div class="bg-black w-100% h-full flex justify-center items-center" >
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][3]"/>
+            <video autoplay
+          muted ref="videoRef9" src="" v-show="cameraGroup[2]&&cameraGroup[2][3]"></video>
           </div>
-          <!-- <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video> -->
-        </div>
-        <!-- <div class="w-full flex">
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-          <video class="bg-gray w-100%"></video>
-        </div> -->
+        </div>     
       </div>
     </div>
   </div>
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
new file mode 100644
index 0000000..033fa8e
--- /dev/null
+++ b/src/utils/utils.ts
@@ -0,0 +1,10 @@
+export function chunkArray<T>(arr: T[], size: number): T[][] {
+  const result: T[][] = [];
+  let index = 0;
+  
+  while (index < arr.length) {
+    result.push(arr.slice(index, index + size));
+    index += size;
+  }
+  return result;
+}
\ No newline at end of file
-- 
2.34.1


From 97236e94b0b84f2c727d396cde4a2cfdd82dd1a5 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 16:52:14 +0800
Subject: [PATCH 08/65] 1

---
 src/components/talk.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/talk.vue b/src/components/talk.vue
index 58f2d42..8fd9699 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -44,7 +44,7 @@ const userInfo = ref({
 })
 
 const deviceInfo = ref({
-  deviceId: '44010200492000000004',
+  deviceId: '44010200492000000007',
   channelId: '34020000001310000001',
   broadcastMode: false
 })
-- 
2.34.1


From 3e71cecdc0b0bb20fa7e6e805c4a32a43e181074 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 17:40:10 +0800
Subject: [PATCH 09/65] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B4=AD?=
 =?UTF-8?q?=E7=89=A9=E8=BD=A6=E6=80=BB=E4=BB=B7=E8=AE=A1=E7=AE=97=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加购物车总价计算功能，优化视频显示比例和购物车界面样式
清理退出服务器时的数据重置逻辑
---
 src/App.vue             | 68 +++++++++++++++++++++++++++++++++++------
 src/components/talk.vue |  2 +-
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index def4da4..6244188 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,6 +62,17 @@ const cameraGroup = computed(()=>{
   }
 })
 const goodsList = ref<any[]>([])
+const totalPrice = computed(()=>{
+  if(goodsList.value.length){
+    let price = 0
+    goodsList.value.forEach(e=>{
+      price += e.goods_price * e.goods_number
+    })
+    return price
+  } else{
+    return 0
+  }
+})
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async (url:string) => {
   const player = new ZLMRTCClient.Endpoint({
@@ -166,7 +177,10 @@ const setVoice = async (id: number) => {
 
 const exitServer = async (clienId: number, storeId: number) => {
   await exitServerApi(clienId, storeId, token.value);
-  // token.value = ""
+  token.value = ""
+  storeData.value = {}
+  cameraList.value = []
+  goodsList.value = []
 };
 
 const talkHandle = () => {
@@ -196,7 +210,41 @@ const talkHandle = () => {
   <talkVue v-model="isTalking" id="202309001"></talkVue>
   <div class="flex-col w-screen relative">
     <video src="" id="video" class="w-100px" muted></video>
-    <div class="z-100 fixed right-4 h-80% w-xl bg-[rgba(0,0,0,0.5)] rounded top-50% transform-translate-y-[-50%]" v-if="goodsList.length">
+    <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%]" v-if="goodsList.length">
+      <div class="flex justify-between items-center px-4 py-2 text-white">
+        <div>
+          购物车
+        </div>
+      </div>
+      <div class="h-1px bg-white mx-4"></div>
+      <div>
+       
+     <table class="text-white w-full m-4">
+    <thead>
+      <tr>
+        <th class="text-left">商品名称</th>
+        <th class="text-left">单价</th>
+        <th class="text-left">数量</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr class="m-4" v-for="(item, index) in goodsList" :key="index">
+        <td >{{ item.goods_name }}</td>
+        <td >¥{{ item.goods_price }}</td>
+        <td >{{ item.goods_number }}</td>
+      </tr>
+    </tbody>
+  </table>
+   <div class="h-1px bg-white m-4"></div>
+   <div class="flex justify-between items-center px-4 py-2 text-white">
+      <div>
+        合计
+      </div>
+      <div>
+        ¥{{ totalPrice }}
+      </div>
+   </div>
+  </div>
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex gap-2">
@@ -346,43 +394,43 @@ const talkHandle = () => {
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][0]" />
             <video autoplay
-          muted ref="videoRef2" src="" v-show="cameraGroup[1]&&cameraGroup[1][0]"></video>
+          muted ref="videoRef2" class="w-full aspect-ratio-video" v-show="cameraGroup[1]&&cameraGroup[1][0]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][1]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef3" src="" v-show="cameraGroup[1]&&cameraGroup[1][1]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][2]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef4" src="" v-show="cameraGroup[1]&&cameraGroup[1][2]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][3]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef5" src="" v-show="cameraGroup[1]&&cameraGroup[1][3]"></video>
           </div>
         </div>
         <div class="w-full flex h-50%">
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][0]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef6" src="" v-show="cameraGroup[2]&&cameraGroup[2][0]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][1]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef7" src="" v-show="cameraGroup[2]&&cameraGroup[2][1]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center"  >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][2]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef8" src="" v-show="cameraGroup[2]&&cameraGroup[2][2]"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][3]"/>
-            <video autoplay
+            <video class="w-full aspect-ratio-video" autoplay
           muted ref="videoRef9" src="" v-show="cameraGroup[2]&&cameraGroup[2][3]"></video>
           </div>
         </div>     
diff --git a/src/components/talk.vue b/src/components/talk.vue
index 8fd9699..de448d9 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -44,7 +44,7 @@ const userInfo = ref({
 })
 
 const deviceInfo = ref({
-  deviceId: '44010200492000000007',
+  deviceId: '44010200492000000001',
   channelId: '34020000001310000001',
   broadcastMode: false
 })
-- 
2.34.1


From bb4bb55df3f6fc857768d2799ffdb43ecb0ebb9a Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 20:07:49 +0800
Subject: [PATCH 10/65] =?UTF-8?q?feat:=E6=89=93=E5=8C=85=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 119 ++++++++++++++++++++++++++++------------------------
 1 file changed, 64 insertions(+), 55 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 6244188..f0bced0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Button from "primevue/button";
+// import Button from "primevue/button";
 import Input from "primevue/inputtext";
 import Dialog from "primevue/dialog";
 import { computed, onMounted, ref } from "vue";
@@ -87,7 +87,7 @@ const startPlay = async (url:string) => {
     },
     zlmsdpUrl:url,
   });
-  player.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, function (e) {
+  player.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, function () {
     // ICE 协商出错
     console.log("ICE 协商出错");
   });
@@ -166,7 +166,7 @@ const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
 };
-const lockDoor = async (type: number, sid: number) => {
+const lockDoor = async (type: number ) => {
   if (!storeData.value?.data?.store_id) return;
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
@@ -175,8 +175,9 @@ const setVoice = async (id: number) => {
   return await setVoiceApi(storeData.value?.data?.store_id, id);
 };
 
-const exitServer = async (clienId: number, storeId: number) => {
-  await exitServerApi(clienId, storeId, token.value);
+const exitServer = async () => {
+  if (!storeData.value?.data?.store_id||!storeData.value?.data?.customer_service_id) return;
+  await exitServerApi(storeData.value?.data?.customer_service_id, storeData.value?.data?.store_id, token.value);
   token.value = ""
   storeData.value = {}
   cameraList.value = []
@@ -209,8 +210,8 @@ const talkHandle = () => {
   </Dialog>
   <talkVue v-model="isTalking" id="202309001"></talkVue>
   <div class="flex-col w-screen relative">
-    <video src="" id="video" class="w-100px" muted></video>
-    <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%]" v-if="goodsList.length">
+    <video src="" id="video" class="w-100px" style="display: none;" muted></video>
+    <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px" v-if="goodsList.length">
       <div class="flex justify-between items-center px-4 py-2 text-white">
         <div>
           购物车
@@ -248,7 +249,7 @@ const talkHandle = () => {
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex gap-2">
-        <Button
+        <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
         >
           <div class="flex gap-2">
@@ -259,35 +260,23 @@ const talkHandle = () => {
               <span>{{ storeData?.data?.store_name || "等待加入" }}</span>
             </div>
           </div>
-        </Button>
-        <Button
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_sy@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>收银</span>
-            </div>
-          </div>
-        </Button>
-        <Button
-          @click="talkHandle"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_dj@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>对讲</span>
-            </div>
-          </div>
-        </Button>
-        <Button
+        </Button> -->
+         <button  class="rounded-[50px] w-100px flex justify-center items-center gap-1 text-white font-600 text-lg" @click="openDoor(1)">
+          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="">
+          {{ storeData?.data?.store_name || "等待加入" }}
+        </button>
+        <button @click="talkHandle"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          对讲       
+        </button>
+         <button @click="getVoiceList"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          语音       
+        </button>
+        
+        <!-- <Button
           @click="getVoiceList"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -297,10 +286,10 @@ const talkHandle = () => {
               <span>语音</span>
             </div>
           </div>
-        </Button>
-        <Button
+        </Button> -->
+        <!-- <Button
           @click="openDoor(1)"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -310,10 +299,22 @@ const talkHandle = () => {
               <span>门一开门</span>
             </div>
           </div>
-        </Button>
-        <Button
+        </Button> -->
+        <button @click="openDoor(1)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          门一开门       
+        </button>
+        <button @click="openDoor(2)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          门一开门       
+        </button>
+        <button @click="lockDoor(0)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          锁门       
+        </button>
+        <!-- <Button
           @click="openDoor(2)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -323,10 +324,10 @@ const talkHandle = () => {
               <span>门二开门</span>
             </div>
           </div>
-        </Button>
-        <Button
-          @click="lockDoor(0, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        </Button> -->
+        <!-- <Button
+          @click="lockDoor(0)"
+          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -336,10 +337,18 @@ const talkHandle = () => {
               <span>锁门</span>
             </div>
           </div>
-        </Button>
-        <Button
-          @click="lockDoor(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        </Button> -->
+        <button @click="lockDoor(1)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          开门       
+        </button>
+         <button @click="exitServer()"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
+          结束服务       
+        </button>
+        <!-- <Button
+          @click="lockDoor(1)"
+          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -349,10 +358,10 @@ const talkHandle = () => {
               <span>开门</span>
             </div>
           </div>
-        </Button>
-        <Button
-          @click="exitServer(1, 1)"
-          pt:root="bg-[rgba(36,87,232,1)] active:bg-[rgba(36,87,232,0.6)] cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
+        </Button> -->
+        <!-- <Button
+          @click="exitServer()"
+          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
         >
           <div class="flex gap-1 items-center">
             <div class="h-24px w-24px">
@@ -362,7 +371,7 @@ const talkHandle = () => {
               <span>结束服务</span>
             </div>
           </div>
-        </Button>
+        </Button> -->
       </div>
       <div class="flex flex-1 justify-end">
         <Input
-- 
2.34.1


From b903ae3a77bcec7c18ef84671e3b0eb5b7214962 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 30 Jun 2025 20:08:06 +0800
Subject: [PATCH 11/65] =?UTF-8?q?feat:=E6=89=93=E5=8C=85=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/talk.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/talk.vue b/src/components/talk.vue
index de448d9..dce50b2 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -17,17 +17,17 @@
 <script lang='ts' setup>``
 import { ref, onMounted } from 'vue';
 import Dialog from 'primevue/dialog';
-import Button from 'primevue/button';
+// import Button from 'primevue/button';
 import { talkLogin, broadcastStart, broadcastStop } from "@/api/talk";
 import md5 from 'md5';
 
-const visible = ref(false);
+// const visible = ref(false);
 const broadcastStatus = ref(-1)  // -2 正在释放资源 -1 默认状态 0 等待接通 1 接通成功
 // const broadcastRtc = ref(null)
 let broadcastRtc;
 
 
-const props = defineProps({
+ defineProps({
   modelValue: Boolean,
   id: {
     type: String,
@@ -35,9 +35,9 @@ const props = defineProps({
   }
 });
 
-const deviceId = ref('')
-const channelId = ref('')
-const broadcastMode = ref('')
+// const deviceId = ref('')
+// const channelId = ref('')
+// const broadcastMode = ref('')
 const userInfo = ref({
   accessToken: '',
   pushKey: ''
@@ -137,7 +137,7 @@ const startBroadcast = (url) => {
     broadcastStatus.value = -1
   })
 
-  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, (e) => { // ICE 协商出错
+  broadcastRtc.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, () => { // ICE 协商出错
     console.error('ICE 协商出错')
     broadcastStatus.value = -1
   })
-- 
2.34.1


From 65d3e4d100488ab73439129a7f466a5dd9d92db4 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 12:20:32 +0800
Subject: [PATCH 12/65] =?UTF-8?q?fixed:=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f0bced0..587a7b8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -209,7 +209,7 @@ const talkHandle = () => {
     </div>
   </Dialog>
   <talkVue v-model="isTalking" id="202309001"></talkVue>
-  <div class="flex-col w-screen relative">
+  <div class="flex-col w-screen h-screen overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none;" muted></video>
     <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px" v-if="goodsList.length">
       <div class="flex justify-between items-center px-4 py-2 text-white">
@@ -248,7 +248,7 @@ const talkHandle = () => {
   </div>
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
-      <div class="flex gap-2">
+      <div class="flex items-center gap-2 h-4vh">
         <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
         >
@@ -261,15 +261,15 @@ const talkHandle = () => {
             </div>
           </div>
         </Button> -->
-         <button  class="rounded-[50px] w-100px flex justify-center items-center gap-1 text-white font-600 text-lg" @click="openDoor(1)">
+         <button  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg" @click="openDoor(1)">
           <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="">
           {{ storeData?.data?.store_name || "等待加入" }}
         </button>
-        <button @click="talkHandle"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button @click="talkHandle"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           对讲       
         </button>
-         <button @click="getVoiceList"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+         <button @click="getVoiceList"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           语音       
         </button>
@@ -300,15 +300,15 @@ const talkHandle = () => {
             </div>
           </div>
         </Button> -->
-        <button @click="openDoor(1)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button @click="openDoor(1)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           门一开门       
         </button>
-        <button @click="openDoor(2)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button @click="openDoor(2)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           门一开门       
         </button>
-        <button @click="lockDoor(0)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button @click="lockDoor(0)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           锁门       
         </button>
@@ -338,11 +338,11 @@ const talkHandle = () => {
             </div>
           </div>
         </Button> -->
-        <button @click="lockDoor(1)"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button @click="lockDoor(1)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           开门       
         </button>
-         <button @click="exitServer()"  class="rounded-[50px] w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+         <button @click="exitServer()"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
           结束服务       
         </button>
@@ -383,9 +383,8 @@ const talkHandle = () => {
         />
       </div>
     </div>
-
     <div class="w-full">
-      <div class="w-full h-50vh">
+      <div class="w-full h-48vh">
           <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!cameraGroup[0]||!cameraGroup[0][0]">
             <img src="@/assets/images/icon_sxt@2x.png" alt="" />
           </div>
@@ -398,7 +397,7 @@ const talkHandle = () => {
         ></video>
       </div>
       <div class="h-1 bg-white"></div>
-      <div class="h-50vh">
+      <div class="h-48vh">
         <div class="w-full flex h-50%">
           <div class="bg-black w-100% h-full flex justify-center items-center" >
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][0]" />
-- 
2.34.1


From d5358ef5633c215958a86bba7ef762f1c295e66e Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 12:21:02 +0800
Subject: [PATCH 13/65] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E9=9F=B3?=
 =?UTF-8?q?=E9=A2=91=E6=9C=8D=E5=8A=A1URL=E5=B9=B6=E6=B7=BB=E5=8A=A0CORS?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor: 移除未使用的用户信息获取逻辑
style: 更新.gitignore添加zip文件忽略
chore: 添加本地开发SSL证书文件
---
 .gitignore                      |  1 +
 src/components/talk.vue         | 20 ++++----------------
 src/http/talkRequest.ts         |  7 +++++--
 src/testKey/localhost+2-key.pem | 28 ++++++++++++++++++++++++++++
 src/testKey/localhost+2.pem     | 27 +++++++++++++++++++++++++++
 vite.config.ts                  |  8 +++++++-
 6 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 src/testKey/localhost+2-key.pem
 create mode 100644 src/testKey/localhost+2.pem

diff --git a/.gitignore b/.gitignore
index a547bf3..4fff125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+*.zip
diff --git a/src/components/talk.vue b/src/components/talk.vue
index dce50b2..a6cde3c 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -18,7 +18,7 @@
 import { ref, onMounted } from 'vue';
 import Dialog from 'primevue/dialog';
 // import Button from 'primevue/button';
-import { talkLogin, broadcastStart, broadcastStop } from "@/api/talk";
+import {  broadcastStart, broadcastStop } from "@/api/talk";
 import md5 from 'md5';
 
 // const visible = ref(false);
@@ -70,19 +70,6 @@ const getStatusText = (status: number) => {
   }
 }
 
-const getUserInfo = () => {
-  talkLogin({
-    username: 'admin',
-    password: md5('admin')
-  }).then(res => {
-    console.log(res)
-    if (res.status === 200) {
-      userInfo.value.accessToken = res.data.data.accessToken
-      userInfo.value.pushKey = res.data.data.pushKey
-    }
-    console.log(userInfo.value)
-  })
-}
 
 const broadcastStatusClick = () => {
   console.log(broadcastStatus.value)
@@ -102,7 +89,8 @@ const broadcastStatusClick = () => {
       console.log(res)
       const streamInfo = res.streamInfo
       if (document.location.protocol.includes('https')) {
-        startBroadcast(streamInfo.rtcs)
+        const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443','https://webrtc.test.7games.store')
+        startBroadcast(rtcs)
       } else {
         startBroadcast(streamInfo.rtc)
       }
@@ -173,7 +161,7 @@ const stopBroadcast = () => {
 }
 
 onMounted(() => {
-  getUserInfo()
+  // getUserInfo()
 })
 </script>
 <style scoped></style>
\ No newline at end of file
diff --git a/src/http/talkRequest.ts b/src/http/talkRequest.ts
index d4d58be..55d44bc 100644
--- a/src/http/talkRequest.ts
+++ b/src/http/talkRequest.ts
@@ -1,12 +1,15 @@
 import axios from 'axios'
 
-const talkUrl = 'http://webrtc.test.7games.store:18080'
+const talkUrl = 'https://audio.test.7games.store'
 
 // create an axios instance
 const service = axios.create({
   baseURL: talkUrl, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 30000 // request timeout
+  timeout: 30000, // request timeout
+  headers:{
+    'Access-Control-Allow-Origin':'*'
+  }
 })
 
 export default service
\ No newline at end of file
diff --git a/src/testKey/localhost+2-key.pem b/src/testKey/localhost+2-key.pem
new file mode 100644
index 0000000..1f17eb0
--- /dev/null
+++ b/src/testKey/localhost+2-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD2XjO7qYpeZANM
+4F+/kDWkTDBEJkbXeVg8Scix6DY+xxi4pYDpux5frP8eb/0NouGPyfRLf3NXri/8
+wQxHuxjaa1uvDkk2ogV1rCwnfmxbeiUY/fKt6U9ukSP4+mt7mBQxnRxPmoAaD7Vc
+09LsL/N7wsnaSOOap9jK9M9lIOnKOdwZbGwT+eemye1b4N+jIAtm6M630vZ0czbL
+xmnff8Yp7ibBvQzb8OIj3zJ4GhhZTKYIW+1R1jyY29h+OfYZu2kWseuLCQc7IXGL
+5MFZ6N1euCo3RD+hcGo+zQl5ikzPL2CikTyqH/Da1cTzjUnMb02UbH0dCj00zgIe
+2j5K9XIXAgMBAAECggEBALDj3EMerOGu74uwAi9ZzJoFthYIYY7uakMHOxk5wFD8
+xKw28MNg/aL2ZEqnX8r9qvSBrWzTuq42u++/cCDEnkidErwzBrA6Tq85io5kwEpB
+/gbetvLVdJnPjkODEc8w1zb0NlKVfOq5Yp+e22+H0kuHBUU8VmdBom++rHZQ1mvC
+DLb40+XDRLzosGDnZxaTqrbeSOwLBumdmo6RMA2340vgUrnnGroLHgeI1HJZ+rn/
+wEjLseyvGOxS9LPZ9NMWzzBMnerT4dFgPYypG6HvPQ3euSPcqwOmys49Ou6GAdGZ
+Fg5AQJCj+wrc9TiZpCdQlOlRNht3qn5o3DO5z4YJIRECgYEA+PJD2GFNpnejkE0U
+QCMVZx7T4zLO2+sPEtUbclUzeLJVMRUWY837BonNUatpAALNTbWanP+gDYmzRfAN
+Q5Ul/VP/vTO/uWBpWXNhZm4m5eIHuQrcxk4EhzTBTQhsoBBA5TaTvCVdWHD/8Ci2
+nmTAUMMTZf3eRS9VCqzTyf228YkCgYEA/Vk8HUGdOE9SgtluBO0q02ddQHcB1dIG
+EaDaCMarxBYfh/pBIJ5KbHSbk2iGhe+KOArKAPAFvohCCJpmsFM9qN9XTBkG6pTK
+9N/3jlPSupNGEgyxYgzHQbEfIsL3uzVrYrs087cQn7iFOEBf5o3B18kEnUCON84B
+WupO0PbUfp8CgYEAph5jj3w+qJqlFqGYpcPDgHBdy/oXd0C/aj2ydvTLx/qYRoxf
+yHGm1JIX5CuRgWRdQ0Gvzpv1XZNJgZ3R/AsGsqjeuo5RnY3sPrhzgjp20mel56CL
++fgNpXtakeDRO24dH9bvdlkolN+yqbtBQSjR/BJwW1qwe1I+WUVCfkNDVKECgYAz
+mI/QmYNOa4EvWt64LCDzqvJn5ZS/GiXYQz0EWomyxpqnU8Udwn7/tYPVsozrDAzH
+OxNGu5s/4XopTGCrelhtYwbhXZt1/NWUp2RAXTvmeYXkuScLA/U0oMDpkHFpdAip
+s9yl4duF28tt2FZvmuEmdC73Y6VTIiZOgLeKgSpnmwKBgQDmqXROzaeXUVM0QZwW
+ijwMsgKschvfPvI+6rFstIS22iBbq1SEltiZ2gs2jaRojvWqdaI9y0XojL+jMMB1
+J8OkzFZDszXVwkmBwrv3crUwNiXRTHcjLDEFOsKw0QwH6HSMMlDB4/2uecArT/QL
+F0VxBVe6zK9v1Hlbp8NZARTGfw==
+-----END PRIVATE KEY-----
diff --git a/src/testKey/localhost+2.pem b/src/testKey/localhost+2.pem
new file mode 100644
index 0000000..ac5edfe
--- /dev/null
+++ b/src/testKey/localhost+2.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEgDCCAuigAwIBAgIRANK8atzwJapubUcr/m+aJvkwDQYJKoZIhvcNAQELBQAw
+gZsxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTE4MDYGA1UECwwvREVT
+S1RPUC00STJPSkJSXFpodWFuWkBERVNLVE9QLTRJMk9KQlIgKFpodWFuWikxPzA9
+BgNVBAMMNm1rY2VydCBERVNLVE9QLTRJMk9KQlJcWmh1YW5aQERFU0tUT1AtNEky
+T0pCUiAoWmh1YW5aKTAeFw0yNTA3MDEwMTI4MDZaFw0yNzEwMDEwMTI4MDZaMGMx
+JzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTE4MDYGA1UE
+CwwvREVTS1RPUC00STJPSkJSXFpodWFuWkBERVNLVE9QLTRJMk9KQlIgKFpodWFu
+WikwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2XjO7qYpeZANM4F+/
+kDWkTDBEJkbXeVg8Scix6DY+xxi4pYDpux5frP8eb/0NouGPyfRLf3NXri/8wQxH
+uxjaa1uvDkk2ogV1rCwnfmxbeiUY/fKt6U9ukSP4+mt7mBQxnRxPmoAaD7Vc09Ls
+L/N7wsnaSOOap9jK9M9lIOnKOdwZbGwT+eemye1b4N+jIAtm6M630vZ0czbLxmnf
+f8Yp7ibBvQzb8OIj3zJ4GhhZTKYIW+1R1jyY29h+OfYZu2kWseuLCQc7IXGL5MFZ
+6N1euCo3RD+hcGo+zQl5ikzPL2CikTyqH/Da1cTzjUnMb02UbH0dCj00zgIe2j5K
+9XIXAgMBAAGjdjB0MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcD
+ATAfBgNVHSMEGDAWgBQoaqXU0ZpMm2M3AEdr+rOiND9aMTAsBgNVHREEJTAjggls
+b2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwDQYJKoZIhvcNAQELBQAD
+ggGBAESPMqHz9OMSgNk4uiTHUxtEnDnmrGN1rNHSz+5ZvVexIt4OPlhh+X/TDmQ3
+vjkdF1UyG8RIqJ7N3sNgPIBj4fW48skWhLU1NZtrUWCxRmveZXsDqPDmx+AErSCR
+/XySMr4dn07GLh/cbWr6mLn5/2PMaSC8YJtMLMkmEHiBttaTNAnC7JUu3epu0iQY
+shCEpu+UKpX3WiTDitS5KzcPTgH7xLuLVFANwnkP+KGge96WrZ5AA10Uq41eW2Ir
+JHkQfKqt+k2gK0donZTbCRoWoI//uirnNcWtybZegVAgzv75UdlDkOfdQMNSYzBR
+qfvb7YcBv/2f+YKoGxGPjilIxg7cphPhX4SH1EzuTY6zxLHrOdGRzks701R3D15g
+Xv37oOJTcjpqWWCVPnGreNfAR9W3Hl8WMPHfnSxid4823XwFEjDnHvGOFBcKLp1P
+zSAWZnQp0vgfpMrCwPx3QH0ZxM7gN/Ff2rhrYzmdXn1vdGmO2NDeU6Lw/ScP1qKl
+G72f4w==
+-----END CERTIFICATE-----
diff --git a/vite.config.ts b/vite.config.ts
index 3ec8153..834b848 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,10 +3,13 @@ import vue from "@vitejs/plugin-vue";
 import UnoCSS from "unocss/vite";
 // import basicSsl from "@vitejs/plugin-basic-ssl";
 import { resolve } from "path";
+import fs from 'fs'
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd());
   console.log(env);
+
+
   return {
     plugins: [vue(), UnoCSS(),
       //  basicSsl()
@@ -14,7 +17,10 @@ export default defineConfig(({ mode }) => {
     server: {
       port: 4444,
       host: "0.0.0.0",
-      // https: true as unknown as any,
+      // https: {
+      //   key: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2-key.pem')),
+      //   cert: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2.pem'))
+      // },
       proxy: {
         "/index/api/webrtc": {
           target: "http://webrtc.test.7games.store",
-- 
2.34.1


From e9ef53a474c28aed9eb9111453d5cd60d781cb8b Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 12:33:18 +0800
Subject: [PATCH 14/65] =?UTF-8?q?feat:video=20muted=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 587a7b8..8d16c22 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -61,6 +61,7 @@ const cameraGroup = computed(()=>{
     return []
   }
 })
+const isMuted = ref(true)
 const goodsList = ref<any[]>([])
 const totalPrice = computed(()=>{
   if(goodsList.value.length){
@@ -156,9 +157,26 @@ ws.once("TOKEN", (data) => {
   console.log("token获取", data.token);
   token.value = data.token;
 });
+const videoList = ref<any[]>([])
 onMounted(async () => {
   // await connectionRtc();
   // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
+  const videoDom = [videoRef1.value,videoRef2.value,videoRef3.value,videoRef4.value,videoRef5.value,videoRef6.value,videoRef7.value,videoRef8.value,videoRef9.value]
+  videoList.value = videoDom.map((e,i)=>{
+    if(!i){
+      return {
+        el:e,
+        main:true,
+        stream:null
+      }
+    }else{
+      return {
+        el:e,
+        main:false,
+        stream:null
+      }
+    }
+  })
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
@@ -187,6 +205,7 @@ const exitServer = async () => {
 const talkHandle = () => {
   console.log("开始对讲");
   isTalking.value = true;
+  isMuted.value =false
 };
 </script>
 
@@ -393,7 +412,7 @@ const talkHandle = () => {
         v-show="cameraGroup[0]&&cameraGroup[0][0]"
           class="w-full aspect-ratio-video h-50vh"
           autoplay
-          muted
+          :muted="isMuted"
         ></video>
       </div>
       <div class="h-1 bg-white"></div>
-- 
2.34.1


From 85dbf874f90014a6883137b74c97a915bd807927 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 12:36:03 +0800
Subject: [PATCH 15/65] =?UTF-8?q?feat(=E5=AF=B9=E8=AE=B2=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?):=20=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E5=AF=B9=E8=AE=B2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E6=94=AF=E6=8C=81=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在App.vue中添加closeTalk方法处理对讲关闭事件
- 修改talk组件支持通过props接收设备ID和通道ID参数
- 添加close事件处理对话框关闭时的资源释放
- 同步更新广播状态处理逻辑
---
 src/App.vue             |  7 ++++++-
 src/components/talk.vue | 24 +++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 587a7b8..6069d8b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -188,6 +188,10 @@ const talkHandle = () => {
   console.log("开始对讲");
   isTalking.value = true;
 };
+
+const closeTalk = ()=>{
+  console.log('关闭对讲')
+}
 </script>
 
 <template>
@@ -208,7 +212,8 @@ const talkHandle = () => {
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue v-model="isTalking" id="202309001"></talkVue>
+  <talkVue v-model="isTalking"  id="202309001" :device-id="'44010200492000000001'"
+  :channel-id="'34020000001310000001'" @close="closeTalk"></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none;" muted></video>
     <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px" v-if="goodsList.length">
diff --git a/src/components/talk.vue b/src/components/talk.vue
index a6cde3c..960f3a5 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -14,7 +14,7 @@
   </Dialog>
 </template>
 
-<script lang='ts' setup>``
+<script lang='ts' setup>
 import { ref, onMounted } from 'vue';
 import Dialog from 'primevue/dialog';
 // import Button from 'primevue/button';
@@ -27,11 +27,19 @@ const broadcastStatus = ref(-1)  // -2 正在释放资源 -1 默认状态 0 等
 let broadcastRtc;
 
 
- defineProps({
+ const props = defineProps({
   modelValue: Boolean,
   id: {
     type: String,
     required: true
+  },
+  deviceId: {
+    type: String,
+    required: true
+  },
+  channelId: {
+    type: String,
+    required: true
   }
 });
 
@@ -44,15 +52,21 @@ const userInfo = ref({
 })
 
 const deviceInfo = ref({
-  deviceId: '44010200492000000001',
-  channelId: '34020000001310000001',
+  deviceId: props.deviceId,
+  channelId: props.channelId,
   broadcastMode: false
 })
 
-const emit = defineEmits(['update:modelValue']);
+// 新增emit事件定义
+const emit = defineEmits(['update:modelValue', 'close']);
 
+// 修改可见性处理方法
 const handleVisibleChange = (val: boolean) => {
   emit('update:modelValue', val);
+  if (!val) {
+    stopBroadcast(); // 同步停止广播
+    emit('close'); // 对话框关闭时触发
+  }
 }
 
 const getStatusText = (status: number) => {
-- 
2.34.1


From 0c3df9bd4c20b92491cf5ac799943ea643b1f585 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 12:37:53 +0800
Subject: [PATCH 16/65] =?UTF-8?q?fix(talk):=20=E4=BF=AE=E5=A4=8D=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=85=B3=E9=97=AD=E6=97=B6=E6=9C=AA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=81=9C=E6=AD=A2=E5=B9=BF=E6=92=AD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在对话框关闭时，只有当广播状态不为-1时才更新状态并停止广播，避免重复调用stopBroadcast
---
 src/components/talk.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/talk.vue b/src/components/talk.vue
index 960f3a5..f5247c5 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -64,7 +64,10 @@ const emit = defineEmits(['update:modelValue', 'close']);
 const handleVisibleChange = (val: boolean) => {
   emit('update:modelValue', val);
   if (!val) {
-    stopBroadcast(); // 同步停止广播
+    if(broadcastStatus.value !== -1){
+      broadcastStatus.value = -1
+      stopBroadcast()
+    }
     emit('close'); // 对话框关闭时触发
   }
 }
-- 
2.34.1


From b1ac66d92fdd98fee8e55006f4dd62285d987791 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 12:38:51 +0800
Subject: [PATCH 17/65] feat:1

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index 1505370..5f07738 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -177,6 +177,7 @@ onMounted(async () => {
       }
     }
   })
+  console.log("视频列表",videoList.value)
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
-- 
2.34.1


From 610f8ab1d7edf9a69ac70524ca9a984b329e19e7 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 12:39:43 +0800
Subject: [PATCH 18/65] feat:1

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index 5f07738..ffdc8ed 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -211,6 +211,7 @@ const talkHandle = () => {
 
 const closeTalk = ()=>{
   console.log('关闭对讲')
+  isMuted.value =true
 }
 </script>
 
-- 
2.34.1


From eba6f5e5caab9cd5058b17e9779a2ef2927c3bde Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 13:03:10 +0800
Subject: [PATCH 19/65] =?UTF-8?q?feat:=E8=A7=86=E9=A2=91=E6=B5=81=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 548 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 371 insertions(+), 177 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ffdc8ed..4ba7cc8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,7 +2,7 @@
 // import Button from "primevue/button";
 import Input from "primevue/inputtext";
 import Dialog from "primevue/dialog";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, ref, watchEffect } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
 import {
@@ -20,64 +20,75 @@ const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
 const storeData = ref<any | null>(null);
-const videoRef1 = ref<HTMLVideoElement|null>()
-const videoRef2 = ref<HTMLVideoElement|null>()
-const videoRef3 = ref<HTMLVideoElement|null>()
-const videoRef4 = ref<HTMLVideoElement|null>()
-const videoRef5 = ref<HTMLVideoElement|null>()
-const videoRef6 = ref<HTMLVideoElement|null>()
-const videoRef7 = ref<HTMLVideoElement|null>()
-const videoRef8 = ref<HTMLVideoElement|null>()
-const videoRef9 = ref<HTMLVideoElement|null>()
+const videoRef1 = ref<HTMLVideoElement | null>();
+const videoRef2 = ref<HTMLVideoElement | null>();
+const videoRef3 = ref<HTMLVideoElement | null>();
+const videoRef4 = ref<HTMLVideoElement | null>();
+const videoRef5 = ref<HTMLVideoElement | null>();
+const videoRef6 = ref<HTMLVideoElement | null>();
+const videoRef7 = ref<HTMLVideoElement | null>();
+const videoRef8 = ref<HTMLVideoElement | null>();
+const videoRef9 = ref<HTMLVideoElement | null>();
 // const customerServiceId = ref("")
 // const storeName = ref("")
 // const storeId = ref("")
 // const cameras = ref<string[]>([])
 const voiceList = ref<any[]>([]);
-const cameraList = ref<any[]>([])
-const cameraGroup = computed(()=>{
-  const videoDom = [videoRef1.value,videoRef2.value,videoRef3.value,videoRef4.value,videoRef5.value,videoRef6.value,videoRef7.value,videoRef8.value,videoRef9.value]
-  if(cameraList.value.length){
-    const _i = cameraList.value[0]
-    videoRef1.value!.srcObject = _i
-    chunkArray(cameraList.value.slice(1),4).forEach((e,i)=>{
-      e.forEach((el,j)=>{
+const cameraList = ref<any[]>([]);
+const cameraGroup = computed(() => {
+  const videoDom = [
+    videoRef1.value,
+    videoRef2.value,
+    videoRef3.value,
+    videoRef4.value,
+    videoRef5.value,
+    videoRef6.value,
+    videoRef7.value,
+    videoRef8.value,
+    videoRef9.value,
+  ];
+  if (cameraList.value.length) {
+    const _i = cameraList.value[0];
+    videoRef1.value!.srcObject = _i;
+    chunkArray(cameraList.value.slice(1), 4).forEach((e, i) => {
+      e.forEach((el, j) => {
         switch (i) {
           case 0:
-            console.log(videoDom[j+1]!.srcObject)
-            videoDom[j+1]!.srcObject = el
+            console.log(videoDom[j + 1]!.srcObject);
+            videoDom[j + 1]!.srcObject = el;
             break;
           case 1:
-            console.log(videoDom[j+5]!.srcObject)
-            videoDom[j+5]!.srcObject = el
+            console.log(videoDom[j + 5]!.srcObject);
+            videoDom[j + 5]!.srcObject = el;
             break;
           default:
             break;
-      }
-      })
-    })
-    return [[_i],...chunkArray(cameraList.value.slice(1),4)]
-  }else{
-    return []
+        }
+      });
+    });
+    return [[_i], ...chunkArray(cameraList.value.slice(1), 4)];
+  } else {
+    return [];
   }
-})
-const isMuted = ref(true)
-const goodsList = ref<any[]>([])
-const totalPrice = computed(()=>{
-  if(goodsList.value.length){
-    let price = 0
-    goodsList.value.forEach(e=>{
-      price += e.goods_price * e.goods_number
-    })
-    return price
-  } else{
-    return 0
+});
+
+const isMuted = ref(true);
+const goodsList = ref<any[]>([]);
+const totalPrice = computed(() => {
+  if (goodsList.value.length) {
+    let price = 0;
+    goodsList.value.forEach((e) => {
+      price += e.goods_price * e.goods_number;
+    });
+    return price;
+  } else {
+    return 0;
   }
-})
+});
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
-const startPlay = async (url:string) => {
+const startPlay = async (url: string) => {
   const player = new ZLMRTCClient.Endpoint({
-    element:document.querySelector("#video"),
+    element: document.querySelector("#video"),
     debug: true,
     recvOnly: "play",
     audioEnable: true,
@@ -86,7 +97,7 @@ const startPlay = async (url:string) => {
       w: 1280,
       h: 720,
     },
-    zlmsdpUrl:url,
+    zlmsdpUrl: url,
   });
   player.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, function () {
     // ICE 协商出错
@@ -97,8 +108,8 @@ const startPlay = async (url:string) => {
     //获取到了远端流，可以播放,如果element 为null 或者不传,可以在这里播放(如下注释代码)
     // console.log(document.getElementById("video"))
     // (document.getElementById("video")! as HTMLVideoElement).srcObject = s;
-    cameraList.value.push(s)
-    console.log("播放成功", s,cameraList.value);
+    cameraList.value.push(s);
+    console.log("播放成功", s, cameraList.value);
   });
   player.on(
     ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED,
@@ -139,45 +150,62 @@ const getVoiceList = async () => {
 ws.once("SHOP_INFO", (data) => {
   console.log("商店登录", data);
   storeData.value = data;
-  if(data?.data?.store_device?.camera?.length){
+  if (data?.data?.store_device?.camera?.length) {
     // chunkArray(data?.data?.store_device?.camera,3)
-    data.data.store_device.camera.forEach((e:string)=>{
-      startPlay(e)
-    })
+    data.data.store_device.camera.forEach((e: string) => {
+      startPlay(e);
+    });
   }
- 
-  console.log(data.data.store_device.camera)
+
+  console.log(data.data.store_device.camera);
 });
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
-  goodsList.value = data.data.order_info.goods_list
-  console.log("商店订单",goodsList.value)
+  goodsList.value = data.data.order_info.goods_list;
+  console.log("商店订单", goodsList.value);
 });
 ws.once("TOKEN", (data) => {
   console.log("token获取", data.token);
   token.value = data.token;
 });
-const videoList = ref<any[]>([])
+const videoList = ref<any[]>([]);
+watchEffect(() => {
+  videoList.value.forEach((e) => {
+    if (e.stream) e.el.srcObject = e.stream;
+  });
+});
 onMounted(async () => {
   // await connectionRtc();
   // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
-  const videoDom = [videoRef1.value,videoRef2.value,videoRef3.value,videoRef4.value,videoRef5.value,videoRef6.value,videoRef7.value,videoRef8.value,videoRef9.value]
-  videoList.value = videoDom.map((e,i)=>{
-    if(!i){
+  const videoDom = [
+    videoRef1.value,
+    videoRef2.value,
+    videoRef3.value,
+    videoRef4.value,
+    videoRef5.value,
+    videoRef6.value,
+    videoRef7.value,
+    videoRef8.value,
+    videoRef9.value,
+  ];
+  videoList.value = videoDom.map((e, i) => {
+    if (!i) {
       return {
-        el:e,
-        main:true,
-        stream:null
-      }
-    }else{
+        id: i,
+        el: e,
+        main: true,
+        stream: null,
+      };
+    } else {
       return {
-        el:e,
-        main:false,
-        stream:null
-      }
+        id: i,
+        el: e,
+        main: false,
+        stream: null,
+      };
     }
-  })
-  console.log("视频列表",videoList.value)
+  });
+  console.log("视频列表", videoList.value);
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
@@ -185,7 +213,7 @@ const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
 };
-const lockDoor = async (type: number ) => {
+const lockDoor = async (type: number) => {
   if (!storeData.value?.data?.store_id) return;
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
@@ -195,28 +223,41 @@ const setVoice = async (id: number) => {
 };
 
 const exitServer = async () => {
-  if (!storeData.value?.data?.store_id||!storeData.value?.data?.customer_service_id) return;
-  await exitServerApi(storeData.value?.data?.customer_service_id, storeData.value?.data?.store_id, token.value);
-  token.value = ""
-  storeData.value = {}
-  cameraList.value = []
-  goodsList.value = []
+  if (
+    !storeData.value?.data?.store_id ||
+    !storeData.value?.data?.customer_service_id
+  )
+    return;
+  await exitServerApi(
+    storeData.value?.data?.customer_service_id,
+    storeData.value?.data?.store_id,
+    token.value
+  );
+  token.value = "";
+  storeData.value = {};
+  cameraList.value = [];
+  goodsList.value = [];
 };
 
 const talkHandle = () => {
   console.log("开始对讲");
   isTalking.value = true;
-  isMuted.value =false
+  isMuted.value = false;
 };
 
-const closeTalk = ()=>{
-  console.log('关闭对讲')
-  isMuted.value =true
-}
+const closeTalk = () => {
+  console.log("关闭对讲");
+  isMuted.value = true;
+};
+const changemedie = (id: number) => {
+  console.log(id);
+  const item = videoList.value.find((e) => e.id === id);
+  console.log(item);
+  videoList[0].value.stream = item.stream;
+};
 </script>
 
 <template>
-  
   <Dialog
     v-model:visible="visible"
     modal
@@ -233,45 +274,52 @@ const closeTalk = ()=>{
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue v-model="isTalking"  id="202309001" :device-id="'44010200492000000001'"
-  :channel-id="'34020000001310000001'" @close="closeTalk"></talkVue>
+  <talkVue
+    v-model="isTalking"
+    id="202309001"
+    :device-id="'44010200492000000001'"
+    :channel-id="'34020000001310000001'"
+    @close="closeTalk"
+  ></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
-    <video src="" id="video" class="w-100px" style="display: none;" muted></video>
-    <div class="z-100 fixed right-4  w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px" v-if="goodsList.length">
+    <video
+      src=""
+      id="video"
+      class="w-100px"
+      style="display: none"
+      muted
+    ></video>
+    <div
+      class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
+      v-if="goodsList.length"
+    >
       <div class="flex justify-between items-center px-4 py-2 text-white">
-        <div>
-          购物车
-        </div>
+        <div>购物车</div>
       </div>
       <div class="h-1px bg-white mx-4"></div>
       <div>
-       
-     <table class="text-white w-full m-4">
-    <thead>
-      <tr>
-        <th class="text-left">商品名称</th>
-        <th class="text-left">单价</th>
-        <th class="text-left">数量</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr class="m-4" v-for="(item, index) in goodsList" :key="index">
-        <td >{{ item.goods_name }}</td>
-        <td >¥{{ item.goods_price }}</td>
-        <td >{{ item.goods_number }}</td>
-      </tr>
-    </tbody>
-  </table>
-   <div class="h-1px bg-white m-4"></div>
-   <div class="flex justify-between items-center px-4 py-2 text-white">
-      <div>
-        合计
+        <table class="text-white w-full m-4">
+          <thead>
+            <tr>
+              <th class="text-left">商品名称</th>
+              <th class="text-left">单价</th>
+              <th class="text-left">数量</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr class="m-4" v-for="(item, index) in goodsList" :key="index">
+              <td>{{ item.goods_name }}</td>
+              <td>¥{{ item.goods_price }}</td>
+              <td>{{ item.goods_number }}</td>
+            </tr>
+          </tbody>
+        </table>
+        <div class="h-1px bg-white m-4"></div>
+        <div class="flex justify-between items-center px-4 py-2 text-white">
+          <div>合计</div>
+          <div>¥{{ totalPrice }}</div>
+        </div>
       </div>
-      <div>
-        ¥{{ totalPrice }}
-      </div>
-   </div>
-  </div>
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
       <div class="flex items-center gap-2 h-4vh">
@@ -287,19 +335,40 @@ const closeTalk = ()=>{
             </div>
           </div>
         </Button> -->
-         <button  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg" @click="openDoor(1)">
-          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="">
+        <button
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg"
+          @click="openDoor(1)"
+        >
+          <img
+            src="@/assets/images/icon_cs@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
           {{ storeData?.data?.store_name || "等待加入" }}
         </button>
-        <button @click="talkHandle"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          对讲       
+        <button
+          @click="talkHandle"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          对讲
         </button>
-         <button @click="getVoiceList"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          语音       
+        <button
+          @click="getVoiceList"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          语音
         </button>
-        
+
         <!-- <Button
           @click="getVoiceList"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
@@ -326,17 +395,38 @@ const closeTalk = ()=>{
             </div>
           </div>
         </Button> -->
-        <button @click="openDoor(1)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          门一开门       
+        <button
+          @click="openDoor(1)"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          门一开门
         </button>
-        <button @click="openDoor(2)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          门一开门       
+        <button
+          @click="openDoor(2)"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          门一开门
         </button>
-        <button @click="lockDoor(0)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          锁门       
+        <button
+          @click="lockDoor(0)"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          锁门
         </button>
         <!-- <Button
           @click="openDoor(2)"
@@ -364,13 +454,27 @@ const closeTalk = ()=>{
             </div>
           </div>
         </Button> -->
-        <button @click="lockDoor(1)"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          开门       
+        <button
+          @click="lockDoor(1)"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          开门
         </button>
-         <button @click="exitServer()"  class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="">
-          结束服务       
+        <button
+          @click="exitServer()"
+          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        >
+          <img
+            src="@/assets/images/icon_dj@2x.png"
+            class="w-20px h-20px"
+            alt=""
+          />
+          结束服务
         </button>
         <!-- <Button
           @click="lockDoor(1)"
@@ -411,12 +515,15 @@ const closeTalk = ()=>{
     </div>
     <div class="w-full">
       <div class="w-full h-48vh">
-          <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!cameraGroup[0]||!cameraGroup[0][0]">
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" />
-          </div>
+        <div
+          class="bg-black w-100% h-full flex justify-center items-center"
+          v-show="!videoList[0]?.stream"
+        >
+          <img src="@/assets/images/icon_sxt@2x.png" alt="" />
+        </div>
         <video
-        ref="videoRef1"
-        v-show="cameraGroup[0]&&cameraGroup[0][0]"
+          ref="videoRef1"
+          v-show="videoList[0]?.stream"
           class="w-full aspect-ratio-video h-50vh"
           autoplay
           :muted="isMuted"
@@ -425,49 +532,136 @@ const closeTalk = ()=>{
       <div class="h-1 bg-white"></div>
       <div class="h-48vh">
         <div class="w-full flex h-50%">
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][0]" />
-            <video autoplay
-          muted ref="videoRef2" class="w-full aspect-ratio-video" v-show="cameraGroup[1]&&cameraGroup[1][0]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[1]?.stream"
+            />
+            <video
+              autoplay
+              muted
+              @click="changemedie(1)"
+              ref="videoRef2"
+              class="w-full aspect-ratio-video"
+              v-show="videoList[1]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][1]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef3" src="" v-show="cameraGroup[1]&&cameraGroup[1][1]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[2]?.stream"
+            />
+            <video
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef3"
+              src=""
+              @click="changemedie(2)"
+              v-show="videoList[2]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][2]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef4" src="" v-show="cameraGroup[1]&&cameraGroup[1][2]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[3]?.stream"
+            />
+            <video
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef4"
+              src=""
+              @click="changemedie(3)"
+              v-show="videoList[3]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[1]||!cameraGroup[1][3]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef5" src="" v-show="cameraGroup[1]&&cameraGroup[1][3]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[4]?.stream"
+            />
+            <video
+              @click="changemedie(4)"
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef5"
+              src=""
+              v-show="videoList[4]?.stream"
+            ></video>
           </div>
         </div>
         <div class="w-full flex h-50%">
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][0]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef6" src="" v-show="cameraGroup[2]&&cameraGroup[2][0]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[5]?.stream"
+            />
+            <video
+              @click="changemedie(5)"
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef6"
+              src=""
+              v-show="videoList[5]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][1]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef7" src="" v-show="cameraGroup[2]&&cameraGroup[2][1]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[6]?.stream"
+            />
+            <video
+              @click="changemedie(5)"
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef7"
+              src=""
+              v-show="videoList[6]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center"  >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][2]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef8" src="" v-show="cameraGroup[2]&&cameraGroup[2][2]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[7]?.stream"
+            />
+            <video
+              @click="changemedie(7)"
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef8"
+              src=""
+              v-show="videoList[7]?.stream"
+            ></video>
           </div>
-          <div class="bg-black w-100% h-full flex justify-center items-center" >
-            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!cameraGroup[2]||!cameraGroup[2][3]"/>
-            <video class="w-full aspect-ratio-video" autoplay
-          muted ref="videoRef9" src="" v-show="cameraGroup[2]&&cameraGroup[2][3]"></video>
+          <div class="bg-black w-100% h-full flex justify-center items-center">
+            <img
+              src="@/assets/images/icon_sxt@2x.png"
+              alt=""
+              v-show="!videoList[8]?.stream"
+            />
+            <video
+              @click="changemedie(8)"
+              class="w-full aspect-ratio-video"
+              autoplay
+              muted
+              ref="videoRef9"
+              src=""
+              v-show="videoList[8]?.stream"
+            ></video>
           </div>
-        </div>     
+        </div>
       </div>
     </div>
   </div>
-- 
2.34.1


From 14f0bbf56080bb2e1125c8f2d0ccbb079f2db371 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 13:04:37 +0800
Subject: [PATCH 20/65] =?UTF-8?q?chore:=E7=BB=93=E6=9D=9F=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index 4ba7cc8..5c888d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -223,6 +223,11 @@ const setVoice = async (id: number) => {
 };
 
 const exitServer = async () => {
+  console.log(
+    "结束服务",
+    storeData.value?.data?.customer_service_id,
+    storeData.value?.data?.store_id
+  );
   if (
     !storeData.value?.data?.store_id ||
     !storeData.value?.data?.customer_service_id
-- 
2.34.1


From 651864b460ef276fb91b0635d123b43db7bc9bf3 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 13:53:44 +0800
Subject: [PATCH 21/65] =?UTF-8?q?fixed:=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E5=AA=92=E4=BD=93=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 44 +++++---------------------------------------
 1 file changed, 5 insertions(+), 39 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5c888d6..b8cf11c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,42 +35,6 @@ const videoRef9 = ref<HTMLVideoElement | null>();
 // const cameras = ref<string[]>([])
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
-const cameraGroup = computed(() => {
-  const videoDom = [
-    videoRef1.value,
-    videoRef2.value,
-    videoRef3.value,
-    videoRef4.value,
-    videoRef5.value,
-    videoRef6.value,
-    videoRef7.value,
-    videoRef8.value,
-    videoRef9.value,
-  ];
-  if (cameraList.value.length) {
-    const _i = cameraList.value[0];
-    videoRef1.value!.srcObject = _i;
-    chunkArray(cameraList.value.slice(1), 4).forEach((e, i) => {
-      e.forEach((el, j) => {
-        switch (i) {
-          case 0:
-            console.log(videoDom[j + 1]!.srcObject);
-            videoDom[j + 1]!.srcObject = el;
-            break;
-          case 1:
-            console.log(videoDom[j + 5]!.srcObject);
-            videoDom[j + 5]!.srcObject = el;
-            break;
-          default:
-            break;
-        }
-      });
-    });
-    return [[_i], ...chunkArray(cameraList.value.slice(1), 4)];
-  } else {
-    return [];
-  }
-});
 
 const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
@@ -170,7 +134,7 @@ ws.once("TOKEN", (data) => {
 });
 const videoList = ref<any[]>([]);
 watchEffect(() => {
-  videoList.value.forEach((e) => {
+  cameraList.value.forEach((e) => {
     if (e.stream) e.el.srcObject = e.stream;
   });
 });
@@ -255,9 +219,10 @@ const closeTalk = () => {
   isMuted.value = true;
 };
 const changemedie = (id: number) => {
-  console.log(id);
   const item = videoList.value.find((e) => e.id === id);
-  console.log(item);
+  console.log(item, id);
+  if (!item || !item.stream)
+    return console.error("传入id有问题或者点击的视频没有流", item, item.stream);
   videoList[0].value.stream = item.stream;
 };
 </script>
@@ -601,6 +566,7 @@ const changemedie = (id: number) => {
             ></video>
           </div>
         </div>
+        <div class="h-1px bg-white"></div>
         <div class="w-full flex h-50%">
           <div class="bg-black w-100% h-full flex justify-center items-center">
             <img
-- 
2.34.1


From ebad99f1b659534f1fb69826385a612a46904ea5 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 14:00:49 +0800
Subject: [PATCH 22/65] =?UTF-8?q?fixed:=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b8cf11c..dc061c9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -73,6 +73,9 @@ const startPlay = async (url: string) => {
     // console.log(document.getElementById("video"))
     // (document.getElementById("video")! as HTMLVideoElement).srcObject = s;
     cameraList.value.push(s);
+    cameraList.value.forEach((e,i)=>{
+      videoList.value[i].stream = e
+    })
     console.log("播放成功", s, cameraList.value);
   });
   player.on(
@@ -134,7 +137,7 @@ ws.once("TOKEN", (data) => {
 });
 const videoList = ref<any[]>([]);
 watchEffect(() => {
-  cameraList.value.forEach((e) => {
+  videoList.value.forEach((e) => {
     if (e.stream) e.el.srcObject = e.stream;
   });
 });
@@ -192,6 +195,10 @@ const exitServer = async () => {
     storeData.value?.data?.customer_service_id,
     storeData.value?.data?.store_id
   );
+  token.value = "";
+  storeData.value = {};
+  cameraList.value = [];
+  goodsList.value = [];
   if (
     !storeData.value?.data?.store_id ||
     !storeData.value?.data?.customer_service_id
@@ -202,10 +209,6 @@ const exitServer = async () => {
     storeData.value?.data?.store_id,
     token.value
   );
-  token.value = "";
-  storeData.value = {};
-  cameraList.value = [];
-  goodsList.value = [];
 };
 
 const talkHandle = () => {
-- 
2.34.1


From 7ab941663c1ee876dc02ca8341b6ff18a17cad5f Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 15:55:46 +0800
Subject: [PATCH 23/65] =?UTF-8?q?feat:=E7=BB=93=E6=9D=9F=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 127 +++++++++++++++++++++-------------------------------
 1 file changed, 52 insertions(+), 75 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dc061c9..0f4a3f1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,7 @@ import {
   setVoiceApi,
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
-import { chunkArray } from "./utils/utils";
+// import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
 const token = ref("");
@@ -114,7 +114,7 @@ const getVoiceList = async () => {
   voiceList.value = data;
   visible.value = true;
 };
-ws.once("SHOP_INFO", (data) => {
+ws.on("SHOP_INFO", (data) => {
   console.log("商店登录", data);
   storeData.value = data;
   if (data?.data?.store_device?.camera?.length) {
@@ -142,6 +142,11 @@ watchEffect(() => {
   });
 });
 onMounted(async () => {
+  window.onbeforeunload =async(e:BeforeUnloadEvent)=>{
+    e.preventDefault()
+    await exitServer()
+    // return ''
+  }
   // await connectionRtc();
   // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
   const videoDom = [
@@ -176,41 +181,61 @@ onMounted(async () => {
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
+// onUnmounted(async ()=>{
+//   await exitServer()
+//   alert("111111")
+// })
 const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
 };
 const lockDoor = async (type: number) => {
   if (!storeData.value?.data?.store_id) return;
+  if(!type)doorStatus.value = true
+  else doorStatus.value = false
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
 const setVoice = async (id: number) => {
+  console.log("音频id",id)
   if (!storeData.value?.data?.store_id) return;
   return await setVoiceApi(storeData.value?.data?.store_id, id);
 };
 
 const exitServer = async () => {
-  console.log(
-    "结束服务",
-    storeData.value?.data?.customer_service_id,
-    storeData.value?.data?.store_id
-  );
-  token.value = "";
+  // console.log(
+  //   "结束服务",
+  //   storeData.value?.data?.store_id,
+  //   storeData.value?.customer_service_id
+  // );
+ 
+  
+  // await 
+  console.log(storeData.value?.data?.store_id,storeData.value?.customer_service_id)
+  console.log(!storeData.value?.data?.store_id,!storeData.value?.customer_service_id)
+   console.log("结束服务",!storeData.value?.data?.store_id||!storeData.value?.customer_service_id)
+  if (
+    !storeData.value?.data?.store_id ||
+    !storeData.value?.customer_service_id
+  )
+    return;
+
+    await lockDoor(0)
+    ws.sendData({
+      instruction: "END_SERVICE",
+      storeId:storeData.value?.data?.store_id
+    })
+       token.value = "";
   storeData.value = {};
   cameraList.value = [];
   goodsList.value = [];
-  if (
-    !storeData.value?.data?.store_id ||
-    !storeData.value?.data?.customer_service_id
-  )
-    return;
+  videoList.value.forEach(e=>(e.stream=null))
   await exitServerApi(
     storeData.value?.data?.customer_service_id,
     storeData.value?.data?.store_id,
     token.value
   );
 };
-
+const doorStatus = ref(true)
 const talkHandle = () => {
   console.log("开始对讲");
   isTalking.value = true;
@@ -226,7 +251,9 @@ const changemedie = (id: number) => {
   console.log(item, id);
   if (!item || !item.stream)
     return console.error("传入id有问题或者点击的视频没有流", item, item.stream);
-  videoList[0].value.stream = item.stream;
+    const stream = videoList.value[0].stream
+    videoList.value[0].stream = item.stream;
+    item.stream = stream
 };
 </script>
 
@@ -341,33 +368,6 @@ const changemedie = (id: number) => {
           />
           语音
         </button>
-
-        <!-- <Button
-          @click="getVoiceList"
-          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_sy@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>语音</span>
-            </div>
-          </div>
-        </Button> -->
-        <!-- <Button
-          @click="openDoor(1)"
-          pt:root="bg-[rgba(36,87,232,1)] bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_sy@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>门一开门</span>
-            </div>
-          </div>
-        </Button> -->
         <button
           @click="openDoor(1)"
           class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
@@ -388,10 +388,11 @@ const changemedie = (id: number) => {
             class="w-20px h-20px"
             alt=""
           />
-          门一开门
+          门二开门
         </button>
         <button
-          @click="lockDoor(0)"
+          v-if="doorStatus"
+          @click="lockDoor(1)"
           class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
         >
           <img
@@ -401,34 +402,9 @@ const changemedie = (id: number) => {
           />
           锁门
         </button>
-        <!-- <Button
-          @click="openDoor(2)"
-          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_sy@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>门二开门</span>
-            </div>
-          </div>
-        </Button> -->
-        <!-- <Button
-          @click="lockDoor(0)"
-          pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-        >
-          <div class="flex gap-1 items-center">
-            <div class="h-24px w-24px">
-              <img src="@/assets/images/icon_sy@2x.png" alt="" />
-            </div>
-            <div class="text-white font-bold text-md flex items-center">
-              <span>锁门</span>
-            </div>
-          </div>
-        </Button> -->
         <button
-          @click="lockDoor(1)"
+        v-else
+          @click="lockDoor(0)"
           class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
         >
           <img
@@ -496,15 +472,16 @@ const changemedie = (id: number) => {
         </div>
         <video
           ref="videoRef1"
+          controls
+          :muted = "isMuted"
           v-show="videoList[0]?.stream"
-          class="w-full aspect-ratio-video h-50vh"
+          class="w-full aspect-ratio-video h-full"
           autoplay
-          :muted="isMuted"
         ></video>
       </div>
       <div class="h-1 bg-white"></div>
       <div class="h-48vh">
-        <div class="w-full flex h-50%">
+        <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
             <img
               src="@/assets/images/icon_sxt@2x.png"
@@ -570,7 +547,7 @@ const changemedie = (id: number) => {
           </div>
         </div>
         <div class="h-1px bg-white"></div>
-        <div class="w-full flex h-50%">
+        <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
             <img
               src="@/assets/images/icon_sxt@2x.png"
-- 
2.34.1


From 2634994418feb1850ba3a3f15cfa6287d0a9c450 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 15:56:37 +0800
Subject: [PATCH 24/65] =?UTF-8?q?chore:=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/vite.config.ts b/vite.config.ts
index 834b848..c3c0125 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import UnoCSS from "unocss/vite";
 // import basicSsl from "@vitejs/plugin-basic-ssl";
 import { resolve } from "path";
-import fs from 'fs'
+// import fs from 'fs'
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd());
-- 
2.34.1


From 3cb5ca7fa83db99e8d6edf8bffd13db8f93e1331 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 19:34:53 +0800
Subject: [PATCH 25/65] =?UTF-8?q?refactor(talk.vue):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E7=9A=84id=20prop=E5=B9=B6?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(App.vue): 优化代码格式和结构，添加关闭窗口功能

- 移除talk组件中不再需要的id prop
- 统一代码缩进和格式
- 添加关闭窗口按钮及相关逻辑
- 为窗口添加拖拽区域样式
---
 src/App.vue             | 370 ++++++++++++----------------------------
 src/components/talk.vue |   4 -
 2 files changed, 112 insertions(+), 262 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0f4a3f1..52458a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -73,7 +73,7 @@ const startPlay = async (url: string) => {
     // console.log(document.getElementById("video"))
     // (document.getElementById("video")! as HTMLVideoElement).srcObject = s;
     cameraList.value.push(s);
-    cameraList.value.forEach((e,i)=>{
+    cameraList.value.forEach((e, i) => {
       videoList.value[i].stream = e
     })
     console.log("播放成功", s, cameraList.value);
@@ -142,11 +142,13 @@ watchEffect(() => {
   });
 });
 onMounted(async () => {
-  window.onbeforeunload =async(e:BeforeUnloadEvent)=>{
-    e.preventDefault()
-    await exitServer()
-    // return ''
-  }
+  // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
+  //   // e.preventDefault()
+  //   console.log(e)
+  //   await exitServer()
+  //   window.close()
+  //   // return ''
+  // }
   // await connectionRtc();
   // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
   const videoDom = [
@@ -191,12 +193,12 @@ const openDoor = async (port: number) => {
 };
 const lockDoor = async (type: number) => {
   if (!storeData.value?.data?.store_id) return;
-  if(!type)doorStatus.value = true
+  if (!type) doorStatus.value = true
   else doorStatus.value = false
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
 const setVoice = async (id: number) => {
-  console.log("音频id",id)
+  console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
   return await setVoiceApi(storeData.value?.data?.store_id, id);
 };
@@ -207,28 +209,28 @@ const exitServer = async () => {
   //   storeData.value?.data?.store_id,
   //   storeData.value?.customer_service_id
   // );
- 
-  
+
+
   // await 
-  console.log(storeData.value?.data?.store_id,storeData.value?.customer_service_id)
-  console.log(!storeData.value?.data?.store_id,!storeData.value?.customer_service_id)
-   console.log("结束服务",!storeData.value?.data?.store_id||!storeData.value?.customer_service_id)
+  // console.log(storeData.value?.data?.store_id, storeData.value?.customer_service_id)
+  // console.log(!storeData.value?.data?.store_id, !storeData.value?.customer_service_id)
+  // console.log("结束服务", !storeData.value?.data?.store_id || !storeData.value?.customer_service_id)
   if (
     !storeData.value?.data?.store_id ||
     !storeData.value?.customer_service_id
   )
     return;
 
-    await lockDoor(0)
-    ws.sendData({
-      instruction: "END_SERVICE",
-      storeId:storeData.value?.data?.store_id
-    })
-       token.value = "";
-  storeData.value = {};
+  await lockDoor(0)
+  ws.sendData({
+    instruction: "END_SERVICE",
+    storeId: storeData.value?.data?.store_id
+  })
+  token.value = "";
+  storeData.value = null;
   cameraList.value = [];
   goodsList.value = [];
-  videoList.value.forEach(e=>(e.stream=null))
+  videoList.value.forEach(e => (e.stream = null))
   await exitServerApi(
     storeData.value?.data?.customer_service_id,
     storeData.value?.data?.store_id,
@@ -251,48 +253,34 @@ const changemedie = (id: number) => {
   console.log(item, id);
   if (!item || !item.stream)
     return console.error("传入id有问题或者点击的视频没有流", item, item.stream);
-    const stream = videoList.value[0].stream
-    videoList.value[0].stream = item.stream;
-    item.stream = stream
+  const stream = videoList.value[0].stream
+  videoList.value[0].stream = item.stream;
+  item.stream = stream
 };
+
+const closeWin = async () => {
+  if (!storeData.value) {
+    window.close()
+    await exitServer()
+    console.log('关闭')
+  }
+}
 </script>
 
 <template>
-  <Dialog
-    v-model:visible="visible"
-    modal
-    header="要发布的语音"
-    pt:mask="bg-[rgba(0,0,0,0.5)]"
-    pt:root="bg-white w-80vw rounded"
-    pt:header="flex justify-between items-center p-4 items-center"
-  >
-    <div
-      v-for="item in voiceList"
-      class="px-4 py-2 hover:bg-[#f5f5f5]"
-      @click="setVoice(item.id)"
-    >
+  <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
+    pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
+    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue
-    v-model="isTalking"
-    id="202309001"
-    :device-id="'44010200492000000001'"
-    :channel-id="'34020000001310000001'"
-    @close="closeTalk"
-  ></talkVue>
+  <talkVue v-model="isTalking" :device-id="'44010200492000000001'" :channel-id="'34020000001310000001'"
+    @close="closeTalk"></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
-    <video
-      src=""
-      id="video"
-      class="w-100px"
-      style="display: none"
-      muted
-    ></video>
+    <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
       class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
-      v-if="goodsList.length"
-    >
+      v-if="goodsList.length">
       <div class="flex justify-between items-center px-4 py-2 text-white">
         <div>购物车</div>
       </div>
@@ -321,7 +309,7 @@ const changemedie = (id: number) => {
         </div>
       </div>
     </div>
-    <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1">
+    <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1" id="tabbar">
       <div class="flex items-center gap-2 h-4vh">
         <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
@@ -335,96 +323,51 @@ const changemedie = (id: number) => {
             </div>
           </div>
         </Button> -->
-        <button
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg"
-          @click="openDoor(1)"
-        >
-          <img
-            src="@/assets/images/icon_cs@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg"
+          @click="openDoor(1)">
+          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
           {{ storeData?.data?.store_name || "等待加入" }}
         </button>
-        <button
-          @click="talkHandle"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button @click="talkHandle"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           对讲
         </button>
-        <button
-          @click="getVoiceList"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button @click="getVoiceList"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           语音
         </button>
-        <button
-          @click="openDoor(1)"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button @click="openDoor(1)"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           门一开门
         </button>
-        <button
-          @click="openDoor(2)"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button @click="openDoor(2)"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           门二开门
         </button>
-        <button
-          v-if="doorStatus"
-          @click="lockDoor(1)"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button v-if="doorStatus" @click="lockDoor(1)"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           锁门
         </button>
-        <button
-        v-else
-          @click="lockDoor(0)"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button v-else @click="lockDoor(0)"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           开门
         </button>
-        <button
-          @click="exitServer()"
-          class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
-        >
-          <img
-            src="@/assets/images/icon_dj@2x.png"
-            class="w-20px h-20px"
-            alt=""
-          />
+        <button @click="exitServer()"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           结束服务
         </button>
+        <button id="closeBtn" @click="closeWin()"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          关闭窗口
+        </button>
         <!-- <Button
           @click="lockDoor(1)"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
@@ -453,164 +396,65 @@ const changemedie = (id: number) => {
         </Button> -->
       </div>
       <div class="flex flex-1 justify-end">
-        <Input
-          readonly
+        <Input readonly
           pt:root="outline-none text-center text-white bg-[rgba(255,255,255,0.1)] rounded-full max-w-500px px-2 min-w-200px placeholder-[rgba(255,255,255,0.8)]"
-          :value="`${storeData?.data?.user_nickname || ''}/${
-            storeData?.data?.user_mobile || ''
-          }`"
-        />
+          :value="`${storeData?.data?.user_nickname || ''}/${storeData?.data?.user_mobile || ''
+            }`" />
       </div>
     </div>
     <div class="w-full">
       <div class="w-full h-48vh">
-        <div
-          class="bg-black w-100% h-full flex justify-center items-center"
-          v-show="!videoList[0]?.stream"
-        >
+        <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-        <video
-          ref="videoRef1"
-          controls
-          :muted = "isMuted"
-          v-show="videoList[0]?.stream"
-          class="w-full aspect-ratio-video h-full"
-          autoplay
-        ></video>
+        <video ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
+          class="w-full aspect-ratio-video h-full" autoplay></video>
       </div>
       <div class="h-1 bg-white"></div>
       <div class="h-48vh">
         <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[1]?.stream"
-            />
-            <video
-              autoplay
-              muted
-              @click="changemedie(1)"
-              ref="videoRef2"
-              class="w-full aspect-ratio-video"
-              v-show="videoList[1]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[1]?.stream" />
+            <video autoplay muted @click="changemedie(1)" ref="videoRef2" class="w-full aspect-ratio-video"
+              v-show="videoList[1]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[2]?.stream"
-            />
-            <video
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef3"
-              src=""
-              @click="changemedie(2)"
-              v-show="videoList[2]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[2]?.stream" />
+            <video class="w-full aspect-ratio-video" autoplay muted ref="videoRef3" src="" @click="changemedie(2)"
+              v-show="videoList[2]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[3]?.stream"
-            />
-            <video
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef4"
-              src=""
-              @click="changemedie(3)"
-              v-show="videoList[3]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[3]?.stream" />
+            <video class="w-full aspect-ratio-video" autoplay muted ref="videoRef4" src="" @click="changemedie(3)"
+              v-show="videoList[3]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[4]?.stream"
-            />
-            <video
-              @click="changemedie(4)"
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef5"
-              src=""
-              v-show="videoList[4]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[4]?.stream" />
+            <video @click="changemedie(4)" class="w-full aspect-ratio-video" autoplay muted ref="videoRef5" src=""
+              v-show="videoList[4]?.stream"></video>
           </div>
         </div>
         <div class="h-1px bg-white"></div>
         <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[5]?.stream"
-            />
-            <video
-              @click="changemedie(5)"
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef6"
-              src=""
-              v-show="videoList[5]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[5]?.stream" />
+            <video @click="changemedie(5)" class="w-full aspect-ratio-video" autoplay muted ref="videoRef6" src=""
+              v-show="videoList[5]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[6]?.stream"
-            />
-            <video
-              @click="changemedie(5)"
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef7"
-              src=""
-              v-show="videoList[6]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[6]?.stream" />
+            <video @click="changemedie(5)" class="w-full aspect-ratio-video" autoplay muted ref="videoRef7" src=""
+              v-show="videoList[6]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[7]?.stream"
-            />
-            <video
-              @click="changemedie(7)"
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef8"
-              src=""
-              v-show="videoList[7]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[7]?.stream" />
+            <video @click="changemedie(7)" class="w-full aspect-ratio-video" autoplay muted ref="videoRef8" src=""
+              v-show="videoList[7]?.stream"></video>
           </div>
           <div class="bg-black w-100% h-full flex justify-center items-center">
-            <img
-              src="@/assets/images/icon_sxt@2x.png"
-              alt=""
-              v-show="!videoList[8]?.stream"
-            />
-            <video
-              @click="changemedie(8)"
-              class="w-full aspect-ratio-video"
-              autoplay
-              muted
-              ref="videoRef9"
-              src=""
-              v-show="videoList[8]?.stream"
-            ></video>
+            <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[8]?.stream" />
+            <video @click="changemedie(8)" class="w-full aspect-ratio-video" autoplay muted ref="videoRef9" src=""
+              v-show="videoList[8]?.stream"></video>
           </div>
         </div>
       </div>
@@ -618,4 +462,14 @@ const changemedie = (id: number) => {
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.btn {
+  -webkit-app-region: no-drag;
+  /* 禁止按钮拖拽 */
+}
+
+#tabbar {
+  -webkit-app-region: drag;
+  /* 允许拖拽 */
+}
+</style>
diff --git a/src/components/talk.vue b/src/components/talk.vue
index f5247c5..37d37a8 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -29,10 +29,6 @@ let broadcastRtc;
 
  const props = defineProps({
   modelValue: Boolean,
-  id: {
-    type: String,
-    required: true
-  },
   deviceId: {
     type: String,
     required: true
-- 
2.34.1


From 404d9880caee1e02f3290e9c026e2e155248f3c2 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 20:06:39 +0800
Subject: [PATCH 26/65] =?UTF-8?q?fixed:=E8=AF=AD=E9=9F=B3=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=8F=8D=E9=A6=88=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 52458a7..685f8f1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,6 +13,7 @@ import {
   setVoiceApi,
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
+import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
@@ -183,10 +184,7 @@ onMounted(async () => {
   await ws.connect();
   ws.sendData({ instruction: "NEW_CLIENT", secrity: "bk3yddsl" });
 });
-// onUnmounted(async ()=>{
-//   await exitServer()
-//   alert("111111")
-// })
+
 const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
@@ -197,20 +195,18 @@ const lockDoor = async (type: number) => {
   else doorStatus.value = false
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
+const sendVoiceSucess = ref(false)
 const setVoice = async (id: number) => {
   console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
-  return await setVoiceApi(storeData.value?.data?.store_id, id);
+   await setVoiceApi(storeData.value?.data?.store_id, id);
+   sendVoiceSucess.value = true
+   setTimeout(() => {
+    sendVoiceSucess.value = false
+   }, 2000)
 };
 
 const exitServer = async () => {
-  // console.log(
-  //   "结束服务",
-  //   storeData.value?.data?.store_id,
-  //   storeData.value?.customer_service_id
-  // );
-
-
   // await 
   // console.log(storeData.value?.data?.store_id, storeData.value?.customer_service_id)
   // console.log(!storeData.value?.data?.store_id, !storeData.value?.customer_service_id)
@@ -268,6 +264,7 @@ const closeWin = async () => {
 </script>
 
 <template>
+  <Message v-if="sendVoiceSucess" class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">语音发送成功</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
     <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">
@@ -407,8 +404,8 @@ const closeWin = async () => {
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-        <video ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
-          class="w-full aspect-ratio-video h-full" autoplay></video>
+        <video  ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
+          class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
       </div>
       <div class="h-1 bg-white"></div>
       <div class="h-48vh">
-- 
2.34.1


From b24e1dac58b7522e554bb44aa207bc9463f6b3a7 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 20:24:38 +0800
Subject: [PATCH 27/65] =?UTF-8?q?fixed:=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 685f8f1..085a564 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,8 @@ import {
 import talkVue from "@/components/talk.vue";
 import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
-// import {useAppStore} from "@/store/__APP__store"
-// const appStore = useAppStore()
+import {useAppStore} from "@/store/__APP__store"
+const appStore = useAppStore()
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
@@ -320,7 +320,7 @@ const closeWin = async () => {
             </div>
           </div>
         </Button> -->
-        <button class="rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 text-white font-600 text-lg"
+        <button class="rounded-[50px] h-32px flex justify-center items-center gap-1 text-white font-600 text-lg max-w-500px"
           @click="openDoor(1)">
           <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
           {{ storeData?.data?.store_name || "等待加入" }}
@@ -400,7 +400,7 @@ const closeWin = async () => {
       </div>
     </div>
     <div class="w-full">
-      <div class="w-full h-48vh">
+      <div class="w-full h-44vh">
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-- 
2.34.1


From 3493cce7264b45422c2f3ecfb0efed9f41171a5a Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 20:34:28 +0800
Subject: [PATCH 28/65] =?UTF-8?q?fixed:=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 085a564..99c95c5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -407,7 +407,7 @@ const closeWin = async () => {
         <video  ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
           class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
       </div>
-      <div class="h-1 bg-white"></div>
+      <div class="h-1px bg-white"></div>
       <div class="h-48vh">
         <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
-- 
2.34.1


From 1278b7a9d91d4acd391b27026ca92353badcedf7 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 1 Jul 2025 20:52:13 +0800
Subject: [PATCH 29/65] 1

---
 src/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 99c95c5..a26d801 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,8 @@ import {
 import talkVue from "@/components/talk.vue";
 import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
-import {useAppStore} from "@/store/__APP__store"
-const appStore = useAppStore()
+// import {useAppStore} from "@/store/__APP__store"
+// const appStore = useAppStore()
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
-- 
2.34.1


From a8a9261cf9121efd82ed0700455ced272ed5b978 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 21:25:57 +0800
Subject: [PATCH 30/65] =?UTF-8?q?chore:=E5=93=8D=E5=BA=94=E6=97=B6?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E7=AB=AF=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue   | 11 +----------
 uno.config.ts |  6 ++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a26d801..3ad6d8c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -143,15 +143,6 @@ watchEffect(() => {
   });
 });
 onMounted(async () => {
-  // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
-  //   // e.preventDefault()
-  //   console.log(e)
-  //   await exitServer()
-  //   window.close()
-  //   // return ''
-  // }
-  // await connectionRtc();
-  // startPlay("https://webrtc.test.7games.store/index/api/webrtc?app=live&stream=m_000001_s_000001_d_000001&type=play");
   const videoDom = [
     videoRef1.value,
     videoRef2.value,
@@ -273,7 +264,7 @@ const closeWin = async () => {
   </Dialog>
   <talkVue v-model="isTalking" :device-id="'44010200492000000001'" :channel-id="'34020000001310000001'"
     @close="closeTalk"></talkVue>
-  <div class="flex-col w-screen h-screen overflow-hidden relative">
+  <div class="flex-col w-screen h-screen overflow-hidden relative min-w-700px min-h-500px">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
       class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
diff --git a/uno.config.ts b/uno.config.ts
index 9013e22..437f1d2 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -2,4 +2,10 @@ import { defineConfig } from 'unocss'
 
 export default defineConfig({
     // ...UnoCSS options
+    theme:{
+        breakpoints:{
+            md:'1200px',
+            sm:"700px"
+        }
+    }
 })
\ No newline at end of file
-- 
2.34.1


From 0236b3c781ce99c18e5392dcdd835281b5ecba79 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 21:41:41 +0800
Subject: [PATCH 31/65] =?UTF-8?q?feat:=E5=9B=BE=E6=A0=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                      |  17 +++++++++--------
 src/assets/images/icon_km@2x.png | Bin 0 -> 805 bytes
 src/assets/images/icon_ks@2x.png | Bin 0 -> 639 bytes
 src/assets/images/icon_yy@2x.png | Bin 0 -> 1270 bytes
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/images/icon_km@2x.png
 create mode 100644 src/assets/images/icon_ks@2x.png
 create mode 100644 src/assets/images/icon_yy@2x.png

diff --git a/src/App.vue b/src/App.vue
index 3ad6d8c..aaacd54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -323,37 +323,38 @@ const closeWin = async () => {
         </button>
         <button @click="getVoiceList"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          <img src="@/assets/images/icon_yy@2x.png" class="w-20px h-20px" alt="" />
           语音
         </button>
         <button @click="openDoor(1)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门一开门
         </button>
         <button @click="openDoor(2)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门二开门
         </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           锁门
         </button>
         <button v-else @click="lockDoor(0)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           开门
         </button>
         <button @click="exitServer()"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+         <i class="fa-solid fa-check"></i>
           结束服务
         </button>
         <button id="closeBtn" @click="closeWin()"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-          <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          <i class="fa-solid fa-xmark"></i>
+          <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
           关闭窗口
         </button>
         <!-- <Button
diff --git a/src/assets/images/icon_km@2x.png b/src/assets/images/icon_km@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdbfbcfe3c644e5f9bb691c2cfb0b8ec57c1b380
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp0008)Nkl<ZXhZFp
zO-NNi6vw@anH5D=w20bOU{Q!kL_`I(h$y0kYgd8jrd3dZ;0H*n5_A<U+C^Vb%OYH~
z38F;=A}u4SPzX1nSkK>q_ux8=@7^=>?0zr<hk18AGw1x~KX>ljYt&To5|x~<DF7B-
z;h<npFy}K6mT1leN=z>(m^ei#9V(T|CR|To-PjN8MHEGUQ+9WD+b{(IY9p(Y*x9O`
zqTUkAbP~Wp=gd=fY#1Ow?Zgy_8j!$ku9L@a0C%R$)7i}n5U6uRzJN*HgUK>XTUG#U
zP3!FH=L87YVFEtGj=Bb>-x@&1Y@zLtG2SAR@ZBSZ{;*9VI|w+7?ez(40o+B~yk*Rv
zw2fmE!2Z+5R4WMJZGwzx16lk{1v~Irs59<;0B>sJx&Xc;$Te-C6oBg~SnFEh$1xzk
zXkxnnP7^?OO5dVYP~r^$IHd_(G{AcR-U@)R83+oR%Yj`q%X=_aOY{Si^BCKM$(eJv
zF<Is&leCLU_uK%!C7H`?2+NWcsvo5Kh;5HS78>w4aG&Ff0XfR`ojQO?5Bl6FxB#5F
z97V<RWcaQOfHMGgS~jO6w8c*$g<Yb50NG|9j8X6k?XSvm5B381)VK$qaNS#mB`OTx
zu!}&-Yn9x8eN>OI_`#yEOSC4EEY<gzY&c!!J;`<90WC~xnq1x{a`T{1f|I`oK+7xz
z1<gqbuS=E_$uw<QeX<BkG%V4i{hd?E8+_z*y>H3wV?sXL_50E}J_m<5{tatlyX>N;
zt4A<R9GkC;f>!~2tqH6Kl)+i1BUE=aff{fYoneeF0GBjzodBzlm#A-GXE6C-q%E4m
z_E!eKuKjE;2{{ACX;Acl%&uYk6Nu+XcwfzjF}CvifzfA?>rdEoeC6##T^a&ti%P<x
zstGOs|7*rpuzr$$sLoi~VZ#8|ftLT#3*;~0=9IZQx&K!{rwlzi1whXU%)EP0Fmnk!
j69@`=PGIKUORwN6*!z)4vSZmB00000NkvXXu0mjfN<?qt

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon_ks@2x.png b/src/assets/images/icon_ks@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2cf2a2e6f499254ec1d2db318538f3656f7dc61
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp0006;Nkl<ZXhZFo
z&npCB7{^Uf!U2h+A1UFYq{u;8<>>6@;^v|pq+}KOAGCjfY$-P(_T=E=AW{yll9YrL
z*5}o1O|!GR@4PeG*Yv#gv^Dd5pZR{D=R5DrtW%Tl<s@8RjR^ej6P5|e1TF7?Sk&?X
zRiq~qtk@#U6J&y>1Ip*~qhM!<KB9#v)yyx>JrEZ})^VIW(`yFdVxJ(wI=N7Wm@**x
z31*vELg>2zz6cVlK*SAlg%hGZBDr($lZbqcSSP-hZNxP|=91_MAoaqrd<n9(99LNX
z+Cku~O#)XSv*{tEL@g7$5Pd91l;(7Eevw!pysjDtdlp4xY!-#&Ekt@<GHO~W$eo5E
zM~yW3YaUF78uMXl_;X_s2(b<d-+PK5LToxLG3wNTc_Nxz><xAL!`AWU$0cxxqH3Ej
ztSyKs%Z6TvRF)ibfzQ-w4qe0ph)duIHPy~nSgR1*Fd>G(V{j=K`$nBclR5>A2-N8w
zT~E#g-JNd0C%n~TD|PCMxYlV-K+Xim3NH%kHEu5;N4?Tzb?S$<C<1d7RwSyq))AQ2
zAs_<%U6Kjv_$GReSk(AAC>AYmzavh6yD4q_4ja1FT8q}Ry?-cCI6=LPABe!<4#)(n
zwaJJ@HSbBWs93a=RU$s<6Mqk?@5bNfAWQx8y{~!C`O~bu2MzTU!9-xSHW`_qW(UNg
zQ7k$KxJ$Fsf0dTwt0bpWJoKMVIz?^D5rH;M!-R`W(4=cNVPt|fO~ZtXOwgojHenJ!
Z!5{S02uObc4N?FA002ovPDHLkV1iY;A<qB+

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon_yy@2x.png b/src/assets/images/icon_yy@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..632d650e25894775a78c6f5fc16e0d27f10a8d88
GIT binary patch
literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp000ENNkl<ZXhZFp
zYp70H7{|Sm%g8mx{aQ3ghsGo_qiEdX3ps?EMvC0VG@%Y6$_L39iZo60!8M|0lzWLN
zG1B-jxn{-(UvP>uGQ=Fe|7q{jW7+53YajdVea~sHdfMyV>silwe(PCl?X}jMYtqP5
zu95RK$p9OAgtG`{5iIc@$cAW%2PoFPEP}CJRN@L*1V1)F)z#HavGD^^nakyV@v%pp
z;pnYF?jh@`_sXYUlukh-h@;JDbT2X+slw5=agI`_B{~m~u7U0z>Me?^S66w#0CBVh
zjUGX!nZ{ejMT2^uqyLBF@YmEkS0BiN0ODk8ocRqI?>OZH*poUB5$oGO{2mHqRZ_^*
z0fB3W6DN?-5zfQ{stz_ZtmirPw*jcRoG7IVh+~~-{S2Z-A}aX;%FbU%XJbUs>j~uZ
zB!sB}0@s~}HBScRali{Oh~g}sha6kW0o++oKtR+fS{-fb9Yn5wOylnXVoURFGx8r&
zf%8vneabKL`%Clg4*Ac}tM-LV6hRuS!0;+W^Q=C}1-y)raIRh=KNjcz4-M1aO!9}F
zhQ^?ydS1yJkj6$}@tT*_x|M1HvG)mTFC5j?IKRaJYNY&)^e}pB&{5RAQWC)LvAE64
zsvn@*u0+}!^?%80A$evX1-#PeoT7ZPuOCSOH(+$Vui-lM+#$LSy^W6UN&vPRz^UYq
z8y&5p9npE~<4dstwIR5VbTQ7}#Q8D<*n#|0#QHh}9eqY(Q&9os9dmIh54-ehh3pJ~
zplT92w|NXSG~*~gA4})-N?v^$*?>Z-Lo{%{8_!2h<5K`QX#g*f|H|l;Q?7k(Y$|#L
z14u0@_M|Z%fL{&ZQS#Fb&0@-T$I_KT1Oq^w9(0Nble^ITOu+(E?)|AKl?dwm*Vh0n
zAws)M1ox4jYsyzp{!@d9AalDFj_UiTlYf}rn`7vlqF|yap9kRnh61Rqn!EKH2Ed;t
zg6<HWMEU840;sd2-I-{2(<$6g2X{JpXZOEfQ0|`kBYBHD2XS6Yzdivr9l-h8`G(Fg
z3U3$%?O@uYqhTGJk^rv7+NM~G`4#e=Cc>H{asH|qp3BJZFlMh)u8qG}N&*;lbn$A$
zD8-#7&g1+zYcyhk*^Z7j{$42wU~?>L+z<7#9Ia#l-P44QPGvZ+y=hGXZU7H$)2yE}
z&^hMogEwH%peDK^`Ki-@PV@^s8g+-L>gao?dG!sBA9SL(o!{S?cba!S(DS~RNd%Y=
zfZh(Bwcj(h$_IBc)YD${4NgCH;B?1x3u$BC??P{hM@QDGqy`v7xSXf1{4|`SQj$xj
z-!Wh>jb+dKm=rdiDqsLPfv4t(&U&#CjOqoVI*0e}PUV9I$S0Di0|t;IdFlh+(QzU+
zf)W2s$b{zTD28X^JE4LA29Se!>Jr#q82JE3{Wq}{ID0SS6TBLof&m7QeR!TlwA{Z&
zTH$EzwO}2?vls96UqtBJUGn;Ty!56riUkD>AoWSn!t)3xzx8pFVfrI_D-a!owXwe9
zQ!h%V;DGgY49I@eeF9wKf0S&SB@0;Jj&bW{fNAw)vFv0KELP8_)ovESw0g2wcCrW-
gtLM{dx6w!N9X1WcNKC$TIRF3v07*qoM6N<$f(QC+IsgCw

literal 0
HcmV?d00001

-- 
2.34.1


From 7cf8cc8904c5e99a24d43b4a7bec9b2113dd1194 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxxxx@qq.com>
Date: Tue, 1 Jul 2025 22:36:02 +0800
Subject: [PATCH 32/65] =?UTF-8?q?fixed:=E8=AF=AD=E9=9F=B3=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E9=BC=A0=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index aaacd54..9a648e6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -258,7 +258,7 @@ const closeWin = async () => {
   <Message v-if="sendVoiceSucess" class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">语音发送成功</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
-    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">
+    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5] cursor-pointer" @click="setVoice(item.id)">
       {{ item.content }}
     </div>
   </Dialog>
-- 
2.34.1


From 745e14def240e19f9312c3992ca2a5f652fd3634 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Wed, 2 Jul 2025 13:34:48 +0800
Subject: [PATCH 33/65] =?UTF-8?q?feat(=E9=9F=B3=E9=A2=91):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AE=B2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在api模块新增audioStartPlay接口用于音频播放
- 在App.vue和talk.vue组件中实现音频播放控制逻辑
- 启用vite的https配置以支持音频流媒体播放
- 优化对讲组件的事件处理，增加音频静音控制
---
 src/App.vue             | 52 +++++++++++++++++++++++++-----
 src/api/talk.ts         |  7 +++-
 src/components/talk.vue | 71 ++++++++++++++++++++++-------------------
 vite.config.ts          | 10 +++---
 4 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a26d801..80a65a0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,7 @@ import Dialog from "primevue/dialog";
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
+import { audioStartPlay } from "@/api/talk"
 import {
   lockDoorApi,
   openDoorApi,
@@ -17,6 +18,12 @@ import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
+const audioRef = ref();
+const deviceInfo = ref({
+  deviceId: '44010200492000000001',
+  channelId: '34020000001310000001',
+  broadcastMode: false
+})
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
@@ -143,6 +150,20 @@ watchEffect(() => {
   });
 });
 onMounted(async () => {
+  audioStartPlay({
+    deviceId: deviceInfo.value.deviceId,
+    channelId: deviceInfo.value.channelId,
+  }).then(res => {
+    console.log(res.data.data.https_fmp4)
+    const src = res.data.data.https_fmp4.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+    console.log(src)
+    audioRef.value.src = src
+  })
+
+  // audioRef.value.addEventListener('loadeddata', () => {
+  //   console.log('卡顿？')
+  //   audioRef.value.playbackRate = 1
+  // })
   // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
   //   // e.preventDefault()
   //   console.log(e)
@@ -199,11 +220,11 @@ const sendVoiceSucess = ref(false)
 const setVoice = async (id: number) => {
   console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
-   await setVoiceApi(storeData.value?.data?.store_id, id);
-   sendVoiceSucess.value = true
-   setTimeout(() => {
+  await setVoiceApi(storeData.value?.data?.store_id, id);
+  sendVoiceSucess.value = true
+  setTimeout(() => {
     sendVoiceSucess.value = false
-   }, 2000)
+  }, 2000)
 };
 
 const exitServer = async () => {
@@ -238,11 +259,14 @@ const talkHandle = () => {
   console.log("开始对讲");
   isTalking.value = true;
   isMuted.value = false;
+  audioRef.value.playbackRate = 1.1
+  // audioRef.value.muted = false
 };
 
 const closeTalk = () => {
   console.log("关闭对讲");
   isMuted.value = true;
+  audioRef.value.muted = true
 };
 const changemedie = (id: number) => {
   const item = videoList.value.find((e) => e.id === id);
@@ -256,15 +280,23 @@ const changemedie = (id: number) => {
 
 const closeWin = async () => {
   if (!storeData.value) {
+  audioRef.value.removeAttribute('src')
+  audioRef.value.load()
+  audioRef.value = null
     window.close()
     await exitServer()
     console.log('关闭')
   }
 }
+const mutedAudio = () => {
+  audioRef.value.muted = !audioRef.value.muted
+}
 </script>
 
 <template>
-  <Message v-if="sendVoiceSucess" class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">语音发送成功</Message>
+  <Message v-if="sendVoiceSucess"
+    class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
+    语音发送成功</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
     <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5]" @click="setVoice(item.id)">
@@ -272,7 +304,7 @@ const closeWin = async () => {
     </div>
   </Dialog>
   <talkVue v-model="isTalking" :device-id="'44010200492000000001'" :channel-id="'34020000001310000001'"
-    @close="closeTalk"></talkVue>
+    @close="closeTalk" @start-broadcast="mutedAudio" @stop-broadcast="mutedAudio"></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
@@ -320,7 +352,8 @@ const closeWin = async () => {
             </div>
           </div>
         </Button> -->
-        <button class="rounded-[50px] h-32px flex justify-center items-center gap-1 text-white font-600 text-lg max-w-500px"
+        <button
+          class="rounded-[50px] h-32px flex justify-center items-center gap-1 text-white font-600 text-lg max-w-500px"
           @click="openDoor(1)">
           <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
           {{ storeData?.data?.store_name || "等待加入" }}
@@ -365,6 +398,9 @@ const closeWin = async () => {
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           关闭窗口
         </button>
+        <audio
+          src=""
+          ref="audioRef" id="video" class="w-0 h-0" controls autoplay muted></audio>
         <!-- <Button
           @click="lockDoor(1)"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
@@ -404,7 +440,7 @@ const closeWin = async () => {
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-        <video  ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
+        <video ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
           class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
       </div>
       <div class="h-1px bg-white"></div>
diff --git a/src/api/talk.ts b/src/api/talk.ts
index 0a746de..a05f846 100644
--- a/src/api/talk.ts
+++ b/src/api/talk.ts
@@ -7,7 +7,12 @@ export function talkLogin(params) {
     params: params
   })
 }
-
+export function audioStartPlay({deviceId, channelId}) {
+  return talkRequest({
+    method: 'get',
+    url: '/api/play/start/' + deviceId + '/' + channelId
+  })
+}
 export function broadcastStart({deviceId, channelId, broadcastMode}, accessToken) {
   return talkRequest({
     method: 'get',
diff --git a/src/components/talk.vue b/src/components/talk.vue
index 37d37a8..cdcffab 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -4,6 +4,7 @@
     <template #closeicon>
       <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 20px; height: 20px; " />
     </template>
+    <!-- <audio src="https://webrtc.test.7games.store/rtp/44010200492000000001_34020000001310000001.live.mp4?originTypeStr=rtp_push" ref="videoRef" id="video" class="w-300px h-300px"  controls autoplay muted></audio> -->
     <div class="flex relative align-center justify-center w-full h-full">
       <div class="flex flex-col items-center justify-end">
         <img class="h-160px w-160px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
@@ -17,17 +18,17 @@
 <script lang='ts' setup>
 import { ref, onMounted } from 'vue';
 import Dialog from 'primevue/dialog';
-// import Button from 'primevue/button';
-import {  broadcastStart, broadcastStop } from "@/api/talk";
+import { broadcastStart, broadcastStop } from "@/api/talk";
 import md5 from 'md5';
 
-// const visible = ref(false);
+
+const videoRef = ref()
+console.log(videoRef)
 const broadcastStatus = ref(-1)  // -2 正在释放资源 -1 默认状态 0 等待接通 1 接通成功
-// const broadcastRtc = ref(null)
 let broadcastRtc;
 
 
- const props = defineProps({
+const props = defineProps({
   modelValue: Boolean,
   deviceId: {
     type: String,
@@ -39,9 +40,6 @@ let broadcastRtc;
   }
 });
 
-// const deviceId = ref('')
-// const channelId = ref('')
-// const broadcastMode = ref('')
 const userInfo = ref({
   accessToken: '',
   pushKey: ''
@@ -54,13 +52,13 @@ const deviceInfo = ref({
 })
 
 // 新增emit事件定义
-const emit = defineEmits(['update:modelValue', 'close']);
+const emit = defineEmits(['update:modelValue', 'close', 'start-broadcast', 'stop-broadcast']);
 
 // 修改可见性处理方法
 const handleVisibleChange = (val: boolean) => {
   emit('update:modelValue', val);
   if (!val) {
-    if(broadcastStatus.value !== -1){
+    if (broadcastStatus.value !== -1) {
       broadcastStatus.value = -1
       stopBroadcast()
     }
@@ -85,38 +83,39 @@ const getStatusText = (status: number) => {
 
 
 const broadcastStatusClick = () => {
-  console.log(broadcastStatus.value)
+
   if (broadcastStatus.value === -1) {
     // 默认状态， 开始
-    broadcastStatus.value = 0
+    emit('start-broadcast');
+    broadcastStatus.value = 1 //0
     // 发起语音对讲+
-    console.log(deviceInfo.value.deviceId)
-    broadcastStart({
-      deviceId: deviceInfo.value.deviceId,
-      channelId: deviceInfo.value.channelId,
-      broadcastMode: deviceInfo.value.broadcastMode
-    }, userInfo.value.accessToken).then(data => {
+    // broadcastStart({
+    //   deviceId: deviceInfo.value.deviceId,
+    //   channelId: deviceInfo.value.channelId,
+    //   broadcastMode: deviceInfo.value.broadcastMode
+    // }, userInfo.value.accessToken).then(data => {
 
-      console.log(data)
-      let res = data.data.data
-      console.log(res)
-      const streamInfo = res.streamInfo
-      if (document.location.protocol.includes('https')) {
-        const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443','https://webrtc.test.7games.store')
-        startBroadcast(rtcs)
-      } else {
-        startBroadcast(streamInfo.rtc)
-      }
-    })
+    //   console.log(data)
+    //   let res = data.data.data
+    //   console.log(res)
+    //   const streamInfo = res.streamInfo
+    //   if (document.location.protocol.includes('https')) {
+    //     const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+    //     startBroadcast(rtcs)
+    //   } else {
+    //     startBroadcast(streamInfo.rtc)
+    //   }
+    // })
   } else if (broadcastStatus.value === 1) {
-    console.log('1')
     broadcastStatus.value = -1
-    stopBroadcast()
+    // stopBroadcast()
     // broadcastRtc.close()
+    emit('stop-broadcast');
   }
 }
 
 
+
 const startBroadcast = (url) => {
 
   url += '&sign=' + md5(userInfo.value.pushKey)
@@ -174,7 +173,15 @@ const stopBroadcast = () => {
 }
 
 onMounted(() => {
-  // getUserInfo()
+  // audioStartPlay({
+  //   deviceId: deviceInfo.value.deviceId,
+  //   channelId: deviceInfo.value.channelId,
+  // }).then(res => {
+  //   console.log( res.data.data.https_fmp4)
+  //   const src = res.data.data.https_fmp4.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+  //   console.log(src)
+  //   videoRef.value.src = src
+  // })
 })
 </script>
 <style scoped></style>
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index c3c0125..65fa8c0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import UnoCSS from "unocss/vite";
 // import basicSsl from "@vitejs/plugin-basic-ssl";
 import { resolve } from "path";
-// import fs from 'fs'
+import fs from 'fs'
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd());
@@ -17,10 +17,10 @@ export default defineConfig(({ mode }) => {
     server: {
       port: 4444,
       host: "0.0.0.0",
-      // https: {
-      //   key: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2-key.pem')),
-      //   cert: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2.pem'))
-      // },
+      https: {
+        key: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2-key.pem')),
+        cert: fs.readFileSync(resolve(__dirname, 'src/testKey/localhost+2.pem'))
+      },
       proxy: {
         "/index/api/webrtc": {
           target: "http://webrtc.test.7games.store",
-- 
2.34.1


From 2b42d31bd6e4eac6c69e323a89ec5d50683fa8e3 Mon Sep 17 00:00:00 2001
From: yyboo <2247268424@qq.com>
Date: Wed, 2 Jul 2025 18:34:58 +0800
Subject: [PATCH 34/65] f

---
 a.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 a.txt

diff --git a/a.txt b/a.txt
new file mode 100644
index 0000000..fb9a769
--- /dev/null
+++ b/a.txt
@@ -0,0 +1 @@
+1233
\ No newline at end of file
-- 
2.34.1


From 35f8ad0e46b6fb58ebaba3f2c23a1f04644613d3 Mon Sep 17 00:00:00 2001
From: lengxiaofei <lengzhiqiang>
Date: Wed, 2 Jul 2025 18:51:22 +0800
Subject: [PATCH 35/65] f

---
 a.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 a.txt

diff --git a/a.txt b/a.txt
deleted file mode 100644
index fb9a769..0000000
--- a/a.txt
+++ /dev/null
@@ -1 +0,0 @@
-1233
\ No newline at end of file
-- 
2.34.1


From 268d02192c7103eda010115a39181aa9608f0b1f Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 11:38:20 +0800
Subject: [PATCH 36/65] =?UTF-8?q?fixed:=E5=A4=9A=E6=AC=A1=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=B8=8A=E7=BA=BF=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 49dd3bd..d9d2474 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,6 +24,7 @@ const deviceInfo = ref({
   channelId: '34020000001310000001',
   broadcastMode: false
 })
+const voiceText = ref("语音转文字")
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
@@ -37,10 +38,9 @@ const videoRef6 = ref<HTMLVideoElement | null>();
 const videoRef7 = ref<HTMLVideoElement | null>();
 const videoRef8 = ref<HTMLVideoElement | null>();
 const videoRef9 = ref<HTMLVideoElement | null>();
-// const customerServiceId = ref("")
-// const storeName = ref("")
-// const storeId = ref("")
-// const cameras = ref<string[]>([])
+const messageShow = ref(false)
+const messageText = ref("")
+
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
 
@@ -124,14 +124,23 @@ const getVoiceList = async () => {
 };
 ws.on("SHOP_INFO", (data) => {
   console.log("商店登录", data);
+  if (storeData.value) {
+    messageText.value = "有顾客进店了"
+    messageShow.value = true
+    setTimeout(() => {
+      messageShow.value = false
+      messageText.value = ""
+    }, 2000)
+    return
+  }
   storeData.value = data;
+
   if (data?.data?.store_device?.camera?.length) {
     // chunkArray(data?.data?.store_device?.camera,3)
     data.data.store_device.camera.forEach((e: string) => {
       startPlay(e);
     });
   }
-
   console.log(data.data.store_device.camera);
 });
 ws.on("SHOP_ORDER", (data) => {
@@ -216,14 +225,15 @@ const lockDoor = async (type: number) => {
   else doorStatus.value = false
   await lockDoorApi(type, storeData.value?.data?.store_id, token.value);
 };
-const sendVoiceSucess = ref(false)
 const setVoice = async (id: number) => {
   console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
   await setVoiceApi(storeData.value?.data?.store_id, id);
-  sendVoiceSucess.value = true
+  messageText.value = "语音发送成功"
+  messageShow.value = true
   setTimeout(() => {
-    sendVoiceSucess.value = false
+    messageShow.value = false
+    messageText.value = ""
   }, 2000)
 };
 
@@ -280,9 +290,9 @@ const changemedie = (id: number) => {
 
 const closeWin = async () => {
   if (!storeData.value) {
-  audioRef.value.removeAttribute('src')
-  audioRef.value.load()
-  audioRef.value = null
+    audioRef.value.removeAttribute('src')
+    audioRef.value.load()
+    audioRef.value = null
     window.close()
     await exitServer()
     console.log('关闭')
@@ -294,9 +304,12 @@ const mutedAudio = () => {
 </script>
 
 <template>
-  <Message v-if="sendVoiceSucess"
+  <Message v-if="messageShow"
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
-    语音发送成功</Message>
+    {{ messageText }}</Message>
+  <Message v-if="!isMuted"
+    class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
+    {{ voiceText }}</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
     <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5] cursor-pointer" @click="setVoice(item.id)">
@@ -361,7 +374,7 @@ const mutedAudio = () => {
         <button @click="talkHandle"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
-          对讲
+          <span>对讲</span> 
         </button>
         <button @click="getVoiceList"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
@@ -390,7 +403,7 @@ const mutedAudio = () => {
         </button>
         <button @click="exitServer()"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
-         <i class="fa-solid fa-check"></i>
+          <i class="fa-solid fa-check"></i>
           结束服务
         </button>
         <button id="closeBtn" @click="closeWin()"
@@ -399,9 +412,7 @@ const mutedAudio = () => {
           <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
           关闭窗口
         </button>
-        <audio
-          src=""
-          ref="audioRef" id="video" class="w-0 h-0" controls autoplay muted></audio>
+        <audio src="" ref="audioRef" id="video" class="w-0 h-0" controls autoplay muted></audio>
         <!-- <Button
           @click="lockDoor(1)"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-- 
2.34.1


From 8ee7f96316f50f04c5168555c088873706d78f10 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Thu, 3 Jul 2025 11:44:42 +0800
Subject: [PATCH 37/65] =?UTF-8?q?fixed:=E8=B0=83=E6=95=B4=E5=AF=B9?=
 =?UTF-8?q?=E8=AE=B2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue             | 19 +++++++++++--------
 src/components/talk.vue | 38 +++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 49dd3bd..8f9fa54 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,7 +21,7 @@ import { Message } from "primevue";
 const audioRef = ref();
 const deviceInfo = ref({
   deviceId: '44010200492000000001',
-  channelId: '34020000001310000001',
+  channelId: '44010200492000000001',
   broadcastMode: false
 })
 const token = ref("");
@@ -159,11 +159,13 @@ onMounted(async () => {
     console.log(src)
     audioRef.value.src = src
   })
-
-  // audioRef.value.addEventListener('loadeddata', () => {
-  //   console.log('卡顿？')
-  //   audioRef.value.playbackRate = 1
-  // })
+console.log(audioRef.value.playbackRate)
+  audioRef.value.addEventListener('waiting', () => {
+    console.log('卡顿？'+audioRef.value.playbackRate)
+    if(audioRef.value.playbackRate >= 1.05) {
+      audioRef.value.playbackRate = 1.05
+    }
+  })
   // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
   //   // e.preventDefault()
   //   console.log(e)
@@ -256,10 +258,10 @@ const exitServer = async () => {
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
+    console.log(audioRef.value.playbackRate)
   console.log("开始对讲");
   isTalking.value = true;
   isMuted.value = false;
-  audioRef.value.playbackRate = 1.1
   // audioRef.value.muted = false
 };
 
@@ -289,6 +291,7 @@ const closeWin = async () => {
   }
 }
 const mutedAudio = () => {
+  audioRef.value.playbackRate =2
   audioRef.value.muted = !audioRef.value.muted
 }
 </script>
@@ -401,7 +404,7 @@ const mutedAudio = () => {
         </button>
         <audio
           src=""
-          ref="audioRef" id="video" class="w-0 h-0" controls autoplay muted></audio>
+          ref="audioRef" id="video" class="w-0px h-0px" controls autoplay muted playbackRate="1.3"></audio>
         <!-- <Button
           @click="lockDoor(1)"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
diff --git a/src/components/talk.vue b/src/components/talk.vue
index cdcffab..4ebed5e 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :visible="modelValue" @update:visible="handleVisibleChange" pt:root="bg-white w-500px h-500px relative"
+  <Dialog :visible="modelValue" @update:visible="handleVisibleChange" pt:root="bg-white w-500px h-500px relative rounded-8px"
     pt:mask="bg-[rgba(0,0,0,0.5)]" pt:header="w-full flex flex-row-reverse p-28px" pt:content="h-full">
     <template #closeicon>
       <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 20px; height: 20px; " />
@@ -89,27 +89,27 @@ const broadcastStatusClick = () => {
     emit('start-broadcast');
     broadcastStatus.value = 1 //0
     // 发起语音对讲+
-    // broadcastStart({
-    //   deviceId: deviceInfo.value.deviceId,
-    //   channelId: deviceInfo.value.channelId,
-    //   broadcastMode: deviceInfo.value.broadcastMode
-    // }, userInfo.value.accessToken).then(data => {
+    broadcastStart({
+      deviceId: deviceInfo.value.deviceId,
+      channelId: deviceInfo.value.channelId,
+      broadcastMode: deviceInfo.value.broadcastMode
+    }, userInfo.value.accessToken).then(data => {
 
-    //   console.log(data)
-    //   let res = data.data.data
-    //   console.log(res)
-    //   const streamInfo = res.streamInfo
-    //   if (document.location.protocol.includes('https')) {
-    //     const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
-    //     startBroadcast(rtcs)
-    //   } else {
-    //     startBroadcast(streamInfo.rtc)
-    //   }
-    // })
+      console.log(data)
+      let res = data.data.data
+      console.log(res)
+      const streamInfo = res.streamInfo
+      if (document.location.protocol.includes('https')) {
+        const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+        startBroadcast(rtcs)
+      } else {
+        startBroadcast(streamInfo.rtc)
+      }
+    })
   } else if (broadcastStatus.value === 1) {
     broadcastStatus.value = -1
-    // stopBroadcast()
-    // broadcastRtc.close()
+    stopBroadcast()
+    broadcastRtc.close()
     emit('stop-broadcast');
   }
 }
-- 
2.34.1


From ce8d03908faf117828d0ba3ba42bbfa7e195a2e3 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Thu, 3 Jul 2025 17:20:49 +0800
Subject: [PATCH 38/65] =?UTF-8?q?feat(=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?):=20=E6=9B=BF=E6=8D=A2=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E4=B8=BAflv.js=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加flv.js视频播放相关依赖
移除audio元素及相关逻辑，改用flv.js实现视频播放
新增视频播放控制方法startTalk和stopTalk
---
 package-lock.json | 23 +++++++++++++++++
 package.json      |  1 +
 src/App.vue       | 63 ++++++++++++++++++++++++++---------------------
 3 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c68a971..80cebfa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@vueuse/core": "^13.4.0",
         "axios": "^1.10.0",
         "dayjs": "^1.11.13",
+        "flv.js": "^1.6.2",
         "md5": "^2.3.0",
         "pinia": "^3.0.3",
         "primevue": "^4.3.5",
@@ -2051,6 +2052,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
+    },
     "node_modules/esbuild": {
       "version": "0.25.5",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
@@ -2118,6 +2125,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -3276,6 +3293,12 @@
       "peerDependencies": {
         "typescript": ">=5.0.0"
       }
+    },
+    "node_modules/webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==",
+      "license": "MIT"
     }
   }
 }
diff --git a/package.json b/package.json
index 95dbc00..5247342 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@vueuse/core": "^13.4.0",
     "axios": "^1.10.0",
     "dayjs": "^1.11.13",
+    "flv.js": "^1.6.2",
     "md5": "^2.3.0",
     "pinia": "^3.0.3",
     "primevue": "^4.3.5",
diff --git a/src/App.vue b/src/App.vue
index 0a40206..370fb8b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,17 +14,17 @@ import {
   setVoiceApi,
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
+import flvjs from 'flv.js'
 import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
-const audioRef = ref();
 const deviceInfo = ref({
   deviceId: '44010200492000000001',
   channelId: '44010200492000000001',
   broadcastMode: false
 })
-const voiceText = ref("语音转文字")
+// const voiceText = ref("语音转文字")
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
@@ -44,6 +44,10 @@ const messageText = ref("")
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
 
+const videoElement = ref()
+const flvPlayer = ref()
+const flvSrc = ref()
+
 const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
 const totalPrice = computed(() => {
@@ -59,6 +63,7 @@ const totalPrice = computed(() => {
 });
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async (url: string) => {
+  console.log(url)
   const player = new ZLMRTCClient.Endpoint({
     element: document.querySelector("#video"),
     debug: true,
@@ -164,17 +169,17 @@ onMounted(async () => {
     channelId: deviceInfo.value.channelId,
   }).then(res => {
     console.log(res.data.data.https_fmp4)
-    const src = res.data.data.https_fmp4.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
-    console.log(src)
-    audioRef.value.src = src
-  })
-console.log(audioRef.value.playbackRate)
-  audioRef.value.addEventListener('waiting', () => {
-    console.log('卡顿？'+audioRef.value.playbackRate)
-    if(audioRef.value.playbackRate >= 1.05) {
-      audioRef.value.playbackRate = 1.05
+    flvSrc.value = res.data.data.https_flv.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+    if (flvjs.isSupported()) {
+      flvPlayer.value = flvjs.createPlayer({
+        type: 'flv',
+        url: flvSrc.value
+      })
+      flvPlayer.value.attachMediaElement(videoElement.value)
+      flvPlayer.value.load()
     }
   })
+
   // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
   //   // e.preventDefault()
   //   console.log(e)
@@ -268,17 +273,14 @@ const exitServer = async () => {
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
-    console.log(audioRef.value.playbackRate)
   console.log("开始对讲");
   isTalking.value = true;
   isMuted.value = false;
-  // audioRef.value.muted = false
 };
 
 const closeTalk = () => {
   console.log("关闭对讲");
   isMuted.value = true;
-  audioRef.value.muted = true
 };
 const changemedie = (id: number) => {
   const item = videoList.value.find((e) => e.id === id);
@@ -292,17 +294,17 @@ const changemedie = (id: number) => {
 
 const closeWin = async () => {
   if (!storeData.value) {
-    audioRef.value.removeAttribute('src')
-    audioRef.value.load()
-    audioRef.value = null
     window.close()
     await exitServer()
     console.log('关闭')
   }
 }
-const mutedAudio = () => {
-  audioRef.value.playbackRate =2
-  audioRef.value.muted = !audioRef.value.muted
+const startTalk = () => {
+  videoElement.value.muted = false
+}
+
+const stopTalk = ()=>{
+  videoElement.value.muted = true
 }
 </script>
 
@@ -310,17 +312,17 @@ const mutedAudio = () => {
   <Message v-if="messageShow"
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
     {{ messageText }}</Message>
-  <Message v-if="!isMuted"
+  <!-- <Message v-if="!isMuted"
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
-    {{ voiceText }}</Message>
+    {{ voiceText }}</Message> -->
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
     <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5] cursor-pointer" @click="setVoice(item.id)">
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue v-model="isTalking" :device-id="'44010200492000000001'" :channel-id="'34020000001310000001'"
-    @close="closeTalk" @start-broadcast="mutedAudio" @stop-broadcast="mutedAudio"></talkVue>
+  <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId"
+    @close="closeTalk" @start-broadcast="startTalk" @stop-broadcast="stopTalk"></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
@@ -377,7 +379,7 @@ const mutedAudio = () => {
         <button @click="talkHandle"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
-          <span>对讲</span> 
+          <span>对讲</span>
         </button>
         <button @click="getVoiceList"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
@@ -415,9 +417,14 @@ const mutedAudio = () => {
           <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
           关闭窗口
         </button>
-        <audio
-          src=""
-          ref="audioRef" id="video" class="w-0px h-0px" controls autoplay muted playbackRate="1.3"></audio>
+        <div class="video-container">
+          <video ref="videoElement" controls autoplay muted style="width: 0px;height: 0px;"> </video>
+        </div> 
+        <!-- <button id="closeBtn" @click="testbtn()"
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          <i class="fa-solid fa-xmark"></i>
+          test
+        </button> -->
         <!-- <Button
           @click="lockDoor(1)"
           pt:root="bg-[rgba(36,87,232,1)]  cursor-pointer py-2 px-4 rounded-full border-0 flex justify-center"
-- 
2.34.1


From 1e975cdd2ef3c66cc2c25e71006b11a630bbe1fa Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 18:13:18 +0800
Subject: [PATCH 39/65] =?UTF-8?q?fixed:=E7=BB=93=E6=9D=9F=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml | 21 +++++++++++++++++++++
 src/App.vue    | 10 +++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a07ef3f..dd50408 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,6 +23,9 @@ importers:
       dayjs:
         specifier: ^1.11.13
         version: 1.11.13
+      flv.js:
+        specifier: ^1.6.2
+        version: 1.6.2
       md5:
         specifier: ^2.3.0
         version: 2.3.0
@@ -731,6 +734,9 @@ packages:
     resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
     engines: {node: '>= 0.4'}
 
+  es6-promise@4.2.8:
+    resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
+
   esbuild@0.25.5:
     resolution: {integrity: sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==}
     engines: {node: '>=18'}
@@ -754,6 +760,9 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
+  flv.js@1.6.2:
+    resolution: {integrity: sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==}
+
   follow-redirects@1.15.9:
     resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
     engines: {node: '>=4.0'}
@@ -1124,6 +1133,9 @@ packages:
       typescript:
         optional: true
 
+  webworkify-webpack@2.1.5:
+    resolution: {integrity: sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==}
+
 snapshots:
 
   '@ampproject/remapping@2.3.0':
@@ -1762,6 +1774,8 @@ snapshots:
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
+  es6-promise@4.2.8: {}
+
   esbuild@0.25.5:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.25.5
@@ -1802,6 +1816,11 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
+  flv.js@1.6.2:
+    dependencies:
+      es6-promise: 4.2.8
+      webworkify-webpack: 2.1.5
+
   follow-redirects@1.15.9: {}
 
   form-data@4.0.3:
@@ -2141,3 +2160,5 @@ snapshots:
       '@vue/shared': 3.5.17
     optionalDependencies:
       typescript: 5.8.3
+
+  webworkify-webpack@2.1.5: {}
diff --git a/src/App.vue b/src/App.vue
index 370fb8b..328c30c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -260,16 +260,16 @@ const exitServer = async () => {
     instruction: "END_SERVICE",
     storeId: storeData.value?.data?.store_id
   })
-  token.value = "";
-  storeData.value = null;
-  cameraList.value = [];
-  goodsList.value = [];
-  videoList.value.forEach(e => (e.stream = null))
   await exitServerApi(
     storeData.value?.data?.customer_service_id,
     storeData.value?.data?.store_id,
     token.value
   );
+  token.value = "";
+  storeData.value = null;
+  cameraList.value = [];
+  goodsList.value = [];
+  videoList.value.forEach(e => (e.stream = null))
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
-- 
2.34.1


From 76fcf623af121b0ff92ac5fa8c0281d29f4477e1 Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 18:45:34 +0800
Subject: [PATCH 40/65] =?UTF-8?q?fixed:=E9=80=80=E5=87=BA=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 328c30c..901a1c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -148,6 +148,10 @@ ws.on("SHOP_INFO", (data) => {
   }
   console.log(data.data.store_device.camera);
 });
+ws.on("LOCK_STATUS", (data) => {
+  console.log("门锁状态改变", data)
+  // data.data.
+})
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
   goodsList.value = data.data.order_info.goods_list;
@@ -261,7 +265,7 @@ const exitServer = async () => {
     storeId: storeData.value?.data?.store_id
   })
   await exitServerApi(
-    storeData.value?.data?.customer_service_id,
+    storeData.value?.customer_service_id,
     storeData.value?.data?.store_id,
     token.value
   );
@@ -303,7 +307,7 @@ const startTalk = () => {
   videoElement.value.muted = false
 }
 
-const stopTalk = ()=>{
+const stopTalk = () => {
   videoElement.value.muted = true
 }
 </script>
@@ -321,8 +325,8 @@ const stopTalk = ()=>{
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId"
-    @close="closeTalk" @start-broadcast="startTalk" @stop-broadcast="stopTalk"></talkVue>
+  <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId" @close="closeTalk"
+    @start-broadcast="startTalk" @stop-broadcast="stopTalk"></talkVue>
   <div class="flex-col w-screen h-screen overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
@@ -419,7 +423,7 @@ const stopTalk = ()=>{
         </button>
         <div class="video-container">
           <video ref="videoElement" controls autoplay muted style="width: 0px;height: 0px;"> </video>
-        </div> 
+        </div>
         <!-- <button id="closeBtn" @click="testbtn()"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
           <i class="fa-solid fa-xmark"></i>
-- 
2.34.1


From 4c34ab72f4b13bd6165b2b76af2c21ec1d783cd9 Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 19:01:49 +0800
Subject: [PATCH 41/65] =?UTF-8?q?fixed:=E7=BB=93=E6=9D=9F=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 901a1c4..3e1b20a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -269,7 +269,7 @@ const exitServer = async () => {
     storeData.value?.data?.store_id,
     token.value
   );
-  token.value = "";
+  // token.value = "";
   storeData.value = null;
   cameraList.value = [];
   goodsList.value = [];
@@ -300,6 +300,7 @@ const closeWin = async () => {
   if (!storeData.value) {
     window.close()
     await exitServer()
+    token.value = "";
     console.log('关闭')
   }
 }
-- 
2.34.1


From 3bc6aba788119c1cb3c3ab1f72150ed7738e5e69 Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 19:29:00 +0800
Subject: [PATCH 42/65] =?UTF-8?q?feat:=E9=97=A8=E9=94=81=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3e1b20a..809fd96 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -40,7 +40,9 @@ const videoRef8 = ref<HTMLVideoElement | null>();
 const videoRef9 = ref<HTMLVideoElement | null>();
 const messageShow = ref(false)
 const messageText = ref("")
-
+const door1 = ref(true)
+const door2 = ref(true)
+const doorState = [door1,door2]
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
 
@@ -150,7 +152,7 @@ ws.on("SHOP_INFO", (data) => {
 });
 ws.on("LOCK_STATUS", (data) => {
   console.log("门锁状态改变", data)
-  // data.data.
+  doorState[data.data.port-1].value =  data.data.state?true:false
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
@@ -229,6 +231,7 @@ onMounted(async () => {
 const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
+  doorState[port-1].value = false
 };
 const lockDoor = async (type: number) => {
   if (!storeData.value?.data?.store_id) return;
@@ -392,15 +395,24 @@ const stopTalk = () => {
           语音
         </button>
         <button @click="openDoor(1)"
+          v-if="door1"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门一开门
         </button>
-        <button @click="openDoor(2)"
+        <button v-else class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          门一未关
+        </button>
+        <button v-if="door2" @click="openDoor(2)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门二开门
         </button>
+        <button v-else
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
+          门一未关
+        </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
-- 
2.34.1


From 8f75a9b479b3ceb8332874610d021e346f422434 Mon Sep 17 00:00:00 2001
From: lengxiaofei <xxx@qq.com>
Date: Thu, 3 Jul 2025 21:53:39 +0800
Subject: [PATCH 43/65] =?UTF-8?q?feat:=E6=9C=AA=E5=85=B3=E9=97=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=90=8C=E6=AD=A5=E7=94=BB=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 809fd96..56e732f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,7 +42,7 @@ const messageShow = ref(false)
 const messageText = ref("")
 const door1 = ref(true)
 const door2 = ref(true)
-const doorState = [door1,door2]
+const doorState = [door1, door2]
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
 
@@ -152,7 +152,7 @@ ws.on("SHOP_INFO", (data) => {
 });
 ws.on("LOCK_STATUS", (data) => {
   console.log("门锁状态改变", data)
-  doorState[data.data.port-1].value =  data.data.state?true:false
+  doorState[data.data.port - 1].value = data.data.state ? true : false
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
@@ -231,7 +231,7 @@ onMounted(async () => {
 const openDoor = async (port: number) => {
   if (!storeData.value?.data?.store_id) return;
   await openDoorApi(port, storeData.value?.data?.store_id, token.value);
-  doorState[port-1].value = false
+  doorState[port - 1].value = false
 };
 const lockDoor = async (type: number) => {
   if (!storeData.value?.data?.store_id) return;
@@ -317,10 +317,11 @@ const stopTalk = () => {
 </script>
 
 <template>
+
   <Message v-if="messageShow"
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
     {{ messageText }}</Message>
-  <!-- <Message v-if="!isMuted"
+  <!-- <Message 
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
     {{ voiceText }}</Message> -->
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
@@ -394,13 +395,13 @@ const stopTalk = () => {
           <img src="@/assets/images/icon_yy@2x.png" class="w-20px h-20px" alt="" />
           语音
         </button>
-        <button @click="openDoor(1)"
-          v-if="door1"
+        <button @click="openDoor(1)" v-if="door1"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门一开门
         </button>
-        <button v-else class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
+        <button v-else
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
           门一未关
         </button>
         <button v-if="door2" @click="openDoor(2)"
@@ -477,6 +478,7 @@ const stopTalk = () => {
       </div>
     </div>
     <div class="w-full">
+      <div v-if="!door1 || !door2" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
       <div class="w-full h-44vh">
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
@@ -546,4 +548,8 @@ const stopTalk = () => {
   -webkit-app-region: drag;
   /* 允许拖拽 */
 }
+
+.radial-gradient {
+  background: radial-gradient(transparent, #e66465);
+}
 </style>
-- 
2.34.1


From 0e5e0e01fc7b0a170d58c28dddc3b9a3707998f0 Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxx@qq.com>
Date: Thu, 3 Jul 2025 22:12:14 +0800
Subject: [PATCH 44/65] =?UTF-8?q?fixed:=E5=BC=80=E5=85=B3=E9=97=A8?=
 =?UTF-8?q?=E9=94=81=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 56e732f..ad41a51 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -152,7 +152,7 @@ ws.on("SHOP_INFO", (data) => {
 });
 ws.on("LOCK_STATUS", (data) => {
   console.log("门锁状态改变", data)
-  doorState[data.data.port - 1].value = data.data.state ? true : false
+  doorState[data.data.port - 1].value = data.data.state ? false : true
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
-- 
2.34.1


From c681082619cfef5da230c7e6d1cf69f105392e0c Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxx@qq.com>
Date: Thu, 3 Jul 2025 22:16:00 +0800
Subject: [PATCH 45/65] feat:test

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index ad41a51..f1addcb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -153,6 +153,7 @@ ws.on("SHOP_INFO", (data) => {
 ws.on("LOCK_STATUS", (data) => {
   console.log("门锁状态改变", data)
   doorState[data.data.port - 1].value = data.data.state ? false : true
+  console.log(doorState.map(e=>e.value),!door1,!door2)
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
-- 
2.34.1


From c8b7f108c19ca10f31c93fabc60d1b50870879fe Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 10:53:18 +0800
Subject: [PATCH 46/65] =?UTF-8?q?fixed:=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f1addcb..fe300a0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,6 +19,7 @@ import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
+const goodsShow = ref(false)
 const deviceInfo = ref({
   deviceId: '44010200492000000001',
   channelId: '44010200492000000001',
@@ -337,7 +338,7 @@ const stopTalk = () => {
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
       class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
-      v-if="goodsList.length">
+      v-if="goodsList.length || goodsShow">
       <div class="flex justify-between items-center px-4 py-2 text-white">
         <div>购物车</div>
       </div>
@@ -367,7 +368,7 @@ const stopTalk = () => {
       </div>
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1" id="tabbar">
-      <div class="flex items-center gap-2 h-4vh">
+      <div class="flex items-center gap-2 h-4vh justify-center">
         <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
         >
@@ -386,13 +387,18 @@ const stopTalk = () => {
           <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
           {{ storeData?.data?.store_name || "等待加入" }}
         </button>
+        <button @click="goodsShow = !goodsShow"
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          <img src="@/assets/images/icon_sy@2x.png" class="w-20px h-20px" alt="" />
+          <span>收银</span>
+        </button>
         <button @click="talkHandle"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           <span>对讲</span>
         </button>
         <button @click="getVoiceList"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_yy@2x.png" class="w-20px h-20px" alt="" />
           语音
         </button>
@@ -416,12 +422,12 @@ const stopTalk = () => {
           门一未关
         </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           锁门
         </button>
         <button v-else @click="lockDoor(0)"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           开门
         </button>
@@ -472,10 +478,15 @@ const stopTalk = () => {
         </Button> -->
       </div>
       <div class="flex flex-1 justify-end">
-        <Input readonly
+        <div class="flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
+          <span>{{storeData?.data?.user_nickname||"" }}</span>
+          <div class="h-1px bg-[rgba(255,255,255,0.5)] mx-1"></div>
+          <span>{{storeData?.data?.user_mobile || ''}}</span>
+        </div>
+        <!-- <Input readonly
           pt:root="outline-none text-center text-white bg-[rgba(255,255,255,0.1)] rounded-full max-w-500px px-2 min-w-200px placeholder-[rgba(255,255,255,0.8)]"
           :value="`${storeData?.data?.user_nickname || ''}/${storeData?.data?.user_mobile || ''
-            }`" />
+            }`" /> -->
       </div>
     </div>
     <div class="w-full">
-- 
2.34.1


From ba07a1182024ecf7501df9e88a91f2420b2b65b1 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 11:22:09 +0800
Subject: [PATCH 47/65] =?UTF-8?q?fixed:=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fe300a0..73de745 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 // import Button from "primevue/button";
-import Input from "primevue/inputtext";
 import Dialog from "primevue/dialog";
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { WebSocketClient } from "./utils/websocket";
@@ -46,7 +45,7 @@ const door2 = ref(true)
 const doorState = [door1, door2]
 const voiceList = ref<any[]>([]);
 const cameraList = ref<any[]>([]);
-
+const beCalled = ref(false)
 const videoElement = ref()
 const flvPlayer = ref()
 const flvSrc = ref()
@@ -165,6 +164,12 @@ ws.once("TOKEN", (data) => {
   console.log("token获取", data.token);
   token.value = data.token;
 });
+ws.on("WATCHER_VOICE_SPEECH",()=>{
+  beCalled.value = true
+  setTimeout(()=>{
+    beCalled.value = false
+  },2000)
+})
 const videoList = ref<any[]>([]);
 watchEffect(() => {
   videoList.value.forEach((e) => {
@@ -436,12 +441,7 @@ const stopTalk = () => {
           <i class="fa-solid fa-check"></i>
           结束服务
         </button>
-        <button id="closeBtn" @click="closeWin()"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
-          <i class="fa-solid fa-xmark"></i>
-          <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
-          关闭窗口
-        </button>
+        
         <div class="video-container">
           <video ref="videoElement" controls autoplay muted style="width: 0px;height: 0px;"> </video>
         </div>
@@ -477,12 +477,17 @@ const stopTalk = () => {
           </div>
         </Button> -->
       </div>
-      <div class="flex flex-1 justify-end">
-        <div class="flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
+      <div class="flex flex-1 justify-end gap-1 items-center">
+        <div class="h-full max-w-300px flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
           <span>{{storeData?.data?.user_nickname||"" }}</span>
           <div class="h-1px bg-[rgba(255,255,255,0.5)] mx-1"></div>
           <span>{{storeData?.data?.user_mobile || ''}}</span>
         </div>
+        <button id="closeBtn" @click="closeWin()"
+          class="btn rounded-[50px] h-32px w-32px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          <i class="fa-solid fa-xmark"></i>
+          <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
+        </button>
         <!-- <Input readonly
           pt:root="outline-none text-center text-white bg-[rgba(255,255,255,0.1)] rounded-full max-w-500px px-2 min-w-200px placeholder-[rgba(255,255,255,0.8)]"
           :value="`${storeData?.data?.user_nickname || ''}/${storeData?.data?.user_mobile || ''
@@ -490,7 +495,7 @@ const stopTalk = () => {
       </div>
     </div>
     <div class="w-full">
-      <div v-if="!door1 || !door2" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
+      <div v-if="!door1 || !door2 || beCalled" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
       <div class="w-full h-44vh">
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
-- 
2.34.1


From 8a6231d6aac120372139c5da340cfdfb4abb148e Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 18:27:09 +0800
Subject: [PATCH 48/65] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E5=BC=8F=E6=96=AD=E7=82=B9=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整UnoCSS配置中的断点值(md:1000px, sm:600px)
添加paymentStatus状态管理支付状态
优化购物车界面样式和支付状态显示
修改门状态提示文字为更清晰的表述
调整视频播放器配置和样式
---
 src/App.vue   | 114 +++++++++++++++++++++++++++++---------------------
 uno.config.ts |   4 +-
 2 files changed, 68 insertions(+), 50 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 73de745..9a4e79e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,6 +25,7 @@ const deviceInfo = ref({
   broadcastMode: false
 })
 // const voiceText = ref("语音转文字")
+const paymentStatus = ref(false)
 const token = ref("");
 const isTalking = ref(false);
 const visible = ref(false);
@@ -149,34 +150,7 @@ ws.on("SHOP_INFO", (data) => {
     });
   }
   console.log(data.data.store_device.camera);
-});
-ws.on("LOCK_STATUS", (data) => {
-  console.log("门锁状态改变", data)
-  doorState[data.data.port - 1].value = data.data.state ? false : true
-  console.log(doorState.map(e=>e.value),!door1,!door2)
-})
-ws.on("SHOP_ORDER", (data) => {
-  console.log("商店订单接口数据", data);
-  goodsList.value = data.data.order_info.goods_list;
-  console.log("商店订单", goodsList.value);
-});
-ws.once("TOKEN", (data) => {
-  console.log("token获取", data.token);
-  token.value = data.token;
-});
-ws.on("WATCHER_VOICE_SPEECH",()=>{
-  beCalled.value = true
-  setTimeout(()=>{
-    beCalled.value = false
-  },2000)
-})
-const videoList = ref<any[]>([]);
-watchEffect(() => {
-  videoList.value.forEach((e) => {
-    if (e.stream) e.el.srcObject = e.stream;
-  });
-});
-onMounted(async () => {
+
   audioStartPlay({
     deviceId: deviceInfo.value.deviceId,
     channelId: deviceInfo.value.channelId,
@@ -187,12 +161,54 @@ onMounted(async () => {
       flvPlayer.value = flvjs.createPlayer({
         type: 'flv',
         url: flvSrc.value
-      })
+      },
+        {
+          enableWorker: false, //不启用分离线程
+          enableStashBuffer: false, //关闭IO隐藏缓冲区
+          reuseRedirectedURL: true, //重用301/302重定向url，用于随后的请求，如查找、重新连接等。
+          autoCleanupSourceBuffer: true //自动清除缓存
+        })
       flvPlayer.value.attachMediaElement(videoElement.value)
       flvPlayer.value.load()
     }
   })
 
+  // setInterval(()=>{
+  //   console.log(videoElement.value.buffered)
+  // })
+});
+ws.on("LOCK_STATUS", (data) => {
+  console.log("门锁状态改变", data)
+  doorState[data.data.port - 1].value = data.data.state ? false : true
+  console.log(doorState.map(e => e.value), !door1, !door2)
+})
+ws.on("SHOP_ORDER", (data) => {
+  console.log("商店订单接口数据", data);
+  goodsList.value = data.data.order_info.goods_list;
+   if(data.data.order_status==2){
+    paymentStatus.value = true
+  }
+  console.log("商店订单", goodsList.value);
+});
+ws.once("TOKEN", (data) => {
+  console.log("token获取", data.token);
+  token.value = data.token;
+});
+ws.on("WATCHER_VOICE_SPEECH", () => {
+  beCalled.value = true
+  setTimeout(() => {
+    beCalled.value = false
+  }, 5000)
+})
+const videoList = ref<any[]>([]);
+watchEffect(() => {
+  videoList.value.forEach((e) => {
+    if (e.stream) e.el.srcObject = e.stream;
+  });
+});
+onMounted(async () => {
+
+
   // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
   //   // e.preventDefault()
   //   console.log(e)
@@ -280,6 +296,7 @@ const exitServer = async () => {
     token.value
   );
   // token.value = "";
+  paymentStatus.value = false
   storeData.value = null;
   cameraList.value = [];
   goodsList.value = [];
@@ -339,7 +356,7 @@ const stopTalk = () => {
   </Dialog>
   <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId" @close="closeTalk"
     @start-broadcast="startTalk" @stop-broadcast="stopTalk"></talkVue>
-  <div class="flex-col w-screen h-screen overflow-hidden relative">
+  <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
       class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
@@ -347,7 +364,7 @@ const stopTalk = () => {
       <div class="flex justify-between items-center px-4 py-2 text-white">
         <div>购物车</div>
       </div>
-      <div class="h-1px bg-white mx-4"></div>
+      <div class="h-1px bg-[#333] mx-4"></div>
       <div>
         <table class="text-white w-full m-4">
           <thead>
@@ -365,10 +382,10 @@ const stopTalk = () => {
             </tr>
           </tbody>
         </table>
-        <div class="h-1px bg-white m-4"></div>
-        <div class="flex justify-between items-center px-4 py-2 text-white">
-          <div>合计</div>
-          <div>¥{{ totalPrice }}</div>
+        <div class="h-1px bg-[#333] m-4"></div>
+        <div class="flex justify-between items-center px-4 py-2" :class="{ 'text-green': paymentStatus, 'text-red': !paymentStatus }">
+          <div>{{ paymentStatus? '已支付' :'待支付'}}</div>
+          <div>{{ totalPrice }}</div>
         </div>
       </div>
     </div>
@@ -410,21 +427,21 @@ const stopTalk = () => {
         <button @click="openDoor(1)" v-if="door1"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
-          门一开门
+          门1开门
         </button>
         <button v-else
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
-          门一未关
+          门1未关
         </button>
         <button v-if="door2" @click="openDoor(2)"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
-          门二开门
+          门2开门
         </button>
         <button v-else
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
-          门一未关
+          门1未关
         </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
           class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
@@ -441,7 +458,7 @@ const stopTalk = () => {
           <i class="fa-solid fa-check"></i>
           结束服务
         </button>
-        
+
         <div class="video-container">
           <video ref="videoElement" controls autoplay muted style="width: 0px;height: 0px;"> </video>
         </div>
@@ -478,13 +495,14 @@ const stopTalk = () => {
         </Button> -->
       </div>
       <div class="flex flex-1 justify-end gap-1 items-center">
-        <div class="h-full max-w-300px flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
-          <span>{{storeData?.data?.user_nickname||"" }}</span>
-          <div class="h-1px bg-[rgba(255,255,255,0.5)] mx-1"></div>
-          <span>{{storeData?.data?.user_mobile || ''}}</span>
+        <div
+          class="h-full max-w-300px flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
+          <span>{{ storeData?.data?.user_nickname || "" }}</span>
+          <div class="h-1px bg-[#ddd] mx-1"></div>
+          <span>{{ storeData?.data?.user_mobile || '' }}</span>
         </div>
         <button id="closeBtn" @click="closeWin()"
-          class="btn rounded-[50px] h-32px w-32px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          class="btn rounded-[50px] h-32px w-32px min-w-32px flex justify-center items-center gap-1 bg-[#f40] text-white">
           <i class="fa-solid fa-xmark"></i>
           <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
         </button>
@@ -495,7 +513,7 @@ const stopTalk = () => {
       </div>
     </div>
     <div class="w-full">
-      <div v-if="!door1 || !door2 || beCalled" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
+      <div v-if="beCalled" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
       <div class="w-full h-44vh">
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
@@ -503,7 +521,7 @@ const stopTalk = () => {
         <video ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
           class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
       </div>
-      <div class="h-1px bg-white"></div>
+      <div class="h-1px bg-[#333]"></div>
       <div class="h-48vh">
         <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
@@ -527,7 +545,7 @@ const stopTalk = () => {
               v-show="videoList[4]?.stream"></video>
           </div>
         </div>
-        <div class="h-1px bg-white"></div>
+        <div class="h-1px bg-[#333]"></div>
         <div class="w-full flex h-50% gap-[1px]">
           <div class="bg-black w-100% h-full flex justify-center items-center">
             <img src="@/assets/images/icon_sxt@2x.png" alt="" v-show="!videoList[5]?.stream" />
diff --git a/uno.config.ts b/uno.config.ts
index 437f1d2..7f7e177 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -4,8 +4,8 @@ export default defineConfig({
     // ...UnoCSS options
     theme:{
         breakpoints:{
-            md:'1200px',
-            sm:"700px"
+            md:'1000px',
+            sm:"600px"
         }
     }
 })
\ No newline at end of file
-- 
2.34.1


From 9ab4eeef76dd0f68fe9b53eb3157e5dffb4f00a0 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 18:39:16 +0800
Subject: [PATCH 49/65] =?UTF-8?q?fixed:=E6=94=B6=E9=93=B6=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9a4e79e..eb6fe69 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -184,6 +184,9 @@ ws.on("LOCK_STATUS", (data) => {
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
+  if(!goodsShow.value){
+    goodsShow.value = true
+  }
   goodsList.value = data.data.order_info.goods_list;
    if(data.data.order_status==2){
     paymentStatus.value = true
@@ -359,8 +362,8 @@ const stopTalk = () => {
   <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
-      class="z-100 fixed right-4 w-xl bg-[rgba(0,0,0,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px"
-      v-if="goodsList.length || goodsShow">
+      class="z-100 fixed right-4 w-xl border border-solid border-[rgba(228,252,236,1)] bg-[rgba(0,0,0,0.8)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px backdrop-blur"
+      v-if="goodsShow">
       <div class="flex justify-between items-center px-4 py-2 text-white">
         <div>购物车</div>
       </div>
-- 
2.34.1


From 1b0d95470a012415febcdb6d42c0a7234f8d0c9a Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 18:51:13 +0800
Subject: [PATCH 50/65] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index eb6fe69..3fa39b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -173,9 +173,6 @@ ws.on("SHOP_INFO", (data) => {
     }
   })
 
-  // setInterval(()=>{
-  //   console.log(videoElement.value.buffered)
-  // })
 });
 ws.on("LOCK_STATUS", (data) => {
   console.log("门锁状态改变", data)
@@ -362,14 +359,14 @@ const stopTalk = () => {
   <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
-      class="z-100 fixed right-4 w-xl border border-solid border-[rgba(228,252,236,1)] bg-[rgba(0,0,0,0.8)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px backdrop-blur"
+      class="z-100 fixed right-4 w-xl  bg-[rgba(255,255,255,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px backdrop-blur"
       v-if="goodsShow">
-      <div class="flex justify-between items-center px-4 py-2 text-white">
+      <div class="flex justify-between items-center px-4 py-2 text-black">
         <div>购物车</div>
       </div>
       <div class="h-1px bg-[#333] mx-4"></div>
       <div>
-        <table class="text-white w-full m-4">
+        <table class="text-black w-full m-4">
           <thead>
             <tr>
               <th class="text-left">商品名称</th>
@@ -386,7 +383,7 @@ const stopTalk = () => {
           </tbody>
         </table>
         <div class="h-1px bg-[#333] m-4"></div>
-        <div class="flex justify-between items-center px-4 py-2" :class="{ 'text-green': paymentStatus, 'text-red': !paymentStatus }">
+        <div class="flex justify-between items-center px-4 py-2" :class="{ 'text-green': paymentStatus, 'text-[#f40]': !paymentStatus }">
           <div>{{ paymentStatus? '已支付' :'待支付'}}</div>
           <div>{{ totalPrice }}</div>
         </div>
-- 
2.34.1


From 3cbe1564c9a95d54887221ced7ccdea970abe9ae Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 19:11:31 +0800
Subject: [PATCH 51/65] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3fa39b6..6939578 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -161,13 +161,7 @@ ws.on("SHOP_INFO", (data) => {
       flvPlayer.value = flvjs.createPlayer({
         type: 'flv',
         url: flvSrc.value
-      },
-        {
-          enableWorker: false, //不启用分离线程
-          enableStashBuffer: false, //关闭IO隐藏缓冲区
-          reuseRedirectedURL: true, //重用301/302重定向url，用于随后的请求，如查找、重新连接等。
-          autoCleanupSourceBuffer: true //自动清除缓存
-        })
+      })
       flvPlayer.value.attachMediaElement(videoElement.value)
       flvPlayer.value.load()
     }
@@ -187,6 +181,8 @@ ws.on("SHOP_ORDER", (data) => {
   goodsList.value = data.data.order_info.goods_list;
    if(data.data.order_status==2){
     paymentStatus.value = true
+  }else{
+    paymentStatus.value = false
   }
   console.log("商店订单", goodsList.value);
 });
@@ -301,6 +297,7 @@ const exitServer = async () => {
   cameraList.value = [];
   goodsList.value = [];
   videoList.value.forEach(e => (e.stream = null))
+  flvPlayer.value.destroy()
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
-- 
2.34.1


From 047e542c04abc5b4dbb2133b8a698146fce167f3 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 19:14:13 +0800
Subject: [PATCH 52/65] =?UTF-8?q?fix:=E7=BB=93=E6=9D=9F=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E9=97=A8=E7=8A=B6=E6=80=81=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index 6939578..12a6213 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -292,6 +292,10 @@ const exitServer = async () => {
     token.value
   );
   // token.value = "";
+  doorState.forEach(e=>{
+    e.value = true
+  })
+  goodsShow.value =false
   paymentStatus.value = false
   storeData.value = null;
   cameraList.value = [];
-- 
2.34.1


From 9683fb787f0e920e98ab1313e869aa6e1800eeab Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 4 Jul 2025 19:21:41 +0800
Subject: [PATCH 53/65] =?UTF-8?q?fix:=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=85=B3=E9=97=A8=E6=89=8B=E5=8A=A8=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index 12a6213..7620ce1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -180,6 +180,7 @@ ws.on("SHOP_ORDER", (data) => {
   }
   goodsList.value = data.data.order_info.goods_list;
    if(data.data.order_status==2){
+    door1.value = false
     paymentStatus.value = true
   }else{
     paymentStatus.value = false
-- 
2.34.1


From fcc32fc0fc2f3ca42dbfbeca8039fcf7baa41062 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Tue, 8 Jul 2025 10:38:23 +0800
Subject: [PATCH 54/65] =?UTF-8?q?refactor(talk):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=AF=B9=E8=AE=B2=E7=BB=84=E4=BB=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除未使用的onMounted钩子和注释代码
- 将deviceInfo从组件内部状态改为使用props传递
- 新增ipAdd和domain props用于动态替换流地址
- 调整代码格式提高可读性
---
 src/App.vue             | 69 ++++++++++++++++++++++++-----------------
 src/components/talk.vue | 45 ++++++++++++---------------
 2 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7620ce1..dc31633 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,9 +20,11 @@ import { Message } from "primevue";
 // const appStore = useAppStore()
 const goodsShow = ref(false)
 const deviceInfo = ref({
-  deviceId: '44010200492000000001',
-  channelId: '44010200492000000001',
-  broadcastMode: false
+  deviceId: '44010200492000000009',
+  channelId: '44010200492000000009',
+  broadcastMode: false,
+  ipAdd: 'https://47.94.83.66:443',
+  domain: 'https://webrtc2.test.7games.store'
 })
 // const voiceText = ref("语音转文字")
 const paymentStatus = ref(false)
@@ -149,23 +151,32 @@ ws.on("SHOP_INFO", (data) => {
       startPlay(e);
     });
   }
+
+  if (data.data.stream_url && data.data.stream_ip && data.data.gb28181_id && data.data.channel) {
+    deviceInfo.value.domain = data.data.stream_url
+    deviceInfo.value.ipAdd = data.data.stream_ip
+    deviceInfo.value.deviceId = data.data.gb28181_id
+    deviceInfo.value.channelId = data.data.channel
+    audioStartPlay({
+      deviceId: deviceInfo.value.deviceId,
+      channelId: deviceInfo.value.channelId,
+    }).then(res => {
+      console.log(res.data.data.https_fmp4)
+      flvSrc.value = res.data.data.https_flv.replace(deviceInfo.value.ipAdd, deviceInfo.value.domain)
+      if (flvjs.isSupported()) {
+        flvPlayer.value = flvjs.createPlayer({
+          type: 'flv',
+          url: flvSrc.value
+        })
+        flvPlayer.value.attachMediaElement(videoElement.value)
+        flvPlayer.value.load()
+      }
+    })
+    console.log(deviceInfo.value)
+  }
   console.log(data.data.store_device.camera);
 
-  audioStartPlay({
-    deviceId: deviceInfo.value.deviceId,
-    channelId: deviceInfo.value.channelId,
-  }).then(res => {
-    console.log(res.data.data.https_fmp4)
-    flvSrc.value = res.data.data.https_flv.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
-    if (flvjs.isSupported()) {
-      flvPlayer.value = flvjs.createPlayer({
-        type: 'flv',
-        url: flvSrc.value
-      })
-      flvPlayer.value.attachMediaElement(videoElement.value)
-      flvPlayer.value.load()
-    }
-  })
+
 
 });
 ws.on("LOCK_STATUS", (data) => {
@@ -175,14 +186,14 @@ ws.on("LOCK_STATUS", (data) => {
 })
 ws.on("SHOP_ORDER", (data) => {
   console.log("商店订单接口数据", data);
-  if(!goodsShow.value){
+  if (!goodsShow.value) {
     goodsShow.value = true
   }
   goodsList.value = data.data.order_info.goods_list;
-   if(data.data.order_status==2){
+  if (data.data.order_status == 2) {
     door1.value = false
     paymentStatus.value = true
-  }else{
+  } else {
     paymentStatus.value = false
   }
   console.log("商店订单", goodsList.value);
@@ -293,10 +304,10 @@ const exitServer = async () => {
     token.value
   );
   // token.value = "";
-  doorState.forEach(e=>{
+  doorState.forEach(e => {
     e.value = true
   })
-  goodsShow.value =false
+  goodsShow.value = false
   paymentStatus.value = false
   storeData.value = null;
   cameraList.value = [];
@@ -356,8 +367,9 @@ const stopTalk = () => {
       {{ item.content }}
     </div>
   </Dialog>
-  <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId" @close="closeTalk"
-    @start-broadcast="startTalk" @stop-broadcast="stopTalk"></talkVue>
+  <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId"
+    :ipAdd="deviceInfo.ipAdd" :domain="deviceInfo.domain" @close="closeTalk" @start-broadcast="startTalk"
+    @stop-broadcast="stopTalk"></talkVue>
   <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
@@ -385,8 +397,9 @@ const stopTalk = () => {
           </tbody>
         </table>
         <div class="h-1px bg-[#333] m-4"></div>
-        <div class="flex justify-between items-center px-4 py-2" :class="{ 'text-green': paymentStatus, 'text-[#f40]': !paymentStatus }">
-          <div>{{ paymentStatus? '已支付' :'待支付'}}</div>
+        <div class="flex justify-between items-center px-4 py-2"
+          :class="{ 'text-green': paymentStatus, 'text-[#f40]': !paymentStatus }">
+          <div>{{ paymentStatus ? '已支付' : '待支付' }}</div>
           <div>{{ totalPrice }}</div>
         </div>
       </div>
@@ -520,7 +533,7 @@ const stopTalk = () => {
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-        <video ref="videoRef1" controls :muted="isMuted" v-show="videoList[0]?.stream"
+        <video ref="videoRef1" :muted="isMuted" v-show="videoList[0]?.stream"
           class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
       </div>
       <div class="h-1px bg-[#333]"></div>
diff --git a/src/components/talk.vue b/src/components/talk.vue
index 4ebed5e..b078bb1 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -1,10 +1,10 @@
 <template>
-  <Dialog :visible="modelValue" @update:visible="handleVisibleChange" pt:root="bg-white w-500px h-500px relative rounded-8px"
-    pt:mask="bg-[rgba(0,0,0,0.5)]" pt:header="w-full flex flex-row-reverse p-28px" pt:content="h-full">
+  <Dialog :visible="modelValue" @update:visible="handleVisibleChange"
+    pt:root="bg-white w-500px h-500px relative rounded-8px" pt:mask="bg-[rgba(0,0,0,0.5)]"
+    pt:header="w-full flex flex-row-reverse p-28px" pt:content="h-full">
     <template #closeicon>
       <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 20px; height: 20px; " />
     </template>
-    <!-- <audio src="https://webrtc.test.7games.store/rtp/44010200492000000001_34020000001310000001.live.mp4?originTypeStr=rtp_push" ref="videoRef" id="video" class="w-300px h-300px"  controls autoplay muted></audio> -->
     <div class="flex relative align-center justify-center w-full h-full">
       <div class="flex flex-col items-center justify-end">
         <img class="h-160px w-160px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
@@ -16,7 +16,7 @@
 </template>
 
 <script lang='ts' setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import Dialog from 'primevue/dialog';
 import { broadcastStart, broadcastStop } from "@/api/talk";
 import md5 from 'md5';
@@ -37,6 +37,14 @@ const props = defineProps({
   channelId: {
     type: String,
     required: true
+  },
+  ipAdd: {
+    type: String,
+    required: true
+  },
+  domain: {
+    type: String,
+    required: true
   }
 });
 
@@ -45,11 +53,6 @@ const userInfo = ref({
   pushKey: ''
 })
 
-const deviceInfo = ref({
-  deviceId: props.deviceId,
-  channelId: props.channelId,
-  broadcastMode: false
-})
 
 // 新增emit事件定义
 const emit = defineEmits(['update:modelValue', 'close', 'start-broadcast', 'stop-broadcast']);
@@ -90,9 +93,9 @@ const broadcastStatusClick = () => {
     broadcastStatus.value = 1 //0
     // 发起语音对讲+
     broadcastStart({
-      deviceId: deviceInfo.value.deviceId,
-      channelId: deviceInfo.value.channelId,
-      broadcastMode: deviceInfo.value.broadcastMode
+      deviceId: props.deviceId,
+      channelId: props.channelId,
+      broadcastMode: false
     }, userInfo.value.accessToken).then(data => {
 
       console.log(data)
@@ -100,7 +103,7 @@ const broadcastStatusClick = () => {
       console.log(res)
       const streamInfo = res.streamInfo
       if (document.location.protocol.includes('https')) {
-        const rtcs = streamInfo.rtcs.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
+        const rtcs = streamInfo.rtcs.replace(props.ipAdd, props.domain)
         startBroadcast(rtcs)
       } else {
         startBroadcast(streamInfo.rtc)
@@ -166,22 +169,12 @@ const stopBroadcast = () => {
   broadcastRtc.close()
   broadcastStatus.value = -1
   broadcastStop({
-    deviceId: deviceInfo.value.deviceId,
-    channelId: deviceInfo.value.channelId,
+    deviceId: props.deviceId,
+    channelId: props.channelId,
     accessToken: userInfo.value.accessToken
   })
 }
 
-onMounted(() => {
-  // audioStartPlay({
-  //   deviceId: deviceInfo.value.deviceId,
-  //   channelId: deviceInfo.value.channelId,
-  // }).then(res => {
-  //   console.log( res.data.data.https_fmp4)
-  //   const src = res.data.data.https_fmp4.replace('https://123.56.105.137:443', 'https://webrtc.test.7games.store')
-  //   console.log(src)
-  //   videoRef.value.src = src
-  // })
-})
+
 </script>
 <style scoped></style>
\ No newline at end of file
-- 
2.34.1


From 00b9a4473f6eaab4b6d553c1883384021767beb3 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Wed, 9 Jul 2025 18:00:47 +0800
Subject: [PATCH 55/65] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=97=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC=E5=92=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将门状态显示从"门1未关"改为"门2未关"
- 调整开门和结束服务按钮的背景色为红色(#f40)
---
 src/App.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dc31633..b9f8e2b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -456,7 +456,7 @@ const stopTalk = () => {
         <button v-else
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
-          门1未关
+          门2未关
         </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
           class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
@@ -464,12 +464,12 @@ const stopTalk = () => {
           锁门
         </button>
         <button v-else @click="lockDoor(0)"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1  text-white bg-[#f40]">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           开门
         </button>
         <button @click="exitServer()"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1  text-white bg-[#f40]">
           <i class="fa-solid fa-check"></i>
           结束服务
         </button>
-- 
2.34.1


From 5316283176d5e1ff06ccfb07f119f9f4d8e04b0c Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Mon, 14 Jul 2025 17:56:37 +0800
Subject: [PATCH 56/65] =?UTF-8?q?feat(=E8=AF=AD=E9=9F=B3=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?):=20=E4=B8=BAsetVoiceApi=E6=B7=BB=E5=8A=A0cid=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BB=A5=E6=94=AF=E6=8C=81=E5=AE=A2=E6=9C=8DID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改setVoiceApi接口，新增cid参数用于传递客服ID，同时在调用处补充该参数。这使语音设置能够关联到具体的客服会话。
---
 src/App.vue    | 6 ++++--
 src/api/api.ts | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b9f8e2b..b1a188c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,7 @@ import {
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
 import flvjs from 'flv.js'
-import { Message } from "primevue";
+import {  Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
@@ -273,7 +273,7 @@ const lockDoor = async (type: number) => {
 const setVoice = async (id: number) => {
   console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
-  await setVoiceApi(storeData.value?.data?.store_id, id);
+  await setVoiceApi(storeData.value?.data?.store_id, id,storeData.value?.customer_service_id);
   messageText.value = "语音发送成功"
   messageShow.value = true
   setTimeout(() => {
@@ -317,6 +317,7 @@ const exitServer = async () => {
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
+    console.log(  videoElement.value.volume)
   console.log("开始对讲");
   isTalking.value = true;
   isMuted.value = false;
@@ -345,6 +346,7 @@ const closeWin = async () => {
   }
 }
 const startTalk = () => {
+  
   videoElement.value.muted = false
 }
 
diff --git a/src/api/api.ts b/src/api/api.ts
index 4103ef1..2a7a48e 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -40,11 +40,11 @@ export const voiceList = async (
     }
   );
 };
-export const setVoiceApi = async (sid,id) => {
+export const setVoiceApi = async (sid,id,cid) => {
   return request.get(
     "/pc/voice/set",
     {
-      params:{sid,id}
+      params:{sid,id,cid}
     },
   );
 };
-- 
2.34.1


From 2c13294dd10b0af2a9cabdbd73cecf9286189d82 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Wed, 16 Jul 2025 15:04:25 +0800
Subject: [PATCH 57/65] =?UTF-8?q?feat(=E8=AF=AD=E9=9F=B3=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?):=20=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3=E8=BD=AC=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增recordrtc依赖用于音频录制
- 实现语音转文字WebSocket连接及录音功能
- 添加语音识别结果显示组件
- 优化vite配置增加分包设置
- 新增语音识别日志记录API
---
 package-lock.json |   7 +++
 package.json      |   1 +
 src/App.vue       | 137 ++++++++++++++++++++++++++++++++++++++++++----
 src/api/api.ts    |  16 ++++++
 vite.config.ts    |  12 ++++
 5 files changed, 162 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80cebfa..625c5ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "md5": "^2.3.0",
         "pinia": "^3.0.3",
         "primevue": "^4.3.5",
+        "recordrtc": "^5.6.2",
         "vue": "^3.5.13",
         "vue-router": "^4.5.1"
       },
@@ -2788,6 +2789,12 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/recordrtc": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmmirror.com/recordrtc/-/recordrtc-5.6.2.tgz",
+      "integrity": "sha512-1QNKKNtl7+KcwD1lyOgP3ZlbiJ1d0HtXnypUy7yq49xEERxk31PHvE9RCciDrulPCY7WJ+oz0R9hpNxgsIurGQ==",
+      "license": "MIT"
+    },
     "node_modules/rfdc": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
diff --git a/package.json b/package.json
index 5247342..d6fae92 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "md5": "^2.3.0",
     "pinia": "^3.0.3",
     "primevue": "^4.3.5",
+    "recordrtc": "^5.6.2",
     "vue": "^3.5.13",
     "vue-router": "^4.5.1"
   },
diff --git a/src/App.vue b/src/App.vue
index b1a188c..dc28597 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 // import Button from "primevue/button";
 import Dialog from "primevue/dialog";
+import RecordRTC from 'recordrtc';
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { WebSocketClient } from "./utils/websocket";
 import { logger } from "./utils/logger/Logger";
@@ -11,10 +12,11 @@ import {
   exitServerApi,
   voiceList as voiceListApi,
   setVoiceApi,
+  speechToTextLogApi
 } from "@/api/api";
 import talkVue from "@/components/talk.vue";
 import flvjs from 'flv.js'
-import {  Message } from "primevue";
+import { Message } from "primevue";
 // import { chunkArray } from "./utils/utils";
 // import {useAppStore} from "@/store/__APP__store"
 // const appStore = useAppStore()
@@ -53,6 +55,12 @@ const videoElement = ref()
 const flvPlayer = ref()
 const flvSrc = ref()
 
+const socket = ref<WebSocket | null>(null);
+const recorder = ref<RecordRTC | null>(null);
+const voiceShow = ref(false)
+const voiceText = ref("测试测试")
+const allVoiceText = ref('')
+
 const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
 const totalPrice = computed(() => {
@@ -66,6 +74,107 @@ const totalPrice = computed(() => {
     return 0;
   }
 });
+
+const videoPlay = () => {
+  console.log('开始播放flv')
+  setTimeout(() => {
+    toggleRecording()
+  }, 1500);
+}
+
+
+//语音转文字websocket
+// 初始化 WebSocket
+const initWebSocket = () => {
+  return new Promise<WebSocket>((resolve, reject) => {
+    const ws = new WebSocket('wss://stt.test.7games.store');
+
+    ws.onopen = () => {
+      console.log('WebSocket connected');
+      resolve(ws);
+    };
+
+    ws.onerror = (err) => {
+      console.error('WebSocket error:', err);
+      reject(new Error('连接服务器失败'));
+    };
+  });
+};
+
+// 开始/停止录音
+const toggleRecording = async () => {
+  console.log('开始录音')
+  try {
+    // 1. 初始化 WebSocket
+    socket.value = await initWebSocket();
+
+    // 2. 设置 WebSocket 消息处理
+    socket.value.onmessage = (event) => {
+      const data = JSON.parse(event.data);
+      console.log('收到服务端消息:', data);
+      if (data.text && data.text !== '') {
+        voiceText.value = data.text
+        voiceShow.value = true
+        allVoiceText.value += ';' + data.text
+        setTimeout(() => {
+          voiceShow.value = false
+        }, 3000);
+      }
+    };
+
+    // 3. 获取麦克风权限并开始录音
+    const stream = videoElement.value.captureStream();
+    console.log(stream)
+    // const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
+    recorder.value = new RecordRTC(stream, {
+      type: 'audio',
+      mimeType: 'audio/wav',
+      sampleRate: 48000,      // 必须与服务端一致
+      numberOfAudioChannels: 1, // 单声道
+      timeSlice: 400,          // 每1秒发送一次数据
+      desiredSampRate: 48000,
+      recorderType: RecordRTC.StereoAudioRecorder,
+      ondataavailable: (blob: Blob) => {
+        console.log(blob.size)
+        if (socket.value?.readyState === WebSocket.OPEN) {
+          const reader = new FileReader();
+          reader.onload = () => {
+            if (reader.result instanceof ArrayBuffer) {
+              const pcmData = new Uint8Array(reader.result).slice(44);
+              socket.value?.send(pcmData);
+            }
+          };
+          reader.readAsArrayBuffer(blob);
+        }
+      },
+    });
+
+    recorder.value.startRecording();
+
+  } catch (err) {
+    console.error('Recording error:', err);
+  } finally {
+  }
+};
+
+// 停止录音
+const stopRecording = () => {
+  if (recorder.value) {
+    recorder.value.stopRecording(() => {
+      if (socket.value) {
+        socket.value.send(JSON.stringify({ action: 'stop' }));
+        socket.value.close();
+      }
+      recorder.value?.getDataURL(() => {
+        const stream = recorder.value?.getBlob();
+        if (stream) {
+          stream.getTracks().forEach(track => track.stop());
+        }
+      });
+    });
+  }
+};
+
 const ws = new WebSocketClient("ws://127.0.0.1:9090", "instruction");
 const startPlay = async (url: string) => {
   console.log(url)
@@ -169,7 +278,7 @@ ws.on("SHOP_INFO", (data) => {
           url: flvSrc.value
         })
         flvPlayer.value.attachMediaElement(videoElement.value)
-        flvPlayer.value.load()
+        flvPlayer.value.load();
       }
     })
     console.log(deviceInfo.value)
@@ -216,7 +325,6 @@ watchEffect(() => {
 });
 onMounted(async () => {
 
-
   // window.onbeforeunload = async (e: BeforeUnloadEvent) => {
   //   // e.preventDefault()
   //   console.log(e)
@@ -273,7 +381,7 @@ const lockDoor = async (type: number) => {
 const setVoice = async (id: number) => {
   console.log("音频id", id)
   if (!storeData.value?.data?.store_id) return;
-  await setVoiceApi(storeData.value?.data?.store_id, id,storeData.value?.customer_service_id);
+  await setVoiceApi(storeData.value?.data?.store_id, id, storeData.value?.customer_service_id);
   messageText.value = "语音发送成功"
   messageShow.value = true
   setTimeout(() => {
@@ -281,7 +389,10 @@ const setVoice = async (id: number) => {
     messageText.value = ""
   }, 2000)
 };
-
+const speechToTextLog = async (content: string) => {
+  if (!storeData.value?.data?.store_id || !storeData.value?.customer_service_id) return
+  await speechToTextLogApi(storeData.value?.data?.store_id, storeData.value?.customer_service_id, content, token.value)
+}
 const exitServer = async () => {
   // await 
   // console.log(storeData.value?.data?.store_id, storeData.value?.customer_service_id)
@@ -303,6 +414,8 @@ const exitServer = async () => {
     storeData.value?.data?.store_id,
     token.value
   );
+
+  await speechToTextLog(allVoiceText.value)
   // token.value = "";
   doorState.forEach(e => {
     e.value = true
@@ -313,11 +426,12 @@ const exitServer = async () => {
   cameraList.value = [];
   goodsList.value = [];
   videoList.value.forEach(e => (e.stream = null))
+  stopRecording()
   flvPlayer.value.destroy()
 };
 const doorStatus = ref(true)
 const talkHandle = () => {
-    console.log(  videoElement.value.volume)
+  console.log(videoElement.value.volume)
   console.log("开始对讲");
   isTalking.value = true;
   isMuted.value = false;
@@ -346,7 +460,7 @@ const closeWin = async () => {
   }
 }
 const startTalk = () => {
-  
+
   videoElement.value.muted = false
 }
 
@@ -360,9 +474,9 @@ const stopTalk = () => {
   <Message v-if="messageShow"
     class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
     {{ messageText }}</Message>
-  <!-- <Message 
-    class="top-4 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-white border border-solid border-[rgba(228,252,236,1)]">
-    {{ voiceText }}</Message> -->
+  <Message v-if="voiceShow" style="text-shadow: 0 1px 2px rgba(0, 0, 0, 0.7);"
+    class="top-20 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-green border border-solid border-[rgba(228,252,236,1)]">
+    {{ voiceText }}</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
     <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5] cursor-pointer" @click="setVoice(item.id)">
@@ -477,7 +591,8 @@ const stopTalk = () => {
         </button>
 
         <div class="video-container">
-          <video ref="videoElement" controls autoplay muted style="width: 0px;height: 0px;"> </video>
+          <video ref="videoElement" @play="videoPlay()" controls autoplay muted style="width: 0px;height: 0px;">
+          </video>
         </div>
         <!-- <button id="closeBtn" @click="testbtn()"
           class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
diff --git a/src/api/api.ts b/src/api/api.ts
index 2a7a48e..224aabf 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -63,3 +63,19 @@ export const exitServerApi = async (
     }
   );
 };
+export const speechToTextLogApi = async (
+  sid: number,
+  cid: number,
+  content: string,
+  token
+) => {
+  return request.post(
+    "/pc/speech/to/text",
+    { sid, cid,content },
+    {
+      headers: {
+        Authorization: "Bearer " + token,
+      },
+    }
+  );
+};
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index 65fa8c0..b909c43 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,6 +11,18 @@ export default defineConfig(({ mode }) => {
 
 
   return {
+    build: {
+      chunkSizeWarningLimit: 1500,
+      rollupOptions: {
+        output: {
+          manualChunks: {
+            flv: ['flv.js'],
+            primevue: ['primevue'],
+            webrtc: ['@/utils/websocket']
+          }
+        }
+      }
+    },
     plugins: [vue(), UnoCSS(),
       //  basicSsl()
     ],
-- 
2.34.1


From e6a3f766949da3c32a70f04be8beed72c8ad22ba Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 18 Jul 2025 17:57:53 +0800
Subject: [PATCH 58/65] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E4=BA=A4=E4=BA=92=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E9=9F=B3=E9=A2=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增呼叫次数和说话次数统计显示
- 调整音频录制参数和播放音量控制
- 增加语音识别时的蓝色渐变背景效果
- 修改测试按钮功能为触发录音
---
 src/App.vue | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dc28597..197e92d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,8 +22,8 @@ import { Message } from "primevue";
 // const appStore = useAppStore()
 const goodsShow = ref(false)
 const deviceInfo = ref({
-  deviceId: '44010200492000000009',
-  channelId: '44010200492000000009',
+  deviceId: '',
+  channelId: '',
   broadcastMode: false,
   ipAdd: 'https://47.94.83.66:443',
   domain: 'https://webrtc2.test.7games.store'
@@ -55,11 +55,14 @@ const videoElement = ref()
 const flvPlayer = ref()
 const flvSrc = ref()
 
+const testBtn = ref()
 const socket = ref<WebSocket | null>(null);
 const recorder = ref<RecordRTC | null>(null);
 const voiceShow = ref(false)
 const voiceText = ref("测试测试")
 const allVoiceText = ref('')
+const callTimes = ref(0)
+const speakTimes = ref(0)
 
 const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
@@ -77,9 +80,12 @@ const totalPrice = computed(() => {
 
 const videoPlay = () => {
   console.log('开始播放flv')
+  videoElement.value.muted = false
+  videoElement.value.volume = 0.01
+
   setTimeout(() => {
     toggleRecording()
-  }, 1500);
+  }, 2000);
 }
 
 
@@ -114,6 +120,7 @@ const toggleRecording = async () => {
       console.log('收到服务端消息:', data);
       if (data.text && data.text !== '') {
         voiceText.value = data.text
+        speakTimes.value++
         voiceShow.value = true
         allVoiceText.value += ';' + data.text
         setTimeout(() => {
@@ -131,7 +138,7 @@ const toggleRecording = async () => {
       mimeType: 'audio/wav',
       sampleRate: 48000,      // 必须与服务端一致
       numberOfAudioChannels: 1, // 单声道
-      timeSlice: 400,          // 每1秒发送一次数据
+      timeSlice: 300,          // 每1秒发送一次数据
       desiredSampRate: 48000,
       recorderType: RecordRTC.StereoAudioRecorder,
       ondataavailable: (blob: Blob) => {
@@ -313,6 +320,7 @@ ws.once("TOKEN", (data) => {
 });
 ws.on("WATCHER_VOICE_SPEECH", () => {
   beCalled.value = true
+  callTimes.value++
   setTimeout(() => {
     beCalled.value = false
   }, 5000)
@@ -461,11 +469,15 @@ const closeWin = async () => {
 }
 const startTalk = () => {
 
-  videoElement.value.muted = false
+  // videoElement.value.muted = false
+  videoElement.value.volume = 1
+
 }
 
 const stopTalk = () => {
-  videoElement.value.muted = true
+  // videoElement.value.muted = true
+  videoElement.value.volume = 0.01
+
 }
 </script>
 
@@ -488,6 +500,11 @@ const stopTalk = () => {
     @stop-broadcast="stopTalk"></talkVue>
   <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
+    <div
+      class="z-100 fixed flex flex-col left-4 top-36  p-4 bg-[rgba(255,255,255,0.5)] rounded-lg  transform-translate-y-[-50%] max-h-300px backdrop-blur">
+      <span class="shadow-text">呼叫次数：{{ callTimes }}</span>
+      <span class="shadow-text">说话次数：{{ speakTimes }}</span>
+    </div>
     <div
       class="z-100 fixed right-4 w-xl  bg-[rgba(255,255,255,0.5)] rounded-lg top-50% transform-translate-y-[-50%] max-h-300px backdrop-blur"
       v-if="goodsShow">
@@ -534,9 +551,9 @@ const stopTalk = () => {
             </div>
           </div>
         </Button> -->
-        <button
+        <button ref="testBtn"
           class="rounded-[50px] h-32px flex justify-center items-center gap-1 text-white font-600 text-lg max-w-500px"
-          @click="openDoor(1)">
+          @click="toggleRecording()">
           <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
           {{ storeData?.data?.store_name || "等待加入" }}
         </button>
@@ -646,6 +663,7 @@ const stopTalk = () => {
     </div>
     <div class="w-full">
       <div v-if="beCalled" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
+      <div v-if='voiceShow' class="absolute h-100vh w-100vw blue-gradient z-200  opacity-[0.7]"></div>
       <div class="w-full h-44vh">
         <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
@@ -719,4 +737,13 @@ const stopTalk = () => {
 .radial-gradient {
   background: radial-gradient(transparent, #e66465);
 }
+
+.blue-gradient {
+  background: radial-gradient(transparent, blue);
+}
+
+.shadow-text {
+  color: #000000;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+}
 </style>
-- 
2.34.1


From 74d892feb3bb84957172343b3e21d694a1137371 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Thu, 24 Jul 2025 10:24:15 +0800
Subject: [PATCH 59/65] =?UTF-8?q?fix(App.vue):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=AE=B9=E5=99=A8=E5=B8=83=E5=B1=80=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BB=A5=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复视频容器布局问题，将视频元素放入单独容器并添加样式确保正确显示。调整视频元素尺寸和位置，添加object-fit属性避免变形。
---
 src/App.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 197e92d..c0629ce 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -664,12 +664,14 @@ const stopTalk = () => {
     <div class="w-full">
       <div v-if="beCalled" class="absolute h-100vh w-100vw radial-gradient z-200  opacity-[0.7]"></div>
       <div v-if='voiceShow' class="absolute h-100vh w-100vw blue-gradient z-200  opacity-[0.7]"></div>
-      <div class="w-full h-44vh">
-        <div class="bg-black w-100% h-full flex justify-center items-center" v-show="!videoList[0]?.stream">
+      <div class="w-full h-44vh relative flex justify-center">
+        <div class="bg-black w-100% h-full flex justify-center items-center absolute" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
+      <div class="w-78vh h-44vh">
         <video ref="videoRef1" :muted="isMuted" v-show="videoList[0]?.stream"
-          class="w-full aspect-ratio-video h-full bg-black" autoplay></video>
+          class=" aspect-ratio-video h-44vh w-66vh bg-black videoClass" autoplay></video>
+      </div>
       </div>
       <div class="h-1px bg-[#333]"></div>
       <div class="h-48vh">
@@ -746,4 +748,14 @@ const stopTalk = () => {
   color: #000000;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
 }
+
+.videoBox {
+  height: 100%;
+}
+
+.videoClass {
+  height: 100%;
+  object-fit: fill;
+  width: 100%;
+}
 </style>
-- 
2.34.1


From fbc3e3009bb53695115cec8a710d67102d8d16bc Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 25 Jul 2025 16:49:45 +0800
Subject: [PATCH 60/65] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=92=8C=E8=A7=86=E9=A2=91=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改对话框尺寸和样式，优化视频布局的缩进和结构
重置通话和语音计数变量，移除锁门操作
---
 src/App.vue             | 12 +++++++-----
 src/components/talk.vue | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c0629ce..2c2f7d4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -412,7 +412,9 @@ const exitServer = async () => {
   )
     return;
 
-  await lockDoor(0)
+  // await lockDoor(0)
+  callTimes.value = 0
+  speakTimes.value = 0
   ws.sendData({
     instruction: "END_SERVICE",
     storeId: storeData.value?.data?.store_id
@@ -668,10 +670,10 @@ const stopTalk = () => {
         <div class="bg-black w-100% h-full flex justify-center items-center absolute" v-show="!videoList[0]?.stream">
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
-      <div class="w-78vh h-44vh">
-        <video ref="videoRef1" :muted="isMuted" v-show="videoList[0]?.stream"
-          class=" aspect-ratio-video h-44vh w-66vh bg-black videoClass" autoplay></video>
-      </div>
+        <div class="w-78vh h-44vh">
+          <video ref="videoRef1" :muted="isMuted" v-show="videoList[0]?.stream"
+            class=" aspect-ratio-video h-44vh w-66vh bg-black videoClass" autoplay></video>
+        </div>
       </div>
       <div class="h-1px bg-[#333]"></div>
       <div class="h-48vh">
diff --git a/src/components/talk.vue b/src/components/talk.vue
index b078bb1..e6a5d86 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -1,14 +1,14 @@
 <template>
   <Dialog :visible="modelValue" @update:visible="handleVisibleChange"
-    pt:root="bg-white w-500px h-500px relative rounded-8px" pt:mask="bg-[rgba(0,0,0,0.5)]"
-    pt:header="w-full flex flex-row-reverse p-28px" pt:content="h-full">
+    pt:root="bg-white w-200px h-200px relative rounded-8px" pt:mask="bg-[rgba(0,0,0,0.1)]"
+    pt:header="w-full flex flex-row-reverse p-6px" pt:content="h-full">
     <template #closeicon>
-      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 20px; height: 20px; " />
+      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 12px; height:12px; " />
     </template>
-    <div class="flex relative align-center justify-center w-full h-full">
+    <div class="flex relative items-center justify-center w-full h-full">
       <div class="flex flex-col items-center justify-end">
-        <img class="h-160px w-160px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
-        <span class="mt-60px mb-128px w-160px text-center text-20px text-[#222222] weight-500">{{
+        <img class="h-60px w-60px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
+        <span class="mt-10px mb-10px w-160px text-center text-20px text-[#222222] weight-500">{{
           getStatusText(broadcastStatus) }}</span>
       </div>
     </div>
-- 
2.34.1


From 62de6f32b7358bd0fdf902ea4a9ef69588b81cfa Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxx@qq.com>
Date: Wed, 30 Jul 2025 16:51:26 +0800
Subject: [PATCH 61/65] feat

---
 pnpm-lock.yaml         |  8 ++++++++
 src/utils/websocket.ts | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd50408..97792bf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,9 @@ importers:
       primevue:
         specifier: ^4.3.5
         version: 4.3.5(vue@3.5.17(typescript@5.8.3))
+      recordrtc:
+        specifier: ^5.6.2
+        version: 5.6.2
       vue:
         specifier: ^3.5.13
         version: 3.5.17(typescript@5.8.3)
@@ -976,6 +979,9 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
+  recordrtc@5.6.2:
+    resolution: {integrity: sha512-1QNKKNtl7+KcwD1lyOgP3ZlbiJ1d0HtXnypUy7yq49xEERxk31PHvE9RCciDrulPCY7WJ+oz0R9hpNxgsIurGQ==}
+
   rfdc@1.4.1:
     resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
@@ -2016,6 +2022,8 @@ snapshots:
     dependencies:
       picomatch: 2.3.1
 
+  recordrtc@5.6.2: {}
+
   rfdc@1.4.1: {}
 
   rollup@4.44.0:
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 842f18b..a920045 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -21,6 +21,7 @@ export class WebSocketClient {
       this.ws = new WebSocket(this.url);
       this.ws.onopen = () => {
         console.log("WebSocket connected");
+        this.breath()
         resolve("连接成功");
         call&&call(this);
         // this.breath();
@@ -90,7 +91,16 @@ export class WebSocketClient {
     this.send(types, data);
     await this.once(types, call);
   }
-
+  breath(){
+    setInterval(()=>{
+      if(this.ws.readyState===WebSocket.OPEN){
+        console.log(11)
+        this.send('breath',{})
+      }else{
+        this.connect()
+      }
+    },5000)
+  }
   disconnect() {
     this.ws.close();
   }
-- 
2.34.1


From 6da7eaf91b3047a76c02d04a70bc39840152b92c Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 1 Aug 2025 13:49:01 +0800
Subject: [PATCH 62/65] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=9C=8D=E5=8A=A1=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4UI=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在App.vue中添加exitServerDialog状态和确认弹窗
- 调整按钮样式统一添加点击动画效果
- 修改talk.vue组件中的内容对齐方式
- 优化tabbar布局和按钮排列
---
 src/App.vue             | 60 ++++++++++++++++++++++++-----------------
 src/components/talk.vue |  4 +--
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2c2f7d4..e77614f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,6 +63,7 @@ const voiceText = ref("测试测试")
 const allVoiceText = ref('')
 const callTimes = ref(0)
 const speakTimes = ref(0)
+const exitServerDialog = ref(false)
 
 const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
@@ -497,13 +498,24 @@ const stopTalk = () => {
       {{ item.content }}
     </div>
   </Dialog>
+  <Dialog v-model:visible="exitServerDialog" modal header="是否要结束服务？" pt:mask="bg-[rgba(0,0,0,0.5)]"
+    pt:root="bg-white rounded-8px w-240px h-140px" pt:header="flex justify-between items-center p-4 items-center">
+    <div class="flex justify-between items-end p-16px">
+      <button
+        class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
+        @click="exitServerDialog = false">取消</button>
+      <button
+        class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1  text-white bg-[#f40]"
+        @click="exitServerDialog = false; exitServer()">结束</button>
+    </div>
+  </Dialog>
   <talkVue v-model="isTalking" :device-id="deviceInfo.deviceId" :channel-id="deviceInfo.channelId"
     :ipAdd="deviceInfo.ipAdd" :domain="deviceInfo.domain" @close="closeTalk" @start-broadcast="startTalk"
     @stop-broadcast="stopTalk"></talkVue>
   <div class="flex-col w-screen h-screen bg-[#333] overflow-hidden relative">
     <video src="" id="video" class="w-100px" style="display: none" muted></video>
     <div
-      class="z-100 fixed flex flex-col left-4 top-36  p-4 bg-[rgba(255,255,255,0.5)] rounded-lg  transform-translate-y-[-50%] max-h-300px backdrop-blur">
+      class="z-100 fixed flex flex-col left-4 top-38  p-4 bg-[rgba(255,255,255,0.5)] rounded-lg  transform-translate-y-[-50%] max-h-300px backdrop-blur">
       <span class="shadow-text">呼叫次数：{{ callTimes }}</span>
       <span class="shadow-text">说话次数：{{ speakTimes }}</span>
     </div>
@@ -539,8 +551,13 @@ const stopTalk = () => {
         </div>
       </div>
     </div>
-    <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1" id="tabbar">
-      <div class="flex items-center gap-2 h-4vh justify-center">
+    <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1 items-center " id="tabbar">
+       <span ref="testBtn"
+          class="rounded-[50px] h-32px flex min-w-120px justify-center items-center gap-1 text-white font-600 text-lg max-w-500px select-none">
+          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
+          {{ storeData?.data?.store_name || "等待加入" }}
+        </span>
+      <div class="flex items-center gap-2  justify-start flex-wrap ">
         <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
         >
@@ -553,58 +570,53 @@ const stopTalk = () => {
             </div>
           </div>
         </Button> -->
-        <button ref="testBtn"
-          class="rounded-[50px] h-32px flex justify-center items-center gap-1 text-white font-600 text-lg max-w-500px"
-          @click="toggleRecording()">
-          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
-          {{ storeData?.data?.store_name || "等待加入" }}
-        </button>
+       
         <button @click="goodsShow = !goodsShow"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_sy@2x.png" class="w-20px h-20px" alt="" />
           <span>收银</span>
         </button>
         <button @click="talkHandle"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" />
           <span>对讲</span>
         </button>
         <button @click="getVoiceList"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_yy@2x.png" class="w-20px h-20px" alt="" />
           语音
         </button>
         <button @click="openDoor(1)" v-if="door1"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门1开门
         </button>
-        <button v-else
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
+        <button v-else @click="openDoor(1)"
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[#f40] text-white">
           门1未关
         </button>
         <button v-if="door2" @click="openDoor(2)"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门2开门
         </button>
-        <button v-else
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+        <button v-else @click="openDoor(1)"
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_km@2x.png" class="w-20px h-20px" alt="" />
           门2未关
         </button>
         <button v-if="doorStatus" @click="lockDoor(1)"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           锁门
         </button>
         <button v-else @click="lockDoor(0)"
-          class="btn rounded-[50px] h-32px w-70px flex justify-center items-center gap-1  text-white bg-[#f40]">
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1  text-white bg-[#f40]">
           <img src="@/assets/images/icon_ks@2x.png" class="w-20px h-20px" alt="" />
           开门
         </button>
-        <button @click="exitServer()"
-          class="btn rounded-[50px] h-32px w-100px flex justify-center items-center gap-1  text-white bg-[#f40]">
+        <button @click="exitServerDialog = true"
+          class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1  text-white bg-[#f40]">
           <i class="fa-solid fa-check"></i>
           结束服务
         </button>
@@ -647,13 +659,13 @@ const stopTalk = () => {
       </div>
       <div class="flex flex-1 justify-end gap-1 items-center">
         <div
-          class="h-full max-w-300px flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
+          class="h-full max-w-300px min-w-200px min-h-32px flex flex-col w-full justify-center bg-[rgba(255,255,255,0.1)] rounded-full text-center text-white">
           <span>{{ storeData?.data?.user_nickname || "" }}</span>
           <div class="h-1px bg-[#ddd] mx-1"></div>
           <span>{{ storeData?.data?.user_mobile || '' }}</span>
         </div>
         <button id="closeBtn" @click="closeWin()"
-          class="btn rounded-[50px] h-32px w-32px min-w-32px flex justify-center items-center gap-1 bg-[#f40] text-white">
+          class="btn rounded-[50px] h-32px w-32px transition-transform duration-100 active:scale-90 min-w-32px flex justify-center items-center gap-1 bg-[#f40] text-white">
           <i class="fa-solid fa-xmark"></i>
           <!-- <img src="@/assets/images/icon_dj@2x.png" class="w-20px h-20px" alt="" /> -->
         </button>
diff --git a/src/components/talk.vue b/src/components/talk.vue
index e6a5d86..545f8f4 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -3,9 +3,9 @@
     pt:root="bg-white w-200px h-200px relative rounded-8px" pt:mask="bg-[rgba(0,0,0,0.1)]"
     pt:header="w-full flex flex-row-reverse p-6px" pt:content="h-full">
     <template #closeicon>
-      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 12px; height:12px; " />
+        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 12px; height:12px; " />
     </template>
-    <div class="flex relative items-center justify-center w-full h-full">
+    <div class="flex relative items-start justify-center w-full h-full">
       <div class="flex flex-col items-center justify-end">
         <img class="h-60px w-60px" src="@/assets/images/icon_ht.png" alt="" @click="broadcastStatusClick">
         <span class="mt-10px mb-10px w-160px text-center text-20px text-[#222222] weight-500">{{
-- 
2.34.1


From 5875cb7c0691a39c4658e80032e857244ffb128b Mon Sep 17 00:00:00 2001
From: lengzhiqiang <xxx@qq.com>
Date: Wed, 30 Jul 2025 16:51:26 +0800
Subject: [PATCH 63/65] feat

---
 pnpm-lock.yaml         |  8 ++++++++
 src/utils/websocket.ts | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd50408..97792bf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,9 @@ importers:
       primevue:
         specifier: ^4.3.5
         version: 4.3.5(vue@3.5.17(typescript@5.8.3))
+      recordrtc:
+        specifier: ^5.6.2
+        version: 5.6.2
       vue:
         specifier: ^3.5.13
         version: 3.5.17(typescript@5.8.3)
@@ -976,6 +979,9 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
+  recordrtc@5.6.2:
+    resolution: {integrity: sha512-1QNKKNtl7+KcwD1lyOgP3ZlbiJ1d0HtXnypUy7yq49xEERxk31PHvE9RCciDrulPCY7WJ+oz0R9hpNxgsIurGQ==}
+
   rfdc@1.4.1:
     resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
@@ -2016,6 +2022,8 @@ snapshots:
     dependencies:
       picomatch: 2.3.1
 
+  recordrtc@5.6.2: {}
+
   rfdc@1.4.1: {}
 
   rollup@4.44.0:
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 842f18b..a920045 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -21,6 +21,7 @@ export class WebSocketClient {
       this.ws = new WebSocket(this.url);
       this.ws.onopen = () => {
         console.log("WebSocket connected");
+        this.breath()
         resolve("连接成功");
         call&&call(this);
         // this.breath();
@@ -90,7 +91,16 @@ export class WebSocketClient {
     this.send(types, data);
     await this.once(types, call);
   }
-
+  breath(){
+    setInterval(()=>{
+      if(this.ws.readyState===WebSocket.OPEN){
+        console.log(11)
+        this.send('breath',{})
+      }else{
+        this.connect()
+      }
+    },5000)
+  }
   disconnect() {
     this.ws.close();
   }
-- 
2.34.1


From 9128b4dc61c1d13a056949d460add0cce56ba4e1 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 1 Aug 2025 15:53:50 +0800
Subject: [PATCH 64/65] =?UTF-8?q?fix(ui):=20=E8=B0=83=E6=95=B4=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=A0=B7=E5=BC=8F=E5=8F=8A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?websocket=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 统一对话框关闭图标大小及边距样式
- 修复websocket心跳定时器未清除导致的内存泄漏问题
- 优化语音选择对话框的交互样式
---
 src/App.vue             | 14 +++++++++++---
 src/components/talk.vue |  4 ++--
 src/utils/websocket.ts  |  7 ++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e77614f..0ad575e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -493,13 +493,21 @@ const stopTalk = () => {
     class="top-20 px-4 py-2 left-50% transform-translate-x--50% fixed z-9999 bg-[rgba(241,253,245,0.2)] rounded text-green border border-solid border-[rgba(228,252,236,1)]">
     {{ voiceText }}</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
-    pt:root="bg-white w-80vw rounded" pt:header="flex justify-between items-center p-4 items-center">
-    <div v-for="item in voiceList" class="px-4 py-2 hover:bg-[#f5f5f5] cursor-pointer" @click="setVoice(item.id)">
-      {{ item.content }}
+    pt:root="bg-white w-80vw rounded" pt:header="flex justify-between text-20px items-center p-t-4 px-4 items-center">
+     <template #closeicon>
+        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
+    </template>
+    <div class="flex flex-col p-4">
+      <div v-for="item in voiceList" class=" py-2 hover:bg-[#c6d1fb] hover:text-[#0055ff] rounded cursor-pointer select-none" @click="setVoice(item.id)">
+        {{ item.content }}
+      </div>
     </div>
   </Dialog>
   <Dialog v-model:visible="exitServerDialog" modal header="是否要结束服务？" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white rounded-8px w-240px h-140px" pt:header="flex justify-between items-center p-4 items-center">
+     <template #closeicon>
+        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
+    </template>
     <div class="flex justify-between items-end p-16px">
       <button
         class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-100px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white"
diff --git a/src/components/talk.vue b/src/components/talk.vue
index 545f8f4..5c0c199 100644
--- a/src/components/talk.vue
+++ b/src/components/talk.vue
@@ -1,9 +1,9 @@
 <template>
   <Dialog :visible="modelValue" @update:visible="handleVisibleChange"
     pt:root="bg-white w-200px h-200px relative rounded-8px" pt:mask="bg-[rgba(0,0,0,0.1)]"
-    pt:header="w-full flex flex-row-reverse p-6px" pt:content="h-full">
+    pt:header="w-full flex flex-row-reverse p-t-12px p-r-12px" pt:content="h-full">
     <template #closeicon>
-        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 12px; height:12px; " />
+        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
     </template>
     <div class="flex relative items-start justify-center w-full h-full">
       <div class="flex flex-col items-center justify-end">
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index a920045..302549a 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -5,6 +5,7 @@ export class WebSocketClient {
   oncelisteners: any;
   breathCount: number;
   eventKey: string;
+  breathTimer: any;
   constructor(url: string, eventKey: string = "type") {
     this.breathCount = 0;
     this.ws = null;
@@ -92,7 +93,10 @@ export class WebSocketClient {
     await this.once(types, call);
   }
   breath(){
-    setInterval(()=>{
+    if(this.breathTimer){
+      clearInterval(this.breathTimer)
+    }
+    this.breathTimer = setInterval(()=>{
       if(this.ws.readyState===WebSocket.OPEN){
         console.log(11)
         this.send('breath',{})
@@ -103,5 +107,6 @@ export class WebSocketClient {
   }
   disconnect() {
     this.ws.close();
+    clearInterval(this.breathTimer)
   }
 }
-- 
2.34.1


From b533c5fada6e7076a9c0d05fd8b4a5011d056216 Mon Sep 17 00:00:00 2001
From: blaze-z <1063796544@qq.com>
Date: Fri, 8 Aug 2025 17:53:56 +0800
Subject: [PATCH 65/65] =?UTF-8?q?refactor(App):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AF=B9=E8=AE=B2=E5=8A=9F=E8=83=BD=E5=92=8C=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除不必要的 isMuted 变量
- 调整对讲开始和结束的逻辑
- 统一关闭按钮样式
- 优化视频元素的 muted 属性设置
---
 src/App.vue | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0ad575e..f0dc5ec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,6 @@ const callTimes = ref(0)
 const speakTimes = ref(0)
 const exitServerDialog = ref(false)
 
-const isMuted = ref(true);
 const goodsList = ref<any[]>([]);
 const totalPrice = computed(() => {
   if (goodsList.value.length) {
@@ -445,12 +444,11 @@ const talkHandle = () => {
   console.log(videoElement.value.volume)
   console.log("开始对讲");
   isTalking.value = true;
-  isMuted.value = false;
 };
 
 const closeTalk = () => {
   console.log("关闭对讲");
-  isMuted.value = true;
+  stopTalk()
 };
 const changemedie = (id: number) => {
   const item = videoList.value.find((e) => e.id === id);
@@ -494,19 +492,21 @@ const stopTalk = () => {
     {{ voiceText }}</Message>
   <Dialog v-model:visible="visible" modal header="要发布的语音" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white w-80vw rounded" pt:header="flex justify-between text-20px items-center p-t-4 px-4 items-center">
-     <template #closeicon>
-        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
+    <template #closeicon>
+      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 22px; height:22px; padding:4px" />
     </template>
     <div class="flex flex-col p-4">
-      <div v-for="item in voiceList" class=" py-2 hover:bg-[#c6d1fb] hover:text-[#0055ff] rounded cursor-pointer select-none" @click="setVoice(item.id)">
+      <div v-for="item in voiceList"
+        class=" py-2 hover:bg-[#c6d1fb] hover:text-[#0055ff] rounded cursor-pointer select-none"
+        @click="setVoice(item.id)">
         {{ item.content }}
       </div>
     </div>
   </Dialog>
   <Dialog v-model:visible="exitServerDialog" modal header="是否要结束服务？" pt:mask="bg-[rgba(0,0,0,0.5)]"
     pt:root="bg-white rounded-8px w-240px h-140px" pt:header="flex justify-between items-center p-4 items-center">
-     <template #closeicon>
-        <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
+    <template #closeicon>
+      <img src="@/assets/images/icon_gb.png" alt="Close" style="width: 18px; height:18px; " />
     </template>
     <div class="flex justify-between items-end p-16px">
       <button
@@ -560,11 +560,11 @@ const stopTalk = () => {
       </div>
     </div>
     <div class="w-full bg-[rgba(33,60,137,1)] py-4 px-1 flex gap-1 items-center " id="tabbar">
-       <span ref="testBtn"
-          class="rounded-[50px] h-32px flex min-w-120px justify-center items-center gap-1 text-white font-600 text-lg max-w-500px select-none">
-          <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
-          {{ storeData?.data?.store_name || "等待加入" }}
-        </span>
+      <span ref="testBtn"
+        class="rounded-[50px] h-32px flex min-w-120px justify-center items-center gap-1 text-white font-600 text-lg max-w-500px select-none">
+        <img src="@/assets/images/icon_cs@2x.png" class="w-20px h-20px" alt="" />
+        {{ storeData?.data?.store_name || "等待加入" }}
+      </span>
       <div class="flex items-center gap-2  justify-start flex-wrap ">
         <!-- <Button
           pt:root="cursor-pointer py-1 px-2 rounded-full border-0 flex gap-2 mx-2"
@@ -578,7 +578,7 @@ const stopTalk = () => {
             </div>
           </div>
         </Button> -->
-       
+
         <button @click="goodsShow = !goodsShow"
           class="btn rounded-[50px] h-32px transition-transform duration-100 active:scale-90 w-70px flex justify-center items-center gap-1 bg-[rgba(36,87,232,1)] text-white">
           <img src="@/assets/images/icon_sy@2x.png" class="w-20px h-20px" alt="" />
@@ -691,7 +691,7 @@ const stopTalk = () => {
           <img src="@/assets/images/icon_sxt@2x.png" alt="" />
         </div>
         <div class="w-78vh h-44vh">
-          <video ref="videoRef1" :muted="isMuted" v-show="videoList[0]?.stream"
+          <video ref="videoRef1" muted v-show="videoList[0]?.stream"
             class=" aspect-ratio-video h-44vh w-66vh bg-black videoClass" autoplay></video>
         </div>
       </div>
-- 
2.34.1