From 8398ae82467dfcfc5a01043cd4c69b2365818583 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Thu, 17 Apr 2025 18:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E5=8F=98=E5=8C=96=E5=90=8E=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml               |  6 +++---
 app/src/main/cpp/MicroPhoto.cpp                | 18 ++++++++++++++++++
 .../com/xypower/mpapp/MicroPhotoService.java   | 13 ++++++++-----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7eebe094..b165d75c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -89,6 +89,9 @@
         <intent>
             <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
         </intent>
+        <intent>
+            <action android:name="android.intent.action.TIME_CHANGED" />
+        </intent>
         <package android:name="com.xypower.mplive" />
     </queries>
 
@@ -166,9 +169,6 @@
         <receiver
             android:name=".MicroPhotoService$AlarmReceiver"
             android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.TIME_CHANGED"/>
-            </intent-filter>
         </receiver>
         <receiver
             android:name=".BootBroadcastReceiver"
diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp
index e16d8bb2..9b629b33 100644
--- a/app/src/main/cpp/MicroPhoto.cpp
+++ b/app/src/main/cpp/MicroPhoto.cpp
@@ -1510,3 +1510,21 @@ Java_com_xypower_mpapp_MicroPhotoService_sendCameraCtrl(
 
     pTerminal->SendCameraCtrl(channel, preset, cmd);
 }
+
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_xypower_mpapp_MicroPhotoService_notifyTimeUpdated(
+        JNIEnv* env, jobject pThis, jlong handle) {
+
+    CTerminal* pTerminal = reinterpret_cast<CTerminal *>(handle);
+    if (pTerminal == NULL)
+    {
+        return;
+    }
+
+    std::thread t([pTerminal]()
+      {
+          pTerminal->OnTimeUpdated();
+      });
+    t.detach();
+}
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index 350bd739..251da4be 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -135,8 +135,6 @@ public class MicroPhotoService extends Service {
     private static final String ACTION_UPDATE_CONFIGS = "com.xypower.mpapp.ACT_UPD_CFG";
     public static final String ACTION_VIDEO_FINISHED = "com.xypower.mpapp.ACT_V_FINISHED";
 
-    public static final String ACTION_TIME_CHANGED = "android.intent.action.TIME_CHANGED";
-
     private static final String EXTRA_PARAM_CHANNEL = "Channel";
     private static final String EXTRA_PARAM_PRESET = "Preset";
     private static final String EXTRA_PARAM_PHOTO_OR_VIDEO = "PhotoOrVideo";
@@ -298,7 +296,7 @@ public class MicroPhotoService extends Service {
             intentFilter.addAction(ACTION_HEARTBEAT_MANUALLY);
             intentFilter.addAction(ACTION_GPS_TIMEOUT);
             intentFilter.addAction(ACTION_RESTART);
-            intentFilter.addAction(ACTION_TIME_CHANGED);
+            intentFilter.addAction(Intent.ACTION_TIME_CHANGED);
             getApplicationContext().registerReceiver(mAlarmReceiver, intentFilter, Context.RECEIVER_EXPORTED | Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);
         }
         {
@@ -662,8 +660,11 @@ public class MicroPhotoService extends Service {
                     ex.printStackTrace();
                 }
                 restartSelfImpl(context, reason);
-            } else if (TextUtils.equals(ACTION_TIME_CHANGED, action)) {
-
+            } else if (TextUtils.equals(Intent.ACTION_TIME_CHANGED, action)) {
+                mService.notifyTimeUpdated(mService.mNativeHandle);
+                Date date = new Date();
+                long startTime = (date.getTime() + 999) / 1000;
+                mService.updateCaptureSchedule(startTime);
             }
         }
     }
@@ -1603,6 +1604,8 @@ cellSignalStrengthGsm.getDbm();
     // protected native long[] getNextScheduleItem(long handler);
     protected native boolean notifyToTakePhoto(long handler, int channel, int preset, long scheduleTime, String url, int mediaType);
 
+    protected native void notifyTimeUpdated(long handler);
+
     protected native boolean sendHeartbeat(long handler, int signalLevel);
     protected native boolean reloadConfigs(long handler);
     protected native void updatePosition(long handler, double lon, double lat, double radius, long ts);