caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

proper iob update on treatmnets&temps tab

Browse source
This commit is contained in:
Milos Kozak 2016-06-24 23:27:52 +02:00
parent 35ff53dbb4
commit 582ffc3c9a
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/info/nightscout/androidaps/plugins/TempBasals/TempBasalsFragment.java
View file

@ -207,17 +207,6 @@ public class TempBasalsFragment extends Fragment implements PluginBase, TempBasa
TempBasal t = tempBasals.get(pos); TempBasal t = tempBasals.get(pos);
total.plus(t.iobCalc(now)); total.plus(t.iobCalc(now));
} }
final IobTotal finalTotal = total;
Activity activity = getActivity();
if (visibleNow && activity != null && recyclerView != null)
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
if (iobTotal != null)
iobTotal.setText(formatNumber2decimalplaces.format(finalTotal.basaliob));
}
});
lastCalculationTimestamp = new Date().getTime(); lastCalculationTimestamp = new Date().getTime();
lastCalculation = total; lastCalculation = total;
@ -385,6 +374,9 @@ public class TempBasalsFragment extends Fragment implements PluginBase, TempBasa
@Override @Override
public void run() { public void run() {
recyclerView.swapAdapter(new RecyclerViewAdapter(tempBasals), false); recyclerView.swapAdapter(new RecyclerViewAdapter(tempBasals), false);
if (lastCalculation != null)
iobTotal.setText(formatNumber2decimalplaces.format(lastCalculation.basaliob));
} }
}); });
} }

18
app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
View file

@ -154,20 +154,6 @@ public class TreatmentsFragment extends Fragment implements View.OnClickListener
total.bolussnooze += bIOB.iobContrib; total.bolussnooze += bIOB.iobContrib;
} }
final IobTotal finalTotal = total;
Activity activity = getActivity();
if (visibleNow && activity != null && recyclerView != null)
activity.runOnUiThread(new Runnable() {
@Override
public void run() {
if (iobTotal != null)
iobTotal.setText(formatNumber2decimalplaces.format(finalTotal.iob));
if (activityTotal != null)
activityTotal.setText(formatNumber3decimalplaces.format(finalTotal.activity));
}
});
lastCalculationTimestamp = new Date().getTime(); lastCalculationTimestamp = new Date().getTime();
lastCalculation = total; lastCalculation = total;
} }
@ -346,6 +332,10 @@ public class TreatmentsFragment extends Fragment implements View.OnClickListener
@Override @Override
public void run() { public void run() {
recyclerView.swapAdapter(new RecyclerViewAdapter(treatments), false); recyclerView.swapAdapter(new RecyclerViewAdapter(treatments), false);
if (lastCalculation != null)
iobTotal.setText(formatNumber2decimalplaces.format(lastCalculation.iob));
if (lastCalculation != null)
activityTotal.setText(formatNumber3decimalplaces.format(lastCalculation.activity));
} }
}); });
} }