Merge pull request 'dev' (#84) from dev into test

Reviewed-on: common/base_daoshi_vue_ts#84

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);

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;

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]

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() {

src/types/native.d.ts

@@ -47,9 +47,7 @@ export declare global {
     chrome: {
       webview: {
         hostObjects: {
-          sync: {
-            csobj: NativeMethods
-          }
+          csobj: NativeMethods
         }
       }
     }