aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-10-13 10:27:02 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-10-13 10:27:02 +1300
commit797263bfe9655ac82a97954c6930ec4a650a0609 (patch)
treef3d5605298763d9d20c44ee07fc2a312ee92d084
parentf95de7fdb6f9a47618b30a991949b86567d6deb9 (diff)
downloadtraccar-server-797263bfe9655ac82a97954c6930ec4a650a0609.tar.gz
traccar-server-797263bfe9655ac82a97954c6930ec4a650a0609.tar.bz2
traccar-server-797263bfe9655ac82a97954c6930ec4a650a0609.zip
Create date builder util class
-rw-r--r--src/org/traccar/helper/DateBuilder.java94
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java15
2 files changed, 99 insertions, 10 deletions
diff --git a/src/org/traccar/helper/DateBuilder.java b/src/org/traccar/helper/DateBuilder.java
new file mode 100644
index 000000000..e0e9e0cab
--- /dev/null
+++ b/src/org/traccar/helper/DateBuilder.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.helper;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+public class DateBuilder {
+
+ private Calendar calendar;
+
+ public DateBuilder() {
+ this(TimeZone.getTimeZone("UTC"));
+
+ }
+
+ public DateBuilder(TimeZone timeZone) {
+ calendar = Calendar.getInstance(timeZone);
+ calendar.clear();
+ }
+
+ public DateBuilder setYear(int year) {
+ if (year < 100) {
+ year += 2000;
+ }
+ calendar.set(Calendar.YEAR, year);
+ return this;
+ }
+
+ public DateBuilder setMonth(int month) {
+ calendar.set(Calendar.MONTH, month - 1);
+ return this;
+ }
+
+ public DateBuilder setDay(int day) {
+ calendar.set(Calendar.DAY_OF_MONTH, day);
+ return this;
+ }
+
+ public DateBuilder setDate(int year, int month, int day) {
+ return setYear(year).setMonth(month).setDay(day);
+ }
+
+ public DateBuilder setHour(int hour) {
+ calendar.set(Calendar.HOUR_OF_DAY, hour);
+ return this;
+ }
+
+ public DateBuilder setMinute(int minute) {
+ calendar.set(Calendar.MINUTE, minute);
+ return this;
+ }
+
+ public DateBuilder setSecond(int second) {
+ calendar.set(Calendar.SECOND, second);
+ return this;
+ }
+
+ public DateBuilder setMillis(int millis) {
+ calendar.set(Calendar.MILLISECOND, millis);
+ return this;
+ }
+
+ public DateBuilder setTime(int hour, int minute, int second) {
+ return setHour(hour).setMinute(minute).setSecond(second);
+ }
+
+ public DateBuilder setTime(int hour, int minute, int second, int millis) {
+ return setHour(hour).setMinute(minute).setSecond(second).setMillis(millis);
+ }
+
+ public DateBuilder setDateTime(int year, int month, int day, int hour, int minute, int second) {
+ return setDate(year, month, day).setTime(hour, minute, second);
+ }
+
+ public Date build() {
+ return calendar.getTime();
+ }
+
+}
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 6f62baf11..5d79958a5 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -24,6 +24,7 @@ import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.Context;
import org.traccar.helper.Checksum;
+import org.traccar.helper.DateBuilder;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -157,16 +158,10 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(getDeviceId());
position.setProtocol(getProtocolName());
- // Date and time
- Calendar time = Calendar.getInstance(timeZone);
- time.clear();
- time.set(Calendar.YEAR, 2000 + buf.readUnsignedByte());
- time.set(Calendar.MONTH, buf.readUnsignedByte() - 1);
- time.set(Calendar.DAY_OF_MONTH, buf.readUnsignedByte());
- time.set(Calendar.HOUR_OF_DAY, buf.readUnsignedByte());
- time.set(Calendar.MINUTE, buf.readUnsignedByte());
- time.set(Calendar.SECOND, buf.readUnsignedByte());
- position.setTime(time.getTime());
+ DateBuilder dateBuilder = new DateBuilder(timeZone)
+ .setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
+ .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+ position.setTime(dateBuilder.build());
// GPS length and Satellites count
int gpsLength = buf.readUnsignedByte();