Fix issue with DewPoint NaN float #528

domoticz · Jun 14, 2019 · 774d27a · 774d27a
1 parent 0e46759
commit 774d27a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 12 deletions.
diff --git a/app/version.properties b/app/version.properties
@@ -1,4 +1,4 @@
-#Fri Jun 14 15:38:04 CEST 2019
-VERSION_BUILD=5910
+#Fri Jun 14 15:47:17 CEST 2019
+VERSION_BUILD=5911
 VERSION_PATCH=110
 VERSION_CODE=426
diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/DevicesInfo.java
@@ -119,12 +119,29 @@ public DevicesInfo(JSONObject row) throws JSONException {
             Chill = row.getString("Chill");
         if (row.has("Speed"))
             Speed = row.getString("Speed");
-        if (row.has("DewPoint"))
-            DewPoint = row.getLong("DewPoint");
-        if (row.has("Temp"))
-            Temp = row.getLong("Temp");
-        if (row.has("Barometer"))
-            Barometer = row.getInt("Barometer");
+
+        if (row.has("DewPoint")) {
+            try {
+                DewPoint = row.getLong("DewPoint");
+            } catch (Exception ex) {
+                DewPoint = 0;
+            }
+        }
+        if (row.has("Temp")) {
+            try {
+                Temp = row.getLong("Temp");
+            } catch (Exception ex) {
+                Temp = 0;
+            }
+        }
+        if (row.has("Barometer")) {
+            try {
+                Barometer = row.getInt("Barometer");
+            } catch (Exception ex) {
+                Barometer = 0;
+            }
+        }
+
         if (row.has("Description"))
             Description = row.getString("Description");
 

diff --git a/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/TemperatureInfo.java b/domoticzapi/src/main/java/nl/hnogames/domoticzapi/Containers/TemperatureInfo.java
@@ -65,7 +65,9 @@ public TemperatureInfo(JSONObject row) throws JSONException {
         try {
             if (row.has("Temp"))
                 Temp = row.getDouble("Temp");
-        }catch(Exception ex){}
+        }catch(Exception ex){
+            Temp = 0;
+        }
 
         if (row.has("LastUpdate"))
             LastUpdate = row.getString("LastUpdate");
@@ -75,8 +77,15 @@ public TemperatureInfo(JSONObject row) throws JSONException {
             TypeImg = row.getString("TypeImg");
         if (row.has("DirectionStr"))
             Direction = row.getString("DirectionStr");
-        if (row.has("SetPoint"))
-            setPoint = row.getDouble("SetPoint");
+
+        if (row.has("SetPoint")) {
+            try {
+                setPoint = row.getDouble("SetPoint");
+            } catch (Exception ex) {
+                setPoint = 0;
+            }
+        }
+
         if (row.has("Name"))
             Name = row.getString("Name");
         if (row.has("Description"))

diff --git a/domoticzapi/version.properties b/domoticzapi/version.properties
@@ -1,4 +1,4 @@
-#Fri Jun 14 15:38:04 CEST 2019
+#Fri Jun 14 15:47:17 CEST 2019
 VERSION_BUILD=3675
 VERSION_PATCH=219
 VERSION_CODE=219