udpate

src/App.vue

@@ -26,7 +26,7 @@
   import BaseDialog from '/@/components/chatRoom/dialog/base.vue';
 
   const { createTourPlayer } = useTourPlayer();
-  const showDebug = ref(false);
+  const showDebug = ref(true);
   const { t } = useI18n();
 
   const { changeLocale } = useLocale();
@@ -38,7 +38,7 @@
   } else {
     changeLocale('zh');
   }
-
+  const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;
   const sceneStore = useSceneStore();
   const appStore = useAppStore();
   const rtcStore = useRtcStore();
@@ -270,8 +270,10 @@
 <template>
   <div class="debug flex justify-between px-1" v-if="showDebug">
     <span>
-      {{ t('base.debuginfo') }}：小地图显示：{{ !!unref(refMiniMap) && player.showWidgets }} </span
-    ><span class="close" @click.stop="showDebug = false">X</span>
+      {{ t('base.debuginfo') }}：公告，当前测试最新:2022120702,当前满员条件：
+      {{ maxNumber }}
+    </span>
+    <span class="close" @click.stop="showDebug = false">X</span>
   </div>
   <LoadingLogo :thumb="true" />
   <!-- 引导页 -->

src/components/basic/FloorSwitch.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-  import { computed } from 'vue';
+  import { computed, unref, watch } from 'vue';
   import { useApp } from '/@/hooks/userApp';
   import { useSocket } from '/@/hooks/userSocket';
   import { useAppStore } from '/@/store/modules/app';
@@ -69,6 +69,21 @@
       }
     }),
   );
+  watch(
+    () => [flying, mode],
+    (val) => {
+      if (!unref(val)[0].value && unref(val)[1].value === 'dollhouse') {
+        console.log('dollhouse-all');
+        setTimeout(() => {
+          onGotoFloor('all');
+        }, 50);
+      }
+
+      // if (!unref(val[0]) && unref(val[1]) === 'dollhouse') {
+      // }
+    },
+    { deep: true, immediate: true },
+  );
 </script>
 
 <style lang="scss" scoped>

src/components/chatRoom/camera.vue

@@ -4,16 +4,23 @@
     class="camera_box"
     v-show="isLeader && isRTCJoined && isPanoramaMode && !muteVideoLeader && hosterhasVideo"
   >
+  <!--  -->
     <span class="micBox">
       <i class="speak_mic" v-if="!roomLeader?.IsMuted"></i>
       <i class="speak_mic_off" v-else></i>
     </span>
   </div>
+  <!-- :id="cameraRemoteBoxId" -->
   <div
-    :id="cameraRemoveBoxId"
+    id="cameraRemoteBox"
     class="camera_box"
     v-show="
-      !isLeader && isRTCJoined && roomLeader && isPanoramaMode && !muteVideoLeader && hosterhasVideo
+      !isLeader &&
+      isRTCJoined &&
+      roomLeader &&
+      isPanoramaMode &&
+      !muteVideoLeader &&
+      remoteStreams.length > 0
     "
   >
     <span class="micBox">
@@ -34,10 +41,9 @@
   // const isPublished = computed(() => rtcStore.isPublished);
   const isRTCJoined = computed(() => rtcStore.isRTCJoined);
   const isLeader = computed(() => rtcStore.isLeader);
-  // const remoteStreams = computed(() => rtcStore.remoteStreams);
   const roomLeader = computed(() => rtcStore.getRoomLeader());
   const cameraBoxId = computed(() => 'camera_box_' + rtcStore.userId);
-  const cameraRemoveBoxId = computed(() => 'camera_remote_box_' + rtcStore.userId);
+  // const cameraRemoteBoxId = computed(() => 'camera_remote_box_' + rtcStore.userId);
   const isPanoramaMode = computed(() => appStore.mode === 'panorama');
   const { muteVideoLeader } = useRtcSdk();
   const hosterhasVideo = computed(() => rtcStore.videoDeviceId?.length > 0);
@@ -47,9 +53,9 @@
     watch(
       () => remoteStreams,
       (val) => {
-        console.log('remoteStreams', unref(val));
+        console.log('远流:', unref(val));
       },
-      { deep: true },
+      { deep: true, immediate: true },
     );
   });
 </script>

src/components/chatRoom/chatroom.scss

@@ -179,7 +179,7 @@
         height: 0.65rem;
         // font-size: 0.56rem;
         // background: #FD5151;
-        margin-right: 0.23rem;
+        margin-right: 0.18rem;
         // &.iconexit {
         //   //   width: 0.56rem;
         //   //   height: 0.56rem;

src/hooks/useTRTC.ts

@@ -438,9 +438,10 @@ async function handleStreamSubscribed(event) {
           closeTxt: t('base.cancel'),
         },
         () => {
-          // rtcStore.remoteStreams.forEach((item) => {
-          //   item.resume();
-          // });
+          console.log('手机端', rtcStore.remoteStreams);
+          rtcStore.remoteStreams.forEach((item) => {
+            item.resume();
+          });
           remoteStream.resume();
         },
       );

src/store/modules/app.ts

@@ -79,9 +79,11 @@ export const useAppStore = defineStore({
           });
       });
 
-      if (payload == 'dollhouse') {
-        this.setFloor('all');
-      }
+      // if (payload == 'dollhouse') {
+      //   // setTimeout(() => {
+      //   //   this.setFloor('all');
+      //   // }, 500);
+      // }
       this.mode = payload;
     },
     setFloorId(id: string): void {