From e0a82f5050d63811cfdab330db613162d8a55fb3 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 16 Jan 2020 09:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/common/loghub/LoghubUtils.kt    |  1 +
 app/src/main/java/com/gh/common/util/LogUtils.java   | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt
index 1f8c95d5ac..50b401b347 100644
--- a/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt
+++ b/app/src/main/java/com/gh/common/loghub/LoghubUtils.kt
@@ -59,6 +59,7 @@ object LoghubUtils {
             val exposureList = loghubSet.toList()
 
             createLogGroupAndUpload()
+            loghubSet.removeAll(exposureList)
             loghubDao.deleteMany(exposureList)
         }
     }
diff --git a/app/src/main/java/com/gh/common/util/LogUtils.java b/app/src/main/java/com/gh/common/util/LogUtils.java
index 396ed18693..1d0b80dd62 100644
--- a/app/src/main/java/com/gh/common/util/LogUtils.java
+++ b/app/src/main/java/com/gh/common/util/LogUtils.java
@@ -139,7 +139,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        uploadToCommunity(object);
+        uploadToCommunity(object, true);
     }
 
     public static void uploadAnswerReadTime(String tracers, int readTime, String answerId, Questions questions, String communityId, String CommunityName, SpecialColumn specialColumn) {
@@ -241,7 +241,7 @@ public class LogUtils {
             e.printStackTrace();
         }
 
-        uploadToCommunity(object);
+        uploadToCommunity(object, true);
     }
 
     public static void qaAccess(String access, CommunityEntity communityEntity) {
@@ -277,8 +277,12 @@ public class LogUtils {
 
         uploadToReservation(object);
     }
-
+    
     private static void uploadToCommunity(JSONObject object) {
+        uploadToCommunity(object, false);
+    }
+
+    private static void uploadToCommunity(JSONObject object, boolean forcedUpload) {
         if (BuildConfig.DEBUG) {
             Utils.log("LogUtils->" + object.toString());
         }
@@ -301,7 +305,7 @@ public class LogUtils {
         }
 
         // 暂时除了曝光外的数据都是扔到 community 这个库的，要是不是这个这个库的话这里要改一下
-        LoghubUtils.log(object, "community", true);
+        LoghubUtils.log(object, "community", forcedUpload);
     }
 
     /**