更新闹钟

MiNotes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java

@@ -267,6 +267,7 @@ public class DateTimePicker extends FrameLayout {
         setCurrentYear(year);
         setCurrentMonth(month);
         setCurrentDay(dayOfMonth);
+        updateHourControl();
         setCurrentHour(hourOfDay);
         setCurrentMinute(minute);
     }
@@ -376,6 +377,8 @@ public class DateTimePicker extends FrameLayout {
                 mIsAm = false;
                 if (hourOfDay > HOURS_IN_HALF_DAY) {
                     hourOfDay -= HOURS_IN_HALF_DAY;
+                } else if (hourOfDay == HOURS_IN_HALF_DAY) {
+                    hourOfDay = HOURS_IN_HALF_DAY;
                 }
             } else {
                 mIsAm = true;
@@ -384,8 +387,10 @@ public class DateTimePicker extends FrameLayout {
                 }
             }
             updateAmPmControl();
+            mHourSpinner.setValue(hourOfDay);
+        } else {
+            mHourSpinner.setValue(hourOfDay);
         }
-        mHourSpinner.setValue(hourOfDay);
         onDateTimeChanged();
     }
 

MiNotes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java

@@ -623,13 +623,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (mWorkingNote.getNoteId() > 0) {
             Intent intent = new Intent(this, AlarmReceiver.class);
             intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+            int requestCode = (int) mWorkingNote.getNoteId();
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT);
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
             showAlertHeader();
             if(!set) {
                 alarmManager.cancel(pendingIntent);
             } else {
-                alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+                // 兼容Android 6.0+，使用setExactAndAllowWhileIdle
+                alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, date, pendingIntent);
             }
         } else {
             /**