caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2106 from MilosKozak/dexcom-sensor-type

Browse source 
Save Dexcom Sensor Type
This commit is contained in:
Milos Kozak 2019-10-10 15:00:53 +02:00 committed by GitHub
parent 9ffed9943d 4a5b0f2a86
commit 40fb9d7386
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/plugins/source/SourceDexcomPlugin.kt
View file

@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.source
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Build
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import info.nightscout.androidaps.Constants import info.nightscout.androidaps.Constants
import info.nightscout.androidaps.MainApp import info.nightscout.androidaps.MainApp
@ -62,6 +61,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
override fun handleNewData(intent: Intent) { override fun handleNewData(intent: Intent) {
if (!isEnabled(PluginType.BGSOURCE)) return if (!isEnabled(PluginType.BGSOURCE)) return
try { try {
val sensorType = intent.getStringExtra("sensorType") ?: ""
val glucoseValues = intent.getBundleExtra("glucoseValues") val glucoseValues = intent.getBundleExtra("glucoseValues")
for (i in 0 until glucoseValues.size()) { for (i in 0 until glucoseValues.size()) {
val glucoseValue = glucoseValues.getBundle(i.toString()) val glucoseValue = glucoseValues.getBundle(i.toString())
@ -70,9 +70,9 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
bgReading.direction = glucoseValue.getString("trendArrow") bgReading.direction = glucoseValue.getString("trendArrow")
bgReading.date = glucoseValue.getLong("timestamp") * 1000 bgReading.date = glucoseValue.getLong("timestamp") * 1000
bgReading.raw = 0.0 bgReading.raw = 0.0
if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom")) { if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom$sensorType")) {
if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) { if (SP.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
NSUpload.uploadBg(bgReading, "AndroidAPS-DexcomG6") NSUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
} }
if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) { if (SP.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
NSUpload.sendToXdrip(bgReading) NSUpload.sendToXdrip(bgReading)
@ -85,7 +85,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
val timestamp = meter!!.getLong("timestamp") * 1000 val timestamp = meter!!.getLong("timestamp") * 1000
if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue if (MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp) != null) continue
val jsonObject = JSONObject() val jsonObject = JSONObject()
jsonObject.put("enteredBy", "AndroidAPS-Dexcom") jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
jsonObject.put("created_at", DateUtil.toISOString(timestamp)) jsonObject.put("created_at", DateUtil.toISOString(timestamp))
jsonObject.put("eventType", CareportalEvent.BGCHECK) jsonObject.put("eventType", CareportalEvent.BGCHECK)
jsonObject.put("glucoseType", "Finger") jsonObject.put("glucoseType", "Finger")
@ -97,7 +97,7 @@ object SourceDexcomPlugin : PluginBase(PluginDescription()
val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000 val sensorInsertionTime = intent.extras!!.getLong("sensorInsertionTime") * 1000
if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) { if (MainApp.getDbHelper().getCareportalEventFromTimestamp(sensorInsertionTime) == null) {
val jsonObject = JSONObject() val jsonObject = JSONObject()
jsonObject.put("enteredBy", "AndroidAPS-Dexcom") jsonObject.put("enteredBy", "AndroidAPS-Dexcom$sensorType")
jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime)) jsonObject.put("created_at", DateUtil.toISOString(sensorInsertionTime))
jsonObject.put("eventType", CareportalEvent.SENSORCHANGE) jsonObject.put("eventType", CareportalEvent.SENSORCHANGE)
NSUpload.uploadCareportalEntryToNS(jsonObject) NSUpload.uploadCareportalEntryToNS(jsonObject)