+/***\r
+ * @Date: 2024-05-30 15:59:37\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-06-28 16:53:50\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h\r
+ */\r
/*\r
* Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
* Description: AddCardItem.h\r
#include "components/ui_view_group.h"\r
#include "components/ui_image_view.h"\r
#include "components/ui_label_button.h"\r
+#include "components/ui_toggle_button.h"\r
#include "UiConfig.h"\r
+#include "components/ui_cross_view.h"\r
+#include "components/ui_canvas_ext.h"\r
\r
-namespace OHOS {\r
-typedef struct {\r
- CardId id;\r
- bool addFlag;\r
- const char *cardImg;\r
-} AddCardInfo;\r
+namespace OHOS\r
+{\r
+ typedef struct\r
+ {\r
+ CardId id;\r
+ bool addFlag;\r
+ const char *cardImg;\r
+ } AddCardInfo;\r
\r
-class AddCardItem : public UIViewGroup {\r
-public:\r
- AddCardItem();\r
- ~AddCardItem() override;\r
- void SetItemInfo(const AddCardInfo &cardInfo);\r
- void SetOnClickListener(OnClickListener *onClickListener);\r
- void UpdateItemInfo(bool addFlag);\r
-private:\r
- void SetUpChild();\r
- UIImageView cardImg_;\r
- UILabelButton cardLabel_;\r
- AddCardInfo cardInfo_;\r
-};\r
+ class AddCardItem : public UIViewGroup\r
+ {\r
+ public:\r
+ AddCardItem();\r
+ ~AddCardItem() override;\r
+ void SetItemInfo(const AddCardInfo &cardInfo);\r
+ void SetOnClickListener(OnClickListener *onClickListener);\r
+ void UpdateItemInfo(bool addFlag);\r
\r
-}\r
+ private:\r
+ void SetUpChild();\r
+ UIImageView cardImg_;\r
+ UILabelButton cardLabel_;\r
+ UIToggleButton cardToggleButton_;\r
+ AddCardInfo cardInfo_;\r
+ UICanvasExt canvas_;\r
+ };\r
\r
+}\r
#endif // ADD_CARD_ITEM_H
\ No newline at end of file
+/***
+ * @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
#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 &);
+/***\r
+ * @Date: 2024-04-15 10:55:58\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-06-28 16:53:33\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp\r
+ */\r
#include "AddCardItem.h"\r
#include "AddCardPresenter.h"\r
#include "wearable_log.h"\r
+#include "components/ui_canvas_ext.h"\r
\r
-namespace OHOS {\r
+namespace OHOS\r
+{\r
AddCardItem::AddCardItem()\r
{\r
- SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+ SetPosition(0, 0, 466, 466);\r
SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);\r
SetUpChild();\r
+ Add(&canvas_);\r
Add(&cardImg_);\r
- Add(&cardLabel_);\r
+ Add(&cardToggleButton_);\r
}\r
\r
AddCardItem::~AddCardItem()\r
{\r
+ Remove(&canvas_);\r
Remove(&cardImg_);\r
- Remove(&cardLabel_);\r
+ Remove(&cardToggleButton_);\r
}\r
\r
void AddCardItem::SetUpChild()\r
{\r
- cardImg_.SetPosition(87, 60);\r
+ cardImg_.SetPosition(93, 83);\r
cardImg_.Resize(280, 280);\r
cardImg_.SetResizeMode(UIImageView::FILL);\r
cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);\r
\r
- cardLabel_.SetPosition(175, 360);\r
- cardLabel_.Resize(100, 50);\r
- cardLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);\r
+ cardToggleButton_.SetPosition(133, 366);\r
+ cardToggleButton_.Resize(200, 100);\r
+ cardToggleButton_.SetViewId("toggleButton1");\r
+ cardToggleButton_.SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+\r
+ canvas_.SetPosition(73, 65);\r
+ canvas_.Resize(320, 320);\r
+ canvas_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
+ canvas_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);\r
+ PaintExt paint;\r
+ Point center = {158, 158};\r
+ paint.SetStyle(Paint::PaintStyle::STROKE_STYLE);\r
+ paint.SetStrokeWidth(20);\r
+ paint.SetStrokeColor(Color::Cyan());\r
+ paint.SetAntialiased(true);\r
+ RadialGradient radial = {158, 158, 150, 150, 152};\r
+ ColorStop stops[3] = {{0, Color::White().full}, {0.8, Color::White().full}, {1, 0x00ffffff}};\r
+ paint.SetRadialGradient(radial, stops, 3); // 3: count\r
+ canvas_.DrawCircle(center, 140, paint);\r
}\r
\r
void AddCardItem::SetItemInfo(const AddCardInfo &cardInfo)\r
{\r
cardInfo_ = cardInfo;\r
cardImg_.SetSrc(cardInfo.cardImg);\r
- if (cardInfo.addFlag) {\r
- cardLabel_.SetText("已添加");\r
- } else {\r
- cardLabel_.SetText("添加");\r
- }\r
+\r
+ cardToggleButton_.SetState(cardInfo.addFlag);\r
}\r
\r
void AddCardItem::UpdateItemInfo(bool addFlag)\r
{\r
- if (addFlag) {\r
- cardLabel_.SetText("已添加");\r
- cardInfo_.addFlag = addFlag;\r
- Invalidate();\r
- }\r
+ cardInfo_.addFlag = addFlag;\r
+ cardToggleButton_.SetState(cardInfo_.addFlag);\r
+ Invalidate();\r
}\r
\r
void AddCardItem::SetOnClickListener(OnClickListener *onClickListener)\r
{\r
cardLabel_.SetOnClickListener(onClickListener);\r
+ cardToggleButton_.SetOnClickListener(onClickListener);\r
}\r
\r
};\r
+/***
+ * @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
#include "kv_store.h"
#include "securec.h"
-namespace OHOS {
+namespace OHOS
+{
AddCardModel::AddCardModel() {}
AddCardModel::~AddCardModel() {}
{
MainModel::GetInstance().AddCardSetting(selectedCardIndex);
}
+ void AddCardModel::DelCardSetting(void)
+ {
+ MainModel::GetInstance().DeleteCardSetting(selectedCardIndex);
+ }
}
#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()
{
}
- 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);
}
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;
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;
}
startTime = osKernelGetTick2ms();
return;
}
-
}
#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<AddCardPresenter>::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<AddCardPresenter>::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<AddCardPresenter>::OnSetUpView();
-}
+ void AddCardView::OnSetUpView()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnSetUpView");
+
View<AddCardPresenter>::OnSetUpView();
+ }
-void AddCardView::OnTearDownView()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnTearDownView");
- View<AddCardPresenter>::OnTearDownView();
-}
+ void AddCardView::OnTearDownView()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnTearDownView");
+
View<AddCardPresenter>::OnTearDownView();
+ }
-void AddCardView::OnStop()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStop");
- View<AddCardPresenter>::OnStop();
- if (container_ != nullptr) {
- container_->RemoveAll();
- delete container_;
- container_ = nullptr;
+ void AddCardView::OnStop()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::OnStop");
+ View<AddCardPresenter>::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();
+ }
}
{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},
+/***\r
+ * @Date: 2024-06-21 09:56:18\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-06-28 16:36:39\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h\r
+ */\r
/***\r
* @Date: 2024-06-21 09:56:18\r
* @LastEditors: Caisking 3449750381@qq.com\r
uint8_t GetFromCardId(void);\r
void printCardSettings();\r
const char *getCardNameFromMap(uint8_t cardId) const;\r
+ const bool GetCardInfoSet(uint8_t index) const;\r
\r
private:\r
void InitDialSettingDefault(void);\r
{TRAINING, PNG_SET_CARD_TRAIN, false},\r
{GOAL, PNG_SET_CARD_ACTIVITY, false},\r
{SLEEP, PNG_SET_CARD_SLEEP, false},\r
- /*在前方增加卡片*/\r
- {SETCARD, PNG_SET_CARD_MAIN, true},\r
};\r
/*维护卡片*/\r
CardInfoSet cardInfoSet[] =\r
{TRAINING, false},\r
{GOAL, false},\r
{SLEEP, false},\r
- {SETCARD, true},\r
};\r
/*自定义map？*/\r
const DialInfo dialInfoMap[] = {\r
{TRAINING, "训练"},\r
{GOAL, "每日目标"},\r
{SLEEP, "睡眠"},\r
- {SETCARD, "设置卡片"},\r
};\r
MainModel::MainModel() {}\r
\r
}\r
return nullptr;\r
}\r
+ const bool MainModel::GetCardInfoSet(uint8_t index) const\r
+ {\r
+ return cardInfoSet[index].isVisible;\r
+ }\r
void MainModel::InitCardSettings(void)\r
{\r
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings");\r
cardSettings[index++] = cardInfoMap[i].id;\r
}\r
}\r
+ /*设置卡片[不被卡片管理，必须设置] */\r
+ cardSettings[index++] = SETCARD;\r
+\r
cardSettingCount = index;\r
}\r
\r
for (uint8_t i = 0; i < count; i++)\r
{\r
// 需要被删除的卡片\r
- if (cardSettings[index + 1] == cardInfoSet[i].id)\r
+ if (cardInfoMap[index].id == cardInfoSet[i].id)\r
{\r
cardInfoSet[i].isVisible = false;\r
printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]);\r
cardSettings[mapindex++] = cardInfoSet[i].id;\r
}\r
}\r
+ /*设置卡片[不被卡片管理，必须设置] */\r
+ cardSettings[mapindex++] = SETCARD;\r
\r
cardSettingCount = mapindex;\r
\r
printf("set cardInfoSet[%d]\r\n", i);\r
}\r
}\r
+ /*设置卡片[不被卡片管理，必须设置] */\r
+ cardSettings[mapindex++] = SETCARD;\r
+\r
cardSettingCount = mapindex;\r
\r
// 更新存储内容\r
#include "SetCardModel.h"
#include "SetCardPresenter.h"
-namespace OHOS {
+namespace OHOS
+{
SetCardPresenter::SetCardPresenter()
{
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardPresenter::SetCardPresenter");
SetCardPresenter::~SetCardPresenter()
{
- if (keyActListenr != nullptr) {
+ if (keyActListenr != nullptr)
+ {
delete keyActListenr;
keyActListenr = nullptr;
}
void SetCardPresenter::OnStart()
{
Presenter<SetCardView>::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");
}
}
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;
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)
{
{
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<CardId>(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);
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();
}
}
projects / mirrors / FD230.git / commitdiff