From 82200e7f45d0120c21c698a297dae1fcb135a217 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 27 Jul 2024 13:35:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E7=9A=84=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xypower/mpmaster/AppMaster.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index a32b8938..e2f30b4a 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -507,7 +507,9 @@ public class AppMaster { String url = jsonObject.optString("url", null); mService.logger.warning("Recv Upload Log " + url); int noSpecData = jsonObject.optInt("noSpecData", 0); - uploadLogs(url, noSpecData == 0); + long modificationTime = jsonObject.optLong("mTime", 0); + modificationTime *= 1000; // to ms + uploadLogs(url, noSpecData == 0, modificationTime); // uploadMasterLogs(url); } else if (TextUtils.equals(cmd, CMD_SET_CMA)) { String ip = jsonObject.optString("value_str", null); @@ -933,12 +935,12 @@ public class AppMaster { } } - private void uploadLogs(String url, final boolean includingSpecData) { + private void uploadLogs(String url, final boolean includingSpecData, final long modificationTime) { String appDir = mService.buildAppDir(); try { - long ts = System.currentTimeMillis();//long now = android.os.SystemClock.uptimeMillis(); + final long ts = System.currentTimeMillis();//long now = android.os.SystemClock.uptimeMillis(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); Date dt = new Date(ts); @@ -978,6 +980,13 @@ public class AppMaster { return false; } + if (modificationTime > 0) { + File f = new File(dir, name); + if (ts - f.lastModified() > modificationTime) { + return false; + } + } + return true; } };