From 267c6e1651b6e0e91dd7c3463f86de929d7bc73c Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 9 Feb 2018 12:11:39 +0500 Subject: Implement unified device timezone handling --- src/org/traccar/BaseProtocolDecoder.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/BaseProtocolDecoder.java') diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java index 18b0bc04a..3ea1208ca 100644 --- a/src/org/traccar/BaseProtocolDecoder.java +++ b/src/org/traccar/BaseProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 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. @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import java.sql.SQLException; public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { @@ -81,6 +82,25 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { } } + protected TimeZone getTimeZone(long deviceId) { + TimeZone result = TimeZone.getTimeZone("UTC"); + String timeZoneName = null; + if (Context.getDeviceManager() != null) { + timeZoneName = Context.getDeviceManager().lookupAttributeString( + deviceId, "decoder.timezone", null, true); + } + if (timeZoneName != null) { + result = TimeZone.getTimeZone(timeZoneName); + } else { + int timeZoneOffset = Context.getConfig().getInteger(getProtocolName() + ".timezone", 0); + if (timeZoneOffset != 0) { + result.setRawOffset(timeZoneOffset * 1000); + Log.warning("Config parameter " + getProtocolName() + ".timezone is deprecated"); + } + } + return result; + } + private DeviceSession channelDeviceSession; // connection-based protocols private Map addressDeviceSessions = new HashMap<>(); // connectionless protocols -- cgit v1.2.3