Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-07 03:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extract getDate

Browse Source
This commit is contained in:
jcardus 2024-12-08 15:16:53 +00:00
parent e7d35efaf9
commit fca235d154
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
View File

@ -669,11 +669,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
|| type == MSG_LBS_EXTEND || type == MSG_LBS_WIFI || type == MSG_LBS_2 || type == MSG_LBS_3
|| (type == MSG_WIFI_3 && variant != Variant.LW4G) || type == MSG_WIFI_5) {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
getLastLocation(position, dateBuilder.getDate());
getLastLocation(position, getDate(buf, deviceSession));
if (variant == Variant.WANWAY_S20 || variant == Variant.SL4X) {
buf.readUnsignedByte(); // ta
@ -800,12 +796,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
if (type == MSG_GPS_LBS_2 && modelNt20) {
buf.readUnsignedByte(); // location source type
buf.skipBytes(8); // imei
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
position.setDeviceTime(dateBuilder.getDate());
position.setDeviceTime(getDate(buf, deviceSession));
}
if (hasGps(type)) {
@ -1029,10 +1020,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
position, buf, false, jc400, jc400, jc400, jc400,
deviceSession.get(DeviceSession.KEY_TIMEZONE));
} else {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
getLastLocation(position, dateBuilder.getDate());
getLastLocation(position, getDate(buf, deviceSession));
}
if (variant == Variant.JC400) {
position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
@ -1075,6 +1063,13 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
return position;
}
private static Date getDate(ByteBuf buf, DeviceSession deviceSession) {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
return dateBuilder.getDate();
}
private Object decodeExtended(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
@ -1155,10 +1150,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
} else if (subType == 0x05) {
if (buf.readableBytes() >= 6 + 1 + 6) {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
position.setDeviceTime(dateBuilder.getDate());
position.setDeviceTime(getDate(buf, deviceSession));
}
int flags = buf.readUnsignedByte();
@ -1261,11 +1253,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
} else if (type == MSG_OBD) {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
getLastLocation(position, dateBuilder.getDate());
getLastLocation(position, getDate(buf, deviceSession));
position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);