From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'

---
 src/App.vue |  175 +++++++++++++++++++---------------------------------------
 1 files changed, 57 insertions(+), 118 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fbe3bf7..5101c82 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,137 +1,76 @@
 <script setup>
-  import {
-    onHide,
-    onLaunch,
-    onShow
-  } from "@dcloudio/uni-app";
-  import {
-    useAppStore,
-    useUserStore
-  } from "@/store";
-  import {
-    mpUpdate
-  } from "@/utils/index";
-  import {
-    genTestUserSig
-  } from '@/utils/voiceCallByTX/GenerateTestUserSig.js';
-  // #ifdef H5
-  import {
-    TUICallKitAPI
-  } from '@trtc/calls-uikit-vue'
-  // #endif
-  const appStore = useAppStore();
-  const userStore = useUserStore();
+import { onHide, onLaunch, onShow } from "@dcloudio/uni-app";
+import { useAppStore, useUserStore } from "@/store";
+import { useGlobalWS } from "@/hooks/useGlobalWS.js";
 
-  onLaunch(() => {
-    // 初始化系统信息
-    appStore.initSystemInfo();
+const appStore = useAppStore();
+const userStore = useUserStore();
 
-    if (!userStore.userInfo) {
-      //不存在则跳转至登录页
-      uni.reLaunch({
-        url: "/pages/login/index",
-      })
-    }
+useGlobalWS();
 
-    // #ifdef MP-WEIXIN
-    mpUpdate();
-    // #endif
-  });
+onShow(() => {
+  console.log("App Show");
+});
 
-  const userId = computed(() => userStore?.userInfo?.user_id)
+onHide(() => {
+  console.log("App Hide");
+});
 
-  function initVoiceCallFromApp() {
-    const TUICallKit = uni.requireNativePlugin('TencentCloud-TUICallKit');
-    const {
-      userSig,
-      SDKAppID
-    } = genTestUserSig(userId.value);
-    uni.$TUICallKit = TUICallKit;
-    uni.$TUICallKit.login({
-      SDKAppID,
-      userID: userId.value,
-      userSig: userSig,
-    })
+onLaunch(() => {
+  // 初始化系统信息
+  appStore.initSystemInfo();
+  if (!userStore.userInfo) {
+    //不存在则跳转至登录页
+    uni.reLaunch({
+      url: "/pages/login/index",
+    });
   }
-
-  async function initVoiceCallFromH5() {
-    const {
-      userSig,
-      SDKAppID
-    } = genTestUserSig(userId.value)
-    await TUICallKitAPI.init({
-      userID: userId.value,
-      userSig,
-      SDKAppID,
-    })
-  }
-
-  // 初始化登陆腾讯音频平台
-  watch(userId, () => {
-    if (!userId.value) return
-    // #ifdef H5
-    initVoiceCallFromH5()
-    // #endif
-
-    // #ifdef APP-PLUS
-    initVoiceCallFromApp()
-    // #endif
-  }, {
-    immediate: true
-  })
-
-  onShow(() => {
-    console.log("App Show");
-  });
-
-  onHide(() => {
-    console.log("App Hide");
-  });
+});
 </script>
 
 <style lang="scss">
-  /* 每个页面公共css */
-  @import "uview-plus/index.scss";
-  @import "@/static/styles/common.scss";
+/* 每个页面公共css */
+@import "uview-plus/index.scss";
+@import "@/static/styles/common.scss";
 
-  .TUICallKit-mobile {
-    position: fixed;
-    left: 0;
-    top: 0;
-    z-index: 9999;
-  }
+.TUICallKit-mobile {
+  position: fixed;
+  left: 0;
+  top: 0;
+  z-index: 9999;
+}
 
-  page {
-    background-image: url('~@/static/images/user/bg.png');
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-attachment: fixed;
-    // min-height: 10vh;
-  }
+page {
+  background-image: url("https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ztzf_app_assets/images/user/bg.png");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  // min-height: 10vh;
+}
 
-  .uni-tabbar__item:nth-child(4) {
-    .uni-tabbar__bd {
-      .uni-tabbar__icon {
-        width: 60px !important;
-        height: 60px !important;
-        margin-top: -20px;
-      }
+.uni-tabbar__item:nth-child(4) {
+  .uni-tabbar__bd {
+    .uni-tabbar__icon {
+      width: 60px !important;
+      height: 60px !important;
+      margin-top: -20px;
     }
   }
+}
 
-  .uni-tabbar-border {
-    background-color: #f6f6f6 !important;
-  }
+.uni-tabbar-border {
+  background-color: #f6f6f6 !important;
+}
 
-  .uni-page-head__title {
-    font-family: Source Han Sans CN, Source Han Sans CN !important;
-    font-weight: 400 !important;
-    font-size: 17px !important;
-    color: #222324 !important;
-  }
+.uni-page-head__title {
+  font-family: Source Han Sans CN, Source Han Sans CN !important;
+  font-weight: 400 !important;
+  font-size: 17px !important;
+  color: #222324 !important;
+}
 
-  .uni-page-head {
-    background: transparent !important;
-  }
+.uni-page-head {
+  background: transparent !important;
+}
 </style>

--
Gitblit v1.9.3