From bbf512f4b6e8b5b5d59b5725e26f01a9404eb0f5 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Mon, 17 Aug 2020 18:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20connected=20=20disconnect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/official/JetlinksTopicMessageCodec.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java b/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java index 07cef14..c17e54d 100644 --- a/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java +++ b/src/main/java/org/jetlinks/protocol/official/JetlinksTopicMessageCodec.java @@ -179,14 +179,13 @@ class JetlinksTopicMessageCodec { message = object.toJavaObject(ReportFirmwareMessage.class); } else if (result.isUpgradeFirmwareProgress()) { message = object.toJavaObject(UpgradeFirmwareProgressMessage.class); + }else if (topic.endsWith("connected")) { + message = object.toJavaObject(DeviceOnlineMessage.class); + } else if (topic.endsWith("disconnect")) { + message = object.toJavaObject(DeviceOfflineMessage.class); } if (result.isChild()) { - if (topic.endsWith("connected")) { - message = object.toJavaObject(DeviceOnlineMessage.class); - } else if (topic.endsWith("disconnect")) { - message = object.toJavaObject(DeviceOfflineMessage.class); - } if (message == null) { throw new UnsupportedOperationException("unsupported topic:" + topic); }