From 40d36e1577c12681cb2d8006183964f9b994c498 Mon Sep 17 00:00:00 2001
From: liuguijing <1440265357@qq.com>
Date: Tue, 29 Apr 2025 15:42:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=BF=83=E8=B7=B3=E8=B0=83=E8=AF=95=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml               |  6 +++++-
 .../mpapp/HeartBeatResponseReceiver.java       |  7 +++++--
 .../com/xypower/mpapp/MicroPhotoService.java   | 18 ++++++++++++++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 57059832..3901641f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -209,7 +209,11 @@
         <receiver
             android:name=".HeartBeatResponseReceiver"
             android:enabled="true"
-            android:exported="true"></receiver>
+            android:exported="true">
+            <intent-filter >
+                <action android:name="com.systemui.ACTION_HEARTBEAT_RESPONSE" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/xypower/mpapp/HeartBeatResponseReceiver.java b/app/src/main/java/com/xypower/mpapp/HeartBeatResponseReceiver.java
index ca9bee49..a8beab8d 100644
--- a/app/src/main/java/com/xypower/mpapp/HeartBeatResponseReceiver.java
+++ b/app/src/main/java/com/xypower/mpapp/HeartBeatResponseReceiver.java
@@ -3,14 +3,17 @@ package com.xypower.mpapp;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 
 public class HeartBeatResponseReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        if ("heartbeat".equals(action)) {
-            MicroPhotoService.infoLog("收到heartbeat广播");
+        if ("com.systemui.ACTION_HEARTBEAT_RESPONSE".equals(action)) {
+            long timestamp = intent.getLongExtra("timestamp", 0);
+            Log.d("MpApp","系统广播监听 timestamp:"+timestamp);
+            MicroPhotoService.infoLog("收到heartbeat广播 timestamp:" + timestamp);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index b87f37d4..58d939ca 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -148,6 +148,7 @@ public class MicroPhotoService extends Service {
     private static final String EXTRA_PARAM_TIME = "Time";
 
     private static final String FOREGROUND_CHANNEL_ID = "fg_mpapp";
+    private HeartBeatResponseReceiver mHeartBeatReceiver;
 
     public static class STATE_SERVICE {
         public static final int CONNECTED = 10;
@@ -323,6 +324,14 @@ public class MicroPhotoService extends Service {
             getApplicationContext().registerReceiver(mNetworkChangedReceiver, filter);
         }
 
+        {
+            mHeartBeatReceiver = new HeartBeatResponseReceiver();
+            IntentFilter filter = new IntentFilter();
+            filter.addAction("com.systemui.ACTION_HEARTBEAT_RESPONSE");
+            getApplicationContext().registerReceiver(mHeartBeatReceiver, filter);
+        }
+
+
         /*
         AlarmManager alarmManager = (AlarmManager) getApplicationContext().getSystemService(ALARM_SERVICE);
 
@@ -353,6 +362,7 @@ public class MicroPhotoService extends Service {
         getApplicationContext().unregisterReceiver(mAlarmReceiver);
         getApplicationContext().unregisterReceiver(mScreenaAtionReceiver);
         getApplicationContext().unregisterReceiver(mNetworkChangedReceiver);
+        getApplicationContext().unregisterReceiver(mHeartBeatReceiver);
 
         if (mConnectivityManager != null) {
             if (mNetworkCallback != null) {
@@ -501,10 +511,10 @@ public class MicroPhotoService extends Service {
                     ex.printStackTrace();
                 }
 
-
-                Intent responseIntent = new Intent("com.systemui.ACTION_HEARTBEAT_RESPONSE");
-                responseIntent.putExtra("timestamp",System.currentTimeMillis());
-                context.sendBroadcast(responseIntent);
+                Intent heartintent = new Intent("com.xy.xsetting.action");
+                heartintent.putExtra("cmd", "heartbeat");
+                heartintent.setPackage("com.android.systemui");
+                context.sendBroadcast(heartintent);
 
             } else if (TextUtils.equals(ACTION_TAKE_PHOTO, action)) {
                 long ts = intent.getLongExtra(EXTRA_PARAM_TIME, 0);

From 7ae8505809650e1423906d5f2f9a57f712cdc4a2 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Tue, 29 Apr 2025 15:45:58 +0800
Subject: [PATCH 2/2] Update version to 1.3.148

Based Core Version to 1.4.80
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index aab9a9d6..ba858567 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 3
-def AppBuildNumber = 147
+def AppBuildNumber = 148
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber