首页 发现 帮助
注册 登录
zhangyupeng
/
daikan-international
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

小地图

gemercheung 2 年之前
父节点
d51a4adb78
当前提交
58743e8f78
共有 11 个文件被更改，包括 47 次插入 和 16 次删除
合并视图 显示文件统计
  1. 1 0
      .env
  2. 1 0
      .env.development
  3. 3 0
      .env.eur
  4. 1 0
      .env.production
  5. 2 2
      index.html
  6. 1 1
      src/App.vue
  7. 21 2
      src/components/basic/floorplan.vue
  8. 5 5
      src/components/basic/miniMap.vue
  9. 10 5
      src/components/basic/title.vue
  10. 1 1
      src/hooks/useRoom.ts
  11. 1 0
      src/hooks/userSocket.ts

+ 1 - 0
.env
查看文件 

@@ -19,3 +19,4 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 
 VITE_USE_HTTPS=1
 
 VITE_USE_HTTPS=1
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_ROOM_MEMBER=3
 
 VITE_ROOM_MEMBER=3
 
+VITE_SHOW_CONSOLE=1

+ 1 - 0
.env.development
查看文件 

@@ -17,4 +17,5 @@ VITE_APP_APIS_URL=https://test.4dkankan.com/
 
 

 

 VITE_USE_HTTPS=1

 VITE_USE_HTTPS=1

 VITE_PUBLIC_DIR='/'

 VITE_PUBLIC_DIR='/'

+VITE_SHOW_CONSOLE=1

+ 3 - 0
.env.eur
查看文件 

@@ -6,6 +6,8 @@ VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 
 VITE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk
 
 VITE_APP_SDK_DIR=https://testeurs3.4dkankan.com/v4/www/sdk
 
 # socket地址
 
 # socket地址
 
 VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
 
 VITE_APP_SOCKET_URL=wss://ws.4dkankan.com
 
+# VITE_APP_SOCKET_URL=wss://testeurws.4dkankan.com
 
+# VITE_APP_SOCKET_URL=ws://127.0.01:6666
 
 # 静态资源目录
 
 # 静态资源目录
 
 VITE_APP_STATIC_DIR=viewer
 
 VITE_APP_STATIC_DIR=viewer
 
 
 
@@ -19,3 +21,4 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 
 VITE_USE_HTTPS=1
 
 VITE_USE_HTTPS=1
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_ROOM_MEMBER=3
 
 VITE_ROOM_MEMBER=3
 
+VITE_SHOW_CONSOLE=1

+ 1 - 0
.env.production
查看文件 

@@ -19,3 +19,4 @@ VITE_APP_APIS_URL=https://testeur.4dkankan.com/
 
 VITE_USE_HTTPS=1
 
 VITE_USE_HTTPS=1
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_PUBLIC_DIR='/livestream/'
 
 VITE_ROOM_MEMBER=3
 
 VITE_ROOM_MEMBER=3
 
+VITE_SHOW_CONSOLE=1

+ 2 - 2
index.html
查看文件 

@@ -25,8 +25,8 @@
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
     <script type="module" src="/src/main.ts"></script>
 
     <script type="module" src="/src/main.ts"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js?v=4.3.3-alpha.8"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js?v=4.3.3-alpha.8"></script>
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js?v=4.4.2-alpha.0"></script>
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js?v=4.4.2-alpha.0"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/flv.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/flv.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/vconsole.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/vconsole.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/swiper/swiper-bundle.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/swiper/swiper-bundle.min.js"></script>

+ 1 - 1
src/App.vue
查看文件 

@@ -270,7 +270,7 @@
 
   </div>
 
   </div>
 
   <LoadingLogo :thumb="true" />
 
   <LoadingLogo :thumb="true" />
 
   <!-- 引导页 -->
 
   <!-- 引导页 -->
 
-  <Title v-if="isLoaded" />
 
+  <Title v-if="isLoaded && !!unref(refMiniMap)" />
 
   <Guideline />
 
   <Guideline />
 
   <div class="ui-view-layout" :class="{ show: show }">
 
   <div class="ui-view-layout" :class="{ show: show }">
 
     <div class="scene" ref="scene$"></div>
 
     <div class="scene" ref="scene$"></div>

+ 21 - 2
src/components/basic/floorplan.vue
查看文件 

@@ -7,7 +7,7 @@
 
     class="tab-layer"

     class="tab-layer"

   >

   >

     <div class="tabs" v-if="show">

     <div class="tabs" v-if="show">

-      <span :class="{ active: isFloorplan }" ref="floorplan_ref" @click="changeMode('floorplan')">

+      <span :class="{ active: isFloorplan }" ref="floorplan_ref" @click="handle2DMode">

         <i

         <i

           :class="{

           :class="{

             'icon-show_plane_selected': isFloorplan,

             'icon-show_plane_selected': isFloorplan,

@@ -23,7 +23,7 @@
 
         ></ui-icon> -->

         ></ui-icon> -->

         {{ t('base.floorPlan') }}

         {{ t('base.floorPlan') }}

       </span>

       </span>

-      <span :class="{ active: isDollhouse }" ref="dollhouse_ref" @click="changeMode('dollhouse')">

+      <span :class="{ active: isDollhouse }" ref="dollhouse_ref" @click="handle3DMode">

         <i

         <i

           :class="{

           :class="{

             'icon-show_3d_selected': isDollhouse,

             'icon-show_3d_selected': isDollhouse,

@@ -45,6 +45,8 @@
 
 <script lang="ts">

 <script lang="ts">

   import { computed, defineComponent, ref, watchEffect, watch, unref } from 'vue';

   import { computed, defineComponent, ref, watchEffect, watch, unref } from 'vue';

   import { useI18n } from '/@/hooks/useI18n';

   import { useI18n } from '/@/hooks/useI18n';

+  import { useAppStore } from '/@/store/modules/app';

+  import { useRtcStore } from '/@/store/modules/rtc';

   import { propTypes } from '/@/utils/propTypes';

   import { propTypes } from '/@/utils/propTypes';

 

 

   export default defineComponent({

   export default defineComponent({

@@ -64,6 +66,11 @@
 
       const dollhouse_ref = ref<Nullable<HTMLElement>>(null);

       const dollhouse_ref = ref<Nullable<HTMLElement>>(null);

       const isFloorplan = computed(() => props.mode === 'floorplan');

       const isFloorplan = computed(() => props.mode === 'floorplan');

       const isDollhouse = computed(() => props.mode === 'dollhouse');

       const isDollhouse = computed(() => props.mode === 'dollhouse');

+      const rtcStore = useRtcStore();

+      const appStore = useAppStore();

+      const isLeader = computed(() => rtcStore.isLeader);

+      const isTourMode = computed(() => appStore.isTourMode);

+

       watchEffect(() => {

       watchEffect(() => {

         console.log('floorplan', isFloorplan);

         console.log('floorplan', isFloorplan);

       });

       });

@@ -100,8 +107,20 @@
 
       const changeMode = (eventName: string) => {

       const changeMode = (eventName: string) => {

         emit('changeMode', eventName);

         emit('changeMode', eventName);

       };

       };

+      const handle2DMode = () => {

+        if (unref(isLeader) || unref(isTourMode)) {

+          changeMode('floorplan');

+        }

+      };

+      const handle3DMode = () => {

+        if (unref(isLeader) || unref(isTourMode)) {

+          changeMode('dollhouse');

+        }

+      };

 

 

       return {

       return {

+        handle2DMode,

+        handle3DMode,

         t,

         t,

         changeMode,

         changeMode,

         refMiniMap,

         refMiniMap,

+ 5 - 5
src/components/basic/miniMap.vue
查看文件 

@@ -16,6 +16,7 @@
 
 <script lang="ts">

 <script lang="ts">

   import { computed, defineComponent, onMounted, ref, unref, watch } from 'vue';

   import { computed, defineComponent, onMounted, ref, unref, watch } from 'vue';

   import { useI18n } from '/@/hooks/useI18n';

   import { useI18n } from '/@/hooks/useI18n';

+  import { useAppStore } from '/@/store/modules/app';

   import { useRtcStore } from '/@/store/modules/rtc';

   import { useRtcStore } from '/@/store/modules/rtc';

   import { propTypes } from '/@/utils/propTypes';

   import { propTypes } from '/@/utils/propTypes';

   const refMiniMap = ref<Nullable<string>>(null);

   const refMiniMap = ref<Nullable<string>>(null);

@@ -35,7 +36,9 @@
 
     emits: ['changeMode', 'toggleMap'],

     emits: ['changeMode', 'toggleMap'],

     setup(props, { emit }) {

     setup(props, { emit }) {

       const rtcStore = useRtcStore();

       const rtcStore = useRtcStore();

+      const appStore = useAppStore();

       const isLeader = computed(() => rtcStore.isLeader);

       const isLeader = computed(() => rtcStore.isLeader);

+      const isTourMode = computed(() => appStore.isTourMode);

 

 

       const { t } = useI18n();

       const { t } = useI18n();

       onMounted(() => {

       onMounted(() => {

@@ -58,8 +61,7 @@
 
       });

       });

 

 

       const toggleMap = () => {

       const toggleMap = () => {

-        debugger;

-        if (unref(isLeader)) {

+        if (unref(isLeader) || unref(isTourMode)) {

           isCollapse.value = !isCollapse.value;

           isCollapse.value = !isCollapse.value;

           emit('toggleMap', isCollapse.value);

           emit('toggleMap', isCollapse.value);

           let $minmap = document.querySelector('[xui_min_map]');

           let $minmap = document.querySelector('[xui_min_map]');

@@ -73,9 +75,7 @@
 
         }

         }

       };

       };

       const changeMode = () => {

       const changeMode = () => {

-        console.log('unref(isLeader)', unref(isLeader));

-        debugger;

-        if (unref(isLeader)) {

+        if (unref(isLeader) || unref(isTourMode)) {

           emit('changeMode', 'dollhouse');

           emit('changeMode', 'dollhouse');

         }

         }

       };

       };

+ 10 - 5
src/components/basic/title.vue
查看文件 

@@ -1,5 +1,5 @@
 
 <template>

 <template>

-  <div class="header" @touchmove.prevent v-if="!isPanoramaMode">

+  <div class="header" @touchmove.prevent v-if="!isPanoramaMode || isTourMode">

     <div class="left" :class="{ show: !isTourMode }">

     <div class="left" :class="{ show: !isTourMode }">

       <div v-show="!isPanoramaMode" class="back-pano" @click="onChangeMode">

       <div v-show="!isPanoramaMode" class="back-pano" @click="onChangeMode">

         <i

         <i

@@ -29,9 +29,9 @@
 
         </span>

         </span>

       </div>

       </div>

     </div>

     </div>

-    <div class="right" v-show="player.showWidgets" @click="onShowMore">

+    <!-- <div class="right" v-show="player.showWidgets" @click="onShowMore">

       <i class="iconfont icon-show_more_share"></i>

       <i class="iconfont icon-show_more_share"></i>

-    </div>

+    </div> -->

     <transition

     <transition

       appear

       appear

       name="custom-classes-transition"

       name="custom-classes-transition"

@@ -62,10 +62,11 @@
 
   // import { useStore } from "vuex";

   // import { useStore } from "vuex";

   // import { Dialog } from "@/global_components/";

   // import { Dialog } from "@/global_components/";

   // import { useMusicPlayer } from "@/utils/sound";

   // import { useMusicPlayer } from "@/utils/sound";

-  import { onMounted, watch, computed, ref, nextTick } from 'vue';

+  import { onMounted, watch, computed, ref, nextTick, unref } from 'vue';

   import shareImage from '/@/assets/share.png';

   import shareImage from '/@/assets/share.png';

   import { useAppStore } from '/@/store/modules/app';

   import { useAppStore } from '/@/store/modules/app';

   import { useSceneStore } from '/@/store/modules/scene';

   import { useSceneStore } from '/@/store/modules/scene';

+  import { useRtcStore } from '/@/store/modules/rtc';

   // import { useApp, getApp } from "@/app";

   // import { useApp, getApp } from "@/app";

   const appStore = useAppStore();

   const appStore = useAppStore();

   const sceneStore = useSceneStore();

   const sceneStore = useSceneStore();

@@ -77,6 +78,8 @@
 
   }

   }

 

 

   const isTourMode = computed(() => appStore.isTourMode);

   const isTourMode = computed(() => appStore.isTourMode);

+  const rtcStore = useRtcStore();

+  const isLeader = computed(() => rtcStore.isLeader);

 

 

   // const musicPlayer = useMusicPlayer()

   // const musicPlayer = useMusicPlayer()

   // const store = useStore();

   // const store = useStore();

@@ -214,7 +217,9 @@
 
   // };

   // };

   const onChangeMode = () => {

   const onChangeMode = () => {

     //   store.commit("setMode", "panorama");

     //   store.commit("setMode", "panorama");

-    appStore.setMode('panorama');

+    if (unref(isLeader) || unref(isTourMode)) {

+      appStore.setMode('panorama');

+    }

   };

   };

 </script>

 </script>

+ 1 - 1
src/hooks/useRoom.ts
查看文件 

@@ -76,7 +76,6 @@ export const currentScene = computed(() => {
 
 

 

 export const changeScene = (scene: SceneItemType) => {

 export const changeScene = (scene: SceneItemType) => {

   const rtcStore = useRtcStore();

   const rtcStore = useRtcStore();

-  rtcStore.clearMemberList();

   if (currentScene.value?.num !== scene.num && scene?.num.length) {

   if (currentScene.value?.num !== scene.num && scene?.num.length) {

     console.log(scene, currentScene.value);

     console.log(scene, currentScene.value);

     const params = new URLSearchParams(location.search);

     const params = new URLSearchParams(location.search);

@@ -84,6 +83,7 @@ export const changeScene = (scene: SceneItemType) => {
 
     const url = new URL(location.href);

     const url = new URL(location.href);

     url.search = `?` + params.toString();

     url.search = `?` + params.toString();

     location.replace(url);

     location.replace(url);

+    rtcStore.clearMemberList();

   } else {

   } else {

     // location.reload();

     // location.reload();

   }

   }

+ 1 - 0
src/hooks/userSocket.ts
查看文件 

@@ -16,6 +16,7 @@ export function createSocket() {
 
   const rtcStore = useRtcStore();

   const rtcStore = useRtcStore();

   // console.log('rtcStore', rtcStore)

   // console.log('rtcStore', rtcStore)

   const address = import.meta.env.VITE_APP_SOCKET_URL;

   const address = import.meta.env.VITE_APP_SOCKET_URL;

+  console.log('address', address);

   socket = io(address, {

   socket = io(address, {

     path: '/ws-sync',

     path: '/ws-sync',

     transports: ['websocket'],

     transports: ['websocket'],