gemercheung %!s(int64=2) %!d(string=hai) anos
pai
achega
cff69c69bd

+ 4 - 2
src/App.vue

@@ -81,7 +81,9 @@
       mobile: true,
     });
     // SDK初始化
-    app.use('MinMap', { theme: { camera_fillStyle: '#ED5D18' } });
+    app.use('MinMap', { theme: { camera_fillStyle: '#ED5D18' } }).then(() => {
+      refMiniMap.value = '[xui_min_map]';
+    });
     app.use('Tag');
 
     createTourPlayer();
@@ -148,7 +150,6 @@
       show.value = true;
     });
     app.Scene.on('loaded', (pano) => {
-      refMiniMap.value = '[xui_min_map]';
       appStore.setFloorId(pano.floorIndex);
 
       // store.commit("setFloorId", pano.floorIndex);
@@ -164,6 +165,7 @@
         app.MinMap.hide(true);
       }
       dataLoaded.value = true;
+
       appStore.isLoad();
     });
     app.store.on('floorcad', ({ floors }: { floors: FloorsType[] }) => {

+ 5 - 3
src/components/chatRoom/controls/actions.ts

@@ -131,10 +131,12 @@ function handleUserJoin(members?: UserInfoType[], user?: UserInfoType) {
     message: '有人进来了',
   });
   const rtcStore = useRtcStore();
+
   // const { closeSocket } = useSocket();
   members && rtcStore.setMemberList(members);
+  const isMaxAlert = rtcStore.memberList.length > Number(import.meta.env.VITE_ROOM_MEMBER);
 
-  if (user) {
+  if (user && !isMaxAlert) {
     let name = user.Nickname;
     if (user.Role === 'leader') {
       const { socket } = useSocket();
@@ -221,10 +223,10 @@ const handleUserMuted = (UserId?: string, muted?: boolean, members?: UserInfoTyp
 //被动处理用离开
 const handleUserLeave = (user?: UserInfoType, members?: UserInfoType[]) => {
   const { t } = useI18n();
-  console.log('有人离开了', user?.UserId);
   const rtcStore = useRtcStore();
   const isMaxAlert = rtcStore.memberList.length > Number(import.meta.env.VITE_ROOM_MEMBER);
-  if (user && isMaxAlert) {
+  console.log('有人离开了', user?.UserId, isMaxAlert);
+  if (user && !isMaxAlert) {
     let name = user.Nickname;
     if (user.Role == 'leader') {
       name = t('action.hoster');

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

@@ -208,6 +208,7 @@
     callback && callback();
   };
   console.log('initParams', rtcStore.userId);
+  const nickname = decodeURIComponent(decodeURIComponent(browser.getURLParam('name')));
   const initParams: SocketParams = {
     userId:
       browser.getURLParam('vruserId') ||
@@ -216,7 +217,7 @@
     roomId: browser.getURLParam('roomId') || `room_${Math.floor(Math.random() * 100000000)}`,
     role: (browser.getURLParam('role') as RoleType) || 'leader',
     avatar: browser.getURLParam('avatar'),
-    nickname: browser.getURLParam('name'),
+    nickname: nickname || '',
     mode: browser.getURLParam('mode'),
   };