Align rawData, decodeSuccess, source to AutoServer
This commit is contained in:
@@ -173,7 +173,7 @@ class KirbyDevice(
|
||||
Log.i("BleListener", "Char received: $payload")
|
||||
val base64Payload = Base64.getEncoder().encodeToString(characteristic.value)
|
||||
publishMeasurement(base64Payload)
|
||||
// publishMeasurementAutoServer(measurement)
|
||||
publishMeasurementAutoServer(hexPayload, measurement as DecoderIaq.Measurement)
|
||||
|
||||
loggerDb.writeLog(measurement)
|
||||
}
|
||||
@@ -217,7 +217,7 @@ class KirbyDevice(
|
||||
queue.add(request)
|
||||
}
|
||||
|
||||
private fun publishMeasurementAutoServer(measurement: DecoderIaq.Measurement) {
|
||||
private fun publishMeasurementAutoServer(hexPayload: String, measurement: DecoderIaq.Measurement) {
|
||||
// Read url from SharedPreferences
|
||||
val sharedPref = context.getSharedPreferences(context.getString(R.string.app_name), Context.MODE_PRIVATE)
|
||||
val url = sharedPref.getString(
|
||||
@@ -239,6 +239,7 @@ class KirbyDevice(
|
||||
postData.put("eui", eui)
|
||||
postData.put("deviceId", measurement.deviceId)
|
||||
postData.put("msgType", measurement.msgType)
|
||||
postData.put("rawData", hexPayload)
|
||||
postData.put("co2", measurement.co2)
|
||||
postData.put("voc", measurement.voc)
|
||||
postData.put("humidity", measurement.humidity)
|
||||
@@ -247,6 +248,8 @@ class KirbyDevice(
|
||||
postData.put("occupancy", measurement.occupancy)
|
||||
postData.put("pm25", measurement.pm25)
|
||||
postData.put("pm10", measurement.pm10)
|
||||
postData.put("decodeSuccess", true)
|
||||
postData.put("source", "bt")
|
||||
} catch (e: JSONException) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user