diff --git a/app/build.gradle b/app/build.gradle index 8ad19e1..eb6e904 100644 --- 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 index a7016df..94ab76b 100644 --- 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; }