From 7483aa20876e0469f46da760124a98de1812177c Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 12 Jul 2024 22:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E4=BD=8D=E6=8D=A2?= =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xypower/mpmaster/MpMasterService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index dc90962b..52be2754 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -101,7 +101,7 @@ public class MpMasterService extends Service { private String mCmdid = ""; private NotificationManager mNotificationManager; private int mQuickHeartbeatDuration = 60; // Unit: second - private int mHeartbeatDuration = 600; // 10m = 10 * 60s + private int mHeartbeatDuration = 600; // Unit: second 10m = 10 * 60s private long mTimeForKeepingLogs = 86400000 * 15; // 15 days @@ -471,6 +471,9 @@ public class MpMasterService extends Service { } MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(getApplicationContext()); + if (appConfig.heartbeat > 0) { + mMpHeartbeatDuration = appConfig.heartbeat; + } logger.warning("Start Mntn report: " + masterUrl + " MntnMode=" + (mMntnMode ? "1" : "0") + " QuickHB=" + (mQuickHbMode ? "1" : "0")); @@ -631,7 +634,7 @@ public class MpMasterService extends Service { if (zeroPoint + closestTime * 1000 > currentTimeMs + mMpHeartbeatDuration * 60000) { keepAlive = true; - registerHeartbeatTimer(currentTimeMs + timeout * 1000, keepAlive); + registerHeartbeatTimer(currentTimeMs + mMpHeartbeatDuration * 60000, keepAlive); } else { registerHeartbeatTimer(zeroPoint + closestTime * 1000, keepAlive); } @@ -1001,7 +1004,6 @@ public class MpMasterService extends Service { Method method1 = telephonyManager.getClass().getDeclaredMethod("setDataEnabled", boolean.class); method1.invoke(telephonyManager, true); } catch (Exception e) { - // Log.e(TAG, "wjz debug setDefaultDataSubId: error is " + e.getMessage()); e.printStackTrace(); } } @@ -1011,8 +1013,8 @@ public class MpMasterService extends Service { try { Method method = subscriptionManager.getClass().getDeclaredMethod("getDefaultDataSubscriptionId"); return (int) method.invoke(subscriptionManager); - } catch (Exception e) { - Log.e(TAG, "wjz debug getDefaultDataSubId: error is " + e.getMessage()); + } catch (Exception ex) { + ex.printStackTrace(); } return 0; }