From 1aea60d64276ab2b960e21ca3fc5716ff89dc7fe Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 30 Mar 2023 18:00:41 +0800
Subject: [PATCH] 优化跨端通讯协议，支持超时自动释放资源，支持异常通讯拦截
---
common/Tools.js | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 169 insertions(+), 5 deletions(-)
diff --git a/common/Tools.js b/common/Tools.js
index e4e7403..8a237b8 100644
--- a/common/Tools.js
+++ b/common/Tools.js
@@ -12,12 +12,13 @@
* 显示消息
* @param msg
* @param [duration=2000]
+ * @param [mask=false]
*/
- static toast(msg, duration = 2000) {
+ static toast(msg, duration = 2000, mask = false) {
Taro.showToast({
title: msg,
icon: 'none',
- mask: true,
+ mask,
duration,
});
}
@@ -66,6 +67,50 @@
v = c === 'x' ? r : ((r & 0x3) | 0x8);
return v.toString(16);
});
+ }
+
+ /**
+ * 获取随机字符串
+ * @param {number} long
+ * @return {string}
+ */
+ static getRandomString(long) {
+ long = long || 32;
+ const template = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+ const count = template.length;
+ let result = '';
+ for (let i = 0; i < long; i++) {
+ result += template.charAt(Math.floor(Math.random() * count));
+ }
+ return result;
+ }
+
+ /**
+ * 检查网络状态
+ */
+ static checkOnlineState(callback) {
+ // 网页模式
+ if (process.env.TARO_ENV === 'h5') {
+ // 网络已开启
+ if (navigator.onLine) {
+ // 用图片资源测试网络状态
+ const img = new Image();
+ img.onload = () => {
+ img.onload = null;
+ callback && callback(true);
+ };
+ img.onerror = () => {
+ img.onerror = null;
+ callback && callback(false);
+ };
+ img.src = 'http://gz.zhiheiot.com/disp/download/buildArchive/online.png?t=' + Date.now();
+ }
+ // 网络未开启
+ else {
+ callback && callback(false);
+ }
+ }
+ // 补充：小程序模式用 getNetworkType
}
/**
@@ -317,7 +362,16 @@
if (Tools.isString(timestamp)) {
// 全数值
if (/^\d+$/.test(timestamp)) {
- timestamp = parseInt(timestamp);
+ // 8位视为无连接符日期
+ if (timestamp.length === 8) {
+ const day = timestamp.substr(0, 4) + '-' +
+ timestamp.substr(4, 2) + '-' + timestamp.substr(6, 2);
+ timestamp = (new Date(timestamp)).getTime();
+ }
+ // 超过8位，视为时间戳
+ else if (timestamp.length > 8) {
+ timestamp = parseInt(timestamp);
+ }
}
// 日期
else {
@@ -327,7 +381,15 @@
}
}
}
- if (timestamp < 9 * 10e8) {
+ // 转为数值的无连接符日期
+ if (timestamp < 9 * 10e6) {
+ const timeStr = timestamp + '';
+ const day = timeStr.substr(0, 4) + '-' +
+ timeStr.substr(4, 2) + '-' + timeStr.substr(6, 2);
+ timestamp = (new Date(day)).getTime();
+ }
+ // 按秒时间戳
+ else if (timestamp < 9 * 10e8) {
timestamp *= 1000;
}
const curMoment = moment(timestamp);
@@ -454,6 +516,106 @@
return /^1[3456789]\d{9}$/.test('' + phone);
}
+ /**
+ * 转换周数到日期
+ * @param year
+ * @param week
+ * @param weekDay 需要输出星期几对应的日期 (1~7)
+ * @return {Date}
+ */
+ static transWeekIndexToDate(year, week, weekDay) {
+ const yearStart = moment([year, 0, 1]);
+ const dayLong = 24 * 60 * 60 * 1000;
+ const firstWeekLong = (7 - yearStart.day()) * dayLong;
+ const weeksLong = (week - 1) * 7 * dayLong;
+ const weekDayLong = weekDay * dayLong;
+ const dayTimestamp = yearStart.valueOf() + firstWeekLong + weeksLong + weekDayLong;
+ return moment(dayTimestamp).format('YYYY-MM-DD');
+ }
+
+ /**
+ * 显示调试面板（仅支持H5）
+ * @param cssSelector
+ * @param callback
+ */
+ static $_showDevConsole(cssSelector, callback) {
+ // 只支持 h5 编译
+ if (process.env.TARO_ENV !== 'h5') {
+ return;
+ }
+ const fileref = document.createElement('script');
+ fileref.setAttribute('type', 'text/javascript');
+ if (window.location.protocol === 'https:') {
+ fileref.setAttribute('src', 'https://cdn.jsdelivr.net/npm/eruda');
+ } else {
+ fileref.setAttribute('src', 'http://cdn.jsdelivr.net/npm/eruda');
+ }
+ document.getElementsByTagName('head')[0].appendChild(fileref);
+ const simulateTouch = (dom, type) => {
+ const button = dom;
+ const touch = new Touch({
+ identifier: Date.now(),
+ target: button,
+ clientX: 0,
+ clientY: 0,
+ screenX: 0,
+ screenY: 0,
+ pageY: 0,
+ pageX: 0,
+ radiusX: 2.5,
+ radiusY: 2.5,
+ rotationAngle: 10,
+ force: 0.5,
+ });
+ const touchstart = new TouchEvent(type, {
+ cancelable: true,
+ bubbles: true,
+ composed: true,
+ touches: [touch],
+ targetTouches: [touch],
+ changedTouches: [touch],
+ });
+ button.dispatchEvent(touchstart);
+ };
+ const erudaTimer = setInterval(() => {
+ if (window.eruda) {
+ clearInterval(erudaTimer);
+ setTimeout(() => {
+ const container = document.createElement('div');
+ if (cssSelector) {
+ document.querySelector(cssSelector).appendChild(container);
+ } else {
+ document.getElementsByTagName('body')[0].appendChild(container);
+ }
+ window.eruda.init({
+ container: container,
+ useShadowDom: false,
+ });
+ let button = null;
+ setTimeout(() => {
+ button = document.querySelector('.eruda-entry-btn');
+ }, 50);
+ setTimeout(() => {
+ simulateTouch(button, 'touchstart');
+ }, 60);
+ setTimeout(() => {
+ simulateTouch(button, 'touchend');
+ }, 350);
+ setTimeout(() => {
+ console.warn('=====【艾信App调试模式】=====');
+ }, 800);
+ setTimeout(() => {
+ console.warn('点击右下角悬浮工具箱图标可以折叠面板');
+ }, 900);
+ setTimeout(() => {
+ callback && callback();
+ }, 1000);
+ }, 100);
+
+ }
+ }, 100);
+ }
+
}
// h5 中，实现 rem 转换 px
@@ -469,4 +631,6 @@
const px = (value - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
console.info(Math.round(px) + 'px');
};
-}
\ No newline at end of file
+}
+
+global.Tools = Tools;
\ No newline at end of file
--
Gitblit v1.9.1