From: luozheng <1732036298@qq.com>
Date: Sat, 2 Mar 2024 08:48:27 +0000 (+0800)
Subject: 为支付宝界面添加屏幕常亮功能
X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~38^2~7
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=ff6d2ce94cfee83c04ee5b10560a3662c0922157;p=mirrors%2FFD230.git

为支付宝界面添加屏幕常亮功能
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
index a0cf81329..4b8103c0a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayModel.h
@@ -88,6 +88,8 @@ public:
     uint8_t* AlipayGetTransCode(void);
     uint32_t AlipayGetTransCodeLen(void);
     char* AlipayGetCardTitle(void);
+
+    void AlipayScreenControl(bool turnOnFlag);
 private:
     osTimerId_t bindTimerId = NULL;
     osTimerId_t switchTimerId = NULL;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
index 4c468ea13..7f3176a77 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
@@ -11,6 +11,7 @@
 #include "AlipayMainView.h"
 #include "graphic_service.h"
 
+#include "power_display_service.h"
 namespace OHOS {
 AlipayModel::AlipayModel() : alipayApi(alipay_svr_get_api())
 {
@@ -575,4 +576,25 @@ char* AlipayModel::AlipayGetCardTitle(void)
     return cardTitle_;
 }
 
+/// @brief 支付宝屏幕控制
+/// @param turnOnFlag 
+void AlipayModel::AlipayScreenControl(bool turnOnFlag)
+{
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayModel::AlipayScreenControl");
+    const power_display_svr_api_t *display_api = power_display_svr_get_api();
+    if(turnOnFlag)
+    {
+        const power_display_svr_api_t *display_api = power_display_svr_get_api();
+        if (display_api->get_screen_state() != SCREEN_ON)
+        {
+            display_api->turn_on_screen();
+        }
+        //当设置的值是-1 的时候，设置屏幕常亮
+        display_api->set_screen_set_keepon_timeout(-1);
+    }
+    else
+    {
+        display_api->set_screen_set_keepon_timeout(0);
+    }
+}
 }
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
index 22006848e..4e6faae58 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayPresenter.cpp
@@ -49,6 +49,11 @@ void AlipayPresenter::OnStart()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlipayPresenter OnStart");
     Presenter<AlipayMainView>::OnStart();
+
+    /* -------------------------------- 设置支付宝界面常亮 ------------------------------- */
+    alipayMode_->AlipayScreenControl(true);
+    /* -------------------------------------------------------------------------- */
+
     alipayMode_->AlipayExitLpm();
     if (alipayMode_->AlipayInitModel() == false) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayPresenter::OnStart AlipayInitModel fail.");
@@ -68,6 +73,9 @@ void AlipayPresenter::OnStop(void)
     svr_alipay_destroy_task();
     alipayMode_->AlipayDeinitModel();
     alipayMode_->AlipayEnterLpm();
+
+    /* -------------------------------- 恢复屏幕保持亮屏的时间 ------------------------------- */
+    alipayMode_->AlipayScreenControl(false);
 }
 
 bool AlipayPresenter::OnDrag(UIView &view, const DragEvent &event)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
index 315e0343a..16fc77fe1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
@@ -24,7 +24,7 @@ uint16_t ignore_slice_ids[] = {
     VIEW_UISAMPLE,
     VIEW_BLOODOXY,//血氧功能
 #ifdef SUPPORT_ALIPAY_SEC
-    // VIEW_MAIN_ALIPAY,
+    VIEW_MAIN_ALIPAY,
 #endif
 };