stellar-ui-v2 1.40.33 → 1.40.34

package/components/ste-app-update/README.md

@@ -2,14 +2,16 @@
 
 - 此组件用于APP更新功能
 - 仅支持APP端
+- 支持整包升级(apk)和资源包升级(wgt)
 
----$
+---
 
 ### 基础用法
 
 - 属性`clientId`用于设置APP的应用编码
 - 属性`clientSecret`用于设置APP的应用密钥
 - 属性`fallbackApiUrl`用于设置兜底检查接口地址
+- 属性`strictVersionCheck`用于设置严格版本检查模式
 - 函数`start`用于开始检查更新
 - 函数`getSkippedVersions`用于获取跳过版本列表
 - 函数`clearSkippedVersions`用于清空跳过版本记录
@@ -59,6 +61,7 @@ export default {
         clientId="workbench_android" 
         clientSecret="gkS6lEEncqAocYK2qsrvPQZykm3ISeMx"
         fallbackApiUrl="https://example.com/api/app-update/check"
+        :strictVersionCheck="true"
         @skip-version="onSkipVersion"
         @fallback="onFallback"
     ></ste-app-update>
@@ -68,7 +71,7 @@ export default {
 </template>
 ```
 
----$
+---
 
 ### API
 
@@ -82,7 +85,8 @@ export default {
 | `btnText`			| 立即体验按钮文本											| `string`					| `立即体验`																																			| -			| -				|
 | `appVersion`	| 应用当前版本															| `string`					| -																																								| -			| `1.40.9`|
 | `zIndex`			| 弹窗层级																		| `string/number`	| `998`																																							| -			| `1.40.9`|
-| `fallbackApiUrl`| 兜底检查接口地址										| `string`					| -																																								| -			| `1.41.0`|
+| `fallbackApiUrl`| 兜底检查接口地址										| `string`					| `https://stellar-public-prd.intecloud.com.cn/api/app-update/check`			| -			| `1.41.0`|
+| `strictVersionCheck`| 严格版本检查，设为true时只有新版本大于当前版本才触发更新 | `boolean` | `false` | `true/false` | - |
 
 
 #### Events
@@ -101,7 +105,50 @@ export default {
 | `start(callback)` | 开始检查更新 | - | - |
 | `getSkippedVersions()` | 获取已跳过的版本列表 | string[] | `1.41.0` |
 | `clearSkippedVersions()` | 清空跳过版本记录 | - | `1.41.0` |
+| `cancelDownload()` | 取消当前下载任务 | - | - |
+| `install()` | 安装已下载的更新包（仅整包升级时可用） | - | - |
 
 
----$
-{{xuyajun}}
+---
+
+### API 返回数据格式
+
+更新接口(`apiUrl`)返回数据格式：
+
+```json
+{
+  "code": 200,
+  "data": {
+    "code": "101",
+    "name": "1.0.1",
+    "desc": "更新内容描述",
+    "isForce": false,
+    "entireFile": "https://example.com/app.apk",
+    "updateFile": "https://example.com/app.wgt"
+  }
+}
+```
+
+| 字段 | 类型 | 说明 |
+| ----- | ----- | ----- |
+| `code` | string | 版本号 |
+| `name` | string | 版本名称 |
+| `desc` | string | 更新内容描述 |
+| `isForce` | boolean | 是否强制更新 |
+| `entireFile` | string | 整包升级文件地址(apk) |
+| `updateFile` | string | 资源包升级文件地址(wgt) |
+
+> 当 `entireFile` 存在时，优先使用整包升级(`package_type=0`)，否则使用资源包升级(`package_type=1`)
+
+---
+
+### 更新流程说明
+
+1. 调用 `start()` 方法开始检查更新
+2. 先检查兜底接口(`fallbackApiUrl`)，命中则触发兜底更新流程
+3. 调用正常更新接口(`apiUrl`)获取版本信息
+4. 检查是否已跳过该版本
+5. 检查版本是否需要更新（根据 `strictVersionCheck` 决定比较方式）
+6. 检查是否存在未完成的下载任务，有则恢复下载
+7. 弹出更新弹窗，用户可选择立即更新、跳过版本或取消
+8. 下载完成后自动安装(wgt)或提示安装(apk)

package/components/ste-app-update/method.js

@@ -1,8 +1,9 @@
-export function download(data, { success, error, onProgressUpdate, downloadSuccess }) {
-	const package_type = data.package_type;
-	let timeout;
+export function download(data, options) {
+	const success = options.success;
+	const error = options.error;
+	const downloadSuccess = options.downloadSuccess;
+	const onProgressUpdate = options.onProgressUpdate;
 
-	// 参数验证
 	if (!data.updateFile) {
 		const errorMsg = '更新文件地址不能为空';
 		uni.showToast({ title: errorMsg, icon: 'none' });
@@ -10,13 +11,111 @@ export function download(data, { success, error, onProgressUpdate, downloadSucce
 		throw new Error(errorMsg);
 	}
 
+	const package_type = data.package_type;
+
+	// #ifdef APP-PLUS
+	let timeout;
+
+	const task = plus.downloader.createDownload(
+		data.updateFile,
+		{
+			filename: '_downloads/stellar_update/',
+		},
+		function(download, status) {
+			clearTimeout(timeout);
+
+			if (status === 200) {
+				if (!download.filename) {
+					const errorMsg = '下载文件路径为空';
+					uni.showToast({ title: errorMsg, icon: 'none' });
+					error && error(new Error(errorMsg));
+					return;
+				}
+
+				downloadSuccess && downloadSuccess(download.filename);
+
+				plus.runtime.install(
+					download.filename,
+					{ force: true },
+					function() {
+						if (package_type == 1) {
+							uni.showModal({
+								title: '提示',
+								content: '升级成功，请重新启动！',
+								confirmText: '确定',
+								showCancel: false,
+								success: function() {
+									success && success();
+									plus.runtime.restart();
+								},
+							});
+						} else {
+							success && success();
+						}
+					},
+					function(e) {
+						const errorMsg = e.message || '安装失败';
+						uni.showModal({
+							title: '提示',
+							content: errorMsg,
+							showCancel: false,
+							success: function() {
+								error && error(e);
+							},
+						});
+					}
+				);
+			} else {
+				const errorMsg = '下载失败，状态码：' + status;
+				uni.showToast({ title: errorMsg, icon: 'none' });
+				error && error(new Error(errorMsg));
+			}
+		}
+	);
+
+	task.addEventListener('statechanged', function(download) {
+		if (download.state === 3 && download.totalSize > 0) {
+			const progress = Math.round((download.downloadedSize / download.totalSize) * 100);
+			onProgressUpdate && onProgressUpdate({
+				progress: progress,
+				totalBytesWritten: download.downloadedSize,
+				totalBytesExpectedToWrite: download.totalSize,
+			});
+
+			clearTimeout(timeout);
+			timeout = setTimeout(function() {
+				task.abort();
+				const errorMsg = '下载超时，请检查网络连接';
+				uni.showToast({ title: errorMsg, icon: 'none' });
+				error && error(new Error(errorMsg));
+			}, 300000);
+		}
+
+		if (download.state === 4 || download.state === -1) {
+			clearTimeout(timeout);
+		}
+	});
+
+	timeout = setTimeout(function() {
+		task.abort();
+		const errorMsg = '下载超时，请检查网络连接';
+		uni.showToast({ title: errorMsg, icon: 'none' });
+		error && error(new Error(errorMsg));
+	}, 300000);
+
+	task.start();
+	return task;
+	// #endif
+
+	// #ifndef APP-PLUS
+	let timeoutFallback;
+
 	const downloadTask = uni.downloadFile({
 		url: data.updateFile,
-		success: (res) => {
-			clearTimeout(timeout);
+		success: function(res) {
+			clearTimeout(timeoutFallback);
 
 			if (res.statusCode === 200) {
-				// 文件完整性检查
 				if (!res.tempFilePath) {
 					const errorMsg = '下载文件路径为空';
 					uni.showToast({ title: errorMsg, icon: 'none' });
@@ -29,70 +128,63 @@ export function download(data, { success, error, onProgressUpdate, downloadSucce
 				plus.runtime.install(
 					res.tempFilePath,
 					{ force: true },
-					() => {
-						// wgt升级
+					function() {
 						if (package_type == 1) {
 							uni.showModal({
 								title: '提示',
 								content: '升级成功，请重新启动！',
 								confirmText: '确定',
 								showCancel: false,
-								success: () => {
+								success: function() {
 									success && success();
 									plus.runtime.restart();
 								},
 							});
 						} else {
-							// 整包升级
 							success && success();
 						}
 					},
-					(e) => {
-						// 提示部分wgt包无法安装的问题
+					function(e) {
 						const errorMsg = e.message || '安装失败';
 						uni.showModal({
 							title: '提示',
 							content: errorMsg,
 							showCancel: false,
-							success: () => {
+							success: function() {
 								error && error(e);
 							},
 						});
 					}
 				);
 			} else {
-				const errorMsg = `下载失败，状态码：${res.statusCode}`;
+				const errorMsg = '下载失败，状态码：' + res.statusCode;
 				uni.showToast({ title: errorMsg, icon: 'none' });
 				error && error(new Error(errorMsg));
 			}
 		},
-		fail: (err) => {
-			clearTimeout(timeout);
-			const errorMsg = `网络请求失败：${err.errMsg || '未知错误'}`;
+		fail: function(err) {
+			clearTimeout(timeoutFallback);
+			const errorMsg = '网络请求失败：' + (err.errMsg || '未知错误');
 			uni.showToast({ title: errorMsg, icon: 'none' });
 			error && error(err);
-		}
+		},
 	});
 
-	// 下载进度监控
-	downloadTask.onProgressUpdate((res) => {
-		// 添加进度验证
+	downloadTask.onProgressUpdate(function(res) {
 		if (res.progress >= 0 && res.progress <= 100) {
 			onProgressUpdate && onProgressUpdate(res);
 		}
 
-		// 重置超时计时器
-		clearTimeout(timeout);
-		timeout = setTimeout(() => {
+		clearTimeout(timeoutFallback);
+		timeoutFallback = setTimeout(function() {
 			downloadTask.abort();
 			const errorMsg = '下载超时，请检查网络连接';
 			uni.showToast({ title: errorMsg, icon: 'none' });
 			error && error(new Error(errorMsg));
-		}, 300000); // 5分钟超时
+		}, 300000);
 	});
 
-	// 初始超时设置
-	timeout = setTimeout(() => {
+	timeoutFallback = setTimeout(function() {
 		downloadTask.abort();
 		const errorMsg = '下载超时，请检查网络连接';
 		uni.showToast({ title: errorMsg, icon: 'none' });
@@ -100,6 +192,7 @@ export function download(data, { success, error, onProgressUpdate, downloadSucce
 	}, 300000);
 
 	return downloadTask;
+	// #endif
 }
 
 // 获取设备唯一标识
@@ -144,3 +237,70 @@ export const getVersion = (appVersion) => {
 		}
 	});
 };
+
+const DOWNLOAD_STATE_KEY = 'app_update_download_state';
+export const DOWNLOAD_TIMEOUT = 30 * 60 * 1000;
+
+export const saveDownloadState = (state) => {
+	try {
+		uni.setStorageSync(DOWNLOAD_STATE_KEY, JSON.stringify(state));
+	} catch (e) {
+		console.warn('保存下载状态失败:', e);
+	}
+};
+
+export const getDownloadState = () => {
+	try {
+		const stored = uni.getStorageSync(DOWNLOAD_STATE_KEY);
+		if (stored) {
+			return JSON.parse(stored);
+		}
+	} catch (e) {
+		console.warn('读取下载状态失败:', e);
+	}
+	return null;
+};
+
+export const clearDownloadState = () => {
+	try {
+		uni.removeStorageSync(DOWNLOAD_STATE_KEY);
+	} catch (e) {
+		console.warn('清除下载状态失败:', e);
+	}
+};
+
+export const isDownloadStateExpired = (state) => {
+	return Date.now() - state.startTime > DOWNLOAD_TIMEOUT;
+};
+
+export const findExistingDownloadTask = (url) => {
+	return new Promise(function(resolve) {
+		// #ifdef APP-PLUS
+		plus.downloader.enumerate(function(tasks) {
+			if (!tasks || !tasks.length) {
+				resolve(null);
+				return;
+			}
+			for (let i = tasks.length - 1; i >= 0; i--) {
+				const task = tasks[i];
+				if (task.url === url) {
+					if (task.state === 0 || task.state === 1 || task.state === 2 || task.state === 3 || task.state === 4) {
+						resolve({ task: task, state: task.state, filename: task.filename || '' });
+						return;
+					}
+					if (task.state === -1) {
+						try {
+							task.abort();
+						} catch (_) {}
+					}
+					break;
+				}
+			}
+			resolve(null);
+		});
+		// #endif
+		// #ifndef APP-PLUS
+		resolve(null);
+		// #endif
+	});
+};

package/components/ste-app-update/ste-app-update.vue

@@ -39,7 +39,7 @@
 	</view>
 </template>
 <script>
-import { download, getDeviceId, getPlatform, getAppId, getVersion } from './method';
+import { download, getDeviceId, getPlatform, getAppId, getVersion, saveDownloadState, getDownloadState, clearDownloadState, isDownloadStateExpired, findExistingDownloadTask } from './method';
 
 const STORAGE_KEY = 'skipped_app_versions';
 
@@ -86,6 +86,11 @@ export default {
 			type: String,
 			default: 'https://stellar-public-prd.intecloud.com.cn/api/app-update/check',
 		},
+		/** 严格版本检查，设为true时只有新版本大于当前版本才触发更新 */
+		strictVersionCheck: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -107,6 +112,9 @@ export default {
 			skippedVersions: [], // 跳过的版本列表
 			timeoutTimer: null, // 超时计时器
 			downloadTask: null, // 下载任务引用
+			nativeDownloadTask: null, // 原生下载任务引用
+			nativeDownloadListener: null, // 原生下载监听器
+			progressPollTimer: null, // 进度轮询计时器
 		};
 	},
 	methods: {
@@ -134,6 +142,19 @@ export default {
 		isVersionSkipped(versionCode) {
 			return this.skippedVersions.includes(versionCode);
 		},
+		// 版本比较函数
+		compareVersions(newVersion, currentVersion) {
+			const newParts = newVersion.split('.').map(function(v) { return parseInt(v) || 0; });
+			const currentParts = currentVersion.split('.').map(function(v) { return parseInt(v) || 0; });
+			const maxLength = Math.max(newParts.length, currentParts.length);
+			for (let i = 0; i < maxLength; i++) {
+				const newPart = newParts[i] || 0;
+				const currentPart = currentParts[i] || 0;
+				if (newPart > currentPart) return 1;
+				if (newPart < currentPart) return -1;
+			}
+			return 0;
+		},
 		// 跳过当前版本
 		skipVersion() {
 			if (!this.data.code) return;
@@ -152,7 +173,100 @@ export default {
 				clearTimeout(this.timeoutTimer);
 				this.timeoutTimer = null;
 			}
+			this.stopProgressPolling();
+			// #ifdef APP-PLUS
+			if (this.nativeDownloadTask && this.nativeDownloadListener) {
+				try {
+					this.nativeDownloadTask.removeEventListener('statechanged', this.nativeDownloadListener);
+				} catch (_) {}
+			}
+			// #endif
 			this.downloadTask = null;
+			this.nativeDownloadTask = null;
+			this.nativeDownloadListener = null;
+		},
+		// 停止进度轮询
+		stopProgressPolling() {
+			if (this.progressPollTimer) {
+				clearInterval(this.progressPollTimer);
+				this.progressPollTimer = null;
+			}
+		},
+		// 恢复下载进度
+		resumeDownloadProgress(task) {
+			// #ifdef APP-PLUS
+			if (this.nativeDownloadTask && this.nativeDownloadListener) {
+				this.nativeDownloadTask.removeEventListener('statechanged', this.nativeDownloadListener);
+			}
+			this.stopProgressPolling();
+
+			this.nativeDownloadTask = task;
+
+			var self = this;
+			var updateProgress = function() {
+				if (task.downloadedSize !== undefined && task.totalSize > 0) {
+					self.percent = Math.round((task.downloadedSize / task.totalSize) * 100);
+					self.downloadedSize = (task.downloadedSize / Math.pow(1024, 2)).toFixed(2);
+					self.packageFileSize = (task.totalSize / Math.pow(1024, 2)).toFixed(2);
+				}
+			};
+			updateProgress();
+
+			this.nativeDownloadListener = function(download) {
+				if (download.state === 4) {
+					self.stopProgressPolling();
+					self.percent = 100;
+					self.downloadedSize = self.packageFileSize;
+					self.tempFilePath = download.filename;
+					if (self.open && self.data.package_type === 1 && download.filename) {
+						self.installWgt(download.filename);
+					}
+				} else if (download.state === -1) {
+					self.stopProgressPolling();
+					self.updateBtn = true;
+					clearDownloadState();
+					self.cleanup();
+				}
+			};
+
+			task.addEventListener('statechanged', this.nativeDownloadListener);
+
+			if (task.state === 3) {
+				this.progressPollTimer = setInterval(updateProgress, 500);
+			}
+
+			if (task.state === 0) {
+				task.start();
+			}
+			// #endif
+		},
+		// 安装wgt包
+		installWgt(filePath) {
+			// #ifdef APP-PLUS
+			plus.runtime.install(
+				filePath,
+				{ force: true },
+				function() {
+					uni.showModal({
+						title: '提示',
+						content: '升级成功，请重新启动！',
+						confirmText: '确定',
+						showCancel: false,
+						success: function() {
+							clearDownloadState();
+							plus.runtime.restart();
+						},
+					});
+				},
+				function(e) {
+					uni.showModal({
+						title: '安装失败',
+						content: e.message || '安装过程中出现错误',
+						showCancel: false,
+					});
+				}
+			);
+			// #endif
 		},
 		// 获取跳过版本列表
 		getSkippedVersions() {
@@ -237,7 +351,7 @@ export default {
 				header: {
 					Authorization: `Basic ${btoa(this.clientId + ':' + this.clientSecret)}`,
 				},
-				success: (res) => {
+				success: async (res) => {
 					try {
 						const _data = res.data;
 						if (_data.code == 200 && _data.data) {
@@ -278,7 +392,40 @@ export default {
 								nvs.splice(nvs.length - 1);
 								this.data.name = nvs.join('.');
 							}
-							if (this.data.updateFile && this.data.code !== this.version) {
+							const shouldUpdate = this.strictVersionCheck
+								? this.compareVersions(this.data.name, this.version) > 0
+								: this.data.code !== this.version;
+							if (this.data.updateFile && shouldUpdate) {
+								const downloadState = getDownloadState();
+								const hasValidDownloadState = downloadState
+									&& downloadState.versionCode === this.data.code
+									&& downloadState.updateFile === this.data.updateFile
+									&& !isDownloadStateExpired(downloadState);
+
+								if (hasValidDownloadState) {
+									const existing = await findExistingDownloadTask(this.data.updateFile);
+
+									if (existing) {
+										this.open = true;
+										this.$emit('update');
+										if (existing.state === 0 || existing.state === 1 || existing.state === 2 || existing.state === 3) {
+											this.updateBtn = false;
+											this.resumeDownloadProgress(existing.task);
+										} else if (existing.state === 4) {
+											this.updateBtn = false;
+											this.tempFilePath = existing.filename;
+											if (this.data.package_type === 1 && existing.filename) {
+												this.installWgt(existing.filename);
+											}
+										}
+										return;
+									}
+								}
+
+								if (downloadState) {
+									clearDownloadState();
+								}
+
 								this.open = true;
 								this.$emit('update');
 								// 如果是强制更新，直接开始下载
@@ -330,7 +477,7 @@ export default {
 			}
 		},
 
-		confirm() {
+		async confirm() {
 			// 先清理之前的任务
 			this.cleanup();
 
@@ -340,6 +487,20 @@ export default {
 				return;
 			}
 
+			// #ifdef APP-PLUS
+			var self = this;
+			var stale = await findExistingDownloadTask(this.data.updateFile);
+			if (stale) {
+				try { stale.task.abort(); } catch (_) {}
+			}
+			// #endif
+
+			saveDownloadState({
+				versionCode: this.data.code,
+				updateFile: this.data.updateFile,
+				startTime: Date.now(),
+			});
+
 			if (this.data.package_type == 0) {
 				// apk整包升级 下载地址必须以.apk结尾
 				if (this.data.updateFile.includes('.apk')) {
@@ -349,9 +510,11 @@ export default {
 						downloadSuccess: (path) => (this.tempFilePath = path),
 						error: () => {
 							this.updateBtn = true;
+							clearDownloadState();
 							this.cleanup();
 						},
 						success: () => {
+							clearDownloadState();
 							this.cleanup();
 						},
 					});
@@ -370,9 +533,11 @@ export default {
 					downloadSuccess: (path) => (this.tempFilePath = path),
 					error: () => {
 						this.updateBtn = true;
+						clearDownloadState();
 						this.cleanup();
 					},
 					success: () => {
+						clearDownloadState();
 						this.cleanup();
 					},
 				});
@@ -430,6 +595,7 @@ export default {
 						if (this.downloadTask) {
 							this.downloadTask.abort();
 						}
+						clearDownloadState();
 						this.cleanup();
 						this.updateBtn = true;
 						this.percent = 0;