niushuai233/DevControl
1
0
Fork 0
mirror of https://github.com/niushuai233/DevControl.git synced 2024-10-27 22:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 申请权限要放在最前面

Browse Source
This commit is contained in:
niushuai233 2022-10-26 22:50:41 +08:00
parent d77ec1fb1c
commit 8dfac50f51
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/cc/niushuai/project/devcontrol/base/App.java
View File

@ -15,6 +15,7 @@ import java.util.List;
import cc.niushuai.project.devcontrol.BuildConfig; import cc.niushuai.project.devcontrol.BuildConfig;
import cc.niushuai.project.devcontrol.base.util.Global; import cc.niushuai.project.devcontrol.base.util.Global;
import cc.niushuai.project.devcontrol.base.util.Keys; import cc.niushuai.project.devcontrol.base.util.Keys;
import cc.niushuai.project.devcontrol.base.util.XLog;
import cc.niushuai.project.devcontrol.db.DB; import cc.niushuai.project.devcontrol.db.DB;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.StrPool; import cn.hutool.core.text.StrPool;
@ -25,12 +26,13 @@ public class App {
public static void init(Activity activity) { public static void init(Activity activity) {
// 申请权限
requestPermissions(activity);
// 初始化日志相关内容 // 初始化日志相关内容
initLog(activity); initLog(activity);
// 检查root权限 // 检查root权限
checkRoot(activity); checkRoot(activity);
// 申请权限
requestPermissions(activity);
// 初始化数据库 // 初始化数据库
initDb(activity); initDb(activity);
// 重建设备信息缓存 // 重建设备信息缓存
@ -47,10 +49,13 @@ public class App {
private static void checkRoot(Activity activity) { private static void checkRoot(Activity activity) {
String which_su = RuntimeUtil.execForStr("which su"); String which_su = RuntimeUtil.execForStr("which su");
XLog.i(Keys.Tag.APP_INIT, "检查root权限... {}", which_su);
if (StrUtil.isNotEmpty(which_su)) { if (StrUtil.isNotEmpty(which_su)) {
Global.HAS_ROOT = true; Global.HAS_ROOT = true;
XLog.i(Keys.Tag.APP_INIT, "当前设备具有root权限, su路径: {}", which_su);
} else {
XLog.i(Keys.Tag.APP_INIT, "当前设备不具有root权限");
} }
System.out.println("当前设备具有root权限");
} }
/** /**

2
app/src/main/java/cc/niushuai/project/devcontrol/base/util/Keys.java
View File

@ -14,5 +14,7 @@ public interface Keys {
interface Tag { interface Tag {
String MY_OPEN_HELPER = "MyOpenHelper"; String MY_OPEN_HELPER = "MyOpenHelper";
String APP_INIT = "AppInit";
} }
} }

5
app/src/main/java/cc/niushuai/project/devcontrol/base/util/XLog.java
View File

@ -9,6 +9,7 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.StrPool; import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
/** /**
@ -124,7 +125,7 @@ public class XLog {
private static String filterThr(String message, Object[] params) { private static String filterThr(String message, Object[] params) {
String format = StrUtil.format(message, params); String format = StrUtil.format(message, params);
if (null != params) { if (ArrayUtil.isNotEmpty(params)) {
Object lastParam = params[params.length - 1]; Object lastParam = params[params.length - 1];
if (lastParam instanceof Throwable) { if (lastParam instanceof Throwable) {
// 最后一个元素如果为异常对象 // 最后一个元素如果为异常对象
@ -179,7 +180,7 @@ public class XLog {
public static void write(String tag, String message, int level) { public static void write(String tag, String message, int level) {
String logContent = concatFinalLog(tag, level, message); String logContent = concatFinalLog(tag, level, message);
FileUtil.appendUtf8String(logContent, currentAbsoluteLogPath()); FileUtil.appendUtf8String(logContent + System.lineSeparator(), currentAbsoluteLogPath());
} }
/** /**