From 0afdd2dfc4f41bae865add997b5786220f1af1e3 Mon Sep 17 00:00:00 2001 From: Eyk Haneklaus Date: Sat, 19 Feb 2022 18:01:39 +0100 Subject: Added support for YP14 from "1903" protocol specification --- src/main/java/org/traccar/protocol/TrvProtocolDecoder.java | 4 ++-- src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java index 05312b820..c72ae9859 100644 --- a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java @@ -59,7 +59,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { .number("(d)") // acc .number("(dd)") // arm status .number("(dd)") // working mode - .number("(?:[0-2]{3})?,") + .number("(?:d{3,5})?,") // (ignored) .number("(d+),") // mcc .number("(d+),") // mnc .number("(d+),") // lac @@ -183,7 +183,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { return position; - } else if (type.equals("AP01") || type.equals("AP10") || type.equals("YP03")) { + } else if (type.equals("AP01") || type.equals("AP10") || type.equals("YP03") || type.equals("YP14")) { Parser parser = new Parser(PATTERN, sentence); if (!parser.matches()) { diff --git a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java index 44735abcb..3cd283de7 100644 --- a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -65,6 +65,7 @@ public class TrvProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "TRVAP10080524A2232.9806N11404.9355E000.1061830323.8706000908000502,460,0,9520,3671,00,zh-cn,00")); + verifyPosition(decoder, text( + "TRVYP14220217A5235.7885N00724.1840E000.0130919177.561000050660000200004,262,01,14635,52789,FritzBox7|DC-39-8F-7E-94-73|-89&FritzBox7|24-4E-5D-71-C3-9C|-90&MY_IOT|80-B4-F7-77-9C-7C|-81&MYAP|44-D4-F7-77-9C-7C|-80#")); } - } -- cgit v1.2.3 From 86768497bd8fbfbfe7b949fd3a28a5864d0d5964 Mon Sep 17 00:00:00 2001 From: 4alexbo <6820539+4alexbo@users.noreply.github.com> Date: Sun, 20 Feb 2022 14:24:35 +0100 Subject: removed comment from TrvProtocolDecoder --- src/main/java/org/traccar/protocol/TrvProtocolDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java index c72ae9859..e62cdf404 100644 --- a/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TrvProtocolDecoder.java @@ -59,7 +59,7 @@ public class TrvProtocolDecoder extends BaseProtocolDecoder { .number("(d)") // acc .number("(dd)") // arm status .number("(dd)") // working mode - .number("(?:d{3,5})?,") // (ignored) + .number("(?:d{3,5})?,") .number("(d+),") // mcc .number("(d+),") // mnc .number("(d+),") // lac -- cgit v1.2.3 From bb3bcee67cd9c1072c1504cae1d4fbde5b0ec9fc Mon Sep 17 00:00:00 2001 From: 4alexbo <6820539+4alexbo@users.noreply.github.com> Date: Sun, 20 Feb 2022 14:30:38 +0100 Subject: re-added empty lines according to typical coding style --- src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java index 3cd283de7..e1eaef87b 100644 --- a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -67,5 +67,7 @@ public class TrvProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "TRVYP14220217A5235.7885N00724.1840E000.0130919177.561000050660000200004,262,01,14635,52789,FritzBox7|DC-39-8F-7E-94-73|-89&FritzBox7|24-4E-5D-71-C3-9C|-90&MY_IOT|80-B4-F7-77-9C-7C|-81&MYAP|44-D4-F7-77-9C-7C|-80#")); + } + } -- cgit v1.2.3 From 7758221ed338ad145fc1861bf596546c34f74bc2 Mon Sep 17 00:00:00 2001 From: 4alexbo <6820539+4alexbo@users.noreply.github.com> Date: Sun, 20 Feb 2022 20:58:37 +0100 Subject: Removed white spaces --- src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java index e1eaef87b..33d4e0124 100644 --- a/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/TrvProtocolDecoderTest.java @@ -67,7 +67,7 @@ public class TrvProtocolDecoderTest extends ProtocolTest { verifyPosition(decoder, text( "TRVYP14220217A5235.7885N00724.1840E000.0130919177.561000050660000200004,262,01,14635,52789,FritzBox7|DC-39-8F-7E-94-73|-89&FritzBox7|24-4E-5D-71-C3-9C|-90&MY_IOT|80-B4-F7-77-9C-7C|-81&MYAP|44-D4-F7-77-9C-7C|-80#")); - + } - + } -- cgit v1.2.3 From 91c465faf6480d7aaf65073e70a42e4173d70eae Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 21 Feb 2022 11:22:07 -0800 Subject: Fix user creation --- src/main/java/org/traccar/model/User.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java index 94828ab95..792f2b669 100644 --- a/src/main/java/org/traccar/model/User.java +++ b/src/main/java/org/traccar/model/User.java @@ -249,6 +249,7 @@ public class User extends ExtendedModel { return null; } + @QueryIgnore public void setPassword(String password) { if (password != null && !password.isEmpty()) { Hashing.HashingResult hashingResult = Hashing.createHash(password); -- cgit v1.2.3 From 82305faa20e383ea569bc5be17eb8cd74c6131f1 Mon Sep 17 00:00:00 2001 From: grmt Date: Tue, 22 Feb 2022 00:42:06 +0100 Subject: double rename for [to|from]Address into [to|from]address --- schema/changelog-4.16.xml | 6 ++++++ schema/changelog-master.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/changelog-4.16.xml b/schema/changelog-4.16.xml index 0b6493f03..adf8d4fc6 100644 --- a/schema/changelog-4.16.xml +++ b/schema/changelog-4.16.xml @@ -16,6 +16,12 @@ + + + + + + diff --git a/schema/changelog-master.xml b/schema/changelog-master.xml index 354037cdd..d79e084f6 100644 --- a/schema/changelog-master.xml +++ b/schema/changelog-master.xml @@ -1,4 +1,4 @@ - +