From 32218364d347207a744c610df73a3bcee9ca0aaf Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 23 Jun 2024 20:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=97=A5=E5=BF=97=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=97=B6=E9=97=B4=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/java/com/xypower/common/MicroPhotoContext.java | 3 +++ .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/common/src/main/java/com/xypower/common/MicroPhotoContext.java b/common/src/main/java/com/xypower/common/MicroPhotoContext.java index 2f8dfbab..e440c40a 100644 --- a/common/src/main/java/com/xypower/common/MicroPhotoContext.java +++ b/common/src/main/java/com/xypower/common/MicroPhotoContext.java @@ -65,6 +65,7 @@ public class MicroPhotoContext { public int[] absHeartbeats; // second public int separateNetwork; public int mpappMonitorTimeout = 30 * 60000; // 30 minutes + public int timeForKeepingLogs = 15; // Unit day public String getUrl() { if (TextUtils.isEmpty(server)) { @@ -298,6 +299,8 @@ public class MicroPhotoContext { masterConfig.quickHbMode = jsonObject.optInt("quickHbMode", 0); masterConfig.usingAbsHbTime = jsonObject.optInt("usingAbsHbTime", 0); masterConfig.separateNetwork = jsonObject.optInt("separateNetwork", 0); + masterConfig.timeForKeepingLogs = jsonObject.optInt("timeForKeepingLogs", 15); + // masterConfig.mpappMonitorTimeout = jsonObject.optInt("mpappMonitorTimeout", 30 * 60000); int mpappMonitorTimeout = jsonObject.optInt("mpappMonitorTimeout", 30 * 60000); if (mpappMonitorTimeout >= 4 * 60000 && mpappMonitorTimeout <= 35 * 60000) { diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 6b880094..4e5cde8e 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -312,6 +312,9 @@ public class MpMasterService extends Service { } mSeparateNetwork = masterConfig.separateNetwork != 0; mTimeOfMpAppAlive = masterConfig.mpappMonitorTimeout; + if (masterConfig.timeForKeepingLogs > 0) { + mTimeForKeepingLogs = masterConfig.timeForKeepingLogs * 86400000; + } } private void loadIccid() {