Merge #3312 into fd272 from refs/changes/3312/head

二维码界面电量更新改成5s一只刷新

* refs/changes/3312/head: (1 commits squashed)

  - 二维码界面电量更新改成5s一只刷新

Signed-off-by: 罗正 <1732036298@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3312

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/include/WatchQRCodeView.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/include/WatchQRCodeView.h
index da9ad81..4aff788 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/include/WatchQRCodeView.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/include/WatchQRCodeView.h
@@ -29,7 +29,7 @@ namespace OHOS
         static uint8_t refresh_time;
         std::string get_voltage_and_version_string(void);
         void update_label(void);
-        void start_refresh_timer(uint32_t interval = 2000);
+        void start_refresh_timer(uint32_t interval = 5000);
         void stop_refresh_timer(void);
         /* -------------------------------------------------------------------------- */
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
index 485b935..f2299c7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
@@ -214,9 +214,9 @@ namespace OHOS
     /*定时器到期时的处理*/
     static void QRCodeView_TimerCallbackProc(int data)
     {
-        if (uapi_get_screen_state() == 0) // 如果在亮屏状态
+        // if (uapi_get_screen_state() == 0) // 如果在亮屏状态
         {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 0");
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 0");
             if (WatchQRCodeView::GetInstance())
             {
                 WatchQRCodeView::GetInstance()->update_label();
@@ -226,26 +226,26 @@ namespace OHOS
                 WatchQRCodeView::refresh_time = UPDATETIME_OUT;
             }
         }
-        else
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 1");
-            WatchQRCodeView::refresh_time -= 2;
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d", WatchQRCodeView::refresh_time);
-            if (WatchQRCodeView::refresh_time <= 0) // 息屏状态下超时删除定时器
-            {
-                if (WatchQRCodeView::GetInstance())
-                {
-                    GraphicService::GetInstance()->PostGraphicEvent(std::bind(&WatchQRCodeView::stop_refresh_timer, WatchQRCodeView::GetInstance()));
-                }
-            }
-            else
-            {
-                if (WatchQRCodeView::GetInstance())
-                {
-                    WatchQRCodeView::GetInstance()->update_label();
-                }
-            }
-        }
+        // else
+        // {
+        //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 1");
+        //     WatchQRCodeView::refresh_time -= 2;
+        //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d", WatchQRCodeView::refresh_time);
+        //     if (WatchQRCodeView::refresh_time <= 0) // 息屏状态下超时删除定时器
+        //     {
+        //         if (WatchQRCodeView::GetInstance())
+        //         {
+        //             GraphicService::GetInstance()->PostGraphicEvent(std::bind(&WatchQRCodeView::stop_refresh_timer, WatchQRCodeView::GetInstance()));
+        //         }
+        //     }
+        //     else
+        //     {
+        //         if (WatchQRCodeView::GetInstance())
+        //         {
+        //             WatchQRCodeView::GetInstance()->update_label();
+        //         }
+        //     }
+        // }
         return;
     }