From 8c2ee77e3bb8e186bbdd34184fafeb41429e9943 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 11 Sep 2024 16:27:22 +0800 Subject: [PATCH] =?utf8?q?#370=EF=BC=8C=E8=A7=A3=E5=86=B3:=E4=B8=8B?= =?utf8?q?=E6=8B=89=E7=8A=B6=E6=80=81=E6=A0=8F=E4=B8=AD=EF=BC=8C=E5=BC=80?= =?utf8?q?=E5=90=AF4G=E5=BC=80=E5=85=B3=EF=BC=8C=E5=81=9C=E7=95=99?= =?utf8?q?=E5=9C=A8=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E4=B8=AD=EF=BC=8C?= =?utf8?q?=E4=BF=A1=E5=8F=B7=E6=A0=BC=E7=8A=B6=E6=80=81=E4=B8=8D=E5=88=B7?= =?utf8?q?=E6=96=B0=EF=BC=88=E6=81=AF=E5=B1=8F=E6=97=B6=E4=B8=8D=E4=BC=9A?= =?utf8?q?=E5=88=B7=E6=96=B0=EF=BC=89bug=20#618=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?utf8?q?=EF=BC=9A4G=E5=BC=80=E5=85=B3=E5=BC=80=E5=90=AF=EF=BC=8C?= =?utf8?q?=E9=87=8D=E5=90=AF=E6=89=8B=E8=A1=A8=EF=BC=8C4G=E5=BC=80?= =?utf8?q?=E5=85=B3=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2=E5=93=8D=E5=BA=94?= =?utf8?q?=E6=AF=94=E8=BE=83=E6=85=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../main/include/dropdown/DropDownCardPage1.h | 3 ++- .../nativeui/main/src/MainPresenterSample.cpp | 23 +++++++++---------- .../nativeui/main/src/PullUpDownView.cpp | 7 +++++- .../main/src/dropdown/DropDownCardPage1.cpp | 8 ++++++- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h index e569d972c..2989d3b63 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-21 11:54:00 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-26 20:21:33 + * @LastEditTime: 2024-09-11 15:28:39 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h */ #ifndef __DROPDOWN_CARD_PAGE1_H__ @@ -53,6 +53,7 @@ namespace OHOS void Updat4GState(bool state); void UpdateDnotdisturbState(bool state); void UpdateSleepModelState(bool state); + void Refresh4GState(); private: UIToggleButton *ToggleButtonInit(ToggleButtonConfig &toggleButtonConfig); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 4587bdb9f..ba20d7952 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -319,7 +319,7 @@ namespace OHOS { UpdataBaseData(); PullUpDownView::GetInstance()->UpdateSignalStrengthStatusAndBatteryPosition(); - PullUpDown_StartTimer(1000); + PullUpDown_StartTimer(2000); } else { @@ -687,19 +687,24 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 声明定时器变量 static osTimerId_t g_timer = NULL; - static uint8_t UPDATETIME = 2; // 2秒 + static uint8_t UPDATETIME = 20; // 20秒 uint8_t MainPresenterSample::g_PullUpDownTimes = UPDATETIME; /*定时器到期时的处理*/ static void PullUpDown_TimerCallbackProc(int data) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDown_TimerCallbackProc"); - MainPresenterSample::g_PullUpDownTimes--; - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d", MainPresenterSample::g_PullUpDownTimes); - if (MainPresenterSample::g_PullUpDownTimes <= 0) + if (uapi_get_screen_state() == 1) // 息屏状态下若停留在下拉界面，20s后无操作停止更新数据 + { + MainPresenterSample::g_PullUpDownTimes -= 2; + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d", MainPresenterSample::g_PullUpDownTimes); + if (MainPresenterSample::g_PullUpDownTimes <= 0) { + GraphicService::GetInstance()->PostGraphicEvent(std::bind(&MainPresenterSample::PullUpDown_StopTimer, MainPresenterSample::GetInstance())); + } + } + else //亮屏状态下每2s刷新一次下拉数据 { MainPresenterSample::g_PullUpDownTimes = UPDATETIME; - if (PullUpDownView::GetInstance() != nullptr) { PullUpDownView::GetInstance()->UpdateSignalStrengthStatusAndBatteryPosition(); @@ -709,12 +714,6 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::GetInstance fail!!"); } } - - if (uapi_get_screen_state() == 1) // 息屏停止更新数据 - { - GraphicService::GetInstance()->PostGraphicEvent(std::bind(&MainPresenterSample::PullUpDown_StopTimer, MainPresenterSample::GetInstance())); - } - return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index aba99e1cd..791aec4b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-26 18:14:24 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-29 10:16:29 + * @LastEditTime: 2024-09-11 16:16:01 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -659,6 +659,11 @@ namespace OHOS } } } + /*4g开关的状态刷新*/ + if(DropDownCardPage1::GetInstance()) + { + DropDownCardPage1::GetInstance()->Refresh4GState(); + } } // 更新信号强度显示 void PullUpDownView::UpdateSignalBarDisplay(int signalBars, bool state) diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp index 6f51b8737..87d6060ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-21 11:54:00 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-31 11:05:12 + * @LastEditTime: 2024-09-11 15:29:18 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp */ #include "main/include/dropdown/DropDownCardPage1.h" @@ -263,6 +263,12 @@ namespace OHOS } } + //刷新4g开关显示 + void DropDownCardPage1::Refresh4GState() + { + Updat4GState(uapi_cat1_get_power_stat()); + } + void DropDownCardPage1::UpdateDnotdisturbState(bool state) { if (toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB] != nullptr) -- 2.17.1