lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-17 18:41:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use NotificationPublisher

Browse source
This commit is contained in:
Jacques Foucry 2016-11-01 23:21:49 +01:00
parent 24f78e0cdf
commit cd1ca18e32
1 changed files with 64 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -69,8 +69,6 @@ public class MedicamentListActivity extends AppCompatActivity {
final static Boolean DEMO = true; final static Boolean DEMO = true;
final static Random random = new Random(); final static Random random = new Random();
private JobScheduler mJobScheduler;
/** /**
* ATTENTION: This was auto-generated to implement the App Indexing API. * ATTENTION: This was auto-generated to implement the App Indexing API.
* See https://g.co/AppIndexing/AndroidStudio for more information. * See https://g.co/AppIndexing/AndroidStudio for more information.
@ -82,16 +80,16 @@ public class MedicamentListActivity extends AppCompatActivity {
super.onStart(); super.onStart();
Log.d(TAG, "Remove old notification"); Log.d(TAG, "Remove old notification");
cancelAllJobs(mRecyclerView); // cancelAllJobs(mRecyclerView);
//NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
//nm.cancelAll(); nm.cancelAll();
try { /*try {
mJobScheduler.cancelAll(); mJobScheduler.cancelAll();
} catch (Exception e) { } catch (Exception e) {
Log.d(TAG, "no old job to remove"); Log.d(TAG, "no old job to remove");
} }*/
// ATTENTION: This was auto-generated to implement the App Indexing API. // ATTENTION: This was auto-generated to implement the App Indexing API.
// See https://g.co/AppIndexing/AndroidStudio for more information. // See https://g.co/AppIndexing/AndroidStudio for more information.
@ -113,15 +111,15 @@ public class MedicamentListActivity extends AppCompatActivity {
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
mJobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE); // mJobScheduler = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
//
JobInfo.Builder builder = new JobInfo.Builder(1, // JobInfo.Builder builder = new JobInfo.Builder(1,
new ComponentName( getPackageName(), PillDroidJobService.class.getName())); // new ComponentName( getPackageName(), PillDroidJobService.class.getName()));
builder.setPeriodic(300000); // Dans 5 minutes, en millisecondes // builder.setPeriodic(30000); // Dans 30 secondes, en millisecondes
//
if (mJobScheduler.schedule(builder.build()) <= 0) { // if (mJobScheduler.schedule(builder.build()) <= 0) {
Log.d(TAG, "Something goes wrong at job schedule"); // Log.d(TAG, "Something goes wrong at job schedule");
} // }
// ATTENTION: This was auto-generated to implement the App Indexing API. // ATTENTION: This was auto-generated to implement the App Indexing API.
// See https://g.co/AppIndexing/AndroidStudio for more information. // See https://g.co/AppIndexing/AndroidStudio for more information.
@ -139,27 +137,27 @@ public class MedicamentListActivity extends AppCompatActivity {
client.disconnect(); client.disconnect();
} }
public void cancelAllJobs(View v) { /* public void cancelAllJobs(View v) {
JobScheduler tm = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE); JobScheduler tm = (JobScheduler) getSystemService(Context.JOB_SCHEDULER_SERVICE);
tm.cancelAll(); tm.cancelAll();
} }*/
private static final String TAG = MedicamentListActivity.class.getName(); private static final String TAG = MedicamentListActivity.class.getName();
private static DBHelper dbHelper; private DBHelper dbHelper;
private static DBMedoc dbMedoc; private DBMedoc dbMedoc;
// private SimpleCursorAdapter drugAdapter; // private SimpleCursorAdapter drugAdapter;
private static List<Medicament> medicaments; private List<Medicament> medicaments;
private View mRecyclerView; private View mRecyclerView;
private SimpleItemRecyclerViewAdapter mAdapter; private SimpleItemRecyclerViewAdapter mAdapter;
public static int getCount() { public int getCount() {
return medicaments.size(); return medicaments.size();
} }
public static Medicament getItem(int position) { public Medicament getItem(int position) {
return medicaments.get(position); return medicaments.get(position);
} }
@ -269,7 +267,8 @@ public class MedicamentListActivity extends AppCompatActivity {
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
Calendar calendar = Calendar.getInstance(); newStockCalculation();
/* Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime(); Date now = calendar.getTime();
long dateSchedule; long dateSchedule;
@ -286,11 +285,16 @@ public class MedicamentListActivity extends AppCompatActivity {
} }
// int between2DateInMillis = (int) (tomorrow.getTime() - now.getTime()); // int between2DateInMillis = (int) (tomorrow.getTime() - now.getTime());
scheduleNotification(getNotification("It's today + 10s"), dateSchedule); scheduleNotification(getNotification(getString(R.string.notification_text)), 10000);
Log.d(TAG, "Notification scheduled for "+ UtilDate.convertDate(dateSchedule)); Log.d(TAG, "Notification scheduled for "+ UtilDate.convertDate(dateSchedule));*/
} }
/** scanNow
*
* @param view
* call ZXing Library to scan a new QR/EAN code
*/
public void scanNow(View view) { public void scanNow(View view) {
Intent intent = new Intent("com.google.zxing.client.android.SCAN"); Intent intent = new Intent("com.google.zxing.client.android.SCAN");
//intent.putExtra("SCAN_MODE", "CODE_128"); //intent.putExtra("SCAN_MODE", "CODE_128");
@ -298,15 +302,40 @@ public class MedicamentListActivity extends AppCompatActivity {
startActivityForResult(intent, 0); startActivityForResult(intent, 0);
} }
public static void newStockCalculation(Context context) { /**
* Calculation of newStock
*/
public void newStockCalculation() {
Medicament currentMedicament; Medicament currentMedicament;
for (int position = 0 ; position < getCount() ; position++ ) { for (int position = 0 ; position < this. getCount() ; position++ ) {
currentMedicament = getItem(position); currentMedicament = this.getItem(position);
currentMedicament.newStock(currentMedicament.getStock()); currentMedicament.newStock(currentMedicament.getStock());
} }
Toast.makeText(context, "PillDroid - Calcul nouveau stocks", Toast.LENGTH_SHORT).show(); // Must record new stock in DB
// Toast.makeText(getApplicationContext(), "PillDroid - Calcul nouveau stocks", Toast.LENGTH_SHORT).show();
// TODO: si un des médicaments est en rouge, on déclanche une notification visuelle pour dans 5 secondes // TODO: si un des médicaments est en rouge, on déclanche une notification visuelle pour dans 5 secondes
Calendar calendar = Calendar.getInstance();
Date now = calendar.getTime();
long dateSchedule;
Medicament firstMedicament = medicaments.get(0);
Date dateAlerte = UtilDate.removeDaysToDate(firstMedicament.getAlertThreshold(), firstMedicament.getDateEndOfStock());
if (dateAlerte.getTime() < now.getTime())
{
dateSchedule = now.getTime() + 10000; // If dateAlerte < now we schedule an alert for now + 5 seconds
} else {
dateSchedule = dateAlerte.getTime(); // If dateAlerte > now we use dateAlerte as scheduleDate
}
// int between2DateInMillis = (int) (tomorrow.getTime() - now.getTime());
scheduleNotification(getNotification(getString(R.string.notification_text)), dateSchedule);
Log.d(TAG, "Notification scheduled for "+ UtilDate.convertDate(dateSchedule));
} }
public void onActivityResult(int requestCode, int resultCode, Intent intent) { public void onActivityResult(int requestCode, int resultCode, Intent intent) {
@ -377,6 +406,8 @@ public class MedicamentListActivity extends AppCompatActivity {
} }
private void scheduleNotification(Notification notification, long delay) { private void scheduleNotification(Notification notification, long delay) {
Log.i(TAG, "scheduleNotification delay == " + delay);
Intent notificationIntent = new Intent(this, NotificationPublisher.class); Intent notificationIntent = new Intent(this, NotificationPublisher.class);
notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1); notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1);
notificationIntent.putExtra(NotificationPublisher.NOTIFICATION, notification); notificationIntent.putExtra(NotificationPublisher.NOTIFICATION, notification);
@ -388,6 +419,8 @@ public class MedicamentListActivity extends AppCompatActivity {
} }
private Notification getNotification(String content) { private Notification getNotification(String content) {
Log.i(TAG, "getNotification");
Notification.Builder builder = new Notification.Builder(this); Notification.Builder builder = new Notification.Builder(this);
builder.setContentTitle(getAppName()); builder.setContentTitle(getAppName());
builder.setContentText(content); builder.setContentText(content);