@tmsfe/tms-core 0.0.14 → 0.0.18

package/dist/index-proxy.js

@@ -131,6 +131,16 @@ function getLocationManager() {
         return setUserLocation;
       }
 
+      if (name === 'locForNoAuth') {
+        return {
+          province: '广东省',
+          cityCode: '440300',
+          cityName: '深圳市',
+          latitude: 22.54286,
+          longitude: 114.05956
+        };
+      }
+
       return function (...args) {
         return ps.then(() => invoke(manager, name, args));
       };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-4c9af397.js';
+import { R as Request, g as getLogManager, a as getRealtimeLogManager } from './request-f350158c.js';
 import { g as getEnvInfo, a as getAuthInfo, s as setAuthInfo, i as isAppPageExist, b as getHomePage, c as setEnvInfo, d as setAppPagePaths } from './env-c7da70e1.js';
 import { s as syncApi, f as formatPlate, a as subStr, h as hidePhoneCenter, i as isValidPhone, b as isValidPlate, c as isValidAuthCode, r as roundStr, d as formatTime, e as formatTimeStr, g as formatTimeWithDetails, j as dateToString, k as ipxInit, l as isIPX, m as getIpxClass, n as getIpxConfig, o as serialize, p as rpxToPx } from './ipxHelper-71ef86c1.js';
 import { m as md5 } from './md5-34a9daf3.js';
@@ -37,6 +37,8 @@ const handleParamOfDifferentType = param => {
   });
   return data;
 };
+
+const defAssign = (value, defaultValue) => value || defaultValue;
 /**
  * @class FastReport
  * @classdesc 快速上报模块，不依赖用户标识和位置
@@ -54,16 +56,20 @@ class FastReport {
    * @param {Boolean} appVer 是否上报小程序版本
    * @returns {Promsie} 返回上报结果
    */
-  static report(param, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
+  static report(param = {}, simulatedUserId = true, simulatedUserIdIndex = 40, reportShowScene = true, appVer = true) {
     var _data$;
 
-    if (!(param !== null && param !== void 0 && param[27])) return Promise.reject('invalid report param');
+    if (!param[27]) return Promise.reject('invalid report param');
     const env = getEnvInfo();
     const data = handleParamOfDifferentType(param);
     data[9] = '2';
     data[33] = encodeURIComponent(JSON.stringify(getSystemInfo$1()));
-    appVer && !data[10] && (data[10] = env.appVersion);
-    if (!data[26]) data[26] = (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0];
+
+    if (appVer) {
+      data[10] = defAssign(data[10], env.appVersion);
+    }
+
+    data[26] = defAssign(data[26], (_data$ = data[27]) === null || _data$ === void 0 ? void 0 : _data$[0]);
     data[28] = env.client;
 
     if (reportShowScene && !data[29]) {
@@ -122,6 +128,17 @@ const parseAllCfgs = (configPaths, resData, defaultCfgs) => configPaths.map((pat
 
   return {}; // 没找到配置，返回一个空对象
 });
+
+const formatConfigPaths = configPath => {
+  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const {
+    client
+  } = getEnvInfo();
+  configPaths.forEach((path, index) => {
+    configPaths[index] = path.replace(/\$\{client\}/, client);
+  });
+  return configPaths;
+};
 /**
  * getConfig 批量拉取配置
  * @description 拉取运营平台上的配置内容。关于运营平台的具体用法，参见{@link https://iwiki.woa.com/pages/viewpage.action?pageId=527948584}
@@ -159,14 +176,8 @@ function getConfig(configPath, extendAttr = {}, defaultCfg) {
     }
   }
 
-  const configPaths = Array.isArray(configPath) ? configPath : [configPath];
+  const configPaths = formatConfigPaths(configPath);
   const defaultCfgs = defaultCfg && (Array.isArray(defaultCfg) ? defaultCfg : [defaultCfg]) || null;
-  const {
-    client
-  } = getEnvInfo();
-  configPaths.forEach((path, index) => {
-    configPaths[index] = path.replace(/\$\{client\}/, client);
-  });
   const extendAttrs = typeof extendAttr === 'string' ? extendAttr : JSON.stringify(extendAttr);
   const api = new Request();
   return api.post('marketing/config', {
@@ -548,6 +559,8 @@ function getWxLocation(type = defaultLocationType) {
         });
     });
 }
+// 是否开启监听位置变更
+let isListenerLocation = false;
 /**
  * @class Location
  * @classdesc 基于微信api，封装location相关的接口。 包括监听位置变化， 获取用户位置信息
@@ -555,11 +568,14 @@ function getWxLocation(type = defaultLocationType) {
  */
 class LocationBase {
     /**
-     * @private 构造函数
+     * @private 开启监听位置变更，要在授权之后才能开启
      */
-    constructor() {
-        wx.onLocationChange(this.subscribeLocationChnage);
-        wx.startLocationUpdate({});
+    listenerLocation() {
+        if (!isListenerLocation) {
+            isListenerLocation = true;
+            wx.onLocationChange(this.subscribeLocationChnage);
+            wx.startLocationUpdate({});
+        }
     }
     /**
      * 获取用户当前位置(经纬度)
@@ -609,6 +625,7 @@ class LocationBase {
     getWxLocationPromise(showModalWhenCloseAuth, type, content = '', showCancel = true) {
         return new Promise((resolve, reject) => {
             getWxLocation(type).then((res) => {
+                this.listenerLocation();
                 userLocationCache$1 = res;
                 // 更新用户状态 -- todo
                 updateLocStatus(true);
@@ -750,6 +767,7 @@ let cityTheUserAt = '';
 // 用户城市变化事件名
 const CityChangeEventName = 'loc_city_changed';
 const LocationType = 'gcj02'; // 获取经纬度时的坐标名称
+let ipLocationPromise = null; // ip定位请求的promise
 /**
  * @class Location
  * @classdesc 基于LocationBase，封装业务侧位置的接口。 将用户经纬度转化为城市等展示信息
@@ -976,6 +994,32 @@ class Location extends LocationBase$1 {
         }
         return request.post('basic/lbs/direction', { from, to, mode });
     }
+    /**
+     * ip定位
+     * 原理：通过调手图接口查询当前IP所在位置，市级的准确率是91%
+     * 注意：由于服务端对该查询服务有次数限制，所以本函数会缓存成功的promise
+     * @param force 是否清除上次的缓存重新请求
+     */
+    getIpLocation(force = false) {
+        if (ipLocationPromise === null || force) {
+            ipLocationPromise = new Promise((resolve, reject) => {
+                request.post('basic/lbs/decodeip')
+                    .then((res) => {
+                    if (res.errCode === 0) {
+                        resolve(res.resData);
+                        return;
+                    }
+                    reject({ erMsg: res.errMsg });
+                    ipLocationPromise = null;
+                })
+                    .catch((e) => {
+                    reject(e);
+                    ipLocationPromise = null;
+                });
+            });
+        }
+        return ipLocationPromise;
+    }
 }
 // 因为在构造函数中会用到wx的api，所以使用到时才实例化
 let instance;
@@ -1119,11 +1163,11 @@ const getProvinceInfoByIp = () => {
   if (!ProvinceInfoCacheByIp) {
     ProvinceInfoCacheByIp = new Promise(async resolve => {
       try {
-        const loc = await R.post('basic/lbs/decodeip');
+        const loc = await getLocInstance().getIpLocation();
         const {
           city,
           province
-        } = loc.resData.ad_info;
+        } = loc.ad_info;
         resolve({
           cityName: city,
           province