调试最多人数

.env.development

@@ -20,7 +20,8 @@ VITE_APP_APIS_URL=https://v4-test.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
-VITE_ROOM_MEMBER=10
+VITE_ROOM_MEMBER_DEBUG=1
+VITE_ROOM_MEMBER=3
 VITE_SHOW_CONSOLE=1
 VITE_SHOW_DEBUGPANEL=1
 VITE_TEST_VERSION =2022120905

.env.home.test

@@ -20,7 +20,8 @@ VITE_APP_APIS_URL=https://v4-test.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
-VITE_ROOM_MEMBER=5
+VITE_ROOM_MEMBER_DEBUG=1
+VITE_ROOM_MEMBER=3
 VITE_SHOW_CONSOLE=1
 VITE_SHOW_DEBUGPANEL=1
 VITE_TEST_VERSION =20230111

.env.production

@@ -18,5 +18,6 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 # VITE_TAKE_LOOK_API=https://testeur.4dkankan.com/
 VITE_USE_HTTPS=1
 VITE_PUBLIC_DIR='/livestream/'
+VITE_ROOM_MEMBER_DEBUG=0
 VITE_ROOM_MEMBER=3
 VITE_SHOW_CONSOLE=0

index.html

@@ -36,10 +36,10 @@
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/jweixin-1.6.0.js"></script>
     <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js"></script>
     <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js"></script>
-    <!-- <script>
+    <script>
       if ((query = window.location.href.indexOf('vlog') != -1)) {
         var vConsole = new window.VConsole();
       }
-    </script> -->
+    </script>
   </body>
 </html>

src/App.vue

@@ -46,8 +46,7 @@
   } else {
     changeLocale('zh');
   }
-  // const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;
-  // const test_version = computed(() => import.meta.env.VITE_TEST_VERSION || '');
+
   const sceneStore = useSceneStore();
   const appStore = useAppStore();
   const rtcStore = useRtcStore();
@@ -62,6 +61,7 @@
   // const isJoined = computed(() => rtcStore.isJoined);
   const isLoaded = computed(() => appStore.isLoaded);
   const showPasswordDialog = ref(false);
+  const { room } = useRoom();
   // const connectStatus = computed(() => rtcStore.connectStatus);
   const controls = computed(() => {
     return metadata.value.controls;
@@ -366,11 +366,12 @@
       {{ maxNumber }}
     </span> -->
     <span>
-      {{ t('base.debuginfo') }}：公告，测试1.2.0-9-8-01,角色:{{ rtcStore.role }} rId:{{
+      {{ t('base.debuginfo') }}V:1.2.0,角色:{{ rtcStore.role }} rId:{{
         rtcStore.roomId || browser.getURLParam('roomId')
       }}
       sceneIndex:{{ currentSceneIndex }} uid::
       {{ rtcStore.userId || browser.getURLParam('vruserId') }}
+      MaxMan: {{ room?.maxMan }}
     </span>
     <span class="close" @click.stop="showDebug = false">X</span>
   </div>

src/components/chatRoom/controls/actions.ts

@@ -179,7 +179,9 @@ function handleUserJoin(members?: UserInfoType[], user?: UserInfoType) {
   const rtcStore = useRtcStore();
   const appStore = useAppStore();
   members && rtcStore.setMemberList(members);
-  const isMaxAlert = rtcStore.memberList.length > Number(import.meta.env.VITE_ROOM_MEMBER);
+  const { room } = useRoom();
+  const isMaxAlert =
+    rtcStore.memberList.length > Number(room.value?.maxMan || import.meta.env.VITE_ROOM_MEMBER);
 
   if (user && !isMaxAlert) {
     let name = user.Nickname;
@@ -326,7 +328,9 @@ const handleUserMuted = (UserId?: string, muted?: boolean) => {
 const handleUserLeave = (user?: UserInfoType, members?: UserInfoType[]) => {
   const { t } = useI18n();
   const rtcStore = useRtcStore();
-  const isMaxAlert = members && members.length > Number(import.meta.env.VITE_ROOM_MEMBER);
+  const { room } = useRoom();
+  const isMaxAlert =
+    members && members.length > Number(room.value?.maxMan || import.meta.env.VITE_ROOM_MEMBER);
   console.log('有人离开了', user?.UserId, isMaxAlert);
   if (user && !isMaxAlert) {
     let name = user.Nickname;
@@ -361,7 +365,9 @@ const handleUserLeave = (user?: UserInfoType, members?: UserInfoType[]) => {
 const handleUserExit = (user?: UserInfoType, members?: UserInfoType[]) => {
   const { t } = useI18n();
   const rtcStore = useRtcStore();
-  const isMaxAlert = members && members.length > Number(import.meta.env.VITE_ROOM_MEMBER);
+  const { room } = useRoom();
+  const isMaxAlert =
+    members && members.length > Number(room.value?.maxMan || import.meta.env.VITE_ROOM_MEMBER);
   console.log('有人退出了', user?.UserId, isMaxAlert);
   if (user && !isMaxAlert) {
     let name = user.Nickname;

src/components/chatRoom/controls/join.ts

@@ -16,7 +16,7 @@ export function handleJoin(data: any) {
   // const app = getApp();
   const { socket, closeSocket } = useSocket();
   const members = data?.members as any as UserInfoType[];
-  const user = data?.user as any as UserInfoType;
+  // const user = data?.user as any as UserInfoType;
   const rtcStore = useRtcStore();
 
   // const userExsit = rtcStore.checkUserInMemberList(rtcStore.userId);
@@ -28,10 +28,10 @@ export function handleJoin(data: any) {
     tag: 'socket:enter',
   });
 
-  console.log('lala', user);
-  const maxNumber = import.meta.env.VITE_ROOM_MEMBER || 10;
-  // console.log('roomMaxNumber', maxNumber);
-  console.log('roomMaxNumber', maxNumber, members.length, Number(maxNumber));
+  const { room } = useRoom();
+  const maxNumber = unref(room)?.maxMan || 10;
+  console.log('maxMan:', maxNumber, members.length, Number(maxNumber));
+
   if (members.length > Number(maxNumber)) {
     if (rtcStore.role === 'customer') {
       const { t } = useI18n();

src/hooks/useRoom.ts

@@ -138,6 +138,16 @@ export const enterRoom = async () => {
   const userID = rtcStore.userId || browser.getURLParam('vruserId');
   const role = rtcStore.role || browser.getURLParam('role');
   shopAxios.defaults.headers.platform = browser.getURLParam('platform') || '';
+
+  // overRide测试人数
+
+  if (Number(import.meta.env.VITE_ROOM_MEMBER_DEBUG) === 1) {
+    if (room.value) {
+      room.value.maxMan = Number(import.meta.env.VITE_ROOM_MEMBER);
+      console.warn('测试设置人数: ' + Number(import.meta.env.VITE_ROOM_MEMBER));
+    }
+  }
+
   await shopAxios.get('/takelook/inOrOutRoom', {
     params: {
       type: 0,