caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Get thresholds from NS

Browse source 
thresholds in NS are in hours
This commit is contained in:
Roumen Georgiev 2018-04-04 12:16:01 +03:00 committed by GitHub
parent 5e045264d5
commit 5e56e2afa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalFragment.java
View file

@ -12,6 +12,11 @@ import android.widget.TextView;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.Config; import info.nightscout.androidaps.Config;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
@ -22,11 +27,11 @@ import info.nightscout.androidaps.events.EventCareportalEventChange;
import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog; import info.nightscout.androidaps.plugins.Careportal.Dialogs.NewNSTreatmentDialog;
import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
import info.nightscout.androidaps.plugins.Overview.OverviewFragment; import info.nightscout.androidaps.plugins.Overview.OverviewFragment;
import info.nightscout.utils.FabricPrivacy; import info.nightscout.utils.FabricPrivacy;
public class CareportalFragment extends SubscriberFragment implements View.OnClickListener { public class CareportalFragment extends SubscriberFragment implements View.OnClickListener {
TextView iage; TextView iage;
TextView cage; TextView cage;
TextView sage; TextView sage;
@ -212,12 +217,33 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
@Override @Override
public void run() { public void run() {
CareportalEvent careportalEvent; CareportalEvent careportalEvent;
String isOld = ""; NSSettingsStatus nsSettings = new NSSettingsStatus().getInstance();
JSONObject extendedSettings = nsSettings.getExtendedSettings();
// Thresholds in NS are in hours
double iageThreshold = 7*24;
double cageThreshold = 3*24;
double sageThreshold = 7*24;
double pbageThreshold = 15*24;
// log.debug("NSExtendedSettings are "+extendedSettings.toString());
// try {
JSONObject iageSettings = extendedSettings.optJSONObject("iage");
if(iageSettings != null)
iageThreshold = iageSettings.optDouble("urgent", 7*24);
JSONObject cageSettings = extendedSettings.optJSONObject("cage");
if(cageSettings != null)
cageThreshold = cageSettings.optDouble("urgent", 3*24);
// log.debug("cageThreshold is "+cageThreshold);
JSONObject sageSettings = extendedSettings.optJSONObject("sage");
if(sageSettings != null)
sageThreshold = sageSettings.optDouble("urgent", 7*24);
// } catch (JSONException e) {
// log.error("Unhandled exception", e);
// }
String notavailable = OverviewFragment.shorttextmode ? "-" : MainApp.sResources.getString(R.string.notavailable); String notavailable = OverviewFragment.shorttextmode ? "-" : MainApp.sResources.getString(R.string.notavailable);
if (sage != null) { if (sage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SENSORCHANGE); careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SENSORCHANGE);
if(careportalEvent != null) { if(careportalEvent != null) {
if(careportalEvent.isOlderThan(7)){ if(careportalEvent.isOlderThan( sageThreshold/24)){
sage.setTextColor(MainApp.sResources.getColor(R.color.low)); sage.setTextColor(MainApp.sResources.getColor(R.color.low));
sage.setText(careportalEvent.age()); sage.setText(careportalEvent.age());
} else { } else {
@ -231,7 +257,7 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (iage != null) { if (iage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.INSULINCHANGE); careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.INSULINCHANGE);
if(careportalEvent != null) { if(careportalEvent != null) {
if(careportalEvent.isOlderThan(5)){ if(careportalEvent.isOlderThan(iageThreshold/24)){
iage.setTextColor(MainApp.sResources.getColor(R.color.low)); iage.setTextColor(MainApp.sResources.getColor(R.color.low));
iage.setText(careportalEvent.age()); iage.setText(careportalEvent.age());
} else { } else {
@ -245,7 +271,7 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (cage != null) { if (cage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SITECHANGE); careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.SITECHANGE);
if (careportalEvent != null) { if (careportalEvent != null) {
if(careportalEvent.isOlderThan(3)){ if(careportalEvent.isOlderThan(cageThreshold/24)){
cage.setTextColor(MainApp.sResources.getColor(R.color.low)); cage.setTextColor(MainApp.sResources.getColor(R.color.low));
cage.setText(careportalEvent.age()); cage.setText(careportalEvent.age());
} else { } else {
@ -259,7 +285,7 @@ public class CareportalFragment extends SubscriberFragment implements View.OnCli
if (pbage != null) { if (pbage != null) {
careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.PUMPBATTERYCHANGE); careportalEvent = MainApp.getDbHelper().getLastCareportalEvent(CareportalEvent.PUMPBATTERYCHANGE);
if(careportalEvent != null) { if(careportalEvent != null) {
if(careportalEvent.isOlderThan(15)){ if(careportalEvent.isOlderThan(pbageThreshold/24)){
pbage.setTextColor(MainApp.sResources.getColor(R.color.low)); pbage.setTextColor(MainApp.sResources.getColor(R.color.low));
pbage.setText(careportalEvent.age()); pbage.setText(careportalEvent.age());
} else { } else {