Browse Source

翻译补上

gemercheung 2 years ago
parent
commit
763d7565d0

+ 17 - 17
src/App.vue

@@ -26,7 +26,7 @@
   import BaseDialog from '/@/components/chatRoom/dialog/base.vue';
 
   const { createTourPlayer } = useTourPlayer();
-  const showDebug = ref(true);
+  const showDebug = ref(false);
   const { t } = useI18n();
 
   const { changeLocale } = useLocale();
@@ -198,10 +198,10 @@
           // Dialog.alert('该场景正在计算中,请稍后再试');
           rtcStore.showBaseDialog(
             {
-              title: '温馨提示',
-              desc: '该场景正在计算中,请稍后再试',
-              okTxt: '确定',
-              closeTxt: '取消',
+              title: t('base.tips'),
+              desc: t('base.baseError1'),
+              okTxt: t('base.confirm'),
+              closeTxt: t('base.cancel'),
             },
             () => {},
           );
@@ -210,10 +210,10 @@
           // Dialog.alert('服务端开小差,请稍后再试');
           rtcStore.showBaseDialog(
             {
-              title: '温馨提示',
-              desc: '房间异常,请联系主持人',
-              okTxt: '确定',
-              closeTxt: '取消',
+              title: t('base.tips'),
+              desc: t('base.baseError2'),
+              okTxt: t('base.confirm'),
+              closeTxt: t('base.cancel'),
               isSingle: true,
             },
             () => {},
@@ -223,10 +223,10 @@
           // Dialog.alert('服务端开小差,请稍后再试');
           rtcStore.showBaseDialog(
             {
-              title: '温馨提示',
-              desc: '房间异常,请联系主持人',
-              okTxt: '确定',
-              closeTxt: '取消',
+              title: t('base.tips'),
+              desc: t('base.baseError2'),
+              okTxt: t('base.confirm'),
+              closeTxt: t('base.cancel'),
               isSingle: true,
             },
             () => {},
@@ -236,10 +236,10 @@
           // Dialog.alert('服务端开小差,请稍后再试');
           rtcStore.showBaseDialog(
             {
-              title: '温馨提示',
-              desc: '房间异常,请联系主持人',
-              okTxt: '确定',
-              closeTxt: '取消',
+              title: t('base.tips'),
+              desc: t('base.baseError2'),
+              okTxt: t('base.confirm'),
+              closeTxt: t('base.cancel'),
               isSingle: true,
             },
             () => {},

+ 24 - 21
src/components/chatRoom/controls/actions.ts

@@ -9,6 +9,7 @@ import { useI18n } from '/@/hooks/useI18n';
 import browser from '/@/utils/browser';
 import { unref } from 'vue';
 import { useAppStore } from '/@/store/modules/app';
+import { useRtcSdk } from '/@/hooks/useTRTC';
 interface ActionDataType {
   type: string;
   data: any;
@@ -160,19 +161,19 @@ function handleUserJoin(members?: UserInfoType[], user?: UserInfoType) {
       Dialog.toast({ content: t('action.hosterEnterRoom') });
       socket.emit('action', { type: 'user-init' });
       socket.emit('sync-floor', { floorId: appStore.floorId });
+      const data: ChatContentType = {
+        role: user?.Role,
+        mode: rtcStore.mode,
+        Nickname: name,
+        UserId: user?.UserId,
+        text: t('action.enterRoom'),
+      };
+      rtcStore.addToChatList(data);
     }
-    const data: ChatContentType = {
-      role: user?.Role,
-      mode: rtcStore.mode,
-      Nickname: name,
-      UserId: user?.UserId,
-      text: t('action.enterRoom'),
-    };
+
     if (rtcStore.isLeader) {
-      rtcStore.addToChatList(data);
       // const { socket } = useSocket();
       // const { currentScene } = useRoom();
-
       // socket.emit('action', {
       //   type: 'changeScene',
       //   data: currentScene.value,
@@ -256,8 +257,10 @@ const handleUserSetWords = (UserId?: string, words?: boolean, members?: UserInfo
 };
 const handleUserMuted = (UserId?: string, muted?: boolean, members?: UserInfoType[]) => {
   const rtcStore = useRtcStore();
+  const { invitedRemoteStreams } = useRtcSdk();
   console.log('members', members);
   console.log('handleUserSetWords', UserId, muted);
+  console.log('invitedRemoteStreams', invitedRemoteStreams);
   UserId &&
     rtcStore.updateMemberDatabyId(UserId, {
       IsMuted: muted,
@@ -278,18 +281,18 @@ const handleUserLeave = (user?: UserInfoType, members?: UserInfoType[]) => {
     if (user.Role == 'leader') {
       name = t('action.hoster');
       Dialog.toast({ content: t('action.hostExitRoom') });
-    }
+      const data = {
+        role: user.Role,
+        mode: '',
+        Nickname: name,
+        UserId: user.UserId,
+        text: t('action.exitRoom'),
+      };
 
-    const data = {
-      role: user.Role,
-      mode: '',
-      Nickname: name,
-      UserId: user.UserId,
-      text: t('action.exitRoom'),
-    };
+      console.log('members', user, members);
+      rtcStore.addToChatList(data);
+    }
 
-    console.log('members', user, members);
-    rtcStore.addToChatList(data);
     members && rtcStore.setMemberList(members);
   }
 };
@@ -307,7 +310,7 @@ const handleLeaderDismiss = () => {
       closeTxt: t('base.cancel'),
       isSingle: true,
     },
-    () => { },
+    () => {},
   );
   setTimeout(() => {
     closeSocket();
@@ -344,4 +347,4 @@ const handleSyncFloor = (data: FloorType) => {
     console.log('data', data, rtcStore);
     appStore.setFloor(data.floorId);
   }
-};
+};

+ 6 - 4
src/components/chatRoom/controls/join.ts

@@ -1,6 +1,7 @@
 import consolaGlobalInstance from 'consola';
 import sortBy from 'lodash-es/sortBy';
 import { unref } from 'vue';
+import { useI18n } from '/@/hooks/useI18n';
 // import { unref } from 'vue';
 // import Dialog from '/@/components/basic/dialog';
 // import { getApp } from '/@/hooks/userApp';
@@ -32,12 +33,13 @@ export function handleJoin(data: any) {
   console.log('roomMaxNumber', maxNumber, members.length, Number(maxNumber));
   if (members.length > Number(maxNumber)) {
     if (rtcStore.role === 'customer') {
+      const { t } = useI18n();
       rtcStore.showBaseDialog(
         {
-          title: '温馨提示',
-          desc: '带看人数已满,可切换自由观看',
-          okTxt: '自由观看',
-          closeTxt: '取消',
+          title: t('base.tips'),
+          desc: t('base.maxRooms'),
+          okTxt: t('base.freeWalk'),
+          closeTxt: t('base.cancel'),
           isSingle: true,
         },
         () => {

+ 3 - 1
src/components/chatRoom/index.vue

@@ -27,7 +27,9 @@
           :class="{ dis: !chatShow }"
         ></div>
       </div>
-      <div style="text-align: right; width: 100%" v-if="connectStatus === 0">连接中...</div>
+      <div style="text-align: right; width: 100%" v-if="connectStatus === 0">{{
+        t('base.connecting')
+      }}</div>
       <div class="control_btn" v-if="connectStatus === 1">
         <div
           class="brushesBack"

+ 3 - 1
src/components/chatRoom/sceneList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="scene-list">
     <div class="header">
-      <p>场景列表({{ sceneList.length }})</p>
+      <p>{{ t('base.sceneList') }}({{ sceneList.length }})</p>
       <span class="icon" @click="emit('close')">
         <Icon type="cross" />
       </span>
@@ -30,12 +30,14 @@
 <script lang="ts" setup>
   import { unref } from 'vue';
   import Icon from '/@/components/basic/icon/index.vue';
+  import { useI18n } from '/@/hooks/useI18n';
   import { useRoom } from '/@/hooks/useRoom';
   // import { currentScene } from "@/store/room";
   const { currentScene, sceneList } = useRoom();
 
   console.log('sceneList', unref(sceneList));
 
+  const { t } = useI18n();
   const emit = defineEmits(['close', 'changeScene']);
 
   const handleClose = () => {

+ 1 - 0
src/hooks/useTRTC.ts

@@ -462,6 +462,7 @@ export function useRtcSdk() {
     handleJoin,
     handleLeave,
     localStream,
+    invitedRemoteStreams,
     client: localClient,
   };
 }

+ 3 - 0
src/locales/lang/en/base.ts

@@ -33,4 +33,7 @@ export default {
   nickNameRegrexError:
     'The nickname is limited to 1 to 15 characters in Chinese, English, digits, or underscores.',
   silent: 'silent',
+  connecting: 'Connecting...',
+  baseError1: 'The scene is calculating, please try again later',
+  baseError2: 'Abnormal studio, please contact the host.',
 };

+ 3 - 0
src/locales/lang/zh/base.ts

@@ -32,4 +32,7 @@ export default {
   audioPermission: '继续访问该页面需要获取您摄像头及麦克风的权限。',
   nickNameRegrexError: '昵称应是为中文、英文、数字或者下划线,且长度为1到15',
   silent: '已被禁言',
+  connecting: '连接中...',
+  baseError1: '该场景正在计算中,请稍后再试',
+  baseError2: '房间异常,请联系主持人',
 };