From: Caisking <3449750381@qq.com> Date: Wed, 26 Jun 2024 01:50:39 +0000 (+0800) Subject: 主界面增加睡眠卡片 X-Git-Tag: release_V1.2.70_20241020_135402~950^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=bca21ce4064175cf8be3aa23003aa93d5e05152d;p=mirrors%2FFD230.git 主界面增加睡眠卡片 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index cb109d15e..33ca91d7b 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -621,6 +621,7 @@ set(SOURCES #睡眠 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/sleep/src/SleepView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/sleep/src/SleepCardView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/sleep/src/SleepTimeView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/sleep/src/SleepControlView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/sleep/src/SleepControlPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index b44e99a94..28b74ea27 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -24,9 +24,9 @@ namespace OHOS BLOODOXGEN, WEATHER, TRAINING, - // ACTIVITY, SETCARD, GOAL, + SLEEP, MAX_CARD, } CardId; @@ -79,6 +79,7 @@ namespace OHOS static constexpr const char *PNG_SET_CARD_WEATHER = APP_RES_PATH "/MainCard/WeatherCard.bin"; static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH "/MainCard/SportCard.bin"; static constexpr const char *PNG_SET_CARD_MAIN = APP_RES_PATH "/MainCard/SetMainCard.bin"; + static constexpr const char *PNG_SET_CARD_SLEEP = APP_RES_PATH "/MainCard/SleepCard.bin"; static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/MainCard/dropdown.bin"; static constexpr const char *CLOCK_IAMGES = APP_RES_PATH "/MainCard/clock.bin"; static constexpr const char *PLAYER_IAMGES = APP_RES_PATH "/MainCard/player.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h index 353aa2b71..39faea926 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h @@ -39,6 +39,7 @@ #include "goal/include/goalControlView.h" #include "message/include/MessageControlView.h" +#include "sleep/include/SleepCardView.h" #include "set_card/include/SetMainView.h" namespace OHOS { @@ -62,7 +63,8 @@ namespace OHOS UICardPage *InitBloodOxygenPage(void); UICardPage *InitWeatherPage(void); UICardPage *InitGoalPage(void); - + + UICardPage *InitSleepPage(void); UICardPage *InitTrainingPage(void); UICardPage *InitApplistPage(void); UICardPage *InitSetMainPage(void); @@ -106,15 +108,15 @@ namespace OHOS ActivityWeekView *activityWeekView{nullptr}; PlayersView *playersView{nullptr}; CompassControlView *compassControlView{nullptr}; + HeartRateView *heartRateView{nullptr}; BloodCardView *bloodView{nullptr}; - - WeatherControlView *weatherControlView{nullptr}; - goalControlView *GoalControlView{nullptr}; - + SleepCardView *sleepView{nullptr}; Training_CardView *traingView{nullptr}; SetMainView *setmainView{nullptr}; + WeatherControlView *weatherControlView{nullptr}; + goalControlView *GoalControlView{nullptr}; // ApplistCardView *applistCardView{nullptr}; UIButton *changebut{nullptr}; UIImageView *disturbIcon{nullptr}; // 勿扰图标 diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index 9c055dee0..ccacb182e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -24,7 +24,7 @@ namespace OHOS {WEATHER, PNG_SET_CARD_WEATHER}, {TRAINING, PNG_SET_CARD_TRAIN}, {GOAL, PNG_SET_CARD_ACTIVITY}, - // {ACTIVITY, PNG_SET_CARD_ACTIVITY}, + {SLEEP, PNG_SET_CARD_SLEEP}, }; /*自定义map?*/ const DialInfo dialInfoMap[] = { diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 4c0c31771..d3eac908a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -36,9 +36,13 @@ namespace OHOS {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage}, {WEATHER, &MainViewSample::InitWeatherPage}, {TRAINING, &MainViewSample::InitTrainingPage}, - //{ACTIVITY, &MainViewSample::InitActivityPage}, {SETCARD, &MainViewSample::InitSetMainPage}, {GOAL, &MainViewSample::InitGoalPage}, + {SLEEP, &MainViewSample::InitSleepPage}, + +#if 0 + {ACTIVITY, &MainViewSample::InitActivityPage}, +#endif }; MainViewSample::MainViewSample() { @@ -127,7 +131,18 @@ namespace OHOS delete bloodView; bloodView = nullptr; } - + if (setmainView != nullptr) + { + setmainView->RemoveAll(); + delete setmainView; + setmainView = nullptr; + } + if (sleepView != nullptr) + { + sleepView->RemoveAll(); + delete sleepView; + sleepView = nullptr; + } if (traingView != nullptr) { traingView->RemoveAll(); @@ -495,6 +510,18 @@ namespace OHOS } return setmainView; } + /*主界面睡眠卡片*/ + UICardPage *MainViewSample::InitSleepPage(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitSetMainPage"); + sleepView = new SleepCardView(); + if (sleepView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepView new fail"); + return nullptr; + } + return sleepView; + } void MainViewSample::SetPage(int16_t page) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::SetPage"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp index b5622b798..63bfdb3f6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp @@ -49,7 +49,7 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool SetMainView::InitView()"); // 初始化label - InitLabel(setLabel, 83, 50, 300, 35, "labletitle", "设置卡片", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(setLabel, 83, 50, 300, 35, "labletitle", STR_CARD_MANAGEMENT, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(setLabel); // 初始化Button InitButton(setButton, 183, 183, 100, 100, SET_CARD_MAIN); 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 e69de29bb..c916e8eea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepCardView.h @@ -0,0 +1,27 @@ +#ifndef SLEEP_CARD_VIEW_H +#define SLEEP_CARD_VIEW_H + +#include "components/root_view.h" +#include "components/ui_card_page.h" +#include "wearable_log.h" +#include "sleep/include/SleepControlView.h" +namespace OHOS +{ + class SleepControlView; + class SleepCardView : public UICardPage + { + public: + SleepCardView(); + virtual ~SleepCardView(); + bool InitView(void); + void PreLoad(void) override; + void UnLoad(void) override; + + private: + void ClearAll(void); + SleepControlView *sleepcontrolView{nullptr}; + UISwipeView::OnSwipeListener *sleepOnSwipeListener{nullptr}; + bool viewiInitStatus{false}; + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h index c1e48caeb..29cfd42be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h @@ -1,15 +1,4 @@ -/*** - * @Date: 2024-06-25 10:32:53 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-06-25 17:35:04 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h - */ -/*** - * @Date: 2024-06-25 10:32:53 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-06-25 17:33:56 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepControlPresenter.h - */ + /*** * @Date: 2024-06-25 10:32:53 * @LastEditors: Caisking 3449750381@qq.com @@ -26,11 +15,11 @@ #include "sleep/include/SleepControlView.h" namespace OHOS { - class SleepViewOnSwipeListener : public UISwipeView::OnSwipeListener + class SleepOnSwipeListener : public UISwipeView::OnSwipeListener { public: - SleepViewOnSwipeListener() {} - ~SleepViewOnSwipeListener() {} + SleepOnSwipeListener() {} + ~SleepOnSwipeListener() {} void OnSwipe(UISwipeView &view) override; }; 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 e69de29bb..780c41cf6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepCardView.cpp @@ -0,0 +1,84 @@ +#include "sleep/include/SleepCardView.h" +#include "sleep/include/SleepControlView.h" +#include "sleep/include/SleepControlPresenter.h" +namespace OHOS +{ + SleepCardView::SleepCardView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepCardView::SleepCardView"); + SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + } + + SleepCardView::~SleepCardView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepCardView::~SleepCardView"); + ClearAll(); + } + + void SleepCardView::ClearAll(void) + { + if (viewiInitStatus == true) + { + RemoveAll(); + if (sleepcontrolView != nullptr) + { + if (sleepOnSwipeListener != nullptr) + { + delete sleepOnSwipeListener; + sleepOnSwipeListener = nullptr; + } + + if (sleepcontrolView != nullptr) + { + delete sleepcontrolView; + sleepcontrolView = nullptr; + } + } + } + } + + bool SleepCardView::InitView(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepCardView::InitView"); + sleepcontrolView = new SleepControlView(); + if (sleepcontrolView == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepView::new SleepView fail!"); + return false; + } + + UISwipeView *SleepSwipView = dynamic_cast(sleepcontrolView->GetSleepControlPageView()); + if (SleepSwipView == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepView->SleepViewInit() == nullptr!!"); + return false; + } + + sleepOnSwipeListener = static_cast(new SleepControlPresenter()); + if (sleepOnSwipeListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepOnSwipeListener new fail"); + return false; + } + SleepSwipView->SetOnSwipeListener(sleepOnSwipeListener); + Add(SleepSwipView); + + return true; + } + + void SleepCardView::PreLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepCardView::PreLoad"); + if (!viewiInitStatus) + { + InitView(); + viewiInitStatus = true; + } + } + + void SleepCardView::UnLoad(void) + { + // Weather's usage scenes is complicated, so we do not release it's resources inner slice. + } + +} \ No newline at end of file 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 0c8461608..5c32fd107 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepControlPresenter.cpp @@ -6,7 +6,7 @@ #include #include #include "UiConfig.h" - +#include "string.h" namespace OHOS { @@ -96,11 +96,10 @@ namespace OHOS } void SleepControlPresenter::OnSwipe(UISwipeView &view) {} -#if 0 - void SleepControlViewOnSwipeListener::OnSwipe(UISwipeView &view) + void SleepOnSwipeListener::OnSwipe(UISwipeView &view) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepControlViewOnSwipeListener::OnSwipe,current tab index = %d", view.GetCurrentPage()); - if (view.GetCurrentPage() == SleepControlView) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepOnSwipeListener::OnSwipe,current tab index = %d", view.GetCurrentPage()); + if (view.GetCurrentPage() == MAINSLEEPVIEW) { view.SetIntercept(false); } @@ -110,5 +109,4 @@ namespace OHOS } return; } -#endif } \ No newline at end of file diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SleepCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SleepCard.bin new file mode 100644 index 000000000..55488d0da --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SleepCard.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4463577e620d95e311db7999ae4318d15d66238b05cf8a4f08973151876b9702 +size 52664 diff --git a/tools/image_converter_tool/test/hert/maincard/SleepCard.png b/tools/image_converter_tool/test/hert/maincard/SleepCard.png new file mode 100644 index 000000000..c065a4c16 Binary files /dev/null and b/tools/image_converter_tool/test/hert/maincard/SleepCard.png differ diff --git a/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier b/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier new file mode 100644 index 000000000..053d1127c --- /dev/null +++ b/tools/image_converter_tool/test/hert/maincard/SleepCard.png:Zone.Identifier @@ -0,0 +1,3 @@ +[ZoneTransfer] +ZoneId=3 +HostUrl=about:internet