From e78ca53bf4adca5eb083dfbf5ec60dab3d0ca0d3 Mon Sep 17 00:00:00 2001
From: mehaotian <490272692@qq.com>
Date: Mon, 25 May 2020 17:01:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(stat)=20:=20=E4=BF=AE=E5=A4=8D=20uni=20?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A6=96=E6=AC=A1=E5=BC=80=E5=90=AF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C24=20=E5=B0=8F=E6=97=B6=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/uni-stat/dist/index.js    | 28 +++++++++++++++++++++++++---
 packages/uni-stat/src/parameter.js | 30 ++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/packages/uni-stat/dist/index.js b/packages/uni-stat/dist/index.js
index f37a47100..e4fc3e81e 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 4bfaac051..2deb8806a 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
-- 
GitLab