linshenjianlu/ShortX_ToolHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(icon): 增强诊\u65ad和\u5907\u7528\u56fe\u6807\u5217\u8868，\u4fee\u590d ShortX \u56fe\u6807\u4e0d\u663e\u793a

Browse Source 
- APK 扫描增\u52a0 mipmap* 目\u5f55\u652f\u6301
- 增\u52a0诊\u65ad信\u606f\u663e\u793a（APK 路\u5f84、\u6587\u4ef6\u6570、\u9519\u8bef\u539f\u56e0）
- 当\u6240\u6709\u81ea\u52a8\u83b7\u53d6\u5931\u8d25\u65f6，\u56de\u9000\u5230 20 \u4e2a\u5e38\u7528\u5907\u7528\u56fe\u6807\u5217\u8868
This commit is contained in:
Hermes
2026-04-20 17:56:40 +08:00
parent ec64ef07d9
commit 5036f48772
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/th_06_icon_parser.js
View File

@@ -341,9 +341,10 @@ FloatBallAppWM.prototype.scanShortXIconsFromApk = function() {
var out = [];
var seen = {};
var paths = this.getShortXApkPaths();
// 宽松匹配：匹配 res/drawable* 下所有以 ic_ 开头的图标，不限于 ic_remix_
var regex = /^res\/drawable[^\/]*\/(ic_[a-z0-9_]+)\.(xml|png|webp|jpg|jpeg)$/;
// 宽松匹配：匹配 res/drawable* 和 res/mipmap* 下所有以 ic_ 开头的图标
var regex = /^res\/(drawable[^\/]*|mipmap[^\/]*)\/(ic_[a-z0-9_]+)\.(xml|png|webp|jpg|jpeg)$/;
var lastErr = "";
var totalFiles = 0;
var pi;
for (pi = 0; pi < paths.length; pi++) {
var zip = null;
@@ -353,10 +354,11 @@ FloatBallAppWM.prototype.scanShortXIconsFromApk = function() {
while (en.hasMoreElements()) {
var ze = en.nextElement();
var name = String(ze.getName());
totalFiles++;
var m = regex.exec(name);
if (!m) continue;
var fullName = String(m[1]);
// 过\u6ee4\u6389\u7cfb\u7edf\u56fe\u6807，只\u4fdd\u7559 ShortX 自\u5b9a\u4e49\u56fe\u6807
var fullName = String(m[2]);
// 过滤掉系统图标
if (fullName.indexOf("ic_launcher") === 0 || fullName.indexOf("ic_menu_") === 0) continue;
if (seen[fullName]) continue;
seen[fullName] = true;
@@ -372,7 +374,7 @@ FloatBallAppWM.prototype.scanShortXIconsFromApk = function() {
try { if (zip) zip.close(); } catch (eClose) {}
}
}
if ((!out || out.length === 0) && lastErr) this._shortxIconCatalogError = lastErr;
if ((!out || out.length === 0) && lastErr) this._shortxIconCatalogError = "APK扫描: " + lastErr + " (路径数=" + paths.length + ", 文件数=" + totalFiles + ")";
return out;
};