mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-22 04:29:22 +01:00
refactoring and use Utils.sortPrescriptionList
add conditional debug code
This commit is contained in:
parent
8a218e7467
commit
5825556cbc
1 changed files with 17 additions and 10 deletions
|
@ -50,8 +50,11 @@ public class AlarmReceiver extends BroadcastReceiver {
|
||||||
List<Prescription> prescriptionList = prescriptionsDAO.getAllMedics();
|
List<Prescription> prescriptionList = prescriptionsDAO.getAllMedics();
|
||||||
Prescription firstPrescription = null ;
|
Prescription firstPrescription = null ;
|
||||||
|
|
||||||
|
// Sorting list by dateEndOfStock
|
||||||
|
Utils.sortPrescriptionList(prescriptionList);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
firstPrescription = prescriptionList.get(1);
|
firstPrescription = prescriptionList.get(0);
|
||||||
}
|
}
|
||||||
catch (Exception e){
|
catch (Exception e){
|
||||||
Log.e(TAG, e.toString());
|
Log.e(TAG, e.toString());
|
||||||
|
@ -122,18 +125,22 @@ public class AlarmReceiver extends BroadcastReceiver {
|
||||||
Calendar calendar = Calendar.getInstance();
|
Calendar calendar = Calendar.getInstance();
|
||||||
Date today;
|
Date today;
|
||||||
Date tomorrow;
|
Date tomorrow;
|
||||||
|
|
||||||
calendar.set(Calendar.HOUR_OF_DAY, 11);
|
|
||||||
today = calendar.getTime();
|
|
||||||
calendar.add(Calendar.DAY_OF_YEAR, 1);
|
|
||||||
tomorrow = calendar.getTime();
|
|
||||||
|
|
||||||
LocalTime todayNow = LocalTime.now();
|
LocalTime todayNow = LocalTime.now();
|
||||||
|
|
||||||
if (todayNow.isBefore(LocalTime.NOON)) {
|
if (BuildConfig.DEBUG) {
|
||||||
calendar.setTimeInMillis(today.getTime());
|
calendar.add(Calendar.MINUTE, 2);
|
||||||
|
Date nextSchedule = calendar.getTime();
|
||||||
|
calendar.setTimeInMillis(nextSchedule.getTime());
|
||||||
} else {
|
} else {
|
||||||
calendar.setTimeInMillis(tomorrow.getTime());
|
calendar.set(Calendar.HOUR_OF_DAY, 11);
|
||||||
|
today = calendar.getTime();
|
||||||
|
calendar.add(Calendar.DAY_OF_YEAR, 1);
|
||||||
|
tomorrow = calendar.getTime();
|
||||||
|
if (todayNow.isBefore(LocalTime.NOON)) {
|
||||||
|
calendar.setTimeInMillis(today.getTime());
|
||||||
|
} else {
|
||||||
|
calendar.setTimeInMillis(tomorrow.getTime());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
PendingIntent alarmIntent;
|
PendingIntent alarmIntent;
|
||||||
|
|
Loading…
Reference in a new issue