#include "kv_store.h"\r
#include "securec.h"\r
#include "wearable_log.h"\r
-\r
+#include <map>\r
namespace OHOS\r
{\r
static const int CARD_SETTING_VALUE_LEN = 32;\r
static const int DIAL_SETTING_VALUE_LEN = 64;\r
// 更新主界面卡片需要更新Map\r
const CardInfo cardInfoMap[] = {\r
- {HEART_RATE, PNG_SET_CARD_HEART},\r
- {COMPASS, PNG_SET_CARD_COMPASS},\r
- {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\r
- {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
- {WEATHER, PNG_SET_CARD_WEATHER},\r
- {TRAINING, PNG_SET_CARD_TRAIN},\r
- {SETCARD, PNG_SET_CARD_MAIN},\r
- {GOAL, PNG_SET_CARD_ACTIVITY},\r
-\r
- // {ACTIVITY, PNG_SET_CARD_ACTIVITY},\r
+ {MUSIC_PLAYER, true, PNG_SET_CARD_PLAYER}, // 音乐播放器\r
+ {HEART_RATE, true, PNG_SET_CARD_HEART}, // 心率检测\r
+ {TRAINING, false, PNG_SET_CARD_TRAIN}, // 训练\r
+ {COMPASS, true, PNG_SET_CARD_COMPASS}, // 指南针\r
+ {BLOODOXGEN, false, PNG_SET_CARD_BLOOD}, // 血氧检测\r
+ {GOAL, true, PNG_SET_CARD_ACTIVITY}, // 每日目标\r
+ {WEATHER, false, PNG_SET_CARD_WEATHER}, // 天气\r
};\r
- /*自定义map？*/\r
+\r
+ /*自定义表盘map？*/\r
const DialInfo dialInfoMap[] = {\r
{DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD},\r
};\r
}\r
return nullptr;\r
}\r
-\r
+ bool MainModel::GetCardVisable(CardId card)\r
+ {\r
+ const CardInfo *info = GetCardInfo(card);\r
+ if (info != nullptr)\r
+ {\r
+ return info->visable;\r
+ }\r
+ return false;\r
+ }\r
void MainModel::InitCardSettings(void)\r
{\r
char temp[CARD_SETTING_VALUE_LEN] = {0};\r
else\r
{\r
/* 使用默认card配置 */\r
+ cardSettings[index++] = SETCARD;\r
cardSettings[index++] = WATCH_FACE;\r
- cardSettings[index++] = HEART_RATE;\r
- cardSettings[index++] = COMPASS;\r
- // cardSettings[index++] = ACTIVITY;\r
- cardSettings[index++] = MUSIC_PLAYER;\r
- cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片\r
+ /**遍历cardInfoMap 的默认visable选项，true的被设置进来 */\r
+ for (uint8_t i = WATCH_FACE + 2; i < MAX_CARD; i++)\r
+ {\r
+ if (GetCardVisable((CardId)i) == true)\r
+ {\r
+ cardSettings[index++] = (CardId)i;\r
+ }\r
+ }\r
cardSettingCount = index;\r
}\r
}\r
\r
void MainModel::DeleteCardSetting(uint8_t index)\r
{\r
+ /**找到 cardInfoMap 中的 对应 CardId , 在 cardSettings中删除 */\r
char temp[CARD_SETTING_VALUE_LEN] = {0};\r
for (uint8_t i = 0; i < cardSettingCount; i++)\r
{\r
\r
void MainModel::AddCardSetting(uint8_t index)\r
{\r
+ /** 找到 cardInfoMap 中的 对应 CardId , 在 cardSettings中添加*/\r
char temp[CARD_SETTING_VALUE_LEN] = {0};\r
if (cardSettingCount >= CARD_SETTING_COUNT_MAX)\r
{\r
{\r
return fromCardId;\r
}\r
+\r
}
\ No newline at end of file
#include "SetCardView.h"
#include "SetCardPresenter.h"
-namespace OHOS {
-SetCardView::SetCardView():contentList_(UIList::HORIZONTAL)
+namespace OHOS
{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::SetCardView");
-}
-
-SetCardView::~SetCardView()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::~SetCardView");
- if (deleteView_ != nullptr) {
- delete deleteView_;
- deleteView_ = nullptr;
- }
-
- if (noCardView_ != nullptr) {
- delete noCardView_;
- noCardView_ = nullptr;
+ SetCardView::SetCardView() : contentList_(UIList::HORIZONTAL)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::SetCardView");
}
- if (setCardAdapter_ != nullptr) {
- delete setCardAdapter_;
- setCardAdapter_ = nullptr;
- }
-}
+ SetCardView::~SetCardView()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::~SetCardView");
+ if (deleteView_ != nullptr)
+ {
+ delete deleteView_;
+ deleteView_ = nullptr;
+ }
-void SetCardView::OnStart()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnStart");
- View<SetCardPresenter>::OnStart();
- SetContainerView(new UIViewGroup());
- container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
- setCardAdapter_ = new SetCardAdapter();
- setCardAdapter_->SetItemClickListener(presenter_);
- SetUpListInfo();
- SetUpListView();
- SetUpDeleteView();
- SetUpAddView();
-}
+ if (noCardView_ != nullptr)
+ {
+ delete noCardView_;
+ noCardView_ = nullptr;
+ }
-void SetCardView::OnSetUpView()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnSetUpView");
- View<SetCardPresenter>::OnSetUpView();
- ShowDeleteView(false);
- if (setCardAdapter_->GetCount() == 0) {
- ShowAddView(true);
+ if (setCardAdapter_ != nullptr)
+ {
+ delete setCardAdapter_;
+ setCardAdapter_ = nullptr;
+ }
}
-}
-
-void SetCardView::OnTearDownView()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnTearDownView");
- View<SetCardPresenter>::OnTearDownView();
-}
-void SetCardView::OnStop()
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnStop");
- View<SetCardPresenter>::OnStop();
- RootView::GetInstance()->ClearOnKeyActListener();
- if (container_ != nullptr) {
- container_->RemoveAll();
- delete container_;
- container_ = nullptr;
+ void SetCardView::OnStart()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnStart");
+ View<SetCardPresenter>::OnStart();
+ SetContainerView(new UIViewGroup());
+ container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+ setCardAdapter_ = new SetCardAdapter();
+ setCardAdapter_->SetItemClickListener(presenter_);
+ SetUpListInfo();
+ SetUpListView();
+ SetUpDeleteView();
+ SetUpAddView();
}
-}
-void SetCardView::SetUpListInfo(void)
-{
- presenter_->InitCardShowList();
- uint8_t num = presenter_->GetCardShowCount();
- uint8_t *cardSettings = presenter_->GetCardShowList();
- uint8_t selectCardId = presenter_->GetSelectedCard();
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::selectCardId = %u", selectCardId);
- setCardAdapter_->ClearItem();
- for (uint8_t i = 0; i < num; i++) {
- const CardInfo *info = MainModel::GetInstance().GetCardInfo(
- static_cast<CardId>(cardSettings[i]));
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::%d %s", info->id, info->cardImg);
- if (selectCardId == info->id) {
- presenter_->SetSelectedCardIndex(i);
- scrollIndex_ = i;
- presenter_->SetSelectedCard(MAX_CARD);
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::scrollIndex_ = %u", scrollIndex_);
+ void SetCardView::OnSetUpView()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnSetUpView");
+ View<SetCardPresenter>::OnSetUpView();
+ ShowDeleteView(false);
+ if (setCardAdapter_->GetCount() == 0)
+ {
+ ShowAddView(true);
}
- setCardAdapter_->AddListItem(*info);
}
-}
-void SetCardView::SetUpListView(void)
-{
- addImg_.SetPosition(187, 10);
- addImg_.Resize(80, 80);
- addImg_.SetResizeMode(UIImageView::FILL);
- addImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
- addImg_.SetSrc(PNG_SET_CARD_ADD);
- addImg_.SetViewId(SET_CARD_ADD);
- addImg_.SetVisible(false);
-
- contentList_.SetPosition(0, 92);
- contentList_.Resize(HORIZONTAL_RESOLUTION, 280);
- contentList_.SetScrollBlankSize(HORIZONTAL_RESOLUTION / 2);
- contentList_.SetSelectPosition(HORIZONTAL_RESOLUTION / 2);
- contentList_.SetDraggable(true);
- contentList_.SetThrowDrag(true);
- contentList_.EnableAutoAlign(true);
- contentList_.SetScrollStateListener(presenter_);
- contentList_.SetMaxScrollDistance(1000);
- contentList_.SetAdapter(setCardAdapter_);
- contentList_.SetVisible(false);
- contentList_.ScrollTo(scrollIndex_);
-
- delImg_.SetPosition(187, 374);
- delImg_.Resize(80, 80);
- delImg_.SetResizeMode(UIImageView::FILL);
- delImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
- delImg_.SetSrc(PNG_SET_CARD_DEL);
- delImg_.SetViewId(SET_CARD_DEL);
- delImg_.SetVisible(false);
-
- addImg_.SetTouchable(true);
- addImg_.SetOnClickListener(presenter_);
- delImg_.SetTouchable(true);
- delImg_.SetOnClickListener(presenter_);
-
- container_->Add(&addImg_);
- container_->Add(&contentList_);
- container_->Add(&delImg_);
-}
+ void SetCardView::OnTearDownView()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnTearDownView");
+ View<SetCardPresenter>::OnTearDownView();
+ }
-void SetCardView::SetUpDeleteView(void)
-{
- deleteView_ = new SetCardDeleteView(presenter_);
- if (deleteView_ == nullptr) {
- return;
+ void SetCardView::OnStop()
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::OnStop");
+ View<SetCardPresenter>::OnStop();
+ RootView::GetInstance()->ClearOnKeyActListener();
+ if (container_ != nullptr)
+ {
+ container_->RemoveAll();
+ delete container_;
+ container_ = nullptr;
+ }
}
- deleteView_->SetVisible(false);
- container_->Add(deleteView_);
-}
-void SetCardView::SetUpAddView(void)
-{
- noCardView_ = new SetCardNoCardView(presenter_);
- if (noCardView_ == nullptr) {
- return;
+ /*加载显示的缩约图*/
+ void SetCardView::SetUpListInfo(void)
+ {
+ presenter_->InitCardShowList();
+ uint8_t num = presenter_->GetCardShowCount();
+ uint8_t *cardSettings = presenter_->GetCardShowList();
+ uint8_t selectCardId = presenter_->GetSelectedCard();
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::selectCardId = %u", selectCardId);
+ setCardAdapter_->ClearItem();
+ for (uint8_t i = 0; i < num; i++)
+ {
+ const CardInfo *info = MainModel::GetInstance().GetCardInfo(
+ static_cast<CardId>(cardSettings[i]));
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::%d %s", info->id, info->cardImg);
+ if (selectCardId == info->id)
+ {
+ presenter_->SetSelectedCardIndex(i);
+ scrollIndex_ = i;
+ presenter_->SetSelectedCard(MAX_CARD);
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetUpListInfo::scrollIndex_ = %u", scrollIndex_);
+ }
+ setCardAdapter_->AddListItem(*info);
+ }
}
- noCardView_->SetVisible(false);
- container_->Add(noCardView_);
-}
-void SetCardView::ShowCardListView(bool show)
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowCardListView %u", show);
- if (show) {
- addImg_.SetVisible(true);
- contentList_.SetVisible(true);
- delImg_.SetVisible(true);
- } else {
+
+ void SetCardView::SetUpListView(void)
+ {
+ /* ---- 根据 cardSettings 中的CardId 确认是否是已添加的 ，+号是cardSettings中有的，-号是其它card ---- */
+ addImg_.SetPosition(187, 10);
+ addImg_.Resize(80, 80);
+ addImg_.SetResizeMode(UIImageView::FILL);
+ addImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
+ addImg_.SetSrc(PNG_SET_CARD_ADD);
+ addImg_.SetViewId(SET_CARD_ADD);
addImg_.SetVisible(false);
+
+ contentList_.SetPosition(0, 92);
+ contentList_.Resize(HORIZONTAL_RESOLUTION, 280);
+ contentList_.SetScrollBlankSize(HORIZONTAL_RESOLUTION / 2);
+ contentList_.SetSelectPosition(HORIZONTAL_RESOLUTION / 2);
+ contentList_.SetDraggable(true);
+ contentList_.SetThrowDrag(true);
+ contentList_.EnableAutoAlign(true);
+ contentList_.SetScrollStateListener(presenter_);
+ contentList_.SetMaxScrollDistance(1000);
+ contentList_.SetAdapter(setCardAdapter_);
contentList_.SetVisible(false);
+ contentList_.ScrollTo(scrollIndex_);
+
+ delImg_.SetPosition(187, 374);
+ delImg_.Resize(80, 80);
+ delImg_.SetResizeMode(UIImageView::FILL);
+ delImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
+ delImg_.SetSrc(PNG_SET_CARD_DEL);
+ delImg_.SetViewId(SET_CARD_DEL);
delImg_.SetVisible(false);
+
+ addImg_.SetTouchable(true);
+ addImg_.SetOnClickListener(presenter_);
+ delImg_.SetTouchable(true);
+ delImg_.SetOnClickListener(presenter_);
+
+ container_->Add(&addImg_);
+ container_->Add(&contentList_);
+ container_->Add(&delImg_);
}
-}
-void SetCardView::ShowDeleteView(bool show)
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowDeleteView %u", show);
- if (show) {
- ShowCardListView(false);
- deleteView_->SetVisible(true);
- } else {
- ShowCardListView(true);
+ void SetCardView::SetUpDeleteView(void)
+ {
+ deleteView_ = new SetCardDeleteView(presenter_);
+ if (deleteView_ == nullptr)
+ {
+ return;
+ }
deleteView_->SetVisible(false);
+ container_->Add(deleteView_);
}
-}
-void SetCardView::ShowAddView(bool show)
-{
- WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowAddView %u", show);
- if (show) {
- ShowCardListView(false);
- noCardView_->SetVisible(true);
- } else {
- ShowCardListView(true);
+ void SetCardView::SetUpAddView(void)
+ {
+ noCardView_ = new SetCardNoCardView(presenter_);
+ if (noCardView_ == nullptr)
+ {
+ return;
+ }
noCardView_->SetVisible(false);
+ container_->Add(noCardView_);
}
-}
-void SetCardView::RefreshCardList(void)
-{
- contentList_.RemoveAll();
- SetUpListInfo();
- contentList_.RefreshList();
- if (setCardAdapter_->GetCount() == 0) {
- ShowAddView(true);
+ void SetCardView::ShowCardListView(bool show)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowCardListView %u", show);
+ if (show)
+ {
+ addImg_.SetVisible(true);
+ contentList_.SetVisible(true);
+ delImg_.SetVisible(true);
+ }
+ else
+ {
+ addImg_.SetVisible(false);
+ contentList_.SetVisible(false);
+ delImg_.SetVisible(false);
+ }
}
-}
-void SetCardView::SaveSelectCardIndex(void)
-{
- uint8_t cardIdex = contentList_.GetSelectView()->GetViewIndex();
- presenter_->SetSelectedCardIndex(cardIdex);
-}
+ void SetCardView::ShowDeleteView(bool show)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowDeleteView %u", show);
+ if (show)
+ {
+ ShowCardListView(false);
+ deleteView_->SetVisible(true);
+ }
+ else
+ {
+ ShowCardListView(true);
+ deleteView_->SetVisible(false);
+ }
+ }
+
+ void SetCardView::ShowAddView(bool show)
+ {
+ WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardView::ShowAddView %u", show);
+ if (show)
+ {
+ ShowCardListView(false);
+ noCardView_->SetVisible(true);
+ }
+ else
+ {
+ ShowCardListView(true);
+ noCardView_->SetVisible(false);
+ }
+ }
+
+ void SetCardView::RefreshCardList(void)
+ {
+ contentList_.RemoveAll();
+ SetUpListInfo();
+ contentList_.RefreshList();
+ if (setCardAdapter_->GetCount() == 0)
+ {
+ ShowAddView(true);
+ }
+ }
+
+ void SetCardView::SaveSelectCardIndex(void)
+ {
+ uint8_t cardIdex = contentList_.GetSelectView()->GetViewIndex();
+ presenter_->SetSelectedCardIndex(cardIdex);
+ }
}
projects / mirrors / FD230.git / commitdiff