优化屏幕常亮相关代码

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 8fac4ef..e065f1c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayModel.cpp
@@ -12,6 +12,7 @@
 #include "graphic_service.h"\r
 \r
 #include "power_display_service.h"\r
+#include "custom_utils.h"\r
 namespace OHOS {\r
 AlipayModel::AlipayModel() : alipayApi(alipay_svr_get_api())\r
 {\r
@@ -584,19 +585,21 @@ void AlipayModel::AlipayScreenControl(bool turnOnFlag)
     const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
     if(turnOnFlag)\r
     {\r
-        const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
-        display_api->set_screen_set_keepon_timeout(0);\r
-        if (display_api->get_screen_state() != SCREEN_ON)\r
-        {\r
-            display_api->turn_on_screen();\r
-        }\r
-        LOS_Msleep(50);\r
-        //当设置的值是-1 的时候，设置屏幕常亮\r
-        display_api->set_screen_set_keepon_timeout(-1);\r
+        // const power_display_svr_api_t *display_api = power_display_svr_get_api();\r
+        // display_api->set_screen_set_keepon_timeout(0);\r
+        // if (display_api->get_screen_state() != SCREEN_ON)\r
+        // {\r
+        //     display_api->turn_on_screen();\r
+        // }\r
+        // LOS_Msleep(50);\r
+        // //当设置的值是-1 的时候，设置屏幕常亮\r
+        // display_api->set_screen_set_keepon_timeout(-1);\r
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);\r
     }\r
     else\r
     {\r
-        display_api->set_screen_set_keepon_timeout(0);\r
+        // display_api->set_screen_set_keepon_timeout(0);\r
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
     }\r
 }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
index fecabbc..5d553f4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
@@ -28,13 +28,15 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodDetectionPresenter::BloodDetectionPresenter");
         g_pBloodDetectionPresenter = this;
 
-        display_api->set_screen_set_keepon_timeout(-1); // 设置常亮
+        // display_api->set_screen_set_keepon_timeout(-1); // 设置常亮
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
         ResetTickTimer();
     }
 
     BloodDetectionPresenter::~BloodDetectionPresenter()
     {
-        display_api->set_screen_set_keepon_timeout(0); // 恢复
+        // display_api->set_screen_set_keepon_timeout(0); // 恢复
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
         g_pBloodDetectionPresenter = nullptr;
     }
     BloodDetectionPresenter *BloodDetectionPresenter::GetInstance()

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
index e9706dd..ce818e8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
@@ -296,12 +296,13 @@ namespace OHOS
         testoldScrollView->SetTouchable(true);
         testoldScrollView->SetDraggable(false);
 
-        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();  
-         }  
-        display_api->set_screen_set_keepon_timeout(-1);
+        // 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();  
+        //  }  
+        // display_api->set_screen_set_keepon_timeout(-1);
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
 
          uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST);
         if (cnt == 0) {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
index c29ecae..4dac40e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
@@ -476,13 +476,14 @@ namespace OHOS
             delete scrollView;
             scrollView = nullptr;
 
-        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();  
-         }
-        int t=ConfigModel::GetInstance()->GetScreenDuration();
-        display_api->set_screen_set_keepon_timeout(t);
+        // 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();  
+        //  }
+        // int t=ConfigModel::GetInstance()->GetScreenDuration();
+        // display_api->set_screen_set_keepon_timeout(t);
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
        // }
     }
 
@@ -959,12 +960,14 @@ namespace OHOS
         //SystemUpgradeButton->SetOnClickListener(clickListener);
 
         //char *Path= "/user/data/ota_start_1.json";
-        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();  
-         }  
-        display_api->set_screen_set_keepon_timeout(-1);
+        // 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();  
+        //  }  
+        // display_api->set_screen_set_keepon_timeout(-1);
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
+        
         memset(uri,0,256);
         imei_str= const_cast<char*>(ConfigModel::GetInstance()->Getimei().c_str());//"864430010001091";//const_cast<char*>(ConfigModel::GetInstance()->Getimei().c_str());
          //https://test.app.api.thisiot.com/ota/task?deviceId=deviceId&sourceVersion=sourceVersion