Revert "Merge branch 'master' into suntech-fixes"

This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing
changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef.

1 files changed, 19 insertions, 12 deletions

diff --git a/src/main/java/org/traccar/protocol/StbProtocolDecoder.java b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java
index cc985d605..bd151c604 100644
--- a/src/main/java/org/traccar/protocol/StbProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StbProtocolDecoder.java
@@ -26,7 +26,9 @@ import org.traccar.Protocol;
 import org.traccar.model.Position;
 
 import javax.json.Json;
+import javax.json.JsonNumber;
 import javax.json.JsonObject;
+import javax.json.JsonString;
 import javax.json.JsonValue;
 import java.io.StringReader;
 import java.net.SocketAddress;
@@ -95,34 +97,39 @@ public class StbProtocolDecoder extends BaseProtocolDecoder {
                     String id = propertyObject.getString("id");
                     switch (id) {
                         case "01101001":
-                            locationType = Integer.parseInt(propertyObject.getString("value"));
+                            locationType = propertyObject.getInt("value");
                             break;
                         case "01102001":
-                            position.setLongitude(
-                                    Double.parseDouble(propertyObject.getString("value")));
+                            position.setLongitude(propertyObject.getJsonNumber("value").doubleValue());
                             break;
                         case "01103001":
-                            position.setLatitude(
-                                    Double.parseDouble(propertyObject.getString("value")));
+                            position.setLatitude(propertyObject.getJsonNumber("value").doubleValue());
                             break;
                         case "01118001":
-                            position.set(
-                                    Position.KEY_DEVICE_TEMP, Double.parseDouble(propertyObject.getString("value")));
+                            position.set(Position.KEY_DEVICE_TEMP, propertyObject.getJsonNumber("value").doubleValue());
                             break;
                         case "01122001":
-                            position.set(
-                                    "batteryControl", Integer.parseInt(propertyObject.getString("value")));
+                            position.set("batteryControl", propertyObject.getInt("value"));
                             break;
                         case "02301001":
-                            position.set(
-                                    "switchCabinetCommand", Integer.parseInt(propertyObject.getString("value")));
+                            position.set("switchCabinetCommand", propertyObject.getInt("value"));
                             break;
                         default:
                             String key = "id" + id;
                             if (propertyObject.containsKey("doorId")) {
                                 key += "Door" + propertyObject.getString("doorId");
                             }
-                            position.set(key, propertyObject.getString("value"));
+                            JsonValue value = propertyObject.get("value");
+                            switch (value.getValueType()) {
+                                case STRING:
+                                    position.set(key, ((JsonString) value).getString());
+                                    break;
+                                case NUMBER:
+                                    position.set(key, ((JsonNumber) value).doubleValue());
+                                    break;
+                                default:
+                                    break;
+                            }
                             break;
                     }
                 }