@tmsfe/tms-core 0.0.14 → 0.0.18

package/src/location/index.ts

@@ -16,6 +16,22 @@ interface UserLocationType {
   [key: string]: Promise<PostionType | void>
 }
 
+interface IpLocationType {
+  ip: string,
+  ad_info: {
+    adcode: number,
+    city: string,
+    cityCode: string,
+    district: string,
+    nation: string,
+    province: string,
+  },
+  location: {
+    lat: number,
+    lng: number,
+  },
+}
+
 const request = new Request();
 const event = new EventDispatcher();
 
@@ -27,6 +43,7 @@ let cityTheUserAt = '';
 // 用户城市变化事件名
 const CityChangeEventName = 'loc_city_changed';
 const LocationType = 'gcj02'; // 获取经纬度时的坐标名称
+let ipLocationPromise: null | Promise<IpLocationType> = null; // ip定位请求的promise
 
 /**
  * @class Location
@@ -272,6 +289,33 @@ class Location extends LocationBase {
     }
     return request.post('basic/lbs/direction', { from, to, mode });
   }
+
+  /**
+   * ip定位
+   * 原理：通过调手图接口查询当前IP所在位置，市级的准确率是91%
+   * 注意：由于服务端对该查询服务有次数限制，所以本函数会缓存成功的promise
+   * @param force 是否清除上次的缓存重新请求
+   */
+  getIpLocation(force = false): Promise<IpLocationType> {
+    if (ipLocationPromise === null || force) {
+      ipLocationPromise = new Promise((resolve, reject) => {
+        request.post('basic/lbs/decodeip')
+          .then((res) => {
+            if (res.errCode === 0) {
+              resolve(res.resData as IpLocationType);
+              return;
+            }
+            reject({ erMsg: res.errMsg });
+            ipLocationPromise = null;
+          })
+          .catch((e) => {
+            reject(e);
+            ipLocationPromise = null;
+          });
+      });
+    }
+    return ipLocationPromise;
+  }
 }
 
 // 因为在构造函数中会用到wx的api，所以使用到时才实例化

package/src/report.js

@@ -106,8 +106,8 @@ const getProvinceInfoByIp = () => {
   if (!ProvinceInfoCacheByIp) {
     ProvinceInfoCacheByIp = new Promise(async (resolve) => {
       try {
-        const loc = await R.post('basic/lbs/decodeip');
-        const { city, province } = loc.resData.ad_info;
+        const loc = await getLocInstance().getIpLocation();
+        const { city, province } = loc.ad_info;
         resolve({ cityName: city, province });
       } catch (_) {
         resolve({ cityName: '', province: '' });

package/src/request.js

@@ -20,7 +20,6 @@ import { getEnvInfo, getAuthInfo } from './env';
  */
 const seriesParam = (param) => {
   const keys = Object.keys(param)
-    .filter(key => typeof param[key] !== 'undefined')
     .sort();
   const series = keys.map((key) => {
     const val = param[key];
@@ -73,6 +72,16 @@ const composeParam = async (param = {}, withAuth = true, baseParam = {}) => {
     { ...baseParam },
     { ...paramsWithAuth },
   );
+  // 清理undefined和NaN的参数
+  Object.keys(combinedParam)
+    .forEach((key) => {
+      if (typeof combinedParam[key] === 'number' && isNaN(combinedParam[key])) {
+        delete combinedParam[key];
+      }
+      if (typeof combinedParam[key] === 'undefined') {
+        delete combinedParam[key];
+      }
+    });
   return combinedParam;
 };