From aa4ed0953c3bc5f8f0b8c47cae2b5c2b2d66ab90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=8E=AF?= <18108170464@163.com>
Date: Wed, 4 Sep 2024 14:53:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#IAFNID=20=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E5=92=8C=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E4=B8=BA24=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 王环 <18108170464@163.com>
---
 common/src/main/ets/default/TimeManager.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/src/main/ets/default/TimeManager.ts b/common/src/main/ets/default/TimeManager.ts
index 2394f58b..e4e34ecd 100644
--- a/common/src/main/ets/default/TimeManager.ts
+++ b/common/src/main/ets/default/TimeManager.ts
@@ -32,7 +32,7 @@ export type TimeEventArgs = {
   timeFormat: boolean;
 };
 
-const TAG = "TimeManager";
+const TAG = "TimeManager_SysUI";
 const TIME_FORMAT_KEY = settings.date.TIME_FORMAT;
 const TIME_SUBSCRIBE_INFO = {
   events: [
@@ -74,8 +74,9 @@ class TimeManager {
   }
 
   public formatTime(date: Date, as24Hour: boolean = false) {
-    this.mUse24hFormat = as24Hour ? true : i18n.System.is24HourClock();
-    return concatTime(date.getHours() % (this.mUse24hFormat ? 24 : 12), date.getMinutes());
+    this.mUse24hFormat = i18n.System.is24HourClock();
+    let format = as24Hour ? 24 : this.mUse24hFormat;
+    return concatTime(date.getHours() % (format ? 24 : 12), date.getMinutes());
   }
 
   private async initTimeFormat(context: any): Promise<void> {
-- 
Gitee


From 3550bdf2be171bcb3c9aaef4ec2cc2f26c287083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=8E=AF?= <18108170464@163.com>
Date: Wed, 13 Nov 2024 15:50:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?systemui=E5=8D=87=E7=BA=A7api12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 王环 <18108170464@163.com>
---
 build-profile.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-profile.json5 b/build-profile.json5
index b5c83cb5..ba43e15d 100644
--- a/build-profile.json5
+++ b/build-profile.json5
@@ -4,8 +4,8 @@
       {
         "name": "default",
         "signingConfig": "release",
-        "compileSdkVersion": 10,
-        "compatibleSdkVersion": 9
+        "compileSdkVersion": 12,
+        "compatibleSdkVersion": 12
       }
     ]
   },
-- 
Gitee