diff --git a/packages/uni-stat/dist/index.js b/packages/uni-stat/dist/index.js index e99cc3db1ea928896ae106104538406b2c320322..f37a471001900878ae0fefaf641a2c455ccfbcdf 100644 --- a/packages/uni-stat/dist/index.js +++ b/packages/uni-stat/dist/index.js @@ -6,6 +6,7 @@ const STAT_H5_URL = 'https://tongji.dcloud.io/uni/stat.gif'; const PAGE_PVER_TIME = 1800; const APP_PVER_TIME = 300; const OPERATING_TIME = 10; +const DIFF_TIME = 60 * 1000 * 60 * 24; const statConfig = require('uni-stat-config').default || require('uni-stat-config'); const UUID_KEY = '__DC_STAT_UUID'; @@ -299,12 +300,12 @@ const calibration = (eventName, options) => { }; const Report_Data_Time = 'Report_Data_Time'; - +const Report_Status = 'Report_Status'; const isReportData = () => { return new Promise((resolve, reject) => { let start_time = ''; let end_time = new Date().getTime(); - let diff_time = 60 * 1000 * 60 * 24; + let diff_time = DIFF_TIME; try { start_time = uni.getStorageSync(Report_Data_Time); } catch (e) { @@ -320,6 +321,7 @@ const isReportData = () => { enable }) => { uni.setStorageSync(Report_Data_Time, end_time); + uni.setStorageSync(Report_Status, enable); if (enable === 1) { resolve(); } @@ -328,11 +330,10 @@ const isReportData = () => { }) }; -const Report_Status = 'Report_Status'; const requestData = (done) => { let formData = { usv: STAT_VERSION, - conf: encodeURIComponent({ + conf: JSON.stringify({ ak: statConfig.appid }) }; @@ -340,8 +341,10 @@ const requestData = (done) => { url: STAT_URL, method: 'GET', data: formData, - success: (res) => { - const {data} = res; + success: (res) => { + const { + data + } = res; if (data.ret === 0) { typeof done === 'function' && done({ enable: data.enable @@ -420,11 +423,11 @@ class Util { }; } - - getIsReportData(){ - return isReportData() - } - + + getIsReportData() { + return isReportData() + } + _applicationShow() { if (this.__licationHide) { getLastTime(); @@ -713,37 +716,39 @@ class Util { } this._sendRequest(optionsData); } - _sendRequest(optionsData) { - this.getIsReportData().then(()=>{ - uni.request({ - url: STAT_URL, - method: 'POST', - // header: { - // 'content-type': 'application/json' // 默认值 - // }, - data: optionsData, - success: () => { - // if (process.env.NODE_ENV === 'development') { - // console.log('stat request success'); - // } - }, - fail: (e) => { - if (++this._retry < 3) { - setTimeout(() => { - this._sendRequest(optionsData); - }, 1000); - } - } - }); - }); + _sendRequest(optionsData) { + this.getIsReportData().then(() => { + uni.request({ + url: STAT_URL, + method: 'POST', + // header: { + // 'content-type': 'application/json' // 默认值 + // }, + data: optionsData, + success: () => { + // if (process.env.NODE_ENV === 'development') { + // console.log('stat request success'); + // } + }, + fail: (e) => { + if (++this._retry < 3) { + setTimeout(() => { + this._sendRequest(optionsData); + }, 1000); + } + } + }); + }); } /** * h5 请求 */ imageRequest(data) { - let image = new Image(); - let options = getSgin(GetEncodeURIComponentOptions(data)).options; - image.src = STAT_H5_URL + '?' + options; + this.getIsReportData().then(() => { + let image = new Image(); + let options = getSgin(GetEncodeURIComponentOptions(data)).options; + image.src = STAT_H5_URL + '?' + options; + }); } sendEvent(key, value) { diff --git a/packages/uni-stat/src/config.js b/packages/uni-stat/src/config.js index c0d9c2815b3db9e75c052d8fdb90e2e38516a202..4b2e79fb2143f4abce32ff253301c18edba88294 100644 --- a/packages/uni-stat/src/config.js +++ b/packages/uni-stat/src/config.js @@ -8,3 +8,4 @@ export const STAT_KEY = 'qkTHEIegZGcL5iy3' export const PAGE_PVER_TIME = 1800 export const APP_PVER_TIME = 300 export const OPERATING_TIME = 10 +export const DIFF_TIME = 60 * 1000 * 60 * 24 diff --git a/packages/uni-stat/src/parameter.js b/packages/uni-stat/src/parameter.js index 0c05f3a8321d4b37c894b054c6fc8649f04b5202..4bfaac051b14597619fe9991b57aba054bc9d3f5 100644 --- a/packages/uni-stat/src/parameter.js +++ b/packages/uni-stat/src/parameter.js @@ -2,7 +2,8 @@ import { PAGE_PVER_TIME, APP_PVER_TIME, STAT_URL, - STAT_VERSION + STAT_VERSION, + DIFF_TIME } from './config'; const statConfig = require('uni-stat-config').default || require('uni-stat-config'); const UUID_KEY = '__DC_STAT_UUID'; @@ -299,12 +300,12 @@ export const calibration = (eventName, options) => { } const Report_Data_Time = 'Report_Data_Time' - +const Report_Status = 'Report_Status' export const isReportData = () => { return new Promise((resolve, reject) => { let start_time = '' let end_time = new Date().getTime() - let diff_time = 60 * 1000 * 60 * 24 + let diff_time = DIFF_TIME try { start_time = uni.getStorageSync(Report_Data_Time) } catch (e) { @@ -320,6 +321,7 @@ export const isReportData = () => { enable }) => { uni.setStorageSync(Report_Data_Time, end_time) + uni.setStorageSync(Report_Status, enable) if (enable === 1) { resolve(); } @@ -328,11 +330,10 @@ export const isReportData = () => { }) } -const Report_Status = 'Report_Status' const requestData = (done) => { let formData = { usv: STAT_VERSION, - conf: encodeURIComponent({ + conf: JSON.stringify({ ak: statConfig.appid }) } @@ -340,8 +341,10 @@ const requestData = (done) => { url: STAT_URL, method: 'GET', data: formData, - success: (res) => { - const {data} = res + success: (res) => { + const { + data + } = res if (data.ret === 0) { typeof done === 'function' && done({ enable: data.enable diff --git a/packages/uni-stat/src/stat.js b/packages/uni-stat/src/stat.js index cdfdf98804f9ff07cbae02968e357f0e541cf18e..a10cee47eebcc2f6563dedb40da6b3f862a67f1c 100644 --- a/packages/uni-stat/src/stat.js +++ b/packages/uni-stat/src/stat.js @@ -22,7 +22,7 @@ import { getPageRoute, getRoute, getPageTypes, - calibration, + calibration, isReportData } from './parameter'; @@ -85,11 +85,11 @@ class Util { } } - - getIsReportData(){ - return isReportData() - } - + + getIsReportData() { + return isReportData() + } + _applicationShow() { if (this.__licationHide) { getLastTime(); @@ -378,37 +378,39 @@ class Util { } this._sendRequest(optionsData) } - _sendRequest(optionsData) { - this.getIsReportData().then(()=>{ - uni.request({ - url: STAT_URL, - method: 'POST', - // header: { - // 'content-type': 'application/json' // 默认值 - // }, - data: optionsData, - success: () => { - // if (process.env.NODE_ENV === 'development') { - // console.log('stat request success'); - // } - }, - fail: (e) => { - if (++this._retry < 3) { - setTimeout(() => { - this._sendRequest(optionsData); - }, 1000); - } - } - }); - }) + _sendRequest(optionsData) { + this.getIsReportData().then(() => { + uni.request({ + url: STAT_URL, + method: 'POST', + // header: { + // 'content-type': 'application/json' // 默认值 + // }, + data: optionsData, + success: () => { + // if (process.env.NODE_ENV === 'development') { + // console.log('stat request success'); + // } + }, + fail: (e) => { + if (++this._retry < 3) { + setTimeout(() => { + this._sendRequest(optionsData); + }, 1000); + } + } + }); + }) } /** * h5 请求 */ imageRequest(data) { - let image = new Image(); - let options = getSgin(GetEncodeURIComponentOptions(data)).options; - image.src = STAT_H5_URL + '?' + options + this.getIsReportData().then(() => { + let image = new Image(); + let options = getSgin(GetEncodeURIComponentOptions(data)).options; + image.src = STAT_H5_URL + '?' + options + }) } sendEvent(key, value) {