From aa59b968c7d6a89b8e6285647ab2e6e62f02cf7f Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 27 Dec 2021 20:48:47 -0600 Subject: Revert "Merge branch 'master' into suntech-fixes" This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef. --- .../org/traccar/protocol/MiniFinderProtocolDecoder.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java') diff --git a/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java index d5be31cec..2b7a960c4 100644 --- a/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2014 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,7 +143,7 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder { } DeviceSession deviceSession = getDeviceSession(channel, remoteAddress); - if (deviceSession == null || !sentence.matches("![35A-D],.*")) { + if (deviceSession == null || !sentence.matches("![3A-D],.*")) { return null; } @@ -161,19 +161,6 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder { return position; - } else if (type.equals("5")) { - - String[] values = sentence.split(","); - - getLastLocation(position, null); - - position.set(Position.KEY_RSSI, Integer.parseInt(values[1])); - if (values.length >= 4) { - position.set(Position.KEY_BATTERY_LEVEL, Integer.parseInt(values[3])); - } - - return position; - } else if (type.equals("B") || type.equals("D")) { Parser parser = new Parser(PATTERN_BD, sentence); -- cgit v1.2.3