From 181d55d4719d79f764c6a385ae93a586303e6881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Fri, 11 Apr 2025 15:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(push):=20=E4=BF=AE=E5=A4=8D=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BB=A4=E7=89=8C=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GlobalValue 中添加 AccountManager 导入并调用 refreshPushToken 方法
- 在 AccountManager 中实现 refreshPushToken 方法，用于刷新推送令牌
- 更新 EnvManagerView 中的环境切换逻辑，移除不必要的日志输出
- 调整 ToolsHelper 中的提示对话框显示逻辑
---
 src/main/ets/utils/ToolsHelper.ets | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/ets/utils/ToolsHelper.ets b/src/main/ets/utils/ToolsHelper.ets
index a804892..82f78d9 100644
--- a/src/main/ets/utils/ToolsHelper.ets
+++ b/src/main/ets/utils/ToolsHelper.ets
@@ -149,7 +149,7 @@ function alertDialogBuilder(options: AlertBean) {
         .width(17)
         .height(17)
         .visibility(options.options.cancel ? Visibility.Hidden : Visibility.None)
-      Text(options.options.title ?? '提示')
+      Text(options.options.title ? !options.options.msg ? '提示' : options.options.title : '提示')
         .fontSize(16)
         .fontColor($r('sys.color.black'))
         .textAlign(TextAlign.Center)
@@ -181,8 +181,8 @@ function alertDialogBuilder(options: AlertBean) {
     .alignItems(VerticalAlign.Top)
     .padding(9)
 
-    Scroll(){
-      Text(options.options.msg)
+    Scroll() {
+      Text(options.options.msg ?? options.options.title)
         .fontSize(14)
         .fontWeight(FontWeight.Medium)
         .fontColor($r('sys.color.black'))
@@ -197,10 +197,11 @@ function alertDialogBuilder(options: AlertBean) {
     .constraintSize({
       maxHeight: 220
     })
+
     Text(options.options.confirm?.text ?? '确定')
       .fontSize(14)
       .fontWeight(FontWeight.Medium)
-      .fontColor(options.options.confirm?.color ?? $r('sys.color.white'))
+      .fontColor($r('sys.color.white'))
       .textAlign(TextAlign.Center)
       .margin({
         top: 40,
@@ -209,7 +210,7 @@ function alertDialogBuilder(options: AlertBean) {
         right: 18
       })
       .width(215)
-      .backgroundColor(options.options.confirm?.bgColor ?? '#0E84FA')
+      .backgroundColor('#0E84FA')
       .borderRadius(5)
       .height(34)
       .onClick(() => {
@@ -347,7 +348,12 @@ export class ToolsHelper {
     const dialogTag = ToolsHelper.getUuid()
     const ui = GlobalContext.getUiContext()
     const c = new ComponentContent(ui, wrapBuilder(alertDialogBuilder),
-      new AlertBean(options, dialogTag))
+      new AlertBean({
+        title: options.title,
+        msg: options.msg,
+        cancel: options.cancel??{},
+        confirm: options.confirm
+      }, dialogTag))
     ui.getPromptAction().openCustomDialog(c, {
       autoCancel: false
     }).then(() => {