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

feat: 完成日志收集

Browse Source
This commit is contained in:
niushuai233 2022-10-27 10:25:14 +08:00
parent 2c2aab8df1
commit a3c0c5bd8c
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,8 @@ import cn.hutool.core.util.StrUtil;
public class App {
public static final String WHICH_SU = "which su";
public static void init(Activity activity) {
// 申请权限
@ -31,12 +33,19 @@ public class App {
// 初始化日志相关内容
initLog(activity);
XLog.i(Keys.Tag.APP_INIT, "====================================================================");
XLog.i(Keys.Tag.APP_INIT, "应用{}启动", BuildConfig.APP_NAME);
XLog.i(Keys.Tag.APP_INIT, "====================================================================");
// 检查root权限
checkRoot(activity);
// 初始化数据库
initDb(activity);
// 重建设备信息缓存
Global.initDeviceInfoMap();
XLog.i(Keys.Tag.APP_INIT, "初始化完毕");
}
/**
@ -48,11 +57,11 @@ public class App {
*/
private static void checkRoot(Activity activity) {
String which_su = RuntimeUtil.execForStr("which su");
XLog.i(Keys.Tag.APP_INIT, "检查root权限... {}", which_su);
String which_su = RuntimeUtil.execForStr(WHICH_SU);
XLog.i(Keys.Tag.APP_INIT, "检查root权限... {} ==> {}", WHICH_SU, which_su);
if (StrUtil.isNotEmpty(which_su)) {
Global.HAS_ROOT = true;
XLog.i(Keys.Tag.APP_INIT, "当前设备具有root权限, su路径: {}", which_su);
XLog.i(Keys.Tag.APP_INIT, "当前设备具有root权限");
} else {
XLog.i(Keys.Tag.APP_INIT, "当前设备不具有root权限");
}
@ -106,6 +115,7 @@ public class App {
* @date: 2022/10/26 14:58
*/
private static void initDb(Activity activity) {
XLog.v(Keys.Tag.APP_INIT, "加载SQLite");
DB.getInstance().init(activity);
}
@ -118,15 +128,18 @@ public class App {
private static void initLog(Activity activity) {
String rootPath = getRootPath();
XLog.v(Keys.Tag.APP_INIT, "获取日志文件根目录: {}", rootPath);
if (!FileUtil.exist(rootPath)) {
// 不存在的时候创建文件
boolean mkdirs = new File(rootPath).mkdirs();
System.out.println(mkdirs);
XLog.v(Keys.Tag.APP_INIT, "日志根目录不存在, 创建: {}", mkdirs);
}
// 内存存储日志根目录
Global.LOG_ROOT_PATH = rootPath;
XLog.i(Keys.Tag.APP_INIT, "日志存储位置: {}", Global.LOG_ROOT_PATH);
}
private static String getRootPath() {
@ -136,9 +149,11 @@ public class App {
if (externalStorageState.equals(Environment.MEDIA_MOUNTED)) {
// 如果存在外置存储
rootPath = StrUtil.join(StrPool.SLASH, Environment.getExternalStorageDirectory().getAbsolutePath(), BuildConfig.APP_NAME);
XLog.v(Keys.Tag.APP_INIT, "外置存储已挂载");
} else {
// 否则就写到/data/data里
rootPath = StrUtil.join(StrPool.SLASH, Keys.LOG_ROOT_FILE_PATH, BuildConfig.APPLICATION_ID);
XLog.v(Keys.Tag.APP_INIT, "外置存储未挂载");
}
return StrUtil.join(StrPool.SLASH, rootPath, Keys.LOG_LOG_FOLDER);

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

@ -31,13 +31,14 @@ public class Global {
* @date: 2022/10/24 17:08
*/
public static void initDeviceInfoMap() {
XLog.v(Keys.Tag.APP_INIT, "重建设备信息缓存");
DEVICE_INFO_MAP.clear();
List<Device> deviceList = DB.getDeviceDao().loadAll();
XLog.v(Keys.Tag.APP_INIT, "现有设备信息: {}条", deviceList.size());
for (Device device : deviceList) {
DEVICE_INFO_MAP.put(device.getId() + "", DeviceInfo.parseDevice(device));
}
System.out.println();
XLog.v(Keys.Tag.APP_INIT, "设备信息缓存建立成功: {}条", deviceList.size());
}
public static Class<? extends BaseActivity> getDeviceAddActivity(String deviceId) {

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

@ -255,7 +255,7 @@ public class XLog {
} else if (ERROR == level) {
str = "ERROR";
}
return StrPool.BRACKET_START + String.format("%7s", str) + StrPool.BRACKET_END;
return String.format("%7s", str);
}
}
}

4
app/src/main/java/cc/niushuai/project/devcontrol/db/DB.java
View File

@ -3,6 +3,7 @@ package cc.niushuai.project.devcontrol.db;
import android.content.Context;
import cc.niushuai.project.devcontrol.base.util.Keys;
import cc.niushuai.project.devcontrol.base.util.XLog;
import cc.niushuai.project.devcontrol.db.greendao.gen.DaoMaster;
import cc.niushuai.project.devcontrol.db.greendao.gen.DaoSession;
import cc.niushuai.project.devcontrol.db.greendao.gen.DeviceDao;
@ -70,7 +71,10 @@ public class DB {
// instance.getDaoMaster();
instance.getDaoSession();
INIT_FLAG = true;
XLog.v(Keys.Tag.APP_INIT, "SQLite已加载");
return;
}
XLog.v(Keys.Tag.APP_INIT, "SQLite已加载, 无需重复初始化");
}
/**