Fixed Device Info data parsing from HTTP api

Bumped gradle version
albertogeniola · Jan 23, 2022 · 5540f6f · 5540f6f
1 parent 9714be0
commit 5540f6f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.albertogeniola.merossconf"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 6
-        versionName "0.0.1-beta6"
+        versionCode 7
+        versionName "0.0.1-beta7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/merosslib/src/main/java/com/albertogeniola/merosslib/model/http/DeviceInfo.java b/merosslib/src/main/java/com/albertogeniola/merosslib/model/http/DeviceInfo.java
@@ -12,19 +12,19 @@ public class DeviceInfo {
     @SerializedName("uuid")
     private String uuid;
 
-    @SerializedName("online_status")
+    @SerializedName("onlineStatus")
     private OnlineStatus onlineStatus;
 
     @SerializedName("devName")
     private String devName;
 
-    @SerializedName("bind_time")
+    @SerializedName("bindTime")
     private String bindTime;
 
-    @SerializedName("device_type")
+    @SerializedName("deviceType")
     private String deviceType;
 
-    @SerializedName("sub_type")
+    @SerializedName("subType")
     private String subType;
 
     @SerializedName("channels")
@@ -33,24 +33,24 @@ public class DeviceInfo {
     @SerializedName("region")
     private String region;
 
-    @SerializedName("fmware_version")
+    @SerializedName("fmwareVersion")
     private String fmwareVersion;
 
-    @SerializedName("hdware_version")
+    @SerializedName("hdwareVersion")
     private String hdwareVersion;
 
-    @SerializedName("user_dev_icon")
+    @SerializedName("userDevIcon")
     private String userDevIcon;
 
-    @SerializedName("icon_type")
+    @SerializedName("iconType")
     private int iconType;
 
-    @SerializedName("skill_number")
+    @SerializedName("skillNumber")
     private String skillNumber;
 
     @SerializedName("domain")
     private String domain;
 
-    @SerializedName("reserved_domain")
+    @SerializedName("reservedDomain")
     private String reservedDomain;
 }