@tmsfe/tms-core 0.0.44 → 0.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tms-core",
-  "version": "0.0.44",
+  "version": "0.0.47",
   "description": "tms运行时框架",
   "repository": {
     "type": "git",

package/src/distanceUtils.ts

@@ -0,0 +1,37 @@
+/**
+ * 经纬度距离计算
+ */
+
+
+// 将角度换算为弧度
+function convertDegreesToRadians(degrees: number): number {
+  return (degrees * Math.PI) / 180;
+}
+
+function haverSin(theta: number): number {
+  const val = Math.sin(theta / 2);
+  return val * val;
+}
+
+// 计算两点间距离，单位 m
+function calCoordinateDistance(
+  a: { latitude: number, longitude: number },
+  b: { latitude: number, longitude: number },
+): number {
+  // 地球半径 平均值，千米
+  const earthRadius = 6371;
+  const lat1 = convertDegreesToRadians(a.latitude);
+  const lon1 = convertDegreesToRadians(a.longitude);
+  const lat2 = convertDegreesToRadians(b.latitude);
+  const lon2 = convertDegreesToRadians(b.longitude);
+  // 差值
+  const vLon = Math.abs(lon1 - lon2);
+  const vLat = Math.abs(lat1 - lat2);
+  const h = haverSin(vLat) + (Math.cos(lat1) * Math.cos(lat2) * haverSin(vLon));
+  const distance = 2 * earthRadius * Math.asin(Math.sqrt(h));
+  return distance * 1000;
+}
+
+export {
+  calCoordinateDistance,
+};

package/src/index-proxy.js

@@ -10,6 +10,7 @@ import AutoReport from './report/proxy/index';
 import md5 from './md5';
 import { rpxToPx } from './rpx';
 import { serialize } from './objUtils';
+import { calCoordinateDistance } from './distanceUtils';
 import * as stringUtils from './stringUtils';
 import * as timeUtils from './timeUtils';
 import * as ipxHelper from './ipxHelper';
@@ -210,6 +211,7 @@ const api = {
   getLocationManager,
   rpxToPx,
   serialize,
+  calCoordinateDistance,
   createRequest,
   getEnvInfo,
   isAppPageExist,

package/src/index.js

@@ -10,6 +10,7 @@ import md5 from './md5';
 import { callCloudFunc } from './cloudService';
 import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
+import { calCoordinateDistance } from './distanceUtils';
 import { rpxToPx } from './rpx';
 import {
   formatPlate,
@@ -169,6 +170,8 @@ const api = {
   /* 处理对象方法 */
   serialize,
 
+  calCoordinateDistance,
+
   /* 获取外部合作商openid */
   getMpOpenId, // 变更为 getOuterOpenId
   getOuterOpenId,

package/src/report/formatV1.ts

@@ -17,7 +17,7 @@ function getBaseData(deviceData: IDeviceData): DataItem[] {
   // ++++++++++++++++++++++++++字段列表++++++++++++++++++++++++++
   // 0: log_time，日志入库时间
   // 1: access_time，埋点触发时间
-  arr[1] = Date.now().toString();
+  arr[1] = helper.getNowString();
   // 2: user_ip，前端无需赋值
   // 3: qimei，灯塔中的用户ID
   // 4: imei，Android手机的imei IOS系统中的idfv 车联网中的wecarid

package/src/report/formatV2.ts

@@ -17,7 +17,7 @@ function getBaseData(deviceData: IDeviceData): { arr: DataItem[], nextIndex: num
   // ++++++++++++++++++++++++++字段列表++++++++++++++++++++++++++
   // 0: log_time，日志入库时间
   // 1: access_time，埋点触发时间
-  arr[1] = Date.now().toString();
+  arr[1] = helper.getNowString();
   // 2: user_ip，前端无需赋值
   // 3: qimei，灯塔中的用户ID
   // 4: imei，Android手机的imei IOS系统中的idfv 车联网中的wecarid

package/src/report/helper.ts

@@ -83,6 +83,25 @@ function convert2String(value: any): string {
   return String(value);
 }
 
+function num2Str(num: number, maxLength = 2): string {
+  return num.toString().padStart(maxLength, '0');
+}
+
+/**
+ * 获取当前时间格式化后的字符串
+ */
+function getNowString(): string {
+  const date = new Date();
+  const year = date.getFullYear().toString();
+  const month = num2Str(date.getMonth() + 1);
+  const day = num2Str(date.getDate());
+  const hours = num2Str(date.getHours());
+  const minutes = num2Str(date.getMinutes());
+  const seconds = num2Str(date.getSeconds());
+  const ms = num2Str(date.getMilliseconds(), 3);
+  return `${year}${month}${day}${hours}${minutes}${seconds}${ms}`;
+}
+
 /**
  * 获取当前页面信息
  */
@@ -203,6 +222,7 @@ export default {
   getSystemInfo,
   getSystemInfoString,
   convert2String,
+  getNowString,
   getPageInfo,
   getLaunchOptionsString,
   getLaunchFrom,

package/src/report/proxy/helper.ts

@@ -11,7 +11,7 @@ function reportData(...args: any[]): any {
     const tms = getApp()?.tms || wx.tms;
     reporter = tms.getReporter();
   }
-  // console.log('自动埋点：', ...args);
+  console.log('自动埋点：', ...args);
   reporter.report2(...args);
 }