From cc5c5de4ea0d33d73470f7183e78fb5202a5291c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=BF=97=E9=BE=99?= Date: Mon, 12 Jun 2023 18:23:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'public/static/qm/Main?= =?UTF-8?q?Map=5FQM.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/qm/MainMap_QM.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 776e109..a2a7b74 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -2103,6 +2103,8 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.pathStateObj.isPathState = false; Map_QM.controls.maxDistance = Map_QM.util.options.maxDis; + Map_QM.controls.minAzimuthAngle = -Infinity; + Map_QM.controls.maxAzimuthAngle = Infinity; clearTimeout(Map_QM.util.timeObj.collTime); Map_QM.controls.enabled = true; Map_QM.controls.enableRotate = true; @@ -4920,6 +4922,7 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); + Map_QM.controls.reset(); if (Map_QM.util.overObj && Map_QM.forShopArr[0]) { Map_QM.util.pathStateObj.isPathPlay = true; Map_QM.clearFloor(); @@ -4948,6 +4951,7 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); + Map_QM.controls.reset(); if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.ftPath); @@ -4979,6 +4983,7 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); + Map_QM.controls.reset(); if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.dtPath); @@ -5010,6 +5015,7 @@ MainMap_QM.prototype = { TweenMax.killAll(true); Map_QM.util.timeObj.pathTime = setTimeout(() => { clearTimeout(Map_QM.util.timeObj.pathTime); + Map_QM.controls.reset(); if (Map_QM.util.overObj) { Map_QM.clearFloor(); Map_QM.onFindPathModel(Map_QM.util.pathStateObj.graphPath); From 883869048b77e684e15d375692c1b43da7fa88bb Mon Sep 17 00:00:00 2001 From: jiangx <1457960500@qq.com> Date: Tue, 13 Jun 2023 09:40:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=B9=E5=99=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Map/Map.vue | 4 ++-- src/composables/useHandleScreen.ts | 3 ++- src/store/root/getters.ts | 2 +- src/types/native.d.ts | 4 +--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 7155c9b..b1e7cfc 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -51,8 +51,8 @@ function handleDetail() { /* stylelint-disable-next-line selector-id-pattern */ #mapContainer { position: relative; - width: 1080px; - height: 1920px; + width: 100vw; + height: 100vh; } .map-flex { display: flex; diff --git a/src/composables/useHandleScreen.ts b/src/composables/useHandleScreen.ts index 4f44133..8cd4117 100644 --- a/src/composables/useHandleScreen.ts +++ b/src/composables/useHandleScreen.ts @@ -94,6 +94,7 @@ export const useHandleScreen = (callback: () => void) => { if (!nativeMethods.value?.hasProgram()) { return } + checkHandleScreen() } }) @@ -101,7 +102,7 @@ export const useHandleScreen = (callback: () => void) => { onMounted(() => { //获取返回首页和进入屏保的具体时间 getBackTime().then(({ data }) => { - const noWallpaper = data[1] + const noWallpaper = data[1] <= 0 totalTime.value = noWallpaper ? [data[0], -1] : data toIndexTime.value = data[0] toWallpaperTime.value = noWallpaper ? -1 : data[1] diff --git a/src/store/root/getters.ts b/src/store/root/getters.ts index aa367e2..24f3d6d 100644 --- a/src/store/root/getters.ts +++ b/src/store/root/getters.ts @@ -18,7 +18,7 @@ export const getters: GenGetters = { if (this.device.label === DEVICE.ANDROID) { return window.android } - return window.chrome?.webview?.hostObjects?.sync?.csobj + return window?.chrome?.webview?.hostObjects?.csobj }, //当前设备所处楼栋的楼层列表 currentBuildingFloorsList() { diff --git a/src/types/native.d.ts b/src/types/native.d.ts index 284a9de..5a74a2a 100644 --- a/src/types/native.d.ts +++ b/src/types/native.d.ts @@ -47,9 +47,7 @@ export declare global { chrome: { webview: { hostObjects: { - sync: { - csobj: NativeMethods - } + csobj: NativeMethods } } }