改动

.env

@@ -1,25 +1,25 @@
 # 场景资源地址
-VITE_APP_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VITE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk
-# socket地址
-VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
+VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk
+# VITE_APP_SOCKET_URL=wss://ws.gemer.xyz
+VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
+# VITE_APP_SOCKET_URL=wss://221.4.210.172:16666
 # 静态资源目录
 VITE_APP_STATIC_DIR=viewer
 
 # 云存储环境
-VITE_APP_REGION_URL=aws
-
+VITE_APP_REGION_URL=
 # 接口请求地址
-VITE_APP_APIS_URL=https://testeur.4dkankan.com/
+VITE_APP_APIS_URL=https://v4-test.4dkankan.com/
 # VITE_APP_APIS_URL=https://v4-uat.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
-VITE_ROOM_MEMBER=3
+VITE_ROOM_MEMBER=10
 VITE_SHOW_CONSOLE=1
 VITE_SHOW_DEBUGPANEL=1
-VITE_TEST_VERSION =2022120704
-VITE_ENABLE_VIDEO=1
+VITE_TEST_VERSION =2022120905
+VITE_ENABLE_VIDEO=0

.env.development

@@ -1,25 +1,26 @@
-VITE_APP_REGION_URL=aws
 # 场景资源地址
 VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
 VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk
-# socket地址
-VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
+VITE_APP_SOCKET_URL=wss://ws.gemer.xyz
+# VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
+# VITE_APP_SOCKET_URL=wss://221.4.210.172:16666
 # 静态资源目录
 VITE_APP_STATIC_DIR=viewer
-# 接口请求地址
-VITE_APP_APIS_URL=https://test.4dkankan.com/
 
-# VITE_TAKE_LOOK_API=https://v4-test.4dkankan.com
-# VITE_APP_APIS_URL=https://v4-uat.4dkankan.com/
+# 云存储环境
+VIIE_APP_REGION_URL=
 
+# 接口请求地址
+VITE_APP_APIS_URL=https://v4-test.4dkankan.com/
+# VITE_APP_APIS_URL=https://v4-uat.4dkankan.com/
+# VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
-VITE_PUBLIC_DIR='/'
+VITE_PUBLIC_DIR='/livestream/'
+VITE_ROOM_MEMBER=10
 VITE_SHOW_CONSOLE=1
 VITE_SHOW_DEBUGPANEL=1
-VITE_TEST_VERSION =2022120704
-VITE_ENABLE_VIDEO=1
-
-
+VITE_TEST_VERSION =2022120905
+VITE_ENABLE_VIDEO=0

.env.home.test

@@ -1,10 +1,9 @@
 # 场景资源地址
-VITE_APP_RESOURCE_URL=https://testeurs3.4dkankan.com/
+VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VITE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk
-# socket地址
+VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk
 # VITE_APP_SOCKET_URL=wss://ws.gemer.xyz
 VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
 # VITE_APP_SOCKET_URL=wss://221.4.210.172:16666
@@ -12,10 +11,10 @@ VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
 VITE_APP_STATIC_DIR=viewer
 
 # 云存储环境
-VUE_APP_REGION_URL=aws
+VITE_APP_REGION_URL=
 
 # 接口请求地址
-VITE_APP_APIS_URL=https://testeur.4dkankan.com/
+VITE_APP_APIS_URL=https://v4-test.4dkankan.com/
 # VITE_APP_APIS_URL=https://v4-uat.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
@@ -23,5 +22,5 @@ VITE_PUBLIC_DIR='/livestream/'
 VITE_ROOM_MEMBER=10
 VITE_SHOW_CONSOLE=1
 VITE_SHOW_DEBUGPANEL=1
-VITE_TEST_VERSION =2022120704
+VITE_TEST_VERSION =202212122202
 VITE_ENABLE_VIDEO=0

package.json

@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite  --mode development --port=6100",
     "dev-eur": "vite --mode eur --port=6100",
     "build-eur-test": "vue-tsc  --noEmit && vite build --mode eur",
     "build-eur-prod": "vue-tsc  --noEmit && vite build --mode eur.prod",

src/components/chatRoom/controls/actions.ts

@@ -293,9 +293,9 @@ const handleUserMuted = (UserId?: string, muted?: boolean) => {
       const { localStream } = useRtcSdk();
       if (muted) {
         console.log('被禁人状态-->', localStream);
-        localStream.muteAudio();
+        localStream && localStream.muteAudio();
       } else {
-        localStream.unmuteAudio();
+        localStream && localStream.unmuteAudio();
       }
     }, 500);
   }

src/components/chatRoom/index.vue

@@ -182,6 +182,7 @@
   import { useLocale } from '/@/locales/useLocale';
   import dayjs from 'dayjs';
   import duration from 'dayjs/plugin/duration';
+  import { useMiniApp } from '/@/hooks/useMiniApp';
   dayjs.extend(duration);
   // hook
   const { isDrawing, setDraw, setCloseDraw } = useDraw();
@@ -472,9 +473,9 @@
       muted: false,
       userId: rtcStore.userId,
     });
-    localStream.resume();
+    localStream && localStream.resume();
     rtcStore.unmute();
-    // localStream.unmuteAudio();
+    localStream && localStream.unmuteAudio();
   };
   const handleMute = () => {
     const { localStream } = useRtcSdk();
@@ -487,7 +488,7 @@
     console.log('localStream', localStream);
     console.log('关闭MIC');
     rtcStore.mute();
-    localStream.muteAudio();
+    localStream && localStream.muteAudio();
   };
 
   const handleCloseRoom = async () => {
@@ -497,6 +498,7 @@
   };
 
   const handleCreateShare = () => {
+    const { isUsingMiniApp } = useMiniApp();
     const search = new URLSearchParams();
     search.set('isTour', '0');
     // search.set('vruserId', `user_${Math.floor(Math.random() * 100000000)}`);
@@ -509,7 +511,17 @@
     Number(import.meta.env.VITE_SHOW_CONSOLE) === 1 && search.set('vlog', '1');
     const url = new URL(location.href);
     url.search = `?` + search.toString();
-    shareLink.value = url.toString();
+    if (!unref(isUsingMiniApp)) {
+      shareLink.value = url.toString();
+    } else {
+      const { socket } = useSocket();
+
+      socket.emit('action', {
+        type: 'users-inviteMember',
+        userId: rtcStore.userId,
+        data: search.toString(),
+      });
+    }
   };
 
   const handleChangeScene = (scene: Ref<SceneItemType>) => {
@@ -533,7 +545,7 @@
         userId: rtcStore.userId,
       },
     });
-    localStream.muteVideo();
+    localStream && localStream.muteVideo();
   };
   const handleShowCamera = () => {
     const { localStream, muteVideoLeader } = useRtcSdk();
@@ -546,7 +558,7 @@
       },
     });
     muteVideoLeader.value = false;
-    localStream.unmuteVideo();
+    localStream && localStream.unmuteVideo();
   };
 </script>
 

src/hooks/useRoom.ts

@@ -90,7 +90,8 @@ export const changeScene = (scene: SceneItemType) => {
 };
 
 const shopAxios = axios.create({
-  baseURL: !import.meta.env.DEV ? import.meta.env.VITE_APP_APIS_URL : '',
+  // baseURL: !import.meta.env.DEV ? import.meta.env.VITE_APP_APIS_URL : '',
+  baseURL: import.meta.env.VITE_APP_APIS_URL,
 });
 
 export const initialRoom = async () => {

src/hooks/useTRTC.ts

@@ -103,11 +103,15 @@ async function createLocalStream() {
 
 async function createRTCSocket(): Promise<void> {
   try {
-    const rtcStore = useRtcStore();
-    await checkSystemRequirements();
-    await checkDevice();
-    console.log('createRTCSocket', rtcStore.videoDeviceId);
-    await handleJoin();
+    if (!unref(isUsingMiniApp)) {
+      const rtcStore = useRtcStore();
+      await checkSystemRequirements();
+      await checkDevice();
+      console.log('createRTCSocket', rtcStore.videoDeviceId);
+      await handleJoin();
+    } else {
+      console.log('小程序关闭rtc入口');
+    }
   } catch (error) {
     consola.error({
       tag: 'createRTCSocket',