Merge branch 'main' of http://dev.xinyingpower.com:8081/git/xymp/TermApp

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

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"

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)) {
+        if ("com.systemui.ACTION_HEARTBEAT_RESPONSE".equals(action)) {
-            MicroPhotoService.infoLog("收到heartbeat广播");
+            long timestamp = intent.getLongExtra("timestamp", 0);
+            Log.d("MpApp","系统广播监听 timestamp:"+timestamp);
+            MicroPhotoService.infoLog("收到heartbeat广播 timestamp:" + timestamp);
         }
     }
 }

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 heartintent = new Intent("com.xy.xsetting.action");
-                Intent responseIntent = new Intent("com.systemui.ACTION_HEARTBEAT_RESPONSE");
+                heartintent.putExtra("cmd", "heartbeat");
-                responseIntent.putExtra("timestamp",System.currentTimeMillis());
+                heartintent.setPackage("com.android.systemui");
-                context.sendBroadcast(responseIntent);
+                context.sendBroadcast(heartintent);
 
             } else if (TextUtils.equals(ACTION_TAKE_PHOTO, action)) {
                 long ts = intent.getLongExtra(EXTRA_PARAM_TIME, 0);