From 344e0aa8889028f6fc21b6766606d8a86c177d51 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 13 Jun 2024 18:09:35 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E6=AC=A1=E6=95=B0=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=81=9C=E7=95=99=E6=97=B6=E9=95=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                    |   2 +
 api/public.js              |   4 ++
 config/page.js             |   5 +-
 mixins/pageListenMixins.js |  27 +++++-----
 pages/home/index.vue       |   2 +-
 pages/home/landMark.vue    |   2 +-
 utils/request.js           |  25 ++++++----
 utils/util.js              | 100 +++++++++++++++++++++++++++++++++----
 8 files changed, 131 insertions(+), 36 deletions(-)

diff --git a/App.vue b/App.vue
index d2204fc..52efa1a 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,9 @@
 <script>
+import { clearAllInterval } from '@/utils/util'
 export default {
   onLaunch: function () {
     console.log('App Launch')
+    clearAllInterval()
   },
   onShow: function () {
     console.log('App Show')
diff --git a/api/public.js b/api/public.js
index 2e31ca1..1acbf7a 100644
--- a/api/public.js
+++ b/api/public.js
@@ -207,4 +207,8 @@ export function getShareImage() {
 
 export function getXiaoZhi() {
     return request.get("/appAdvertising", {}, {login: false})
+}
+
+export function pushSystemStatic(data) {
+    return request.post("/systemStats/push", data, { login: false })
 }
\ No newline at end of file
diff --git a/config/page.js b/config/page.js
index 7f1f01d..2768c5a 100644
--- a/config/page.js
+++ b/config/page.js
@@ -1,6 +1,3 @@
 export const pageToWatchData = {
-	'home_index': {
-		count: 0,
-		timer: 0
-	}
+	'appIndex': []
 }
diff --git a/mixins/pageListenMixins.js b/mixins/pageListenMixins.js
index c811663..6fd42d7 100644
--- a/mixins/pageListenMixins.js
+++ b/mixins/pageListenMixins.js
@@ -1,15 +1,18 @@
 import {
 	pageToWatchShowCount,
-	pageToWatchShowTimer
+	pageToWatchShowTimer,
+  getCurrDateTime,
+  TimeDifference
 } from '@/utils/util'
 export const pageListenMixins = {
 	data(){
 		return {
-      pageTimer: null
+      pageViewDateTime: ''
 		}
 	},
   onShow() {
-    this.pageToWatchShowCount(this.pageKeyId, this.pageShowTimerFn())
+    this.pageViewDateTime = getCurrDateTime()
+    this.pageToWatchShowCount(this.pageKeyId)
   },
   onHide() {
     this.clearPageTimerFn()
@@ -17,17 +20,17 @@ export const pageListenMixins = {
 	methods: {
 		pageToWatchShowCount,
 		pageToWatchShowTimer,
-    pageShowTimerFn() {
-      this.pageTimer = setInterval(() => {
-        console.log('----页面监听----%s', this.pageKeyId)
-        this.pageToWatchShowTimer(this.pageKeyId)
-      }, 1000)
-    },
     clearPageTimerFn() {
-      if (this.pageTimer) {
-        console.log('清除页面监听-----%s', this.pageKeyId)
-        clearInterval(this.pageTimer)
+      const visitTime = TimeDifference(this.pageViewDateTime, getCurrDateTime())
+      if (visitTime > 0) {
+        this.pageToWatchShowTimer(this.pageKeyId, {
+          statsName: this.pageKeyId,
+          statsTime: this.pageViewDateTime,
+          visitTime
+        })
       }
+      this.pageViewDateTime = ''
+      console.log('清除页面监听-----%s', this.pageKeyId)
     }
 	}
 }
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 72aded0..7312a88 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -372,7 +372,7 @@ export default {
       contentFestival: {},
       countyFamous: {},
       seasonalFood: {},
-      pageKeyId: Object.freeze('home_index'),
+      pageKeyId: Object.freeze('appIndex'),
       scrollTop: 0
     }
   },
diff --git a/pages/home/landMark.vue b/pages/home/landMark.vue
index b9d80fe..7702e21 100644
--- a/pages/home/landMark.vue
+++ b/pages/home/landMark.vue
@@ -93,7 +93,7 @@ export default {
       mapLocations: [],
       goods: [],
       directionClass: ['', 'up', 'right', 'down', 'left'],
-      pageKeyId: Object.freeze('land_index')
+      pageKeyId: Object.freeze('landmarkGoodsIndex')
     }
   },
   computed: {
diff --git a/utils/request.js b/utils/request.js
index 2428f46..fc568d7 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -18,13 +18,18 @@ fly.interceptors.response.use(
             console.log('————————')
             handleLoginFailure();
             return Promise.reject({msg: "未登录", toLogin: true});
-        }
-        if (error.status == 401) {
+        } else if (error.status == 401) {
             console.log('————————')
             console.log('登录失效 401', error)
             console.log('————————')
             handleLoginFailure();
             return Promise.reject({msg: "未登录", toLogin: true});
+        } else {
+            uni.showToast({
+                title: '服务开小差了，请稍后再试',
+                icon: 'none',
+                duration: 3000
+            })
         }
         return Promise.reject(error);
     }
@@ -61,13 +66,15 @@ function baseRequest(options) {
         } else if (data.status === 200) {
             return Promise.resolve(data, res);
         } else {
-            uni.showToast({
-                title: res.data.msg,
-                icon: 'none',
-                duration: 3000,
-                success() {
-                }
-            })
+            if (url.indexOf('api/systemStats/push') < 0) {
+                uni.showToast({
+                    title: res.data.msg,
+                    icon: 'none',
+                    duration: 3000,
+                    success() {
+                    }
+                })
+            }
             return Promise.reject({msg: res.data.msg, res, data});
         }
     });
diff --git a/utils/util.js b/utils/util.js
index a3135d8..b54d61d 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { pushSystemStatic } from '@/api/public'
 
 // 日期格式化
 export function formatterDate(date, flag = '-', mode = 'date') {
@@ -34,14 +35,11 @@ export function formatContent(html) {
  * @returns {null}
  */
 export function pageToWatchShowCount(key, cb = '') {
-  if (Vue.prototype.$pageToWatchData[key]) {
-    Vue.prototype.$pageToWatchData[key].count++
-  } else {
-    Vue.prototype.$pageToWatchData[key] = {
-      count: 1,
-      timer: 0
-    }
+  console.log(Vue.prototype.$pageToWatchData)
+  if (!Vue.prototype.$pageToWatchData[key]) {
+    Vue.prototype.$pageToWatchData[key] = []
   }
+  console.log('页面监听-----%s', key)
   cb && cb()
 }
 
@@ -52,8 +50,92 @@ export function pageToWatchShowCount(key, cb = '') {
  * @param key-页面唯一标识
  * @returns {null}
  */
-export function pageToWatchShowTimer(key) {
+export function pageToWatchShowTimer(key, data) {
   if (Vue.prototype.$pageToWatchData[key]) {
-    Vue.prototype.$pageToWatchData[key].timer++
+    Vue.prototype.$pageToWatchData[key].push(data)
   }
 }
+
+/**
+ * desc: 获取当前系统时间
+ * auth: lifizer
+ * date: 2024-05-16
+ * @returns {String}
+ */
+export function getCurrDateTime() {
+  const date = new Date()
+  let str = ''
+  str += date.getFullYear() + '-'
+  str += (date.getMonth() + 1).toString().padStart(2, '0') + '-'
+  str += (date.getDate()).toString().padStart(2, '0') + ' '
+  str += (date.getHours()).toString().padStart(2, '0') + ':'
+  str += (date.getMinutes()).toString().padStart(2, '0') + ':'
+  str += (date.getSeconds()).toString().padStart(2, '0')
+  return str
+}
+
+/**
+ * desc: 计算两个时间的相差的秒数
+ * auth: lifizer
+ * date: 2024-05-16
+ * @param startValue-开始时间
+ * @param endValue-结束时间
+ * @returns {null}
+ */
+export function TimeDifference(startValue, endValue) {
+  const startYear = parseInt(startValue.substring(0, 4))
+  const startMonth = parseInt(startValue.substring(5, 7)) - 1
+  const startDate = parseInt(startValue.substring(8, 10))
+  const startHours = parseInt(startValue.substring(11, 13))
+  const startMinutes = parseInt(startValue.substring(14, 16))
+  const startSeconds = parseInt(startValue.substring(17, 19))
+  const endYear = parseInt(endValue.substring(0, 4))
+  const endMonth = parseInt(endValue.substring(5, 7)) - 1
+  const endDate = parseInt(endValue.substring(8, 10))
+  const endHours = parseInt(endValue.substring(11, 13))
+  const endMinutes = parseInt(endValue.substring(14, 16))
+  const endSeconds = parseInt(endValue.substring(17, 19))
+  const startTime = (new Date(startYear, startMonth, startDate, startHours, startMinutes, startSeconds)).getTime()
+  const endTime = (new Date(endYear, endMonth, endDate, endHours, endMinutes, endSeconds)).getTime()
+  return (endTime - startTime) / 1000
+}
+
+/**
+ * 清楚所有的定时器
+ * @returns {null}
+ */
+export function clearAllInterval() {
+  const endTimerId = setInterval(function() {
+    console.log('clear all timer...')
+  }, 1000)
+  for (let i = 1; i <= endTimerId; i++) {
+    clearInterval(i)
+  }
+  pushSysByOneMinutesHandle()
+}
+
+/**
+ * 定时推送埋点
+ * @returns {null}
+ */
+function pushSysByOneMinutesHandle() {
+  setInterval(() => {
+    let statsData = []
+    for (const key in Vue.prototype.$pageToWatchData) {
+      if (Vue.prototype.$pageToWatchData[key]) {
+        console.log(Vue.prototype.$pageToWatchData[key])
+        statsData = statsData.concat(Vue.prototype.$pageToWatchData[key])
+      }
+    }
+    console.log(statsData)
+    const postData = {
+      uid: '',
+      deviceType: 'android',
+      statsData
+    }
+    console.log('开始上报数据-------------------')
+    pushSystemStatic(postData).catch(err => {
+      console.log(err)
+    })
+  }, 60 * 1000)
+}