From 362fb75ec0ff6f6c615f07abde917cb55da4de5c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 1 Aug 2015 11:56:39 +1200 Subject: Add specific other field setters --- src/org/traccar/protocol/Gps103ProtocolEncoder.java | 2 +- src/org/traccar/protocol/TotemProtocolEncoder.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/Gps103ProtocolEncoder.java b/src/org/traccar/protocol/Gps103ProtocolEncoder.java index 147451e3b..308fb0820 100644 --- a/src/org/traccar/protocol/Gps103ProtocolEncoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolEncoder.java @@ -24,7 +24,7 @@ public class Gps103ProtocolEncoder extends StringProtocolEncoder implements Stri public String formatValue(String key, Object value) { if (key.equals(Command.KEY_FREQUENCY)) { - long frequency = (Long) value; + long frequency = ((Number) value).longValue(); if (frequency / 60 / 60 > 0) { return String.format("%02dh", frequency / 60 / 60); } else if (frequency / 60 > 0) { diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java index 39e3214cc..935ab1b64 100644 --- a/src/org/traccar/protocol/TotemProtocolEncoder.java +++ b/src/org/traccar/protocol/TotemProtocolEncoder.java @@ -19,21 +19,13 @@ package org.traccar.protocol; import org.traccar.StringProtocolEncoder; import org.traccar.model.Command; -import java.util.HashMap; -import java.util.Map; - public class TotemProtocolEncoder extends StringProtocolEncoder{ @Override protected Object encodeCommand(Command command) { // Temporary put default password - Map other = command.getOther(); - if (other == null) { - other = new HashMap<>(); - command.setOther(other); - } - other.put(Command.KEY_DEVICE_PASSWORD, "000000"); + command.set(Command.KEY_DEVICE_PASSWORD, "000000"); switch (command.getType()) { //Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8 -- cgit v1.2.3