From 365c5fce79434b84803143cc1c0ae21eccdd08ec Mon Sep 17 00:00:00 2001 From: BlueMatthew Date: Fri, 12 Jan 2024 16:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xypower/mpapp/MicroPhotoService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index 7d5974e0..02f628d4 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1,5 +1,6 @@ package com.xypower.mpapp; +import static java.lang.System.err; import static java.lang.System.loadLibrary; import android.app.AlarmManager; @@ -433,6 +434,11 @@ public class MicroPhotoService extends Service { PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT); AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE); + try { + alarmManager.cancel(pendingIntent); + } catch (Exception ex) { + ex.printStackTrace(); + } long currentTimeMillis = System.currentTimeMillis(); Date date = new Date(currentTimeMillis + timeout); @@ -485,7 +491,7 @@ public class MicroPhotoService extends Service { val = photoTimeData[idx]; ts = (int) ((val & 0x00FFFFFF00000000L) >> 32) + offset; - if (ts < secondsOfToday) { + if (ts <= secondsOfToday) { continue; }