From 4beb1b72bba916773725d09d838c4b832bbe5fa4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com>
Date: Tue, 11 Nov 2025 18:07:25 +0800
Subject: [PATCH] =?utf8?q?Revert=20from=20"=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?utf8?q?=E5=88=86osal=5Fkmalloc=20=E4=B8=BAmalloc=EF=BC=8C=E4=BC=98?=
 =?utf8?q?=E5=8C=96272=20lcd=20tp=E4=B8=8A=E4=B8=8B=E7=94=B5=20=E9=99=8D?=
 =?utf8?q?=E4=BD=8E=E5=8A=9F=E8=80=97"=20to=20"Merge=20branch=20'sdk650pat?=
 =?utf8?q?hc0423'=20of=20https://codeup.aliyun.com/64191456b9581d62e8f..."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

 * Reverted:
a3f7b025 修改部分osal_kmalloc 为malloc，优化272 lcd tp上下电 降低功耗
dfec72e7 Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f...

This reverts change request#2721
---
 .../nativeui/watchQRcode/src/WatchQRCodePresenter.cpp     | 4 ++--
 .../service/msg_center/src/notify/charge_notification.cpp | 8 ++++----
 .../nativeui/watchQRcode/src/WatchQRCodePresenter.cpp     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index f26aa1c9b..163806dcf 100644
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -153,9 +153,9 @@ namespace OHOS
 
     std::string WatchQRCodePresenter::WatchQRCodeGetQRCodeStr()
     {
-        /*实例：https://m.fuyingy.com/new/app_download?c=5&p=5&m=7a:8c:2d:61:9a:fc*/
+        /*实例：https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=7a:8c:2d:61:9a:fc*/
         /*m=后边的值为手表 mac 地址，前面部分为固定格式*/
-        std::string QRCodeStr = "https://m.fuyingy.com/new/app_download?c=5&p=5&m=";
+        std::string QRCodeStr = "https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=";
         std::string MacAddress = GetCurrentWatchMacAddress(); // 假设这是获取当前手表 Mac 地址的函数
         QRCodeStr += MacAddress;
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QRCodeStr:%s", QRCodeStr.c_str());
diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/charge_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/charge_notification.cpp
index f61ad5efa..bca70ba31 100644
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/charge_notification.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/charge_notification.cpp
@@ -48,10 +48,10 @@ namespace OHOS
     static constexpr char *ChargeAnimationPaths = "/user/res/charge/"; //充电动画路径
     static constexpr int16_t CHARGE_ANIMATION_VIEW_NUM_FRAMES = 24; //充电动画帧数
     static constexpr int16_t CHARGE_ANIMATION_VIEW_TIME = 150; //充电动画更新间隔
-    static constexpr int16_t CHARGE_ANIMATION_VIEW_X = 42; //充电动画位置x
-    static constexpr int16_t CHARGE_ANIMATION_VIEW_Y = 50; //充电动画位置y
-    static constexpr int16_t CHARGE_ANIMATION_VIEW_W = 392; //充电动画宽度
-    static constexpr int16_t CHARGE_ANIMATION_VIEW_H = 435; //充电动画高度
+    static constexpr int16_t CHARGE_ANIMATION_VIEW_X = 142; //充电动画位置x
+    static constexpr int16_t CHARGE_ANIMATION_VIEW_Y = 134; //充电动画位置y
+    static constexpr int16_t CHARGE_ANIMATION_VIEW_W = 182; //充电动画宽度
+    static constexpr int16_t CHARGE_ANIMATION_VIEW_H = 202; //充电动画高度
     const ImageInfo **ChargeAnimationInfoArray{nullptr}; //充电动画图片路径数组
     ImageAnimatorInfo ChargeAnimationInfo[CHARGE_ANIMATION_VIEW_NUM_FRAMES]; //充电动画图像的信息
 
diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index 985cfb9b3..163806dcf 100644
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -155,7 +155,7 @@ namespace OHOS
     {
         /*实例：https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=7a:8c:2d:61:9a:fc*/
         /*m=后边的值为手表 mac 地址，前面部分为固定格式*/
-        std::string QRCodeStr = "https://lanque.kazktv.com/index.html?c=5&p=5&m=";
+        std::string QRCodeStr = "https://www.kumi.top/p-i-kumi.html?c=5&p=5&m=";
         std::string MacAddress = GetCurrentWatchMacAddress(); // 假设这是获取当前手表 Mac 地址的函数
         QRCodeStr += MacAddress;
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QRCodeStr:%s", QRCodeStr.c_str());
-- 
2.17.1