diff --git a/packages/uni-stat/dist/index.js b/packages/uni-stat/dist/index.js index f37a471001900878ae0fefaf641a2c455ccfbcdf..e4fc3e81edb0f33b020307f0917794a4c6701271 100644 --- a/packages/uni-stat/dist/index.js +++ b/packages/uni-stat/dist/index.js @@ -306,27 +306,46 @@ const isReportData = () => { let start_time = ''; let end_time = new Date().getTime(); let diff_time = DIFF_TIME; + let report_status = 1; try { start_time = uni.getStorageSync(Report_Data_Time); + report_status = uni.getStorageSync(Report_Status); } catch (e) { start_time = ''; + report_status = 1; + } + + if (report_status === '') { + requestData(({ + enable + }) => { + uni.setStorageSync(Report_Data_Time, end_time); + uni.setStorageSync(Report_Status, enable); + if (enable === 1) { + resolve(); + } + }); + return + } + + if (report_status === 1) { + resolve(); } if (!start_time) { uni.setStorageSync(Report_Data_Time, end_time); start_time = end_time; } + if ((end_time - start_time) > diff_time) { requestData(({ enable }) => { uni.setStorageSync(Report_Data_Time, end_time); uni.setStorageSync(Report_Status, enable); - if (enable === 1) { - resolve(); - } }); } + }) }; @@ -358,6 +377,9 @@ const requestData = (done) => { } catch (e) { report_status_code = 1; } + if (report_status_code === '') { + report_status_code = 1; + } if (report_status_code === 1) { typeof done === 'function' && done({ enable: res.enable diff --git a/packages/uni-stat/src/parameter.js b/packages/uni-stat/src/parameter.js index 4bfaac051b14597619fe9991b57aba054bc9d3f5..2deb8806abe1f951816a0565874ab416bd57118d 100644 --- a/packages/uni-stat/src/parameter.js +++ b/packages/uni-stat/src/parameter.js @@ -2,7 +2,7 @@ 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'); @@ -306,27 +306,46 @@ export const isReportData = () => { let start_time = '' let end_time = new Date().getTime() let diff_time = DIFF_TIME + let report_status = 1 try { start_time = uni.getStorageSync(Report_Data_Time) + report_status = uni.getStorageSync(Report_Status) } catch (e) { start_time = '' + report_status = 1 + } + + if (report_status === '') { + requestData(({ + enable + }) => { + uni.setStorageSync(Report_Data_Time, end_time); + uni.setStorageSync(Report_Status, enable); + if (enable === 1) { + resolve(); + } + }); + return + } + + if (report_status === 1) { + resolve(); } if (!start_time) { uni.setStorageSync(Report_Data_Time, end_time) start_time = end_time } + if ((end_time - start_time) > diff_time) { requestData(({ enable }) => { uni.setStorageSync(Report_Data_Time, end_time) uni.setStorageSync(Report_Status, enable) - if (enable === 1) { - resolve(); - } }); } + }) } @@ -358,6 +377,9 @@ const requestData = (done) => { } catch (e) { report_status_code = 1 } + if (report_status_code === '') { + report_status_code = 1 + } if (report_status_code === 1) { typeof done === 'function' && done({ enable: res.enable