awin/vc-kirby-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align rawData, decodeSuccess, source to AutoServer

Browse Source
This commit is contained in:
Awin Huang
2024-10-28 15:22:11 +08:00
parent d691c9c47c
commit a549304540
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/logitech/vc/kirbytest/KirbyDevice.kt
View File

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