From ed3ee6eaf6d5ee10ed3886f39cde67d29993955d Mon Sep 17 00:00:00 2001 From: linshenjianlu Date: Tue, 21 Apr 2026 08:24:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(ToolHub):=20=E5=85=B3=E9=94=AE=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E7=9B=B4=E6=8E=A5=20throw=EF=BC=8C=E8=80=8C=E6=98=AF?= =?UTF-8?q?=E9=80=9A=E8=BF=87=20=5F=5Fout=20=E8=BF=94=E5=9B=9E=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ToolHub.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ToolHub.js b/ToolHub.js index a95d290..a0f9365 100644 --- a/ToolHub.js +++ b/ToolHub.js @@ -274,9 +274,7 @@ for (var i = 0; i < modules.length; i++) { writeLog(modErr); try { android.util.Log.e("ToolHub", modErr); } catch(eLog) {} loadErrors.push({ module: modules[i], err: String(e) }); - if (modules[i] === "th_16_entry.js") { - throw "Critical module failed: " + modules[i]; - } + // # 关键模块失败也记录到 loadErrors,由 __out 统一返回错误信息,不再直接 throw } } @@ -352,8 +350,11 @@ var __out = (function() { if (loadInfo.count > 0) { out.loadMsg = loadInfo.msg; out.loadErrors = loadInfo.modules; + if (!started) { + out.err = loadInfo.modules.join(", "); + } } - if (!started) out.err = optStr(startRet && startRet.err) || "未知错误"; + if (!started && !out.err) out.err = optStr(startRet && startRet.err) || "未知错误"; return out; })();