From 359c63afa4ea8f500571b6228ab4f4018016c638 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Thu, 27 Jun 2024 12:49:14 +0000 Subject: [PATCH] Merge #394 into sdk602patch0521 from refs/changes/394/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/394/head: (2 commits squashed) - 卡片管理按照顺序配置 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/394 --- .../nativelauncher/include/UiConfig.h | 4 +- .../heart_blood/set_heart/SetHeartModel.cpp | 0 .../heart_blood/set_heart/SetHeartModel.h | 0 .../set_heart/SetHeartPresenter.cpp | 0 .../heart_blood/set_heart/SetHeartPresenter.h | 0 .../heart_blood/set_heart/SetHeartView.cpp | 0 .../heart_blood/set_heart/SetHeartView.h | 0 .../nativeui/main/include/MainModel.h | 35 +- .../fd230app/nativeui/main/src/MainModel.cpp | 346 +++++++++++++++--- .../nativeui/main/src/MainViewSample.cpp | 2 +- .../nativeui/set_card/src/SetCardModel.cpp | 2 +- 11 files changed, 317 insertions(+), 72 deletions(-) create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.cpp create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.h create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.cpp create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.h create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.cpp create mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.h diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index d8dfa8d27..6b9ee61a5 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -14,11 +14,10 @@ namespace OHOS { - static const int CARD_SETTING_COUNT_MAX = 8; + static const int CARD_SETTING_COUNT_MAX = 10; typedef enum { WATCH_FACE = 0, /* 主表盘枚举值不能修改 */ - SETCARD, HEART_RATE, COMPASS, MUSIC_PLAYER, @@ -27,6 +26,7 @@ namespace OHOS TRAINING, GOAL, SLEEP, + SETCARD, MAX_CARD, } CardId; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartModel.h new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartPresenter.h new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/set_heart/SetHeartView.h new file mode 100644 index 000000000..e69de29bb 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 1d82fac85..0c3673714 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-27 09:38:03 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: MainModel.h @@ -11,26 +17,36 @@ #include #include "UiConfig.h" -namespace OHOS { - typedef struct { +namespace OHOS +{ + struct CardInfo + { CardId id; const char *cardImg; - } CardInfo; - - typedef struct { + bool isVisible; + }; + struct CardInfoSet + { + CardId id; + bool isVisible; + }; + typedef struct + { DialId id; const char *dialName; const char *dialImg; uint8_t freq; } DialInfo; - typedef struct { + typedef struct + { uint8_t dialFlag; uint8_t dialId; std::string dialFullName; } DialSetting; - class MainModel { + class MainModel + { public: static MainModel &GetInstance(void); void InitCardSettings(void); @@ -47,6 +63,9 @@ namespace OHOS { void SetFromSetCardView(bool isFrom); void SetFromCardId(uint8_t cardId); uint8_t GetFromCardId(void); + void printCardSettings(); + const char *getCardNameFromMap(uint8_t cardId) const; + private: void InitDialSettingDefault(void); MainModel(); @@ -54,7 +73,7 @@ namespace OHOS { MainModel &operator=(const MainModel &); virtual ~MainModel(); - CardId cardSettings[CARD_SETTING_COUNT_MAX] = { MAX_CARD }; + CardId cardSettings[CARD_SETTING_COUNT_MAX] = {MAX_CARD}; uint8_t cardSettingCount{0}; DialSetting dialSetting; bool isFromSetCardView{false}; 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 bb5a7d56e..c6c68d9ca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -17,21 +17,46 @@ namespace OHOS static const int DIAL_SETTING_VALUE_LEN = 64; // 更新主界面卡片需要更新Map const CardInfo cardInfoMap[] = { - {SETCARD, PNG_SET_CARD_MAIN}, - {HEART_RATE, PNG_SET_CARD_HEART}, - {COMPASS, PNG_SET_CARD_COMPASS}, - {MUSIC_PLAYER, PNG_SET_CARD_PLAYER}, - {BLOODOXGEN, PNG_SET_CARD_BLOOD}, - {WEATHER, PNG_SET_CARD_WEATHER}, - {TRAINING, PNG_SET_CARD_TRAIN}, - {GOAL, PNG_SET_CARD_ACTIVITY}, - {SLEEP, PNG_SET_CARD_SLEEP}, + {HEART_RATE, PNG_SET_CARD_HEART, true}, + {COMPASS, PNG_SET_CARD_COMPASS, true}, + {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, true}, + {BLOODOXGEN, PNG_SET_CARD_BLOOD, false}, + {WEATHER, PNG_SET_CARD_WEATHER, false}, + {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[] = + { + {HEART_RATE, true}, + {COMPASS, true}, + {MUSIC_PLAYER, true}, + {BLOODOXGEN, false}, + {WEATHER, false}, + {TRAINING, false}, + {GOAL, false}, + {SLEEP, false}, + {SETCARD, true}, }; /*自定义map？*/ const DialInfo dialInfoMap[] = { {DIAL_CLOCK, "KUMI", DEFAULT_DIALPER_PATH, DEFAULT_TASK_PERIOD}, }; + const CardInfo printfMap[] = { + {HEART_RATE, "心率卡片"}, + {COMPASS, "指南针"}, + {MUSIC_PLAYER, "音乐"}, + {BLOODOXGEN, "血氧"}, + {WEATHER, "天气"}, + {TRAINING, "训练"}, + {GOAL, "每日目标"}, + {SLEEP, "睡眠"}, + {SETCARD, "设置卡片"}, + }; MainModel::MainModel() {} MainModel::~MainModel() {} @@ -41,33 +66,51 @@ namespace OHOS static MainModel instance; return instance; } + /* ---------------------------------- 卡片配置 ---------------------------------- */ + void MainModel::printCardSettings(void) + { + uint8_t i; + printf("_____________________________________________________\r\n"); + for (i = 0; i < cardSettingCount; i++) + { + uint8_t cardId = cardSettings[i]; + const char *cardname = getCardNameFromMap(cardId); + printf("cardSettings[%d]:Id: %d, CardName: %s\r\n", i, cardId, cardname); + } - const CardInfo *MainModel::GetCardInfo(CardId card) const + for (uint8_t m = 0; m < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); m++) + { + // printf("cardInfoSet[%d]:Id %d, Visible: %s\n", m, cardInfoSet[m].id, cardInfoSet[m].isVisible ? "true" : "false"); + } + printf("_____________________________________________________\r\n"); + } + + const char *MainModel::getCardNameFromMap(uint8_t cardId) const { - for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++) + for (uint8_t i = 0; i < (sizeof(printfMap) / sizeof(printfMap[0])); i++) { - if (card == cardInfoMap[i].id) + if (cardId == printfMap[i].id) { - return &cardInfoMap[i]; + return printfMap[i].cardImg; } } - return nullptr; + return "Unknown"; } - - const DialInfo *MainModel::GetDialInfo(DialId dialId) const + const CardInfo *MainModel::GetCardInfo(CardId card) const { - for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++) + for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++) { - if (dialId == dialInfoMap[i].id) + if (card == cardInfoMap[i].id) { - return &dialInfoMap[i]; + printf("cardInfoMap[%d]:%d\n", i, cardInfoMap[i].id); + return &cardInfoMap[i]; } } return nullptr; } - void MainModel::InitCardSettings(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); char temp[CARD_SETTING_VALUE_LEN] = {0}; int len; int index = 0; @@ -76,9 +119,10 @@ namespace OHOS len = UtilsGetValue("card_setting", temp, CARD_SETTING_VALUE_LEN); if (len >= 0) { - /* 读取用户card配置 */ + // 更新用户卡片配置及更新卡片可见性 char *setBuffer = nullptr; char *setValue = strtok_s(temp, ",", &setBuffer); + index = 0; // 重置 index while (setValue != nullptr) { if (index >= CARD_SETTING_COUNT_MAX) @@ -89,67 +133,168 @@ namespace OHOS setValue = strtok_s(nullptr, ",", &setBuffer); } cardSettingCount = index; + + // 更新卡片可见性 + for (size_t i = 0; i < sizeof(cardInfoSet) / sizeof(cardInfoSet[0]); i++) + { + bool visible = false; + for (size_t j = 0; j < cardSettingCount; j++) + { + if (cardInfoSet[i].id == cardSettings[j]) + { + printf("CardSettings:cardInfoSet[%d] is set cardSettings[%d]\r\n", i, j); + visible = true; + break; + } + } + cardInfoSet[i].isVisible = visible; + } } else { - /* 使用默认card配置 */ - cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片 - cardSettings[index++] = WATCH_FACE; - cardSettings[index++] = HEART_RATE; - cardSettings[index++] = COMPASS; - cardSettings[index++] = MUSIC_PLAYER; + for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++) + { + if (index == 0) + { + /* 表盘卡片[不被卡片管理，必须设置] */ + cardSettings[index++] = WATCH_FACE; + printf("cardSettings[%d] is set [%d]\r\n", index, i, WATCH_FACE); + } + if (cardInfoMap[i].isVisible) + { + printf("cardSettings[%d] is set cardInfoMap[%d]:%d\r\n", index, i, cardInfoMap[i].id); + cardSettings[index++] = cardInfoMap[i].id; + } + } cardSettingCount = index; } - } + printCardSettings(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCardSettings"); + } void MainModel::DeleteCardSetting(uint8_t index) { + /*设置卡片类型为false cardsetting 重新遍历map里面为ture的卡片{表盘必须存在}*/ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); + printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]); + // printCardSettings(); char temp[CARD_SETTING_VALUE_LEN] = {0}; - for (uint8_t i = 0; i < cardSettingCount; i++) + + if (cardSettingCount > CARD_SETTING_COUNT_MAX) { - if (i == index + 1) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettingCount %d is error", cardSettingCount); + return; + } + // 检查要插入的位置是否有效 + if (index < 0 || index > cardSettingCount) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index %d is error or cardSettingCount %d is error", index, cardSettingCount); + return; + } + int count = sizeof(cardInfoSet) / sizeof(cardInfoSet[0]); + printf("count:%d\r\n", count); + // 设置map里面的属性 + for (uint8_t i = 0; i < count; i++) + { + // 需要被删除的卡片 + if (cardSettings[index + 1] == cardInfoSet[i].id) { - uint8_t j = i; - for (; j < cardSettingCount - 1; j++) - { - cardSettings[j] = cardSettings[j + 1]; - } - cardSettings[j] = MAX_CARD; - cardSettingCount--; + cardInfoSet[i].isVisible = false; + printf("删除卡片:cardSettings[%d] is %d \r\n", index + 1, cardSettings[index + 1]); + printf("设置删除卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible); + } + printf("cardInfoSet[%d]:id%d\r\n", i, cardInfoSet[i].id); + } + int mapindex = 0; + // 重新生成cardSettings + for (uint8_t i = 0; i < CARD_SETTING_COUNT_MAX; i++) + { + cardSettings[i] = MAX_CARD; + } + printCardSettings(); + for (uint8_t i = 0; i < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); i++) + { + if (mapindex == 0) + { + /* 表盘卡片[不被卡片管理，必须设置] */ + cardSettings[mapindex++] = WATCH_FACE; + } + // 设置其他卡片 + if (cardInfoSet[i].isVisible) + { + // printf("cardSettings[%d]\r\n", i); + cardSettings[mapindex++] = cardInfoSet[i].id; } } - for (uint8_t i = 0; i < cardSettingCount; i++) + cardSettingCount = mapindex; + + // 更新存储内容 + for (uint8_t k = 0; k < cardSettingCount; k++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); - (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); + (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[k]); } (void)UtilsSetValue("card_setting", temp); + + // printf("index:%d\r\n", index); + printCardSettings(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DeleteCardSetting"); } void MainModel::AddCardSetting(uint8_t index) { + /*设置卡片类型为ture cardsetting 重新遍历map里面为ture的卡片{表盘必须存在}*/ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddCardSetting"); char temp[CARD_SETTING_VALUE_LEN] = {0}; - if (cardSettingCount >= CARD_SETTING_COUNT_MAX) + + if (cardSettingCount > CARD_SETTING_COUNT_MAX) { return; } - for (int i = 0; i < cardSettingCount; i++) + + // 检查要插入的位置是否有效 + if (index < 0 || index > cardSettingCount) { - if (cardSettings[i] == cardInfoMap[index].id) + return; + } + + // 设置map里面的属性 + int mapindex = 0; + + for (uint8_t i = 0; i < (sizeof(cardInfoSet) / sizeof(cardInfoSet[0])); i++) + { + if (mapindex == 0) { - return; + /* 表盘卡片[不被卡片管理，必须设置] */ + cardSettings[mapindex++] = WATCH_FACE; + } + // 需要被添加的卡片 因为添加是显示所有卡片，所以是使用map + if (cardInfoMap[index].id == cardInfoSet[i].id) + { + cardInfoSet[i].isVisible = true; + printf("添加卡片:cardSettings[%d] is %d \r\n", index, cardInfoMap[index].id); + printf("设置添加卡片属性:cardInfoSet[%d] is %d \r\n", i, cardInfoSet[i].isVisible); + } + // 设置其他卡片 + if (cardInfoSet[i].isVisible) + { + cardSettings[mapindex++] = cardInfoSet[i].id; + printf("set cardInfoSet[%d]\r\n", i); } } - cardSettings[cardSettingCount++] = cardInfoMap[index].id; - for (uint8_t i = 0; i < cardSettingCount; i++) + cardSettingCount = mapindex; + + // 更新存储内容 + for (uint8_t j = 0; j < cardSettingCount; j++) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); - (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); + (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[j]); } (void)UtilsSetValue("card_setting", temp); - } + printf("index:%d\r\n", index); + printCardSettings(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddCardSetting"); + } uint8_t MainModel::GetCardSettingCount(void) { return cardSettingCount; @@ -159,7 +304,38 @@ namespace OHOS { return cardSettings; } + bool MainModel::IsFromSetCardView(void) const + { + return isFromSetCardView; + } + + void MainModel::SetFromSetCardView(bool isFrom) + { + isFromSetCardView = isFrom; + } + void MainModel::SetFromCardId(uint8_t cardId) + { + fromCardId = cardId; + } + + uint8_t MainModel::GetFromCardId(void) + { + return fromCardId; + } + + /* ---------------------------------- 表盘配置 ---------------------------------- */ + const DialInfo *MainModel::GetDialInfo(DialId dialId) const + { + for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++) + { + if (dialId == dialInfoMap[i].id) + { + return &dialInfoMap[i]; + } + } + return nullptr; + } void MainModel::InitDialSettingDefault(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitDialSettingDefault"); @@ -238,23 +414,73 @@ namespace OHOS return dialSetting; } - bool MainModel::IsFromSetCardView(void) const - { - return isFromSetCardView; - } +} - void MainModel::SetFromSetCardView(bool isFrom) +#if 0 + void MainModel::DeleteCardSetting(uint8_t index) { - isFromSetCardView = isFrom; + char temp[CARD_SETTING_VALUE_LEN] = {0}; + for (uint8_t i = 0; i < cardSettingCount; i++) + { + if (i == index + 1) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "i:%d index:%d", i, index); + uint8_t j = i; + for (; j < cardSettingCount - 1; j++) + { + cardSettings[j] = cardSettings[j + 1]; + } + cardSettings[j] = MAX_CARD; + cardSettingCount--; + } + } + + for (uint8_t i = 0; i < cardSettingCount; i++) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); + (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); + } + (void)UtilsSetValue("card_setting", temp); + + printf("\r\n***************DeleteCardSetting********************\r\n"); + printCardSettings(); + printf("\r\n_____________________________________________________\r\n"); } - void MainModel::SetFromCardId(uint8_t cardId) + void MainModel::AddCardSetting(uint8_t index) { - fromCardId = cardId; + char temp[CARD_SETTING_VALUE_LEN] = {0}; + if (cardSettingCount >= CARD_SETTING_COUNT_MAX) + { + return; + } + for (int i = 0; i < cardSettingCount; i++) + { + if (cardSettings[i] == cardInfoMap[index].id) + { + return; + } + } + cardSettings[cardSettingCount++] = cardInfoMap[index].id; + for (uint8_t i = 0; i < cardSettingCount; i++) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]); + (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]); + } + (void)UtilsSetValue("card_setting", temp); + + printf("\r\n***************AddCardSetting********************\r\n"); + printCardSettings(); } - uint8_t MainModel::GetFromCardId(void) + else { - return fromCardId; + /* 使用默认card配置 */ + cardSettings[index++] = WATCH_FACE; + cardSettings[index++] = HEART_RATE; + cardSettings[index++] = COMPASS; + cardSettings[index++] = MUSIC_PLAYER; + cardSettings[index++] = SETCARD; // 默认卡片增加设置卡片 + cardSettingCount = index; } -} \ No newline at end of file +#endif 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 de7352644..d662e704d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -30,7 +30,6 @@ namespace OHOS // 严格按照Id对应 static const MainViewMapper CardMapper[] = { {WATCH_FACE, &MainViewSample::InitWatchFacePage}, - {SETCARD, &MainViewSample::InitSetMainPage}, {HEART_RATE, &MainViewSample::InitHeartRatePage}, {COMPASS, &MainViewSample::InitCompassPage}, {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage}, @@ -39,6 +38,7 @@ namespace OHOS {TRAINING, &MainViewSample::InitTrainingPage}, {GOAL, &MainViewSample::InitGoalPage}, {SLEEP, &MainViewSample::InitSleepPage}, + {SETCARD, &MainViewSample::InitSetMainPage}, #if 0 {ACTIVITY, &MainViewSample::InitActivityPage}, diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp index 69b97f840..4f32dbc69 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetCardModel.cpp @@ -30,7 +30,7 @@ namespace OHOS cardShowCount = 0; for (uint8_t i = 0; i < cardCount; i++) { - if (cardSettings[i] == WATCH_FACE || cardSettings[i] == SETCARD) + if (cardSettings[i] == WATCH_FACE) { continue; } -- 2.17.1