From 1afddb60aeeeaba618fa015c36103051d48c1448 Mon Sep 17 00:00:00 2001 From: Zhennan Zhou Date: Sat, 3 Jun 2023 16:43:20 -0700 Subject: [PATCH] fixed json payload field name mismatch issue --- .../model/datamodel/BaseMeasureDataModel.kt | 7 ------- .../model/datamodel/ConnectivityReportModel.kt | 10 +++++----- .../model/datamodel/SignalStrengthReportModel.kt | 10 +++++----- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/BaseMeasureDataModel.kt b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/BaseMeasureDataModel.kt index 2456605..a41b9a3 100644 --- a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/BaseMeasureDataModel.kt +++ b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/BaseMeasureDataModel.kt @@ -1,22 +1,15 @@ package com.lcl.lclmeasurementtool.model.datamodel -import kotlinx.serialization.SerialName - @kotlinx.serialization.Serializable sealed interface BaseMeasureDataModel { - @SerialName("latitude") var latitude: Double - @SerialName("longitude") var longitude: Double - @SerialName("timestamp") var timestamp: String - @SerialName("cell_id") var cellId: String - @SerialName("device_id") var deviceId: String var reported: Boolean diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/ConnectivityReportModel.kt b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/ConnectivityReportModel.kt index 6221c52..6c2f696 100644 --- a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/ConnectivityReportModel.kt +++ b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/ConnectivityReportModel.kt @@ -9,11 +9,11 @@ import kotlinx.serialization.Transient @kotlinx.serialization.Serializable @Entity(tableName = "connectivity_table") data class ConnectivityReportModel constructor( - @ColumnInfo(name = "latitude") override var latitude: Double, - @ColumnInfo(name = "longitude") override var longitude: Double, - @PrimaryKey @ColumnInfo(name = "time_stamp") override var timestamp: String, - override var cellId: String, - override var deviceId: String, + @ColumnInfo(name = "latitude") @SerialName("latitude") override var latitude: Double, + @ColumnInfo(name = "longitude") @SerialName("longitude") override var longitude: Double, + @PrimaryKey @ColumnInfo(name = "time_stamp") @SerialName("timestamp") override var timestamp: String, + @SerialName("cell_id") override var cellId: String, + @SerialName("device_id") override var deviceId: String, @ColumnInfo(name = "upload_speed") @SerialName("upload_speed") var uploadSpeed: Double, @ColumnInfo(name = "download_speed") @SerialName("download_speed") var downloadSpeed: Double, @ColumnInfo(name = "ping") @SerialName("ping") var ping: Double, diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/SignalStrengthReportModel.kt b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/SignalStrengthReportModel.kt index 9fdb308..e0c3df6 100644 --- a/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/SignalStrengthReportModel.kt +++ b/app/src/main/java/com/lcl/lclmeasurementtool/model/datamodel/SignalStrengthReportModel.kt @@ -9,11 +9,11 @@ import kotlinx.serialization.Transient @Entity(tableName = "signal_strength_table") @kotlinx.serialization.Serializable data class SignalStrengthReportModel( - @ColumnInfo(name = "latitude") override var latitude: Double, - @ColumnInfo(name = "longitude") override var longitude: Double, - @PrimaryKey @ColumnInfo(name = "time_stamp") override var timestamp: String, - override var cellId: String, - override var deviceId: String, + @ColumnInfo(name = "latitude") @SerialName("latitude") override var latitude: Double, + @ColumnInfo(name = "longitude") @SerialName("longitude") override var longitude: Double, + @PrimaryKey @ColumnInfo(name = "time_stamp") @SerialName("timestamp") override var timestamp: String, + @SerialName("cell_id") override var cellId: String, + @SerialName("device_id") override var deviceId: String, @SerialName("dbm") @ColumnInfo(name = "signal_strength") var dbm: Int, @SerialName("level_code") @ColumnInfo(name = "signal_strength_level") var levelCode: Int, @ColumnInfo("reported") @Transient override var reported: Boolean = false