Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -671,7 +671,7 @@ public class MicroPhotoService extends Service {
         alarmIntent.setAction(ACTION_HEARTBEAT);
         alarmIntent.putExtra("HeartbeatDuration", mHeartbeatDuration);
         alarmIntent.putExtra("HeartbeatTime", triggerTime);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, mPendingIntentFeed.getAndIncrement(), alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, BROADCAST_REQUEST_CODE_HEARTBEAT, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         Date date = new Date(triggerTime);
         String dateStr = (String) DateFormat.format("kk:mm:ss", date);
@@ -714,7 +714,7 @@ public class MicroPhotoService extends Service {
             LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
             localBroadcastManager.sendBroadcast(intent);
         } else {
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, mPendingIntentFeed.getAndIncrement(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, BROADCAST_REQUEST_CODE_TAKING_PHOTO, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
             AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE);
             try {

mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java

@@ -812,9 +812,8 @@ public class MpMasterService extends Service {
         if (keepAlive) {
             alarmIntent.putExtra("keepAlive", keepAlive);
         }
-        int uniqueReqCode = reqCode.getAndIncrement();
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, uniqueReqCode, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-//        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, keepAlive ? 0 : 1, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+//        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, uniqueReqCode, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, keepAlive ? 0 : 1, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         Date dt = new Date(triggerTime);