@tmsfe/tms-core 0.0.37 → 0.0.40

package/package.json

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

package/src/report/formatV1.ts

@@ -12,6 +12,7 @@ function getBaseData(deviceData: IDeviceData): DataItem[] {
   const arr = new Array<string>(helper.dataArrLen);
   const { networkType, location } = deviceData;
   const { appVersion, client } = helper.getInitOptions();
+  const { host } = helper.getSystemInfo();
   // todo: 如何区分新旧埋点？新：f20不为空，旧：f20为空
   // ++++++++++++++++++++++++++字段列表++++++++++++++++++++++++++
   // 0: log_time，日志入库时间
@@ -42,7 +43,7 @@ function getBaseData(deviceData: IDeviceData): DataItem[] {
   // 18: f18，city - 城市
   arr[18] = location.cityName;
   // 19: f19，当前小程序运行的宿主环境
-  arr[19] = helper.getSystemInfo().host;
+  arr[19] = helper.convert2String(host);
   // 28: f28，sinan、mycar等
   arr[28] = client;
   // 29: f29，小程序场景值

package/src/report/helper.ts

@@ -117,11 +117,6 @@ function getAppScene(): string {
   return scene.toString();
 }
 
-// 给非空字段都encodeURIComponent一下
-function encodeItems(arr: DataItem[]): DataItem[] {
-  return arr.map(t => (t ? encodeURIComponent(t) : t));
-}
-
 // 是否爬虫
 let isCrawler: boolean | null = null;
 
@@ -207,7 +202,6 @@ function getDeviceData(): Promise<IDeviceData> {
 export default {
   init,
   getTms,
-  encodeItems,
   getInitOptions,
   getSystemInfo,
   getSystemInfoString,

package/src/report/sender.ts

@@ -73,7 +73,7 @@ function requestFail(batch: DataItem[][]): void {
  */
 function send(arr: DataItem[]): void {
   stopTimer();
-  cacheArr.unshift(helper.encodeItems(arr)); // 如果队列中很多，排前面比较稳妥
+  cacheArr.unshift(arr); // 如果队列中很多，排前面比较稳妥
   batchSendData();
 }
 
@@ -82,7 +82,7 @@ function send(arr: DataItem[]): void {
  * @param arr
  */
 function queue(arr: DataItem[]): void {
-  cacheArr.push(helper.encodeItems(arr));
+  cacheArr.push(arr);
   checkQueue(false);
 }
 

package/src/report/types.ts

@@ -28,9 +28,9 @@ interface IOldParams {
 interface ISystemInfo {
   model: string,
   wxVersion: string,
-  platform: '',
-  SDKVersion: '',
-  host: '',
+  platform: string,
+  SDKVersion: string,
+  host: object | '',
 }
 
 interface ILocation {