更新 PermissionUtils.java

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />

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

@@ -1,39 +1,52 @@
 package com.nbee.echolink;
 
+import static java.lang.Thread.*;
+
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.PowerManager;
 import android.view.View;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.nbee.echolink.service.MonitorService;
+import com.nbee.echolink.utils.BatteryOptimizationUtil;
 import com.nbee.echolink.utils.PermissionUtils;
+import com.nbee.echolink.utils.ShellUtils;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 
+import timber.log.Timber;
+
 public class MainActivity extends AppCompatActivity {
     private final String TAG =  "MainActivity";
     private PermissionUtils permissionUtils;
     private TextView logTextView; // 将类型从 View 更改为 TextView
-
+    private ShellUtils shellUtils;
+    private boolean isRoot;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        isRoot = shellUtils.checkRootPermission();
+        if (!isRoot){
+            Timber.d("未获取root权限: "+ isRoot);
+        }
         logTextView = findViewById(R.id.logTextView);
         updateLog("初始化日志...");
 
-
-
+        requestIgnoreBattery();
         permissionUtils = new PermissionUtils(this);
         permissionUtils.checkPermissions();
-
         // 启动MonitorService服务
+
         Intent serviceIntent = new Intent(this, MonitorService.class);
         startService(serviceIntent);
     }
@@ -50,7 +63,17 @@ public class MainActivity extends AppCompatActivity {
         String logContent = readLogFile();
         updateLog(logContent);
     }
-
+    private void requestIgnoreBattery(){
+        Context context = getApplicationContext();
+        PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
+        boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+        if(!hasIgnored){
+            BatteryOptimizationUtil.requestIgnoreBatteryOptimization(context);
+            Timber.d("不在在优化电池白名单内");
+        } else {
+            return;
+        }
+    }
 
     private void updateLog(String newLog) {
         logTextView.setText(newLog);

app/src/main/java/com/nbee/echolink/utils/BatteryOptimizationUtil.java

@@ -32,19 +32,22 @@ public class BatteryOptimizationUtil {
      * 请求将应用加入电池优化白名单。
      */
     public static void requestIgnoreBatteryOptimization(Context context) {
+        if (isAppIgnoringBatteryOptimizations(context)) {
+            Timber.d("已在忽略电池优化白名单");
+            return;
+        }
         Timber.d("请求电池优化白名单");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             String packageName = context.getPackageName();
             PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
             if (pm != null && !pm.isIgnoringBatteryOptimizations(packageName)) {
-                Intent intent = new Intent();
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
                 intent.setData(Uri.parse("package:" + packageName));
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // 添加FLAG_ACTIVITY_NEW_TASK标志
                 context.startActivity(intent);
             }
         }
     }
 
-
-}
+}

app/src/main/java/com/nbee/echolink/utils/PermissionUtils.java

@@ -69,6 +69,7 @@ public class PermissionUtils {
                 // 在这里处理所有权限被授予的情况
                 Timber.d("已获取所有权限：" + Arrays.toString(permissions));
                 showToast("已授予运行所需的权限");
+                return;
             }
         }
     }

app/src/main/java/com/nbee/echolink/utils/ShellUtils.java

@@ -0,0 +1,193 @@
+package com.nbee.echolink.utils;
+
+
+
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.List;
+
+/**
+ * Shell工具类
+ * Created by HDL on 2018/8/6.
+ */
+
+public class ShellUtils {
+    public static final String COMMAND_SU = "su";
+    public static final String COMMAND_SH = "sh";
+    public static final String COMMAND_EXIT = "exit\n";
+    public static final String COMMAND_LINE_END = "\n";
+
+    private ShellUtils() {
+        throw new AssertionError();
+    }
+
+    /**
+     * 查看是否有了root权限
+     *
+     * @return
+     */
+    public static boolean checkRootPermission() {
+        return execCommand("echo root", true, false).result == 0;
+    }
+
+
+    /**
+     * 执行shell命令，默认返回结果
+     *
+     * @param command command
+     * @return
+     * @see ShellUtils#execCommand(String[], boolean, boolean)
+     */
+    public static CommandResult execCommand(String command, boolean isRoot) {
+        return execCommand(new String[]{command}, isRoot, true);
+    }
+
+
+    /**
+     * 执行shell命令，默认返回结果
+     *
+     * @param commands command list
+     * @return
+     * @see ShellUtils#execCommand(String[], boolean, boolean)
+     */
+
+    public static CommandResult execCommand(List<String> commands, boolean isRoot) {
+        return execCommand(commands == null ? null : commands.toArray(new String[]{}), isRoot, true);
+    }
+
+
+    /**
+     * 执行shell命令，默认返回结果
+     *
+     * @param commands command array
+     * @return
+     * @see ShellUtils#execCommand(String[], boolean, boolean)
+     */
+
+    public static CommandResult execCommand(String[] commands, boolean isRoot) {
+        return execCommand(commands, isRoot, true);
+    }
+
+
+    /**
+     * execute shell command
+     *
+     * @param command         command
+     * @param isNeedResultMsg whether need result msg
+     * @return
+     * @see ShellUtils#execCommand(String[], boolean, boolean)
+     */
+    public static CommandResult execCommand(String command, boolean isRoot, boolean isNeedResultMsg) {
+        return execCommand(new String[]{command}, isRoot, isNeedResultMsg);
+    }
+
+
+    /**
+     * execute shell commands
+     *
+     * @param commands command list
+     * @return
+     * @see ShellUtils#execCommand(String[], boolean, boolean)
+     */
+    public static CommandResult execCommand(List<String> commands, boolean isRoot, boolean isNeedResultMsg) {
+
+        return execCommand(commands == null ? null : commands.toArray(new String[]{}), isRoot, isNeedResultMsg);
+    }
+
+
+    /**
+     * execute shell commands
+     */
+    public static CommandResult execCommand(String[] commands, boolean isRoot, boolean isNeedResultMsg) {
+        int result = -1;
+        if (commands == null || commands.length == 0) {
+            return new CommandResult(result, null, null);
+        }
+        Process process = null;
+        BufferedReader successResult = null;
+        BufferedReader errorResult = null;
+        StringBuilder successMsg = null;
+        StringBuilder errorMsg = null;
+        DataOutputStream os = null;
+        try {
+            process = Runtime.getRuntime().exec(isRoot ? COMMAND_SU : COMMAND_SH);
+            os = new DataOutputStream(process.getOutputStream());
+            for (String command : commands) {
+                if (command == null) {
+                    continue;
+                }
+                // donnot use os.writeBytes(commmand), avoid chinese charset
+                // error
+                os.write(command.getBytes());
+                os.writeBytes(COMMAND_LINE_END);
+                os.flush();
+            }
+            os.writeBytes(COMMAND_EXIT);
+            os.flush();
+            result = process.waitFor();
+            // get command result
+            if (isNeedResultMsg) {
+                successMsg = new StringBuilder();
+                errorMsg = new StringBuilder();
+                successResult = new BufferedReader(new InputStreamReader(process.getInputStream()));
+                errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+                String s;
+                while ((s = successResult.readLine()) != null) {
+                    successMsg.append(s);
+                }
+                while ((s = errorResult.readLine()) != null) {
+                    errorMsg.append(s);
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (os != null) {
+                    os.close();
+                }
+                if (successResult != null) {
+                    successResult.close();
+                }
+                if (errorResult != null) {
+                    errorResult.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (process != null) {
+                process.destroy();
+            }
+        }
+        return new CommandResult(result, successMsg == null ? null : successMsg.toString(), errorMsg == null ? null : errorMsg.toString());
+    }
+
+    public static class CommandResult {
+        /**
+         * 运行结果
+         **/
+        public int result;
+        /**
+         * 运行成功结果
+         **/
+        public String successMsg;
+        /**
+         * 运行失败结果
+         **/
+        public String errorMsg;
+
+        public CommandResult(int result) {
+            this.result = result;
+        }
+
+        public CommandResult(int result, String successMsg, String errorMsg) {
+            this.result = result;
+            this.successMsg = successMsg;
+            this.errorMsg = errorMsg;
+        }
+    }
+}