diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-19 15:53:13 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-19 15:53:13 +0300 |
| commit | b6f3291589d950e1a91a8b8491e8bea59e7259bd (patch) | |
| tree | ccaa2896fa610c69290f24e05dc7401fc2487daa /src/org | |
| parent | 20f603076210073e122c720e21a3e8999478b11a (diff) | |
| download | trackermap-server-b6f3291589d950e1a91a8b8491e8bea59e7259bd.tar.gz trackermap-server-b6f3291589d950e1a91a8b8491e8bea59e7259bd.tar.bz2 trackermap-server-b6f3291589d950e1a91a8b8491e8bea59e7259bd.zip | |
automated check fix
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/Main.java | 6 | ||||
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/H02ProtocolDecoder.java | 11 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java index baad9d040..454124fbf 100644 --- a/src/org/traccar/Main.java +++ b/src/org/traccar/Main.java @@ -23,8 +23,8 @@ import java.util.TimerTask; import java.util.Locale; public final class Main { - static final long cleanDelay = 10*1000; - static final long cleanPeriod = 24*60*60*1000; + static final long CLEAN_DELAY = 10 * 1000; + static final long CLEAN_PERIOD = 24 * 60 * 60 * 1000; private Main() { } @@ -50,7 +50,7 @@ public final class Main { Log.warning(error); } } - }, cleanDelay, cleanPeriod); + }, CLEAN_DELAY, CLEAN_PERIOD); Runtime.getRuntime().addShutdownHook(new Thread() { @Override diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 3c8529eff..691c31643 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -411,7 +411,7 @@ public class DataManager { for (Device device : getAllDevices()) { Date lastUpdate = device.getLastUpdate(); - if(lastUpdate != null){ + if (lastUpdate != null) { Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000); diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index 033f6476d..f366d8100 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -25,7 +25,6 @@ import org.traccar.helper.BitUtil; import org.traccar.helper.DateBuilder; import org.traccar.helper.Parser; import org.traccar.helper.PatternBuilder; -import org.traccar.model.Event; import org.traccar.model.Position; import java.net.SocketAddress; @@ -68,15 +67,15 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { if (!BitUtil.check(status, 0) || !BitUtil.check(status, 1) || !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) { - if (!BitUtil.check(status, 0)){ + if (!BitUtil.check(status, 0)) { position.set(Position.KEY_ALARM, Position.ALARM_VIBRATION);//theft alarm in protocol - } else if (!BitUtil.check(status, 1)){ + } else if (!BitUtil.check(status, 1)) { position.set(Position.KEY_ALARM, "robbery"); - } else if (!BitUtil.check(status, 3)){ + } else if (!BitUtil.check(status, 3)) { position.set(Position.KEY_ALARM, "illegal ignition"); - } else if (!BitUtil.check(status, 4)){ + } else if (!BitUtil.check(status, 4)) { position.set(Position.KEY_ALARM, "entering"); - } else if (!BitUtil.check(status, 7)){ + } else if (!BitUtil.check(status, 7)) { position.set(Position.KEY_ALARM, "out"); } |