From 124d70212f91a6031363f4e8c0aa4e90c4775cb0 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sun, 14 Jul 2024 11:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A03=E9=A1=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

最后心跳时间
最后心跳回复时间
最后收到主站报文时间
---
 .../java/com/xypower/mpmaster/AppMaster.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
index b352ad99..e807df51 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
@@ -342,6 +342,12 @@ public class AppMaster {
                 int uploaded;
                 int devReboots;
                 int appReboots;
+                int devRebootsInLastWeek;
+	            int appRebootsInLastWeek;
+
+                long lastHb   --- v2 20240714 added
+                long lastHbResp
+                long lastRecv
             };
             */
 
@@ -378,6 +384,18 @@ public class AppMaster {
                 stats.add(new Pair<String, String>("i1RebootTimesWk", Integer.toString(items[11])));
             }
 
+            if (items.length >= 12 && items.length <= 18) {
+                // v2
+
+                long ts = (((long)items[12]) & 0xFFFFFFFFl) | ((((long)items[13]) << 32) & 0xFFFFFFFF00000000l);
+                stats.add(new Pair<String, String>("lastHbTime", Long.toString(ts)));
+
+                ts = (((long)items[14]) & 0xFFFFFFFFl) | ((((long)items[15]) << 32) & 0xFFFFFFFF00000000l);
+                stats.add(new Pair<String, String>("lastHbRespTime", Long.toString(ts)));
+
+                ts = (((long)items[16]) & 0xFFFFFFFFl) | ((((long)items[17]) << 32) & 0xFFFFFFFF00000000l);
+                stats.add(new Pair<String, String>("lastRecvTime", Long.toString(ts)));
+            }
         } catch (Exception ex) {
             ex.printStackTrace();
         }