From: Caisking <3449750381@qq.com> Date: Tue, 3 Sep 2024 08:39:33 +0000 (+0800) Subject: 优化睡眠card处理 X-Git-Tag: release_V1.2.70_20241020_135402~529^2~19^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7c7e6dae6811f8396da10de7af38a4b1a7509e61;p=mirrors%2FFD230.git 优化睡眠card处理 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h index c916e8eea..624d48908 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-06-25 10:41:32 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-09-03 15:10:21 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h + */ #ifndef SLEEP_CARD_VIEW_H #define SLEEP_CARD_VIEW_H @@ -13,13 +19,17 @@ namespace OHOS public: SleepCardView(); virtual ~SleepCardView(); + static SleepCardView *GetInstance(void); + bool InitView(void); void PreLoad(void) override; void UnLoad(void) override; + UISwipeView *GetSleepCardView(); private: void ClearAll(void); SleepControlView *sleepcontrolView{nullptr}; + UISwipeView *SleepSwipView{nullptr}; UISwipeView::OnSwipeListener *sleepOnSwipeListener{nullptr}; bool viewiInitStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlView.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlView.h index 4af27f906..c552368b7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlView.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-06-25 10:41:08 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-09-02 09:22:33 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlView.h + */ /*** * @Date: 2024-06-25 10:41:08 * @LastEditors: Caisking 3449750381@qq.com @@ -43,8 +49,8 @@ namespace OHOS SleepView *GetSleepView(void); SleepTimeView *GetSleepTimeView(void); - UIView *GetSleepControlPageView(void); - + UISwipeView *GetSleepControlPageView(void); + void ChangeView(int16_t hideView, int16_t showView); public: void OnStart() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h index 88c848f37..1a2796ffe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h @@ -119,6 +119,16 @@ namespace OHOS void Sleep_StartTimer(uint32_t interval); void Sleep_StopTimer(void); + /*主界面卡片相关*/ + void SetCardId(int cardid) + { + CradId = cardid; + } + int GetCardId() + { + return CradId; + } + private: SleepModel(); SleepModel(const SleepModel &); @@ -137,6 +147,7 @@ namespace OHOS int goal_total_time = 0; SLEEPSTATE sleepstate_ = SLEEPSTATE::WAKE; + int CradId = 0; // 主界面状态 }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp index 2164e2ec5..79ec67755 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp @@ -9,18 +9,23 @@ #include "sleep/include/SleepControlPresenter.h" namespace OHOS { + static SleepCardView *g_pSleepCardView = nullptr; SleepCardView::SleepCardView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepCardView::SleepCardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + g_pSleepCardView = this; } - SleepCardView::~SleepCardView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepCardView::~SleepCardView"); ClearAll(); + g_pSleepCardView = nullptr; + } + SleepCardView *SleepCardView::GetInstance() + { + return g_pSleepCardView; } - void SleepCardView::ClearAll(void) { if (viewiInitStatus == true) @@ -53,14 +58,14 @@ namespace OHOS return false; } - UISwipeView *SleepSwipView = dynamic_cast(sleepcontrolView->GetSleepControlPageView()); + SleepSwipView = dynamic_cast(sleepcontrolView->GetSleepControlPageView()); if (SleepSwipView == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepView->SleepViewInit() == nullptr!!"); return false; } - sleepOnSwipeListener = static_cast(new SleepControlPresenter()); + sleepOnSwipeListener = static_cast(new SleepOnSwipeListener()); if (sleepOnSwipeListener == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepOnSwipeListener new fail"); @@ -71,7 +76,10 @@ namespace OHOS return true; } - + UISwipeView *SleepCardView::GetSleepCardView() + { + return SleepSwipView; + } void SleepCardView::PreLoad(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepCardView::PreLoad"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp index d300dc71d..8691a4fc9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp @@ -111,14 +111,6 @@ namespace OHOS void SleepOnSwipeListener::OnSwipe(UISwipeView &view) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepOnSwipeListener::OnSwipe,current tab index = %d", view.GetCurrentPage()); - if (view.GetCurrentPage() == MAINSLEEPVIEW) - { - view.SetIntercept(false); - } - else - { - view.SetIntercept(true); - } return; } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp index 473a7301f..97b3bfc20 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-09-02 14:46:10 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-09-03 16:01:25 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlView.cpp + */ /*** * @Date: 2024-06-25 10:41:15 * @LastEditors: Caisking 3449750381@qq.com @@ -82,10 +88,11 @@ namespace OHOS } /*获取睡眠主界面*/ - UIView *SleepControlView::GetSleepControlPageView() + UISwipeView *SleepControlView::GetSleepControlPageView() { - return dynamic_cast(SleepControlViewInit()); + return SleepControlViewInit(); } + /*OnStart 增加界面控制*/ void SleepControlView::OnStart() {