From 09f3f550d68ed6b511b2f1dc2dd26e50556a2188 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Fri, 28 Jun 2024 19:22:52 +0800 Subject: [PATCH] =?utf8?q?=E5=8D=A1=E7=89=87=E7=AE=A1=E7=90=86=E9=87=8D?= =?utf8?q?=E6=96=B0=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/add_card/include/AddCardItem.h | 54 +++-- .../nativeui/add_card/include/AddCardModel.h | 14 +- .../nativeui/add_card/src/AddCardItem.cpp | 58 +++-- .../nativeui/add_card/src/AddCardModel.cpp | 13 +- .../add_card/src/AddCardPresenter.cpp | 51 ++-- .../nativeui/add_card/src/AddCardView.cpp | 217 +++++++++--------- .../nativeui/applist/src/ApplistModel.cpp | 2 +- .../nativeui/main/include/MainModel.h | 7 + .../fd230app/nativeui/main/src/MainModel.cpp | 18 +- .../set_card/src/SetCardPresenter.cpp | 59 +++-- 10 files changed, 305 insertions(+), 188 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h index 5325f4e22..43022a479 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-05-30 15:59:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-28 16:53:50 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: AddCardItem.h @@ -14,29 +20,37 @@ #include "components/ui_view_group.h" #include "components/ui_image_view.h" #include "components/ui_label_button.h" +#include "components/ui_toggle_button.h" #include "UiConfig.h" +#include "components/ui_cross_view.h" +#include "components/ui_canvas_ext.h" -namespace OHOS { -typedef struct { - CardId id; - bool addFlag; - const char *cardImg; -} AddCardInfo; +namespace OHOS +{ + typedef struct + { + CardId id; + bool addFlag; + const char *cardImg; + } AddCardInfo; -class AddCardItem : public UIViewGroup { -public: - AddCardItem(); - ~AddCardItem() override; - void SetItemInfo(const AddCardInfo &cardInfo); - void SetOnClickListener(OnClickListener *onClickListener); - void UpdateItemInfo(bool addFlag); -private: - void SetUpChild(); - UIImageView cardImg_; - UILabelButton cardLabel_; - AddCardInfo cardInfo_; -}; + class AddCardItem : public UIViewGroup + { + public: + AddCardItem(); + ~AddCardItem() override; + void SetItemInfo(const AddCardInfo &cardInfo); + void SetOnClickListener(OnClickListener *onClickListener); + void UpdateItemInfo(bool addFlag); -} + private: + void SetUpChild(); + UIImageView cardImg_; + UILabelButton cardLabel_; + UIToggleButton cardToggleButton_; + AddCardInfo cardInfo_; + UICanvasExt canvas_; + }; +} #endif // ADD_CARD_ITEM_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardModel.h b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardModel.h index 9bdf0e41d..22a24908d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardModel.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-05-30 15:59:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-28 18:18:30 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardModel.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: AddCardModel.h @@ -15,13 +21,17 @@ #include "AddCardPresenter.h" #include "MainModel.h" -namespace OHOS { - class AddCardModel { +namespace OHOS +{ + class AddCardModel + { public: static AddCardModel &GetInstance(void); void SetSelectedCardIndex(uint8_t cardIndex); uint8_t GetSelectedCardIndex(void) const; void AddCardSetting(void); + void DelCardSetting(void); + private: AddCardModel(); AddCardModel(const AddCardModel &); diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp index 67e287ec8..5da769a44 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp @@ -1,58 +1,80 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-28 16:53:33 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp + */ #include "AddCardItem.h" #include "AddCardPresenter.h" #include "wearable_log.h" +#include "components/ui_canvas_ext.h" -namespace OHOS { +namespace OHOS +{ AddCardItem::AddCardItem() { - SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + SetPosition(0, 0, 466, 466); SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); SetUpChild(); + Add(&canvas_); Add(&cardImg_); - Add(&cardLabel_); + Add(&cardToggleButton_); } AddCardItem::~AddCardItem() { + Remove(&canvas_); Remove(&cardImg_); - Remove(&cardLabel_); + Remove(&cardToggleButton_); } void AddCardItem::SetUpChild() { - cardImg_.SetPosition(87, 60); + cardImg_.SetPosition(93, 83); cardImg_.Resize(280, 280); cardImg_.SetResizeMode(UIImageView::FILL); cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - cardLabel_.SetPosition(175, 360); - cardLabel_.Resize(100, 50); - cardLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); + cardToggleButton_.SetPosition(133, 366); + cardToggleButton_.Resize(200, 100); + cardToggleButton_.SetViewId("toggleButton1"); + cardToggleButton_.SetStyle(STYLE_BACKGROUND_OPA, 0x00); + + canvas_.SetPosition(73, 65); + canvas_.Resize(320, 320); + canvas_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + canvas_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + PaintExt paint; + Point center = {158, 158}; + paint.SetStyle(Paint::PaintStyle::STROKE_STYLE); + paint.SetStrokeWidth(20); + paint.SetStrokeColor(Color::Cyan()); + paint.SetAntialiased(true); + RadialGradient radial = {158, 158, 150, 150, 152}; + ColorStop stops[3] = {{0, Color::White().full}, {0.8, Color::White().full}, {1, 0x00ffffff}}; + paint.SetRadialGradient(radial, stops, 3); // 3: count + canvas_.DrawCircle(center, 140, paint); } void AddCardItem::SetItemInfo(const AddCardInfo &cardInfo) { cardInfo_ = cardInfo; cardImg_.SetSrc(cardInfo.cardImg); - if (cardInfo.addFlag) { - cardLabel_.SetText("已添加"); - } else { - cardLabel_.SetText("添加"); - } + + cardToggleButton_.SetState(cardInfo.addFlag); } void AddCardItem::UpdateItemInfo(bool addFlag) { - if (addFlag) { - cardLabel_.SetText("已添加"); - cardInfo_.addFlag = addFlag; - Invalidate(); - } + cardInfo_.addFlag = addFlag; + cardToggleButton_.SetState(cardInfo_.addFlag); + Invalidate(); } void AddCardItem::SetOnClickListener(OnClickListener *onClickListener) { cardLabel_.SetOnClickListener(onClickListener); + cardToggleButton_.SetOnClickListener(onClickListener); } }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardModel.cpp index fa052decb..fd0c9d609 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardModel.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-28 18:18:55 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardModel.cpp + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: AddCardModel.cpp @@ -9,7 +15,8 @@ #include "kv_store.h" #include "securec.h" -namespace OHOS { +namespace OHOS +{ AddCardModel::AddCardModel() {} AddCardModel::~AddCardModel() {} @@ -34,4 +41,8 @@ namespace OHOS { { MainModel::GetInstance().AddCardSetting(selectedCardIndex); } + void AddCardModel::DelCardSetting(void) + { + MainModel::GetInstance().DeleteCardSetting(selectedCardIndex); + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp index 7b01f0f99..b92ffb584 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp @@ -9,14 +9,16 @@ #include "AddCardModel.h" #include "AddCardPresenter.h" -namespace OHOS { +namespace OHOS +{ AddCardPresenter::AddCardPresenter() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::AddCardPresenter"); model = &AddCardModel::GetInstance(); } - AddCardPresenter::~AddCardPresenter() { + AddCardPresenter::~AddCardPresenter() + { } void AddCardPresenter::OnStart() @@ -32,12 +34,12 @@ namespace OHOS { { } - bool AddCardPresenter::OnDrag(UIView& view, const DragEvent& event) + bool AddCardPresenter::OnDrag(UIView &view, const DragEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnDrag"); UNUSED(view); - if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) && - (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) { + if ((event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP)) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnDrag ChangeSlice"); NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); } @@ -47,12 +49,24 @@ namespace OHOS { bool AddCardPresenter::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnClick"); - if (MainModel::GetInstance().GetCardSettingCount() >= CARD_SETTING_COUNT_MAX) { - cardCountEvent = true; - view_->ExceedsCardCountEvent(true); - ResetTickTimer(); - } else { - model->AddCardSetting(); + uint8_t index = model->GetSelectedCardIndex(); + if (!MainModel::GetInstance().GetCardInfoSet(index)) + { + if (MainModel::GetInstance().GetCardSettingCount() >= CARD_SETTING_COUNT_MAX) + { + cardCountEvent = true; + view_->ExceedsCardCountEvent(true); + ResetTickTimer(); + } + else + { + model->AddCardSetting(); + view_->RefreshCardList(); + } + } + else + { + model->DelCardSetting(); view_->RefreshCardList(); } return true; @@ -67,25 +81,29 @@ namespace OHOS { void AddCardPresenter::OnScrollEnd(int16_t index, UIView *view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnScrollEnd index = %d", index); - if (view == nullptr) { + if (view == nullptr) + { return; } model->SetSelectedCardIndex(index); } - void AddCardPresenter::OnItemSelected(int16_t index, UIView* view) + void AddCardPresenter::OnItemSelected(int16_t index, UIView *view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnItemSelected index = %d", index); - if (view == nullptr) { + if (view == nullptr) + { return; } } void AddCardPresenter::OnTickEvent() { - if (cardCountEvent) { + if (cardCountEvent) + { uint64_t current_time = osKernelGetTick2ms(); - if (current_time - startTime > TOAST_KEEP_TIME) { + if (current_time - startTime > TOAST_KEEP_TIME) + { view_->ExceedsCardCountEvent(false); cardCountEvent = false; } @@ -98,5 +116,4 @@ namespace OHOS { startTime = osKernelGetTick2ms(); return; } - } diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp index 6e87bde5e..b062fa2af 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp @@ -9,127 +9,134 @@ #include "AddCardView.h" #include "AddCardPresenter.h" -namespace OHOS { -AddCardView::AddCardView() +namespace OHOS { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::AddCardView"); -} + AddCardView::AddCardView() : contentList_(UIList::HORIZONTAL) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::AddCardView"); + } -AddCardView::~AddCardView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::~AddCardView"); - if (addCardAdapter_ != nullptr) { - delete addCardAdapter_; - addCardAdapter_ = nullptr; + AddCardView::~AddCardView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::~AddCardView"); + if (addCardAdapter_ != nullptr) + { + delete addCardAdapter_; + addCardAdapter_ = nullptr; + } } -} -void AddCardView::OnStart() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStart"); - View::OnStart(); - SetContainerView(new UIViewGroup()); - container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - addCardAdapter_ = new AddCardAdapter(); - addCardAdapter_->SetItemClickListener(presenter_); - SetUpListInfo(); - SetUpListView(); - SetUpToast(); -} + void AddCardView::OnStart() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStart"); + View::OnStart(); + SetContainerView(new UIViewGroup()); + container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + addCardAdapter_ = new AddCardAdapter(); + addCardAdapter_->SetItemClickListener(presenter_); + SetUpListInfo(); + SetUpListView(); + SetUpToast(); + } -void AddCardView::OnSetUpView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnSetUpView"); - View::OnSetUpView(); -} + void AddCardView::OnSetUpView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnSetUpView"); + View::OnSetUpView(); + } -void AddCardView::OnTearDownView() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnTearDownView"); - View::OnTearDownView(); -} + void AddCardView::OnTearDownView() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnTearDownView"); + View::OnTearDownView(); + } -void AddCardView::OnStop() -{ - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStop"); - View::OnStop(); - if (container_ != nullptr) { - container_->RemoveAll(); - delete container_; - container_ = nullptr; + void AddCardView::OnStop() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStop"); + View::OnStop(); + if (container_ != nullptr) + { + container_->RemoveAll(); + delete container_; + container_ = nullptr; + } } -} -void AddCardView::SetUpListInfo(void) -{ - MainModel::GetInstance().InitCardSettings(); - uint8_t cardCount = MainModel::GetInstance().GetCardSettingCount(); - CardId *cardSettings = MainModel::GetInstance().GetCardSettings(); - addCardAdapter_->ClearItem(); - for (uint8_t i = WATCH_FACE + 1; i < MAX_CARD; i++) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "All:cardId = %d", i); - const CardInfo *info = MainModel::GetInstance().GetCardInfo((CardId)i); - if (info != nullptr) { - AddCardInfo addInfo; - addInfo.id = info->id; - addInfo.cardImg = info->cardImg; - addInfo.addFlag = false; - for (uint8_t j = 0; j < cardCount; j++) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Settings:cardId = %d", cardSettings[j]); - if (cardSettings[j] == i) { - addInfo.addFlag = true; - break; + void AddCardView::SetUpListInfo(void) + { + MainModel::GetInstance().InitCardSettings(); + uint8_t cardCount = MainModel::GetInstance().GetCardSettingCount(); + CardId *cardSettings = MainModel::GetInstance().GetCardSettings(); + addCardAdapter_->ClearItem(); + for (uint8_t i = WATCH_FACE + 1; i < MAX_CARD; i++) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "All:cardId = %d", i); + const CardInfo *info = MainModel::GetInstance().GetCardInfo((CardId)i); + if (info != nullptr) + { + AddCardInfo addInfo; + addInfo.id = info->id; + addInfo.cardImg = info->cardImg; + addInfo.addFlag = false; + for (uint8_t j = 0; j < cardCount; j++) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Settings:cardId = %d", cardSettings[j]); + if (cardSettings[j] == i) + { + addInfo.addFlag = true; + break; + } } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::%d %s %d", + addInfo.id, addInfo.cardImg, addInfo.addFlag); + addCardAdapter_->AddListItem(addInfo); } - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::%d %s %d", - addInfo.id, addInfo.cardImg, addInfo.addFlag); - addCardAdapter_->AddListItem(addInfo); } } -} -void AddCardView::SetUpListView(void) -{ - contentList_.SetPosition(0, 0); - contentList_.Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); - contentList_.SetScrollBlankSize(VERTICAL_RESOLUTION / 2); - contentList_.SetSelectPosition(VERTICAL_RESOLUTION / 2); - contentList_.SetDraggable(true); - contentList_.SetThrowDrag(true); - contentList_.EnableAutoAlign(true); - contentList_.SetScrollStateListener(presenter_); - contentList_.SetOnDragListener(presenter_); - contentList_.SetMaxScrollDistance(1000); - contentList_.SetAdapter(addCardAdapter_); - contentList_.SetVisible(true); - container_->Add(&contentList_); -} + void AddCardView::SetUpListView(void) + { + contentList_.SetPosition(0, 0); + contentList_.Resize(HORIZONTAL_RESOLUTION, 466); + contentList_.SetScrollBlankSize(HORIZONTAL_RESOLUTION / 2); + contentList_.SetSelectPosition(HORIZONTAL_RESOLUTION / 2); + contentList_.SetDraggable(true); + contentList_.SetThrowDrag(true); + contentList_.EnableAutoAlign(true); + contentList_.SetScrollStateListener(presenter_); + contentList_.SetOnDragListener(presenter_); + contentList_.SetMaxScrollDistance(1000); + contentList_.SetAdapter(addCardAdapter_); + contentList_.SetVisible(true); + container_->Add(&contentList_); + } -void AddCardView::SetUpToast(void) -{ - toastLabel_.SetPosition(77, 220); - toastLabel_.Resize(454, 60); - toastLabel_.SetViewId("toast"); - toastLabel_.SetText("卡片数量已经到达上限"); - toastLabel_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Gray().full); - toastLabel_.SetStyle(STYLE_BACKGROUND_OPA, 255); - toastLabel_.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - toastLabel_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - toastLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - toastLabel_.SetVisible(false); - container_->Add(&toastLabel_); -} + void AddCardView::SetUpToast(void) + { + toastLabel_.SetPosition(77, 220); + toastLabel_.Resize(454, 60); + toastLabel_.SetViewId("toast"); + toastLabel_.SetText("卡片数量已经到达上限"); + toastLabel_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Gray().full); + toastLabel_.SetStyle(STYLE_BACKGROUND_OPA, 255); + toastLabel_.SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + toastLabel_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + toastLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + toastLabel_.SetVisible(false); + container_->Add(&toastLabel_); + } -void AddCardView::RefreshCardList(void) -{ - SetUpListInfo(); - contentList_.RefreshList(); -} + void AddCardView::RefreshCardList(void) + { + SetUpListInfo(); + contentList_.RefreshList(); + } -void AddCardView::ExceedsCardCountEvent(bool isVisible) -{ - toastLabel_.SetVisible(isVisible); - toastLabel_.Invalidate(); -} + void AddCardView::ExceedsCardCountEvent(bool isVisible) + { + toastLabel_.SetVisible(isVisible); + toastLabel_.Invalidate(); + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 438f125fe..dff4a565e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -71,7 +71,7 @@ namespace OHOS {VIEW_GOAL, PNG_APPLIST_GOAL_IMAGE, PNG_APPLIST_GOAL_IMAGE, "活动", STR_ACTIVITY, nullptr}, {VIEW_SET_DIAL, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, "更换表盘", STR_WATCH_FACE, nullptr}, {VIEW_THEME_STYLE, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_THEME_IMAGE, "显示方式", STR_DISPLAY_MODE, nullptr}, - {VIEW_SET_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, "卡片管理", STR_CARD_MANAGEMENT, nullptr}, + {VIEW_ADD_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, "卡片管理", STR_CARD_MANAGEMENT, nullptr}, {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_SLEEP_IMAGE, "睡眠", STR_SLEEP, nullptr}, {VIEW_RECORD, PNG_APPLIST_RECORD_IMAGE, PNG_APPLIST_RECORD_IMAGE, "录音", STR_RECORD, nullptr}, {VIEW_RESPIRATORY_TRAINING, PNG_APPLIST_BREATHE_IMAGE, PNG_APPLIST_BREATHE_IMAGE, "呼吸训练", STR_BREATH_TRAINING, nullptr}, diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h index 0c3673714..24b351070 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-06-21 09:56:18 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-28 16:36:39 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h + */ /*** * @Date: 2024-06-21 09:56:18 * @LastEditors: Caisking 3449750381@qq.com @@ -65,6 +71,7 @@ namespace OHOS uint8_t GetFromCardId(void); void printCardSettings(); const char *getCardNameFromMap(uint8_t cardId) const; + const bool GetCardInfoSet(uint8_t index) const; private: void InitDialSettingDefault(void); 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 c6c68d9ca..57fc16d92 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -25,8 +25,6 @@ namespace OHOS {TRAINING, PNG_SET_CARD_TRAIN, false}, {GOAL, PNG_SET_CARD_ACTIVITY, false}, {SLEEP, PNG_SET_CARD_SLEEP, false}, - /*在前方增加卡片*/ - {SETCARD, PNG_SET_CARD_MAIN, true}, }; /*维护卡片*/ CardInfoSet cardInfoSet[] = @@ -39,7 +37,6 @@ namespace OHOS {TRAINING, false}, {GOAL, false}, {SLEEP, false}, - {SETCARD, true}, }; /*自定义map？*/ const DialInfo dialInfoMap[] = { @@ -55,7 +52,6 @@ namespace OHOS {TRAINING, "训练"}, {GOAL, "每日目标"}, {SLEEP, "睡眠"}, - {SETCARD, "设置卡片"}, }; MainModel::MainModel() {} @@ -108,6 +104,10 @@ namespace OHOS } return nullptr; } + const bool MainModel::GetCardInfoSet(uint8_t index) const + { + return cardInfoSet[index].isVisible; + } void MainModel::InitCardSettings(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); @@ -166,6 +166,9 @@ namespace OHOS cardSettings[index++] = cardInfoMap[i].id; } } + /*设置卡片[不被卡片管理，必须设置] */ + cardSettings[index++] = SETCARD; + cardSettingCount = index; } @@ -197,7 +200,7 @@ namespace OHOS for (uint8_t i = 0; i < count; i++) { // 需要被删除的卡片 - if (cardSettings[index + 1] == cardInfoSet[i].id) + if (cardInfoMap[index].id == cardInfoSet[i].id) { cardInfoSet[i].isVisible = false; printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]); @@ -226,6 +229,8 @@ namespace OHOS cardSettings[mapindex++] = cardInfoSet[i].id; } } + /*设置卡片[不被卡片管理，必须设置] */ + cardSettings[mapindex++] = SETCARD; cardSettingCount = mapindex; @@ -282,6 +287,9 @@ namespace OHOS printf("set cardInfoSet[%d]\r\n", i); } } + /*设置卡片[不被卡片管理，必须设置] */ + cardSettings[mapindex++] = SETCARD; + cardSettingCount = mapindex; // 更新存储内容 diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardPresenter.cpp index c36e8580a..24d560fb8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardPresenter.cpp @@ -9,7 +9,8 @@ #include "SetCardModel.h" #include "SetCardPresenter.h" -namespace OHOS { +namespace OHOS +{ SetCardPresenter::SetCardPresenter() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SetCardPresenter"); @@ -19,7 +20,8 @@ namespace OHOS { SetCardPresenter::~SetCardPresenter() { - if (keyActListenr != nullptr) { + if (keyActListenr != nullptr) + { delete keyActListenr; keyActListenr = nullptr; } @@ -28,11 +30,15 @@ namespace OHOS { void SetCardPresenter::OnStart() { Presenter::OnStart(); - if (keyActListenr == nullptr) { + if (keyActListenr == nullptr) + { keyActListenr = new KeyInputListener(); - if (keyActListenr != nullptr) { + if (keyActListenr != nullptr) + { RootView::GetInstance()->SetOnKeyActListener(keyActListenr); - } else { + } + else + { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnStart: new KeyInputListener fail"); } } @@ -50,28 +56,38 @@ namespace OHOS { bool SetCardPresenter::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::OnClick"); - if (strcmp(view.GetViewId(), SET_CARD_ADD) == 0) { + if (strcmp(view.GetViewId(), SET_CARD_ADD) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_ADD"); NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD); - } else if (strcmp(view.GetViewId(), SET_CARD_DEL) == 0) { + } + else if (strcmp(view.GetViewId(), SET_CARD_DEL) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_DEL"); view_->SaveSelectCardIndex(); view_->ShowDeleteView(true); - } else if (strcmp(view.GetViewId(), SET_CARD_DEL_CONFIRM) == 0) { + } + else if (strcmp(view.GetViewId(), SET_CARD_DEL_CONFIRM) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_DEL_CONFIRM"); model->DeleteCardSetting(); view_->ShowDeleteView(false); view_->RefreshCardList(); - } else if (strcmp(view.GetViewId(), SET_CARD_DEL_CANCEL) == 0) { + } + else if (strcmp(view.GetViewId(), SET_CARD_DEL_CANCEL) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_DEL_CANCEL"); view_->ShowDeleteView(false); - } else if (strcmp(view.GetViewId(), SET_CARD_IMG) == 0) { + } + else if (strcmp(view.GetViewId(), SET_CARD_IMG) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_IMG"); GoToMainView(); } - else if (strcmp(view.GetViewId(), SET_CARD_MAIN) == 0) { + else if (strcmp(view.GetViewId(), SET_CARD_MAIN) == 0) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SET_CARD_MAIN"); - NativeAbility::GetInstance().ChangeSlice(VIEW_SET_CARD); + NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD); } ResetTickTimer(); return true; @@ -86,19 +102,21 @@ namespace OHOS { void SetCardPresenter::OnScrollEnd(int16_t index, UIView *view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::OnScrollEnd index = %d", index); - if (view == nullptr) { + if (view == nullptr) + { return; } SetSelectedCardIndex(index); ResetTickTimer(); } - void SetCardPresenter::OnItemSelected(int16_t index, UIView* view) + void SetCardPresenter::OnItemSelected(int16_t index, UIView *view) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::OnItemSelected index = %d", index); - if (view == nullptr) { + if (view == nullptr) + { return; - } + } } void SetCardPresenter::InitCardShowList(void) { @@ -135,9 +153,11 @@ namespace OHOS { { uint8_t *cardSettings = model->GetCardShowList(); uint8_t selectIndex = model->GetSelectedCardIndex(); - if (selectIndex < model->GetCardShowCount()) { + if (selectIndex < model->GetCardShowCount()) + { const CardInfo *info = MainModel::GetInstance().GetCardInfo(static_cast(cardSettings[selectIndex])); - if (info != nullptr) { + if (info != nullptr) + { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::GoToMainView %d", info->id); MainModel::GetInstance().SetFromSetCardView(true); MainModel::GetInstance().SetFromCardId(info->id); @@ -149,7 +169,8 @@ namespace OHOS { void SetCardPresenter::OnTickEvent() { uint64_t current_time = osKernelGetTick2ms(); - if ((startTime != 0) && (current_time - startTime > MISS_SET_CARD_OPERATION_TIME)) { + if ((startTime != 0) && (current_time - startTime > MISS_SET_CARD_OPERATION_TIME)) + { GoToMainView(); } } -- 2.17.1