From 7097b4a7391e84af916819bb25f64026922c3d8d Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Tue, 27 Feb 2024 12:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=9B=91=E6=8E=A7=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E8=BF=90=E7=BB=B4=E7=A8=8B=E5=BA=8F=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                          | 6 +-----
 mpmaster/src/main/AndroidManifest.xml                     | 5 +++++
 .../src/main/java/com/xypower/mpmaster}/SmsReceiver.java  | 8 +++++---
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename {app/src/main/java/com/xypower/mpapp => mpmaster/src/main/java/com/xypower/mpmaster}/SmsReceiver.java (90%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26300344..ab2d287b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -135,11 +135,7 @@
                 <action android:name="android.intent.action.USER_UNLOCKED" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".SmsReceiver">
-            <intent-filter android:priority="2147483647">
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-        </receiver>
+
         <receiver
             android:name="com.xypower.common.UpdateReceiver"
             android:enabled="true"
diff --git a/mpmaster/src/main/AndroidManifest.xml b/mpmaster/src/main/AndroidManifest.xml
index 4570a168..1ce06ef8 100644
--- a/mpmaster/src/main/AndroidManifest.xml
+++ b/mpmaster/src/main/AndroidManifest.xml
@@ -110,6 +110,11 @@
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".SmsReceiver">
+            <intent-filter android:priority="2147483647">
+                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
+            </intent-filter>
+        </receiver>
         <receiver
             android:name=".BootBroadcastReceiver"
             android:enabled="true"
diff --git a/app/src/main/java/com/xypower/mpapp/SmsReceiver.java b/mpmaster/src/main/java/com/xypower/mpmaster/SmsReceiver.java
similarity index 90%
rename from app/src/main/java/com/xypower/mpapp/SmsReceiver.java
rename to mpmaster/src/main/java/com/xypower/mpmaster/SmsReceiver.java
index 407ed700..40b5533f 100644
--- a/app/src/main/java/com/xypower/mpapp/SmsReceiver.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/SmsReceiver.java
@@ -1,4 +1,4 @@
-package com.xypower.mpapp;
+package com.xypower.mpmaster;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -18,6 +18,7 @@ import java.util.TimeZone;
  */
 public class SmsReceiver extends BroadcastReceiver {
 
+    private static final String TAG = "MPLOG";
     private Context mContext;
     public static final String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED";
     public static final String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER";
@@ -26,11 +27,11 @@ public class SmsReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         this.mContext = context;
 
-        Log.e("日志：onReceive...", "-接收短信执行了" + intent.getStringExtra("sele"));
+        Log.e(TAG, "Recv SMS");
         String action = intent.getAction();
         if (SMS_RECEIVED_ACTION.equals(action) || SMS_DELIVER_ACTION.equals(action)) {
 
-            Log.e("日志：onReceive。。。", "开始接收短信.....");
+            // Log.e("日志：onReceive。。。", "开始接收短信.....");
             Bundle bundle = intent.getExtras();
             if (bundle != null) {
                 Object[] pdus = (Object[]) bundle.get("pdus");
@@ -48,6 +49,7 @@ public class SmsReceiver extends BroadcastReceiver {
                         format.setTimeZone(TimeZone.getTimeZone("GMT+08:00"));
                         String dateContent = format.format(date);
 
+
 //                            this.abortBroadcast();// 中止
 
                     }