From ae20f7998d99fc569e382297223d38ea57daf3f7 Mon Sep 17 00:00:00 2001
From: DCloud_LXH <283700113@qq.com>
Date: Sun, 28 Apr 2024 16:49:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uni-upgrade-center-app/changelog.md           | 7 +++++++
 .../uni-upgrade-center-app/uni-upgrade-center-app.uvue    | 4 ++--
 uni_modules/uni-upgrade-center-app/package.json           | 7 ++++---
 .../uni-upgrade-center-app/pages/upgrade-popup.vue        | 4 ++++
 .../uni-upgrade-center-app/utils/call-check-version.ts    | 5 ++---
 uni_modules/uts-progressNotification/changelog.md         | 2 ++
 uni_modules/uts-progressNotification/package.json         | 2 +-
 .../utssdk/app-android/TransparentActivity.uts            | 2 +-
 .../utssdk/app-android/callbacks.uts                      | 4 ++++
 .../uts-progressNotification/utssdk/app-android/index.uts | 8 ++++----
 10 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 uni_modules/uts-progressNotification/utssdk/app-android/callbacks.uts

diff --git a/uni_modules/uni-upgrade-center-app/changelog.md b/uni_modules/uni-upgrade-center-app/changelog.md
index 68a219dc..555df080 100644
--- a/uni_modules/uni-upgrade-center-app/changelog.md
+++ b/uni_modules/uni-upgrade-center-app/changelog.md
@@ -1,3 +1,10 @@
+## 0.8.1（2024-04-28）
+- 修复 在 HX 4.0.3+ uni-app x 项目运行到 Android 调不起安装的Bug
+## 0.8.0（2024-04-15）
+- 修复 更新弹窗 data 中新增初始化字段
+## 0.7.9（2024-03-15）
+- 移除无用代码
+- 调整 is_silently 类型为可为 null
 ## 0.7.8（2024-01-04）
 - 新增 移除无用代码
 ## 0.7.7（2024-01-04）
diff --git a/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue b/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
index 58e2a0ae..6ad28105 100644
--- a/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
+++ b/uni_modules/uni-upgrade-center-app/components/uni-upgrade-center-app/uni-upgrade-center-app.uvue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-  import { openSchema as utsOpenSchema } from '@/uni_modules/uts-openSchema'
+	import { openSchema as utsOpenSchema } from '@/uni_modules/uts-openSchema'
   import { createNotificationProgress, cancelNotificationProgress, finishNotificationProgress } from '@/uni_modules/uts-progressNotification'
   import { type CreateNotificationProgressOptions, type FinishNotificationProgressOptions } from '@/uni_modules/uts-progressNotification/utssdk/interface.uts'
 	import { UniUpgradeCenterResult, StoreListItem } from '../../utils/call-check-version'
@@ -72,7 +72,7 @@
 	let downloadTask : DownloadTask | null = null;
 	let openSchemePromise: Promise<boolean> | null = null;
 
-  const openSchema = (url: string): Promise<boolean> => new Promise<boolean>((resolve,reject) =>{
+	const openSchema = (url: string): Promise<boolean> => new Promise<boolean>((resolve,reject) =>{
     try{
       utsOpenSchema(url)
       resolve(true)
diff --git a/uni_modules/uni-upgrade-center-app/package.json b/uni_modules/uni-upgrade-center-app/package.json
index 9bb2c603..e647f39c 100644
--- a/uni_modules/uni-upgrade-center-app/package.json
+++ b/uni_modules/uni-upgrade-center-app/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-upgrade-center-app",
   "displayName": "升级中心 uni-upgrade-center - App",
-  "version": "0.7.8",
+  "version": "0.8.1",
   "description": "uni升级中心 - 客户端检查更新",
   "keywords": [
     "uniCloud",
@@ -11,7 +11,7 @@
 ],
   "repository": "https://gitee.com/dcloud/uni-upgrade-center/tree/master/uni_modules/uni-upgrade-center-app",
   "engines": {
-    "HBuilderX": "^3.97"
+    "HBuilderX": "^4.03"
   },
 "dcloudext": {
     "sale": {
@@ -43,7 +43,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "y"
       },
       "client": {
         "App": {
diff --git a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
index 4cfdaf10..86fba100 100644
--- a/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
+++ b/uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue
@@ -139,7 +139,11 @@
 				// 默认安装包信息
 				title: '更新日志',
 				contents: '',
+				version: '',
 				is_mandatory: false,
+				url: '',
+				platform: [],
+				store_list: null,
 
 				// 可自定义属性
 				subTitle: '发现新版本',
diff --git a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
index 72ef019d..4a0af00f 100644
--- a/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
+++ b/uni_modules/uni-upgrade-center-app/utils/call-check-version.ts
@@ -18,7 +18,7 @@ export type UniUpgradeCenterResult = {
 	uni_platform : string // "android" | "ios" // 版本号 1.0.0
 	stable_publish : boolean // 是否是稳定版
 	is_mandatory : boolean // 是否强制更新
-	is_silently : boolean	// 是否静默更新
+	is_silently : boolean | null	// 是否静默更新
 	create_env : string // "upgrade-center"
 	create_date : number
 	message : string
@@ -77,7 +77,6 @@ export default function () : Promise<UniUpgradeCenterResult> {
 					name: 'uni-upgrade-center',
 					data: data
 				}).then(res => {
-          console.log('res: ',res);
 					const code = res.result['code']
 					const codeIsNumber = ['Int', 'Long', 'number'].includes(typeof code)
 					if (codeIsNumber) {
@@ -86,7 +85,7 @@ export default function () : Promise<UniUpgradeCenterResult> {
 					      code: res.result['code'],
 					      message: res.result['message']
 					    })
-					  } else if (code < 0) {
+					  } else if ((code as number) < 0) {
 					    reject({
 					      code: res.result['code'],
 					      message: res.result['message']
diff --git a/uni_modules/uts-progressNotification/changelog.md b/uni_modules/uts-progressNotification/changelog.md
index d326a915..8f90d3db 100644
--- a/uni_modules/uts-progressNotification/changelog.md
+++ b/uni_modules/uts-progressNotification/changelog.md
@@ -1,3 +1,5 @@
+## 1.1.0（2024-03-08）
+修复uniapp打包报错问题
 ## 1.0.9（2024-02-29）
 去除代码过时警告
 ## 1.0.8（2023-12-21）
diff --git a/uni_modules/uts-progressNotification/package.json b/uni_modules/uts-progressNotification/package.json
index e5f75a2c..d3a6dcc4 100644
--- a/uni_modules/uts-progressNotification/package.json
+++ b/uni_modules/uts-progressNotification/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uts-progressNotification",
   "displayName": "uts-progressNotification",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "uts-progressNotification",
   "keywords": [
     "uts-progressNotification"
diff --git a/uni_modules/uts-progressNotification/utssdk/app-android/TransparentActivity.uts b/uni_modules/uts-progressNotification/utssdk/app-android/TransparentActivity.uts
index edbf05fa..19678999 100644
--- a/uni_modules/uts-progressNotification/utssdk/app-android/TransparentActivity.uts
+++ b/uni_modules/uts-progressNotification/utssdk/app-android/TransparentActivity.uts
@@ -4,7 +4,7 @@ import Build from 'android.os.Build';
 import View from 'android.view.View';
 import Color from 'android.graphics.Color';
 import WindowManager from 'android.view.WindowManager';
-import { globalNotificationProgressFinishCallBack, globalNotificationProgressCallBack } from './index.uts';
+import { globalNotificationProgressFinishCallBack, globalNotificationProgressCallBack } from './callbacks.uts';
 import { ACTION_DOWNLOAD_FINISH, ACTION_DOWNLOAD_PROGRESS } from "./constant.uts"
 
 
diff --git a/uni_modules/uts-progressNotification/utssdk/app-android/callbacks.uts b/uni_modules/uts-progressNotification/utssdk/app-android/callbacks.uts
new file mode 100644
index 00000000..410adf66
--- /dev/null
+++ b/uni_modules/uts-progressNotification/utssdk/app-android/callbacks.uts
@@ -0,0 +1,4 @@
+
+
+export let globalNotificationProgressCallBack : (() => void) | null = () => { }
+export let globalNotificationProgressFinishCallBack = () => { }
diff --git a/uni_modules/uts-progressNotification/utssdk/app-android/index.uts b/uni_modules/uts-progressNotification/utssdk/app-android/index.uts
index 39d14cd5..0782f616 100644
--- a/uni_modules/uts-progressNotification/utssdk/app-android/index.uts
+++ b/uni_modules/uts-progressNotification/utssdk/app-android/index.uts
@@ -8,7 +8,8 @@ import ComponentName from 'android.content.ComponentName';
 import PendingIntent from 'android.app.PendingIntent';
 import { CreateNotificationProgressOptions, FinishNotificationProgressOptions } from '../interface.uts';
 import { ACTION_DOWNLOAD_FINISH, ACTION_DOWNLOAD_PROGRESS } from "./constant.uts"
-
+
+import { globalNotificationProgressFinishCallBack, globalNotificationProgressCallBack } from './callbacks.uts';
 
 export { TransparentActivity } from './TransparentActivity.uts';
 
@@ -26,8 +27,7 @@ let histroyProgress = 0
 
 let isProgress = false
 
-export let globalNotificationProgressCallBack : (() => void) | null = () => { }
-export let globalNotificationProgressFinishCallBack = () => { }
+
 
 export function createNotificationProgress(options : CreateNotificationProgressOptions) : void {
 	const { content, progress, onClick } = options
@@ -156,4 +156,4 @@ function getAppName(context : Context) : string {
 		e.printStackTrace()
 	}
 	return appName
-}
\ No newline at end of file
+}
-- 
GitLab