fix: 🧩 修改艺术点位

3 years ago · f853688ce0
7 changed files with 45 additions and 17 deletions
--- a/public/index.html
+++ b/public/index.html
@ -1,19 +1,26 @@
 <!DOCTYPE html>
 <html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-    <script src="./static/qm/three.js"></script>
-    <script src="./static/qm/MainMap_QM.js"></script>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
+  <script src="./static/qm/three.js"></script>
+  <script src="./static/qm/MainMap_QM.js"></script>
+  <script src="./static/android/android.js"></script>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
 </html>
--- a/public/static/android/android.js
+++ b/public/static/android/android.js
@ -0,0 +1,4 @@
+
+window.leaveScreenSave= ()=>{
+  // 离开屏保需要调用
+}
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@ -53,6 +53,10 @@ function handleDetail() {
 onMounted(() => {
  !window.Map_QM && useInitMap()
  window.addEventListener('touchend', checkHandleScreen)
+
+  window.leaveScreenSave = () => {
+    checkHandleScreen(new TouchEvent('touchstart'))
+  }
 })
 onBeforeUnmount(() => {
  window.removeEventListener('touchend', checkHandleScreen)
--- a/src/components/TypeBtnList/TypeBtnList.vue
+++ b/src/components/TypeBtnList/TypeBtnList.vue
@ -10,7 +10,7 @@
      <h4>
        {{ switchLanguage(item, 'title') }}
      </h4>
-      <div class="saw"></div>
+      <div v-if="list.length > 1" class="saw"></div>
    </div>
  </div>
 </template>
--- a/src/composables/useHandleScreen.ts
+++ b/src/composables/useHandleScreen.ts
@ -68,6 +68,7 @@ export const useHandleScreen = (callback: () => void) => {
        callback()
      }
      await sleepToWallpaper()
+      window?.android?.goScreenSave() //进入屏保
      callback()
    }, DELAY_CHECK_TIME)
  }
--- a/src/types/window.d.ts
+++ b/src/types/window.d.ts
@ -0,0 +1,11 @@
+/**
+ * android.goScreenSave ()   进入屏保
+leaveScreenSave()  离开屏保需要调用我这里的方法
+ */
+type Android = {
+  goScreenSave: () => void
+}
+declare interface Window {
+  android: Android
+  leaveScreenSave: () => void
+}
--- a/src/views/Art/Art.vue
+++ b/src/views/Art/Art.vue
@ -471,6 +471,7 @@ function clickGo(item: any) {
    top: 85px;
    left: 510px;
    li {
+      margin-bottom: -108px;
      img {
        height: 205px;
      }