Revert from "修改部分osal_kmalloc 为malloc，优化272 lcd tp上下电 降低功耗" to "Merge branch 'sdk650p...

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

This reverts change request#2721

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 f26aa1c..163806d 100644 (file)
--- 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 f61ad5e..bca70ba 100644 (file)
--- 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 985cfb9..163806d 100644 (file)
--- 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());