From bd5d2256d0795b2ace5df549f5bcc832a76c0b07 Mon Sep 17 00:00:00 2001 From: cheng Date: Mon, 12 Aug 2024 11:33:30 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=B1=8F=E5=B9=95=E5=B8=B8?= =?utf8?q?=E4=BA=AE=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/alipay/src/AlipayModel.cpp | 23 ++++++++------- .../src/BloodDetectionPresenter.cpp | 6 ++-- .../nativeui/producttest/src/testold.cpp | 13 +++++---- .../nativeui/system/src/Systemupgrade.cpp | 29 ++++++++++--------- 4 files changed, 40 insertions(+), 31 deletions(-) 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 8fac4ef02..e065f1c95 100644 --- 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" #include "power_display_service.h" +#include "custom_utils.h" namespace OHOS { AlipayModel::AlipayModel() : alipayApi(alipay_svr_get_api()) { @@ -584,19 +585,21 @@ void AlipayModel::AlipayScreenControl(bool turnOnFlag) 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(); - display_api->set_screen_set_keepon_timeout(0); - if (display_api->get_screen_state() != SCREEN_ON) - { - display_api->turn_on_screen(); - } - LOS_Msleep(50); - //当设置的值是-1 的时候，设置屏幕常亮 - display_api->set_screen_set_keepon_timeout(-1); + // const power_display_svr_api_t *display_api = power_display_svr_get_api(); + // display_api->set_screen_set_keepon_timeout(0); + // if (display_api->get_screen_state() != SCREEN_ON) + // { + // display_api->turn_on_screen(); + // } + // LOS_Msleep(50); + // //当设置的值是-1 的时候，设置屏幕常亮 + // display_api->set_screen_set_keepon_timeout(-1); + ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); } else { - display_api->set_screen_set_keepon_timeout(0); + // display_api->set_screen_set_keepon_timeout(0); + ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); } } } \ 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 fecabbc16..5d553f408 100644 --- 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 e9706ddfc..ce818e8dd 100644 --- 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 c29ecaec1..4dac40ee6 100644 --- 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(ConfigModel::GetInstance()->Getimei().c_str());//"864430010001091";//const_cast(ConfigModel::GetInstance()->Getimei().c_str()); //https://test.app.api.thisiot.com/ota/task?deviceId=deviceId&sourceVersion=sourceVersion -- 2.17.1