From 8cb4921babe85156087d15de6728d0c27223ea56 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 15 Dec 2017 01:03:31 +0100 Subject: [PATCH] BG viewer --- .../androidaps/Services/DataService.java | 6 +- .../nightscout/androidaps/db/BgReading.java | 1 + .../androidaps/db/DatabaseHelper.java | 30 ++- .../plugins/NSClientInternal/data/NSSgv.java | 1 + .../SourceDexcomG5/BGSourceFragment.java | 172 ++++++++++++++++++ .../SourceDexcomG5/SourceDexcomG5Plugin.java | 9 +- .../SourceGlimp/SourceGlimpPlugin.java | 10 +- .../SourceMM640g/SourceMM640gPlugin.java | 10 +- .../SourceNSClient/SourceNSClientPlugin.java | 12 +- .../SourceXdrip/SourceXdripPlugin.java | 13 +- app/src/main/res/layout/bgsource_fragment.xml | 22 +++ app/src/main/res/layout/bgsource_item.xml | 78 ++++++++ app/src/main/res/values/strings.xml | 1 + 13 files changed, 337 insertions(+), 28 deletions(-) create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/BGSourceFragment.java create mode 100644 app/src/main/res/layout/bgsource_fragment.xml create mode 100644 app/src/main/res/layout/bgsource_item.xml diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java index c8d8dbe808..aeb1a7acf9 100644 --- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java +++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java @@ -117,10 +117,8 @@ public class DataService extends IntentService { handleNewDataFromDexcomG5(intent); } } else if (Intents.ACTION_NEW_SGV.equals(action)) { - // always handle SGV if NS-Client is the source - if (nsClientEnabled) { - handleNewDataFromNSClient(intent); - } + // always backfill SGV from NS + handleNewDataFromNSClient(intent); // Objectives 0 ObjectivesPlugin.bgIsAvailableInNS = true; ObjectivesPlugin.saveProgress(); diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java index 4d43f942e3..c8d5295811 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java +++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java @@ -53,6 +53,7 @@ public class BgReading implements DataPointWithLabelInterface { value = sgv.getMgdl(); raw = sgv.getFiltered() != null ? sgv.getFiltered() : value; direction = sgv.getDirection(); + _id = sgv.getId(); } public Double valueToUnits(String units) { diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index 79c52b1a50..566df6995b 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -367,6 +367,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { return false; } + public void update(BgReading bgReading) { + bgReading.date = roundDateToSec(bgReading.date); + try { + getDaoBgReadings().update(bgReading); + } catch (SQLException e) { + e.printStackTrace(); + } + } + private static void scheduleBgChange() { class PostRunnable implements Runnable { public void run() { @@ -397,7 +406,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { QueryBuilder queryBuilder = daoBgReadings.queryBuilder(); queryBuilder.orderBy("date", false); queryBuilder.limit(1L); - queryBuilder.where().gt("value", 38); + queryBuilder.where().gt("value", 38).and().eq("isValid", true); PreparedQuery preparedQuery = queryBuilder.prepare(); bgList = daoBgReadings.query(preparedQuery); @@ -435,7 +444,24 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { QueryBuilder queryBuilder = daoBgreadings.queryBuilder(); queryBuilder.orderBy("date", ascending); Where where = queryBuilder.where(); - where.ge("date", mills).and().gt("value", 38); + where.ge("date", mills).and().gt("value", 38).and().eq("isValid", true); + PreparedQuery preparedQuery = queryBuilder.prepare(); + bgReadings = daoBgreadings.query(preparedQuery); + return bgReadings; + } catch (SQLException e) { + log.error("Unhandled exception", e); + } + return new ArrayList(); + } + + public List getAllBgreadingsDataFromTime(long mills, boolean ascending) { + try { + Dao daoBgreadings = getDaoBgReadings(); + List bgReadings; + QueryBuilder queryBuilder = daoBgreadings.queryBuilder(); + queryBuilder.orderBy("date", ascending); + Where where = queryBuilder.where(); + where.ge("date", mills); PreparedQuery preparedQuery = queryBuilder.prepare(); bgReadings = daoBgreadings.query(preparedQuery); return bgReadings; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java index af134ea50d..50336a5f52 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSgv.java @@ -63,5 +63,6 @@ public class NSSgv { public Long getMills () { return getLongOrNull("mills"); } public String getDevice () { return getStringOrNull("device"); } public String getDirection () { return getStringOrNull("direction"); } + public String getId () { return getStringOrNull("_id"); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/BGSourceFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/BGSourceFragment.java new file mode 100644 index 0000000000..bd686ec96c --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/BGSourceFragment.java @@ -0,0 +1,172 @@ +package info.nightscout.androidaps.plugins.SourceDexcomG5; + +import android.app.Activity; +import android.content.DialogInterface; +import android.graphics.Paint; +import android.os.Bundle; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.crashlytics.android.Crashlytics; +import com.squareup.otto.Subscribe; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +import info.nightscout.androidaps.MainApp; +import info.nightscout.androidaps.R; +import info.nightscout.androidaps.data.Profile; +import info.nightscout.androidaps.db.BgReading; +import info.nightscout.androidaps.events.EventNewBG; +import info.nightscout.androidaps.plugins.Common.SubscriberFragment; +import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; +import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue; +import info.nightscout.utils.DateUtil; +import info.nightscout.utils.NSUpload; + +/** + * Created by mike on 16.10.2017. + */ + +public class BGSourceFragment extends SubscriberFragment { + private static Logger log = LoggerFactory.getLogger(BGSourceFragment.class); + + RecyclerView recyclerView; + + Profile profile; + + final long MILLS_TO_THE_PAST = 12 * 60 * 60 * 1000L; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + try { + View view = inflater.inflate(R.layout.bgsource_fragment, container, false); + + recyclerView = (RecyclerView) view.findViewById(R.id.bgsource_recyclerview); + recyclerView.setHasFixedSize(true); + LinearLayoutManager llm = new LinearLayoutManager(view.getContext()); + recyclerView.setLayoutManager(llm); + + long now = System.currentTimeMillis(); + RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false)); + recyclerView.setAdapter(adapter); + + profile = ConfigBuilderPlugin.getActiveProfileInterface().getProfile().getDefaultProfile(); + + return view; + } catch (Exception e) { + Crashlytics.logException(e); + } + + return null; + } + + @Subscribe + @SuppressWarnings("unused") + public void onStatusEvent(final EventNewBG ev) { + updateGUI(); + } + + @Override + protected void updateGUI() { + Activity activity = getActivity(); + if (activity != null) + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + long now = System.currentTimeMillis(); + recyclerView.swapAdapter(new BGSourceFragment.RecyclerViewAdapter(MainApp.getDbHelper().getAllBgreadingsDataFromTime(now - MILLS_TO_THE_PAST, false)), true); + } + }); + } + + public class RecyclerViewAdapter extends RecyclerView.Adapter { + + List bgReadings; + + RecyclerViewAdapter(List bgReadings) { + this.bgReadings = bgReadings; + } + + @Override + public BgReadingsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) { + View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.bgsource_item, viewGroup, false); + return new BgReadingsViewHolder(v); + } + + @Override + public void onBindViewHolder(BgReadingsViewHolder holder, int position) { + BgReading bgReading = bgReadings.get(position); + holder.ns.setVisibility(NSUpload.isIdValid(bgReading._id) ? View.VISIBLE : View.GONE); + holder.invalid.setVisibility(!bgReading.isValid ? View.VISIBLE : View.GONE); + holder.date.setText(DateUtil.dateAndTimeString(bgReading.date)); + holder.value.setText(bgReading.valueToUnitsToString(profile.getUnits())); + holder.direction.setText(bgReading.directionToSymbol()); + holder.remove.setTag(bgReading); + } + + @Override + public int getItemCount() { + return bgReadings.size(); + } + + class BgReadingsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { + TextView date; + TextView value; + TextView direction; + TextView invalid; + TextView ns; + TextView remove; + + BgReadingsViewHolder(View itemView) { + super(itemView); + date = (TextView) itemView.findViewById(R.id.bgsource_date); + value = (TextView) itemView.findViewById(R.id.bgsource_value); + direction = (TextView) itemView.findViewById(R.id.bgsource_direction); + invalid = (TextView) itemView.findViewById(R.id.invalid_sign); + ns = (TextView) itemView.findViewById(R.id.ns_sign); + remove = (TextView) itemView.findViewById(R.id.bgsource_remove); + remove.setOnClickListener(this); + remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); + } + + @Override + public void onClick(View v) { + final BgReading bgReading = (BgReading) v.getTag(); + switch (v.getId()) { + + case R.id.bgsource_remove: + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + builder.setTitle(MainApp.sResources.getString(R.string.confirmation)); + builder.setMessage(MainApp.sResources.getString(R.string.removerecord) + "\n" + DateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(profile.getUnits())); + builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + final String _id = bgReading._id; + if (NSUpload.isIdValid(_id)) { + NSUpload.removeFoodFromNS(_id); + } else { + UploadQueue.removeID("dbAdd", _id); + } + bgReading.isValid = false; + MainApp.getDbHelper().update(bgReading); + updateGUI(); + } + }); + builder.setNegativeButton(MainApp.sResources.getString(R.string.cancel), null); + builder.show(); + break; + + } + } + } + } + +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java index 56934d0081..04f5700dae 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java @@ -12,6 +12,7 @@ import info.nightscout.androidaps.interfaces.PluginBase; public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface { private boolean fragmentEnabled = false; + private boolean fragmentVisible = false; private static SourceDexcomG5Plugin plugin = null; @@ -23,7 +24,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface { @Override public String getFragmentClass() { - return null; + return BGSourceFragment.class.getName(); } @Override @@ -49,7 +50,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface { @Override public boolean isVisibleInTabs(int type) { - return false; + return Config.G5UPLOADER || type == BGSOURCE && fragmentVisible; } @Override @@ -59,7 +60,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface { @Override public boolean hasFragment() { - return false; + return true; } @Override @@ -74,7 +75,7 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface { @Override public void setFragmentVisible(int type, boolean fragmentVisible) { - + if (type == BGSOURCE) this.fragmentVisible = fragmentVisible; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java index 934635f03b..51fd755b07 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java @@ -4,12 +4,14 @@ import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.interfaces.BgSourceInterface; import info.nightscout.androidaps.interfaces.PluginBase; +import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment; /** * Created by mike on 05.08.2016. */ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface { private boolean fragmentEnabled = false; + private boolean fragmentVisible = false; private static SourceGlimpPlugin plugin = null; @@ -21,7 +23,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface { @Override public String getFragmentClass() { - return null; + return BGSourceFragment.class.getName(); } @Override @@ -47,7 +49,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface { @Override public boolean isVisibleInTabs(int type) { - return false; + return type == BGSOURCE && fragmentVisible; } @Override @@ -57,7 +59,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface { @Override public boolean hasFragment() { - return false; + return true; } @Override @@ -72,7 +74,7 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface { @Override public void setFragmentVisible(int type, boolean fragmentVisible) { - + if (type == BGSOURCE) this.fragmentVisible = fragmentVisible; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java index aba07ffe05..e530dd563b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java @@ -4,12 +4,14 @@ import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.interfaces.BgSourceInterface; import info.nightscout.androidaps.interfaces.PluginBase; +import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment; /** * Created by mike on 05.08.2016. */ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface { private boolean fragmentEnabled = false; + private boolean fragmentVisible = false; private static SourceMM640gPlugin plugin = null; @@ -21,7 +23,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface { @Override public String getFragmentClass() { - return null; + return BGSourceFragment.class.getName(); } @Override @@ -47,7 +49,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface { @Override public boolean isVisibleInTabs(int type) { - return false; + return type == BGSOURCE && fragmentVisible; } @Override @@ -57,7 +59,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface { @Override public boolean hasFragment() { - return false; + return true; } @Override @@ -72,7 +74,7 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface { @Override public void setFragmentVisible(int type, boolean fragmentVisible) { - + if (type == BGSOURCE) this.fragmentVisible = fragmentVisible; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java index 0e85793850..1928448f0e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java @@ -5,12 +5,14 @@ import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.interfaces.BgSourceInterface; import info.nightscout.androidaps.interfaces.PluginBase; +import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment; /** * Created by mike on 05.08.2016. */ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { private boolean fragmentEnabled = true; + private boolean fragmentVisible = false; private static SourceNSClientPlugin plugin = null; @@ -22,7 +24,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { @Override public String getFragmentClass() { - return null; + return BGSourceFragment.class.getName(); } @Override @@ -32,7 +34,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { @Override public String getName() { - return MainApp.instance().getString(R.string.nsclient); + return MainApp.instance().getString(R.string.nsclientbg); } @Override @@ -49,7 +51,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { @Override public boolean isVisibleInTabs(int type) { - return false; + return type == BGSOURCE && fragmentVisible; } @Override @@ -59,7 +61,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { @Override public boolean hasFragment() { - return false; + return true; } @Override @@ -74,7 +76,7 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface { @Override public void setFragmentVisible(int type, boolean fragmentVisible) { - + if (type == BGSOURCE) this.fragmentVisible = fragmentVisible; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java index 8363f13566..7f73d457e7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java @@ -4,12 +4,16 @@ import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.interfaces.BgSourceInterface; import info.nightscout.androidaps.interfaces.PluginBase; +import info.nightscout.androidaps.plugins.SourceDexcomG5.BGSourceFragment; /** * Created by mike on 05.08.2016. */ public class SourceXdripPlugin implements PluginBase, BgSourceInterface { + private boolean fragmentEnabled = false; + private boolean fragmentVisible = false; + private static SourceXdripPlugin plugin = null; public static SourceXdripPlugin getPlugin() { @@ -20,11 +24,9 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface { @Override public String getFragmentClass() { - return null; + return BGSourceFragment.class.getName(); } - private boolean fragmentEnabled = false; - @Override public int getType() { return PluginBase.BGSOURCE; @@ -48,7 +50,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface { @Override public boolean isVisibleInTabs(int type) { - return false; + return type == BGSOURCE && fragmentVisible; } @Override @@ -58,7 +60,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface { @Override public boolean hasFragment() { - return false; + return true; } @Override @@ -73,6 +75,7 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface { @Override public void setFragmentVisible(int type, boolean fragmentVisible) { + if (type == BGSOURCE) this.fragmentVisible = fragmentVisible; } @Override diff --git a/app/src/main/res/layout/bgsource_fragment.xml b/app/src/main/res/layout/bgsource_fragment.xml new file mode 100644 index 0000000000..dbd0ea4e67 --- /dev/null +++ b/app/src/main/res/layout/bgsource_fragment.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml new file mode 100644 index 0000000000..acd0454327 --- /dev/null +++ b/app/src/main/res/layout/bgsource_item.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7286003410..7306a49355 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -788,5 +788,6 @@ Send BG data to xDrip+ dexcomg5_xdripupload In xDrip+ select 640g/Eversense data source + NSClient BG