caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Do calculations in a central place

Browse source
This commit is contained in:
Markus M. May 2018-06-28 22:36:08 +02:00
parent 7d4eec6c99
commit 468b645486
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -839,7 +839,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
if (wizard.superBolus) {
final LoopPlugin loopPlugin = LoopPlugin.getPlugin();
if (loopPlugin.isEnabled(PluginType.LOOP)) {
loopPlugin.superBolusTo(System.currentTimeMillis() + 2 * 60L * 60 * 1000);
loopPlugin.superBolusTo(System.currentTimeMillis() + DateUtil.hourToMs(2));
MainApp.bus().post(new EventRefreshOverview("WizardDialog"));
}
ConfigBuilderPlugin.getCommandQueue().tempBasalPercent(0, 120, true, profile, new Callback() {
@ -1426,12 +1426,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
predHours = Math.max(0, predHours);
hoursToFetch = rangeToDisplay - predHours;
toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
fromTime = toTime - hoursToFetch * 60 * 60 * 1000L;
endTime = toTime + predHours * 60 * 60 * 1000L;
fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
endTime = toTime + DateUtil.hourToMs(predHours);
} else {
hoursToFetch = rangeToDisplay;
toTime = calendar.getTimeInMillis() + 100000; // little bit more to avoid wrong rounding - Graphview specific
fromTime = toTime - hoursToFetch * 60 * 60 * 1000L;
fromTime = toTime - DateUtil.hourToMs(hoursToFetch);
endTime = toTime;
}

4
app/src/main/java/info/nightscout/utils/DateUtil.java
View file

@ -180,4 +180,8 @@ public class DateUtil {
return date - date % 1000;
}
public static long hourToMs(long hour) {
return hour * 60 * 60 * 1000L;
}
}