From: luozheng <1732036298@qq.com> Date: Wed, 11 Sep 2024 08:27:22 +0000 (+0800) Subject: #370，解决:下拉状态栏中，开启4G开关，停留在下拉菜单中，信号格状态不刷新（息屏时不会刷新）bug X-Git-Tag: release_V1.2.70_20241020_135402~485^2^2~19 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8c2ee77e3bb8e186bbdd34184fafeb41429e9943;p=mirrors%2FFD230.git #370，解决:下拉状态栏中，开启4G开关，停留在下拉菜单中，信号格状态不刷新（息屏时不会刷新）bug #618，解决：4G开关开启，重启手表，4G开关状态颜色响应比较慢bug --- 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)