caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move COB string representation to CobInfo

Browse source
This commit is contained in:
AdrianLxM 2018-05-02 07:51:04 +02:00
parent 55db89b547
commit f75329f5dc
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/CobInfo.java
View file

@ -1,7 +1,10 @@
package info.nightscout.androidaps.plugins.IobCobCalculator; package info.nightscout.androidaps.plugins.IobCobCalculator;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import info.nightscout.utils.DecimalFormatter;
public class CobInfo { public class CobInfo {
/** All COB up to now, including carbs not yet processed by IobCob calculation. */ /** All COB up to now, including carbs not yet processed by IobCob calculation. */
@Nullable @Nullable
@ -12,4 +15,19 @@ public class CobInfo {
this.displayCob = displayCob; this.displayCob = displayCob;
this.futureCarbs = futureCarbs; this.futureCarbs = futureCarbs;
} }
@NonNull
public static String generateCOBString() {
String cobStringResult = "--";
CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "WatcherUpdaterService");
if (cobInfo.displayCob != null) {
cobStringResult = DecimalFormatter.to0Decimal(cobInfo.displayCob);
if (cobInfo.futureCarbs > 0) {
cobStringResult += "(" + DecimalFormatter.to0Decimal(cobInfo.futureCarbs) + ")";
}
cobStringResult += "g";
}
return cobStringResult;
}
} }

19
app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
View file

@ -42,8 +42,6 @@ import info.nightscout.androidaps.plugins.Treatments.Treatment;
import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.interfaces.TreatmentsInterface; import info.nightscout.androidaps.interfaces.TreatmentsInterface;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
import info.nightscout.androidaps.plugins.Loop.LoopPlugin; import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus; import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
import info.nightscout.androidaps.plugins.Overview.OverviewPlugin; import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
@ -592,7 +590,7 @@ public class WatchUpdaterService extends WearableListenerService implements
iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob); iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")"; iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
cobString = generateCOBString(); cobString = CobInfo.generateCOBString();
currentBasal = generateBasalString(treatmentsInterface); currentBasal = generateBasalString(treatmentsInterface);
//bgi //bgi
@ -715,21 +713,6 @@ public class WatchUpdaterService extends WearableListenerService implements
return basalStringResult; return basalStringResult;
} }
@NonNull
private String generateCOBString() {
String cobStringResult = "--";
CobInfo cobInfo = IobCobCalculatorPlugin.getPlugin().getCobInfo(false, "WatcherUpdaterService");
if (cobInfo.displayCob != null) {
cobStringResult = DecimalFormatter.to0Decimal(cobInfo.displayCob);
if (cobInfo.futureCarbs > 0) {
cobStringResult += "(" + DecimalFormatter.to0Decimal(cobInfo.futureCarbs) + ")";
}
cobStringResult += "g";
}
return cobStringResult;
}
@Override @Override
public void onDestroy() { public void onDestroy() {
if (googleApiClient != null && googleApiClient.isConnected()) { if (googleApiClient != null && googleApiClient.isConnected()) {