删除 HeartbeatWorker.java

app/src/main/AndroidManifest.xml

@@ -49,6 +49,10 @@
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".broadcast.HeartbeatAlarmReceiver"
+            android:enabled="true"
+            android:exported="true">
+        </receiver>
         <receiver android:name=".broadcast.PhoneCallReceiver"
             android:enabled="true"
             android:exported="true">

app/src/main/java/com/nbee/echolink/EchoLink.java

@@ -1,20 +1,10 @@
 package com.nbee.echolink;
 
 import android.app.Application;
-import android.content.Context;
-
-import androidx.work.ExistingPeriodicWorkPolicy;
-import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkManager;
-
-import com.nbee.echolink.utils.HeartbeatWorker;
-
-import java.util.concurrent.TimeUnit;
 
 import timber.log.Timber;
 
 public class EchoLink extends Application {
-    private static final int EXECUTION_INTERVAL = 10; // 示例：15分钟
     @Override
     public void onCreate() {
         super.onCreate();
@@ -24,17 +14,6 @@ public class EchoLink extends Application {
         // 打印日志文件的路径
         Timber.d("Log file path: " + this.getFilesDir() + "/logs/echoLink.log");
         // 安排定时任务
-        doScheduledTask(this);
+//        doScheduledTask(this);
-    }
-    private void doScheduledTask(Context context){
-        Timber.d("start do scheduled task");
-        PeriodicWorkRequest heartbeatWorkRequest =
-                new PeriodicWorkRequest.Builder(HeartbeatWorker.class, EXECUTION_INTERVAL, TimeUnit.MINUTES)
-                        .build();
-
-        // 安排周期性工作
-        WorkManager.getInstance(context).enqueueUniquePeriodicWork("HeartbeatWork",
-                ExistingPeriodicWorkPolicy.KEEP,
-                heartbeatWorkRequest);
     }
 }

app/src/main/java/com/nbee/echolink/MainActivity.java

@@ -1,22 +1,17 @@
 package com.nbee.echolink;
 
-import static java.lang.Thread.*;
-
 import android.content.Context;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.PowerManager;
-import android.view.View;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.work.ExistingPeriodicWorkPolicy;
-import androidx.work.PeriodicWorkRequest;
-import androidx.work.WorkManager;
 
+import com.nbee.echolink.async.BatteryOptimizationTask;
 import com.nbee.echolink.service.MonitorService;
 import com.nbee.echolink.utils.BatteryOptimizationUtil;
-import com.nbee.echolink.utils.HeartbeatWorker;
 import com.nbee.echolink.utils.PermissionUtils;
 import com.nbee.echolink.utils.ShellUtils;
 
@@ -24,7 +19,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 import timber.log.Timber;
 
@@ -40,16 +34,13 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        isRoot = shellUtils.checkRootPermission();
-        if (!isRoot){
-            Timber.d("未获取root权限: "+ isRoot);
-        }
         logTextView = findViewById(R.id.logTextView);
         updateLog("初始化日志...");
 
-        requestIgnoreBattery();
+        requestIgnoreBatteryAsync();
         permissionUtils = new PermissionUtils(this);
         permissionUtils.checkPermissions();
+
         // 启动MonitorService服务
 
         Intent serviceIntent = new Intent(this, MonitorService.class);
@@ -65,19 +56,26 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        String logContent = readLogFile();
+        readLogFileAsync();
-        updateLog(logContent);
     }
-    private void requestIgnoreBattery(){
+
-        Context context = getApplicationContext();
+
-        PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
+    private void readLogFileAsync() {
-        boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+        new AsyncTask<Void, Void, String>() {
-        if(!hasIgnored){
+            @Override
-            BatteryOptimizationUtil.requestIgnoreBatteryOptimization(context);
+            protected String doInBackground(Void... voids) {
-            Timber.d("不在在优化电池白名单内");
+                return readLogFile();
-        } else {
+            }
-            return;
+
-        }
+            @Override
+            protected void onPostExecute(String logContent) {
+                updateLog(logContent);
+            }
+        }.execute();
+    }
+
+    private void requestIgnoreBatteryAsync() {
+        new BatteryOptimizationTask(this).execute();
     }
 
     private void updateLog(String newLog) {

app/src/main/java/com/nbee/echolink/async/BatteryOptimizationTask.java

@@ -0,0 +1,30 @@
+package com.nbee.echolink.async;
+
+import static android.content.Context.POWER_SERVICE;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.PowerManager;
+
+import com.nbee.echolink.utils.BatteryOptimizationUtil;
+
+import timber.log.Timber;
+
+public class BatteryOptimizationTask extends AsyncTask<Void, Void, Void> {
+    private Context context;
+
+    public BatteryOptimizationTask(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    protected Void doInBackground(Void... voids) {
+        PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+        boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+        if (!hasIgnored) {
+            BatteryOptimizationUtil.requestIgnoreBatteryOptimization(context);
+            Timber.d("请求忽略电池优化");
+        }
+        return null;
+    }
+}

app/src/main/java/com/nbee/echolink/broadcast/HeartbeatAlarmReceiver.java

@@ -1,17 +1,15 @@
-package com.nbee.echolink.utils;
+package com.nbee.echolink.broadcast;
 
-import androidx.annotation.NonNull;
+import android.content.BroadcastReceiver;
-import androidx.work.Worker;
-import androidx.work.WorkerParameters;
 import android.content.Context;
-import android.os.Handler;
+import android.content.Intent;
-import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.nbee.echolink.R;
 import com.nbee.echolink.model.DeviceInfo;
 import com.nbee.echolink.response.ApiResponse;
+import com.nbee.echolink.utils.DeviceInfoUtils;
 
 import java.io.IOException;
 
@@ -21,24 +19,16 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import timber.log.Timber;
 
-public class HeartbeatWorker extends Worker {
+public class HeartbeatAlarmReceiver extends BroadcastReceiver {
-    private final Context context;
+    private Context context;
     private String accessToken;
     private String SN;
-
-
-    public HeartbeatWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
-        super(context, workerParams);
-        this.context = context; // 保存上下文引用
-    }
-
-    @NonNull
     @Override
-    public Result doWork() {
+    public void onReceive(Context context1, Intent intent) {
-        Context context = getApplicationContext();
+        // 在这里执行发送心跳的逻辑
-        // 在这里实现您的心跳发送逻辑
+        context = context1;
+        // 例如，你可以启动一个服务或者直接在这里执行网络请求
         sendHeartbeatSignal();
-        return Result.success();
     }
 
     private void sendHeartbeatSignal() {
@@ -81,7 +71,6 @@ public class HeartbeatWorker extends Worker {
         });
     }
 
-
     private <T>Request buildRequest(String apiUrl){
         SN = context.getResources().getString(R.string.SN);
         accessToken = context.getResources().getString(R.string.access_token);

app/src/main/java/com/nbee/echolink/service/MonitorService.java

@@ -1,9 +1,12 @@
 package com.nbee.echolink.service;
 
+import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
@@ -12,14 +15,25 @@ import android.util.Log;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import com.nbee.echolink.R;
+import com.nbee.echolink.broadcast.HeartbeatAlarmReceiver;
 import com.nbee.echolink.model.CallInfo;
+import com.nbee.echolink.model.DeviceInfo;
 import com.nbee.echolink.model.SMSInfo;
+import com.nbee.echolink.response.ApiResponse;
+import com.nbee.echolink.utils.DeviceInfoUtils;
 import com.nbee.echolink.utils.NetworkUtil;
 
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
 import timber.log.Timber;
 
 public class MonitorService extends Service {
@@ -27,18 +41,17 @@ public class MonitorService extends Service {
     private static final String TAG = "MonitorService";
     private String lastPhoneNumber = null;
     private long lastCallTime = 0;
-    private int count;
+    private static final long HEARTBEAT_INTERVAL_MINUTES = 10; // 10分钟
     @Override
     public void onCreate() {
         super.onCreate();
-        Timber.d("MonitorService onCreate");
+        Timber.d("监控服务 onCreate");
         startForegroundService();
         networkUtil = new NetworkUtil(this);
+        scheduleHeartbeat(); // 启动心跳定时任务
     }
-
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Timber.d("MonitorService onStartCommand");
         if (intent != null) {
             if (intent.hasExtra("incomingNumber")) {
                 String incomingNumber = intent.getStringExtra("incomingNumber");
@@ -126,4 +139,20 @@ public class MonitorService extends Service {
         Timber.d("MonitorService onBind");
         return null; // 不提供绑定服务的接口
     }
+
+    private void scheduleHeartbeat() {
+        AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
+        Intent intent = new Intent(this, HeartbeatAlarmReceiver.class); // HeartbeatAlarmReceiver是一个BroadcastReceiver
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+
+        long intervalMillis = HEARTBEAT_INTERVAL_MINUTES * 60 * 1000; // 10分钟的毫秒数
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + intervalMillis, pendingIntent);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            alarmManager.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + intervalMillis, pendingIntent);
+        } else {
+            alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + intervalMillis, pendingIntent);
+        }
+    }
 }