@tmsfe/tms-core 0.0.84 → 0.0.87

package/package.json

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

package/src/index-proxy.js

@@ -10,7 +10,7 @@ import AutoReport from './report/proxy/index';
 import md5 from './md5';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
-import { getNavBarConfigData } from './navbarUtils';
+import { getNavBarConfigData, compareVersion } from './navbarUtils';
 import * as uiUtil from './tmsuiUtils';
 import * as rpxUtil from './rpx';
 import * as stringUtils from './stringUtils';
@@ -216,6 +216,7 @@ const api = {
   calCoordinateDistance,
   formatDistance,
   getNavBarConfigData,
+  compareVersion,
   createRequest,
   getEnvInfo,
   isAppPageExist,

package/src/index.js

@@ -12,7 +12,7 @@ import EventDispatcher from './eventDispatcher';
 import { serialize } from './objUtils';
 import { calCoordinateDistance, formatDistance } from './distanceUtils';
 import { rpxToPx, pxToRpx } from './rpx';
-import { getNavBarConfigData } from './navbarUtils';
+import { getNavBarConfigData, compareVersion } from './navbarUtils';
 import {
   formatPlate,
   subStr,
@@ -196,6 +196,8 @@ const api = {
   rpxToPx,
   pxToRpx,
 
+  /** 版本比较 */
+  compareVersion,
   getNavBarConfigData,
 
   storage,

package/src/navbarUtils.js

@@ -194,4 +194,5 @@ const getEnterOptions = () => {
 
 export {
   getNavBarConfigData,
+  compareVersion,
 };

package/src/utils/canvas/canvasDrawer.js

@@ -125,14 +125,15 @@ class CanvasDrawer {
    * @memberof Wxml2Poster
    */
   drawText(text, x, y, size, color, align = 'left', bold = 'normal', baseLine = 'middle', calWidth = false) {
+    const str = `${text}`;  // 避免某些环境下字体宽度计算异常（如手图），这里统一将绘制文本转为字符串
     this.ctx.save();
     this.ctx.fillStyle = color;
     this.ctx.font = `normal ${bold} ${~~(this.toPx(size))}px sans-serif`;
     let width = 0;
-    if (calWidth) width = this.ctx.measureText(text).width; // 必须在设置字体属性后未绘制前计算才能拿到准确值; 无需计算时避免耗费性能
+    if (calWidth) width = this.ctx.measureText(str).width; // 必须在设置字体属性后未绘制前计算才能拿到准确值; 无需计算时避免耗费性能
     this.ctx.textAlign = align;
     this.ctx.textBaseline = baseLine;
-    this.ctx.fillText(text, this.toPx(x), this.toPx(y));
+    this.ctx.fillText(str, this.toPx(x), this.toPx(y));
     this.ctx.restore();
     return width;
   }

package/src/utils/carCard/Comm.js

@@ -1,61 +0,0 @@
-class Common {
-  // 获取本月开始时间
-  static getMonthStart() {
-    const now = new Date();             // 获取当前时间
-    const beginTimes = now.getFullYear();     // 开始计算
-    let month = now.getMonth() + 1 ;           // getMonth()是以0开始的月份
-    if (month < 10) {
-      month = `0${month}`;
-    }
-    const startTimes = `${beginTimes}-${month}-01`;        // 格式 Y-m-d
-    return startTimes;
-  }
-
-  static pointToYuan(num) {
-    if (!num || num <= 0) {
-      return 0;
-    }
-    const { tms } = getApp({ allowDefault: true });
-    return tms.roundStr(num / 100, 0);
-  }
-
-  static handleApiRes(res) {
-    let { errCode, errMsg, resData } = res;
-    // 兼容后端返回err、info作为字段的情况
-    // eslint-disable-next-line
-    if (resData?.data?.hasOwnProperty('err')) {
-      errCode = resData.data.err;
-      errMsg = resData.data.info;
-      resData = resData.data;
-      if (errCode !== 0) {
-        return Promise.reject({ errCode, errMsg, resData });
-      }
-      return Promise.resolve(resData);
-    }
-    if (errCode !== 0) {
-      return Promise.reject(res);
-    }
-    return Promise.resolve(resData);
-  }
-
-  static handleConditionValue(item, value) {
-    if (isNaN(value)) {
-      return { value, units: item.units };
-    }
-    let newValue = value;
-    let { units } = item;
-    // 小数点处理
-    if (item.point === 0) {
-      newValue = Math.round(newValue);
-    }
-    if (item.point) {
-      newValue = parseFloat(newValue.toFixed(item.point));
-    }
-    if (newValue > 9999) {
-      newValue = `${(newValue / 10000).toFixed(1)}`;
-      units = `万${item.units}`;
-    }
-    return { value: newValue, units };
-  }
-}
-export default Common;

package/src/utils/carCard/Controller.js

@@ -1,91 +0,0 @@
-import m from './Model';
-import Comm from './Comm';
-
-export default class Controller {
-  static report = m.report;
-  static carManager = m.carManager;
-  static getConfig = m.getConfig;
-  static locManager = m.locManager;
-  static rtLog = m.rtLog;
-  static dateToString = m.dateToString;
-  static log = m.log;
-
-  // 通用的埋点方法
-  // wecarId seriesId modelId必传
-  static commReport(currentCar = {}, param = {}) {
-    const { wecarId = '', seriesId = 0, modelId = 0  } = currentCar;
-    // console.log('我要埋点了', param['27'], { 4: wecarId, 39: seriesId, 30: modelId, ...param });
-    return Controller.report({ 4: wecarId, 39: seriesId, 30: modelId, ...param });
-  }
-
-  // 车辆本月etc账单
-  static async getETCAmount(currentCar) {
-    const { plate, wecarId, userId, plateColor } = currentCar;
-    const param = { userId, plateNum: plate, wecarId };
-    let result = { etcData: {} };
-    try {
-      const { data } = await m.queryEtcBindStatus(param) || {};
-      if (!data || data.etcStatus !== 1) {
-        result.isBindEtc = false;
-        return result;
-      }
-    } catch (error) {
-      result.isBindEtc = false;
-      return result;
-    }
-
-    try {
-      const param2 = { plateColor, dateBegin: Comm.getMonthStart(), dateEnd: Controller.dateToString() };
-      Object.assign(param, param2);
-      const res = await m.queryEtcMount(param) || {};
-      result = {
-        isBindEtc: true,
-        getEtcDataError: false,
-      };
-      if (res.totalAmount > 0) {
-        result.etcData = { ...res, totalAmount: Comm.pointToYuan(res.totalAmount) };
-      } else {
-        result.etcData = { };
-      }
-    } catch (error) {
-      result = {
-        isBindEtc: true,
-        getEtcDataError: true,
-      };
-    }
-    return result;
-  }
-
-  // 获取车况配置
-  static async getCarConditionConfig(param) {
-    let data = {};
-    try {
-      data = await m.getCarConditionConfig(param);
-    } catch (err) {
-      m.log({ name: 'getCarConditionConfig', param, err });
-    }
-    return data;
-  }
-
-  // 获取车控配置
-  static async getCarControlConfig(param) {
-    let data = {};
-    try {
-      data = await m.getCarControlConfig(param);
-    } catch (err) {
-      m.log({ name: 'getCarControlConfig', param, err });
-    }
-    return data;
-  }
-
-  // 获取车况
-  static async getGactoyotaCondition(param) {
-    let data = {};
-    try {
-      data = await m.getGactoyotaCondition(param);
-    } catch (err) {
-      m.log({ name: 'getGactoyotaCondition', param, err });
-    }
-    return data;
-  }
-};

package/src/utils/carCard/Model.js

@@ -1,52 +0,0 @@
-import Comm from './Comm';
-const app = getApp({ allowDefault: true });
-
-export default class Model {
-  static report = app.tms.getReporter().report;
-  static carManager = app.tms.getCarManager();
-  static getConfig = app.tms.getConfig;
-  static locManager = app.tms.getLocationManager();
-  static rtLog = app.tms.getRealtimeLogManager();
-  static dateToString = app.tms.dateToString;
-
-  static doRequest(path, param, method = 'POST', header) {
-    return app.tms.createRequest().doRequest(path, { ...param }, method, header)
-      .then(res => Comm.handleApiRes(res))
-      .catch(err => Promise.reject(err));
-  }
-
-  static log(...args) {
-    console.error(...args);
-    Model.rtLog.info(args[0]);
-  }
-
-  // 获取车况数据
-  // static getGactoyotaCondition(param) {
-  //   return Model.doRequest('gactoyota/condition', { ...param }, 'POST');
-  // }
-  static getGactoyotaCondition(param) {
-    return Model.doRequest('carcardvinfosvc/get_car_condition', { ...param }, 'POST', {
-      'X-TAI-Module': 'carcardvinfosvc',
-    });
-  }
-
-  // 获取车况配置
-  static getCarConditionConfig() {
-    const app = getApp({ allowDefault: true });
-    return app.tms.getConfig('/sinan/carcondition/config');
-  }
-
-  // 获取车控配置
-  static getCarControlConfig() {
-    const app = getApp({ allowDefault: true });
-    return app.tms.getConfig('/sinan/carcontrol/config');
-  }
-
-  static queryEtcMount(param) {
-    return Model.doRequest('etc/totalamount', { ...param }, 'post');
-  }
-
-  static queryEtcBindStatus(param) {
-    return Model.doRequest('etc/querybindstatus', { ...param }, 'post');
-  }
-};