From c9bfbc2781135152735ccc43538905979bd6715d Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 19 Sep 2026 19:30:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=94=E7=94=A8=E5=86=85=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AE=89=E8=A3=85=E5=99=A8=E6=97=A0=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E8=B5=B7(=E8=A1=A5=E9=BD=90=20install-apk=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 根因: simpleDemo/libs 缺 install-apk-release.aar(提取 SDK 时漏拷), plus.runtime.install 走静默安装路径失败且不回落 UI 安装器 - 补齐 install-apk-release.aar(与散单工程一致) - AndroidManifest 补 INSTALL_PACKAGES/REQUEST_INSTALL_PACKAGES 权限(与散单权限集一致) - update.js: installUpdatePackage 改为无参调用 plus.runtime.install(filePath)(带 options/回调会走静默安装分支),下载恢复默认路径 - login.vue: 检查更新优先于鉴权跳转(updateChecked/pendingAutoEnter 门控,检测完成前挂起自动进入打包模式) - 版本号 1.0.19(用户已改) - 真机端到端验证: 1.0.18 降级包 → 更新弹窗 → 下载 → 系统安装器弹出 → 安装成功 1.0.19 --- .../simpleDemo/libs/install-apk-release.aar | Bin 0 -> 1991 bytes .../simpleDemo/src/main/AndroidManifest.xml | 5 +++ package.json | 2 +- src/core/update.js | 14 +++++-- src/pages/login/login.vue | 38 +++++++++++++++++- 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 android-offline/HBuilder-Integrate-AS/simpleDemo/libs/install-apk-release.aar diff --git a/android-offline/HBuilder-Integrate-AS/simpleDemo/libs/install-apk-release.aar b/android-offline/HBuilder-Integrate-AS/simpleDemo/libs/install-apk-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..dedb4d8ffe77cf3c75ea279ca41889315328eb86 GIT binary patch literal 1991 zcmbW2c~sL^7RP@!EXu0GCMr#7S(LS6*|(-PB7{{0)Mzk53?L+AVJD<47HOmbCB=Zi zu#~cj5Rffw0%i~i4H-e%ENjXdkZ3?m($xOZ4m0yl-#g!T?>q0^d(M6Docr;Hfn?MH zVE=vq03cEUz(*fe0Fag1b7sU?A_(yQk4teCn9dyO;hObrYNUe`zm@kBXia{jpUtJaADyzPR-nCm0%G` z(>j=Q`Am@}sFp2KF0bcu44l;haKC2A=RXXl%8gzULQX^*LkC~ak1SNIetcfn-!Rql z*hH;jv@XaAMucOIqZ^tu?r0wBdqJ|Cy4QkMnoU&Y{3QP^&sm`Il}>|ySHmV~PZ53P zv_2UCI3))Fiqay2!jS|5ieMIo#4B!Gzm5bzP!*_woL;w5AARTDJ{yflhADz-i2Mf8?MtAPV1bc04{nfo+rD{58?5~ZfeW3lwg%3{d$wlkJE1=c`i zrP$d-g0PkR;5d`x)p44%@p`b`y1;MUJ~4QDsG9%QpPay8yccy13+GnoF^z+67KB)Q z2<+IQNb#q6fw6DtMf^35-P>+F!_EuaU(6O|F<6&HVwnS|V)fA_MWsXqD*2WzX~uJ+ zS)Xn_Wwo}`gnkmC45F4|ttfora(H6ZNKhzs=MyH7|n#;5#fM*wV9XI zYF-x3U2wMNS)cMH2Z#Q;FtJD@D@T30n0A=xJ%5P0v3p0L6QCsSyc%rh1o`%H4#DMyo$xX3I-u_RhX|W{CbP{R(r9* zlYLp3FutPyQw(A)YsokAErHbSkOoise|q6Ye+_$_$xk3ZK7fKOzQY3VmNQ9 zag7<`QQA3wk{V(6ii~k9e7)8*xRTL)Pjb?rpz7-WcMT5*NXgAt^<#2J#4P)2f;RU- z^lqh-)&24?wU%O6UgUT05!8tYp3vw$$B`5`xfLc!Q5$og(8FG7&1!c%)q81eH~f%q z|0n4=+zA4cow#9?Y!oPT)2ycvGxhB8a-BHn=f`=RDSF&+CPrNcI zNq#f0jArXHnA;0GtFg5C`40KgqDqoEpC~HOOx(z92@U9hMh&dc611??6Ld#&Y(8%B zXl^?kLwsQD6!7a^vfv_iV(0+aAdb}45%r{%VoW_iYjo}En%)XR6y%zeB4a{mkFyiy zz(;$Gqu5V7{4iwjv2#q_SKGdX>a8BbBhY|G{L33{+&Y1=fGqkUc#+xqa(*Y!)1$g> z#FeGLKHh3Vzq+t-^D`!PHYFWi(D+nraqmVg6PJz~`FH1RNjhJtj_J5u^I7S(A5ulD zeTtQ0oloc2NVoyGDKxxa_51Bw=A?<_k-=Hq(9gcarxEn#i*tNjFPm#`*L2$AxuHqh z1^7Z^<>_r}*qD;_zzR6+fuUz-r_(&ghrQ!Td8B}w@@^?%d@jt68g!MU_WP7vTQa-P z$yCN?=(=}WS&BEGnd-VcTh$1NFC_n*k)1qa)v_VGr(-wBb5pU>CU;*dTd6#t=OL!9 zo@dO1uo33SKiaqXwW!eWU~@Dc861u>M + + + { if (status === 200) { - resolve(download.filename) + const filePath = download.filename || '' + console.log('[update] 下载完成:', filePath) + resolve(filePath) } else { + console.error('[update] 下载失败 status:', status) reject(new Error(`download failed: ${status}`)) } } @@ -125,7 +128,12 @@ export function installUpdatePackage(filePath) { return } if (appEnv.isApp && typeof plus !== 'undefined') { - plus.runtime.install(filePath, {}, () => {}, () => {}) + console.log('[update] plus.runtime.install:', filePath) + // 与散单项目一致:只传路径,不传 options 与回调。 + // 实测传了 options/回调时 5+ Runtime 走静默安装路径(应用进程内 PackageParser 解析 APK), + // 无系统安装权限时 error 回调收到 null 且不回落 UI 安装器 → 打不开安装包; + // 不传回调则走系统 UI 安装器(弹出安装界面)。 + plus.runtime.install(filePath) return } } diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index db2be25..90af647 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -257,6 +257,9 @@ export default { updateInstalling: false, updateError: '', updateProgress: { received: 0, total: 0 }, + // ---- 检查更新优先于鉴权跳转 ---- + updateChecked: false, // 更新检测是否已完成(无论有无更新) + pendingAutoEnter: false, // 更新检测完成前被挂起的自动进入打包模式 } }, onUnload() { @@ -334,19 +337,37 @@ export default { isPageActive() { return this.pageActive !== false }, - /** 检测发布服务器上是否有新版本;有新版本则弹窗提示(不自动下载) */ + /** 检测发布服务器上是否有新版本;有新版本则弹窗提示(不自动下载)。 + * 检查更新优先于鉴权跳转:检测完成前自动进入打包模式被挂起, + * 有更新时弹窗,用户跳过/关闭后才继续跳转;无更新或检测失败则放行。 */ checkAppUpdate() { + console.log('[update] checkAppUpdate 开始, url =', appEnv.updateLatestUrl) if (!appEnv.updateLatestUrl) { + this.updateChecked = true + this.flushPendingAutoEnter() return } checkAppUpdate().then((info) => { + console.log('[update] 检测结果:', JSON.stringify(info), 'pageActive =', this.isPageActive()) + this.updateChecked = true if (!info || !this.isPageActive()) { + // 无更新 / 网络失败 / 页面已离开:放行挂起的鉴权跳转 + this.flushPendingAutoEnter() return } this.updateInfo = info this.updateDialogVisible = true + // 有更新:鉴权跳转继续挂起,直到用户在弹窗中跳过(可跳过时) }) }, + /** 更新检测完成后,若鉴权跳转被挂起则继续执行 */ + flushPendingAutoEnter() { + if (!this.pendingAutoEnter) { + return + } + this.pendingAutoEnter = false + this.autoEnterPackMode() + }, /** 点击“立即更新”:内置下载(带进度),完成后自动安装 */ startUpdateDownload() { const info = this.updateInfo @@ -386,7 +407,7 @@ export default { this.startUpdateDownload() } }, - /** 跳过更新:仅 canSkip===1 且未在下载/安装中时可点 */ + /** 跳过更新:仅 canSkip===1 且未在下载/安装中时可点;跳过后放行挂起的鉴权跳转 */ skipUpdate() { if (!this.updateInfo || this.updateInfo.canSkip !== 1) { return @@ -395,6 +416,7 @@ export default { return } this.updateDialogVisible = false + this.flushPendingAutoEnter() }, updatePercent() { const { received, total } = this.updateProgress @@ -1453,9 +1475,15 @@ export default { return } const storedToken = uni.getStorageSync('workbench_token') + console.log('[update][gate] autoEnterPackMode: updateChecked =', this.updateChecked, 'storedToken =', !!storedToken, 'pending =', this.pendingAutoEnter) if (!storedToken) { return } + // 检查更新优先:更新检测未完成时挂起鉴权跳转,待检测完成后由 flushPendingAutoEnter 继续 + if (!this.updateChecked) { + this.pendingAutoEnter = true + return + } this.hasStoredWorkbench = true this.clearAutoEnterPackTimer() // 延迟 500ms,期间再次确认 token 未被清除后再进入打包模式 @@ -1473,6 +1501,7 @@ export default { }, 500) }, doEnterPackMode(storedToken) { + console.log('[update][gate] doEnterPackMode 进入, updateChecked =', this.updateChecked) if (!this.isPageActive()) { return } @@ -1510,6 +1539,11 @@ export default { return } const storedToken = uni.getStorageSync('workbench_token') + // 检查更新优先:检测未完成时挂起,完成后继续 + if (!this.updateChecked) { + this.pendingAutoEnter = true + return + } this.doEnterPackMode(storedToken) }, chooseRebindWorkbench() {