feat(升级中心): 升级至 0.9.0 使用 dialogPage 实现需要 HBuilderX 4.31

pages.json

@@ -1233,6 +1233,15 @@
 			}
 		},
 		// #endif
+    // #ifdef APP-ANDROID || APP-IOS
+    {
+      "path" : "uni_modules/uni-upgrade-center-app/pages/uni-app-x/upgrade-popup",
+      "style" :
+      {
+        "navigationBarTitleText" : ""
+      }
+    },
+    // #endif
 		{
 			"path": "pages/tabBar/CSS",
 			"style": {

pages/tabBar/component.uvue

@@ -39,10 +39,6 @@
           </template>
         </uni-collapse-item>
       </uni-collapse>
-
-      <!-- #ifdef UNI-APP-X && APP -->
-      <uni-upgrade-center-app ref="upgradePopup" @show="upgradePopupShow" @close="upgradePopupClose" />
-      <!-- #endif -->
     </view>
   <!-- #ifdef APP -->
   </scroll-view>
@@ -80,19 +76,7 @@
         } else {
           uni.navigateTo({ url })
         }
-      },
-      // #ifdef UNI-APP-X && APP
-      upgradePopupShow() {
-        console.log('upgradePopup show');
-        if (!this.pageHiden) {
-          uni.hideTabBar()?.catch(_ => { })
-        }
-      }
-      , upgradePopupClose() {
-        console.log('upgradePopup close');
-        uni.showTabBar()?.catch(_ => { })
       }
-      // #endif
     },
     // #ifdef WEB
     watch: {
@@ -118,11 +102,11 @@
           if (res.needAuthorization) {
             uni.onPrivacyAuthorizationChange((res) => {
               if (!res.needAuthorization) {
-                checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
+                checkUpdate()
               }
             })
           } else {
-            checkUpdate(this.$refs['upgradePopup'] as UniUpgradeCenterAppComponentPublicInstance)
+            checkUpdate()
           }
         }
       })

uni_modules/uni-upgrade-center-app/changelog.md

+## 0.9.0（2024-10-30）
+- **重要更新** 在 uni-app x 项目中弃用之前弹窗方案使用[dialogPage](https://doc.dcloud.net.cn/uni-app-x/api/dialog-page.html)实现，需要 `HBuilderX 4.31+`
 ## 0.8.5（2024-10-26）
 - 优化 去除不必要代码
 ## 0.8.4（2024-10-26）

uni_modules/uni-upgrade-center-app/package.json

 {
   "id": "uni-upgrade-center-app",
   "displayName": "升级中心 uni-upgrade-center - App",
-  "version": "0.8.5",
+  "version": "0.9.0",
   "description": "uni升级中心 - 客户端检查更新",
   "keywords": [
     "uniCloud",

uni_modules/uni-upgrade-center-app/utils/call-check-version.ts

@@ -26,7 +26,7 @@ export type UniUpgradeCenterResult = {
 
 	type : string // "native_app" | "wgt"
 	store_list : StoreListItem[] | null
-	min_uni_version : string | null  // 升级 wgt 的最低 uni-app 版本
+	min_uni_version : string | null	// 升级 wgt 的最低 uni-app 版本
 }
 
 export default function () : Promise<UniUpgradeCenterResult> {
@@ -80,20 +80,20 @@ export default function () : Promise<UniUpgradeCenterResult> {
 					const code = res.result['code']
 					const codeIsNumber = ['Int', 'Long', 'number'].includes(typeof code)
 					if (codeIsNumber) {
-					  if ((code as number) == 0) {
-					    reject({
-					      code: res.result['code'],
-					      message: res.result['message']
-					    })
-					  } else if ((code as number) < 0) {
-					    reject({
-					      code: res.result['code'],
-					      message: res.result['message']
-					    })
-					  } else {
-              const result = JSON.parse<UniUpgradeCenterResult>(JSON.stringify(res.result)) as UniUpgradeCenterResult
-              resolve(result)
-            }
+						if ((code as number) == 0) {
+							reject({
+								code: res.result['code'],
+								message: res.result['message']
+							})
+						} else if ((code as number) < 0) {
+							reject({
+								code: res.result['code'],
+								message: res.result['message']
+							})
+						} else {
+							const result = JSON.parse<UniUpgradeCenterResult>(JSON.stringify(res.result)) as UniUpgradeCenterResult
+							resolve(result)
+						}
 					}
 				}).catch<void>((err : any | null) => {
 					const error = err as UniCloudError

uni_modules/uni-upgrade-center-app/utils/check-update.ts

@@ -6,13 +6,7 @@ import { openSchema } from '@/uni_modules/uts-openSchema'
 // 推荐再App.vue中使用
 const PACKAGE_INFO_KEY = '__package_info__'
 
-// uni-app 项目无法从 vue 中导出 ComponentPublicInstance 类型，故使用条件编译
-// #ifdef UNI-APP-X
-export default function (component : ComponentPublicInstance | null = null) : Promise<UniUpgradeCenterResult> {
-// #endif
-// #ifndef UNI-APP-X
 export default function () : Promise<UniUpgradeCenterResult> {
-// #endif
 	return new Promise<UniUpgradeCenterResult>((resolve, reject) => {
 		callCheckVersion().then(async (uniUpgradeCenterResult) => {
 			// NOTE uni-app x 3.96 解构有问题
@@ -20,65 +14,72 @@ export default function () : Promise<UniUpgradeCenterResult> {
 			const message = uniUpgradeCenterResult.message
 			const url = uniUpgradeCenterResult.url // 安装包下载地址
 
-        // 此处逻辑仅为示例，可自行编写
-        if (code > 0) {
-          // 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
-          const tcbRes = await uniCloud.getTempFileURL({ fileList: [url] });
-          if (typeof tcbRes.fileList[0].tempFileURL !== 'undefined') uniUpgradeCenterResult.url = tcbRes.fileList[0].tempFileURL;
+				// 此处逻辑仅为示例，可自行编写
+				if (code > 0) {
+					// 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
+					const tcbRes = await uniCloud.getTempFileURL({ fileList: [url] });
+					if (typeof tcbRes.fileList[0].tempFileURL !== 'undefined') uniUpgradeCenterResult.url = tcbRes.fileList[0].tempFileURL;
 
-          /**
-           * 提示升级一
-           * 使用 uni.showModal
-           */
-          // return updateUseModal(uniUpgradeCenterResult)
+					/**
+					 * 提示升级一
+					 * 使用 uni.showModal
+					 */
+					// return updateUseModal(uniUpgradeCenterResult)
 
-          // #ifndef UNI-APP-X
-          // 静默更新，只有wgt有
-          if (uniUpgradeCenterResult.is_silently) {
-            uni.downloadFile({
-              url,
-              success: res => {
-                if (res.statusCode == 200) {
-                  // 下载好直接安装，下次启动生效
-                  plus.runtime.install(res.tempFilePath, {
-                    force: false
-                  });
-                }
-              }
-            });
-            return;
-          }
-          // #endif
+					// #ifndef UNI-APP-X
+					// 静默更新，只有wgt有
+					if (uniUpgradeCenterResult.is_silently) {
+						uni.downloadFile({
+							url,
+							success: res => {
+								if (res.statusCode == 200) {
+									// 下载好直接安装，下次启动生效
+									plus.runtime.install(res.tempFilePath, {
+										force: false
+									});
+								}
+							}
+						});
+						return;
+					}
+					// #endif
 
-          /**
-           * 提示升级二
-           * 官方适配的升级弹窗，可自行替换资源适配UI风格
-           */
-          // #ifndef UNI-APP-X
-          uni.setStorageSync(PACKAGE_INFO_KEY, uniUpgradeCenterResult)
-          uni.navigateTo({
-            url: `/uni_modules/uni-upgrade-center-app/pages/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
-            fail: (err) => {
-              console.error('更新弹框跳转失败', err)
-              uni.removeStorageSync(PACKAGE_INFO_KEY)
-            }
+					/**
+					 * 提示升级二
+					 * 官方适配的升级弹窗，可自行替换资源适配UI风格
+					 */
+					uni.setStorageSync(PACKAGE_INFO_KEY, uniUpgradeCenterResult)
+					// #ifndef UNI-APP-X
+					uni.navigateTo({
+						url: `/uni_modules/uni-upgrade-center-app/pages/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
+						fail: (err) => {
+							console.error('更新弹框跳转失败', err)
+							uni.removeStorageSync(PACKAGE_INFO_KEY)
+						}
+					})
+					// #endif
+					// #ifdef UNI-APP-X
+          uni.openDialogPage({
+            url: `/uni_modules/uni-upgrade-center-app/pages/uni-app-x/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
+            disableEscBack: true,
+                fail: (err) => {
+                  console.error('更新弹框跳转失败', err)
+                  uni.removeStorageSync(PACKAGE_INFO_KEY)
+                }
           })
-          // #endif
-          // #ifdef UNI-APP-X
-          component?.$callMethod('show', true, uniUpgradeCenterResult)
-          // #endif
+					// #endif
 
-          return resolve(uniUpgradeCenterResult)
-        } else if (code < 0) {
-          console.error(message)
-          return reject(uniUpgradeCenterResult)
-        }
-        return resolve(uniUpgradeCenterResult)
-      }).catch((err) => {
-        reject(err)
-      })
-    });
-  }
+					return resolve(uniUpgradeCenterResult)
+				} else if (code < 0) {
+					console.error(message)
+					return reject(uniUpgradeCenterResult)
+				}
+				return resolve(uniUpgradeCenterResult)
+			}).catch((err) => {
+				reject(err)
+			})
+		});
+	}
 
 /**
  * 使用 uni.showModal 升级
@@ -104,13 +105,13 @@ function updateUseModal(packageInfo : UniUpgradeCenterResult) : void {
 	let confirmText = '立即下载更新'
 	// #endif
 
-    return uni.showModal({
-      title,
-      content: contents,
-      showCancel: !is_mandatory,
-      confirmText,
-      success: res => {
-        if (res.cancel) return;
+		return uni.showModal({
+			title,
+			content: contents,
+			showCancel: !is_mandatory,
+			confirmText,
+			success: res => {
+				if (res.cancel) return;
 
 			if (isiOS) {
 				// iOS 平台跳转 AppStore
@@ -123,10 +124,10 @@ function updateUseModal(packageInfo : UniUpgradeCenterResult) : void {
 				return;
 			}
 
-        uni.showToast({
-          title: '后台下载中……',
-          duration: 1000
-        });
+				uni.showToast({
+					title: '后台下载中……',
+					duration: 1000
+				});
 
 			// wgt 和 安卓下载更新
 			uni.downloadFile({
@@ -137,7 +138,7 @@ function updateUseModal(packageInfo : UniUpgradeCenterResult) : void {
 						return;
 					}
 					// 下载好直接安装，下次启动生效
-          // uni-app x 项目没有 plus5+ 故使用条件编译
+					// uni-app x 项目没有 plus5+ 故使用条件编译
 					// #ifndef UNI-APP-X
 					plus.runtime.install(res.tempFilePath, {
 						force: false
@@ -166,23 +167,23 @@ function updateUseModal(packageInfo : UniUpgradeCenterResult) : void {
 					});
 					// #endif
 
-          // #ifdef UNI-APP-X
-          uni.installApk({
-          	filePath: res.tempFilePath,
-          	success: () => {
-          		uni.showModal({
-          			title: '安装成功请手动重启'
-          		});
-          	},
-          	fail: err => {
-          		uni.showModal({
-          			title: '更新失败',
-          			content: err.errMsg,
-          			showCancel: false
-          		});
-          	}
-          });
-          // #endif
+					// #ifdef UNI-APP-X
+					uni.installApk({
+						filePath: res.tempFilePath,
+						success: () => {
+							uni.showModal({
+								title: '安装成功请手动重启'
+							});
+						},
+						fail: err => {
+							uni.showModal({
+								title: '更新失败',
+								content: err.errMsg,
+								showCancel: false
+							});
+						}
+					});
+					// #endif
 				}
 			});
 		}