From f15f725cf84a110114a32605f95d1bda0445cae2 Mon Sep 17 00:00:00 2001 From: shizhendong Date: Wed, 11 Sep 2024 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20app=20=E5=88=97=E8=A1=A8=E4=B8=8D?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20droidvnc=5Fng=5Fpkg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/geedge/api/util/AdbUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/geedge/api/util/AdbUtil.java b/src/main/java/net/geedge/api/util/AdbUtil.java index 5d9f370..8ece5d6 100644 --- a/src/main/java/net/geedge/api/util/AdbUtil.java +++ b/src/main/java/net/geedge/api/util/AdbUtil.java @@ -22,6 +22,7 @@ public class AdbUtil { private static AdbUtil instance; + private static String DEFAULT_DROIDVNC_NG_PKG_NAME = "net.christianbeier.droidvnc_ng"; private static String DEFAULT_DROIDVNC_NG_APK_PATH = "./lib/droidvnc-np-2.6.0.apk"; private static String DEFAULT_DROIDVNC_NG_DEFAULTS_JSON_PATH = "./lib/droidvnc-np-defaults.json"; @@ -387,6 +388,7 @@ public class AdbUtil { String[] lines = result.split("\\n"); for (String line : lines) { String packageName = T.StrUtil.trim(line.substring(prefix.length())); + if (T.StrUtil.equals(DEFAULT_DROIDVNC_NG_PKG_NAME, packageName)) continue; String dumpsysResult = CommandExec.exec(AdbCommandBuilder.builder() .serial(this.getSerial()) @@ -423,6 +425,9 @@ public class AdbUtil { String appName = apkInfo.getLabel(); String iconFilename = apkInfo.getIcon(); String base64IconDate = apkUtil.extractFileFromApk(localApk.getAbsolutePath(), iconFilename); + if (T.StrUtil.isNotEmpty(base64IconDate)) { + base64IconDate = "data:image/jpeg;base64," + base64IconDate; + } Map relMap = T.MapUtil.newHashMap(); relMap.put("pkg", packageName);