From: Caisking Date: Mon, 19 Jan 2026 02:03:07 +0000 (+0800) Subject: 修改运动与心率的卡片顺序 X-Git-Url: http://git.snicker.com.cn/css/html/static/gitweb.css?a=commitdiff_plain;h=c1e9d270ae38cf9d42754235159ff63ed24172b8;p=mirrors%2FFD230.git 修改运动与心率的卡片顺序 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h index 598e74cb8..c7fe8b6ef 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h @@ -18,8 +18,8 @@ namespace OHOS typedef enum { WATCH_FACE = 0, /* 主表盘枚举值不能修改 */ - HEART_RATE, TRAINING, + HEART_RATE, // COMPASS, SLEEP, BLOODOXGEN, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp index 10cfe5866..e488dbcd6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp @@ -30,12 +30,12 @@ namespace OHOS { static const int CARD_SETTING_VALUE_LEN = 32; static const int DIAL_SETTING_VALUE_LEN = 64; - /*默认卡片:心率,睡眠,快速训练*/ + /*默认卡片:运动,心率,睡眠*/ // 更新主界面卡片需要更新Map const CardInfo cardInfoMap[] = { - {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING}, + {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE}, // {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS}, {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP}, {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN}, @@ -46,11 +46,11 @@ namespace OHOS /*维护卡片*/ /* fd272 排序 - 心率 运动 指南针 睡眠 血氧 每日目标 天气 音乐 + 运动 心率 睡眠 指南针 血氧 每日目标 天气 音乐 */ CardInfoSet cardInfoSet[] = { - {HEART_RATE, true}, {TRAINING, true}, + {HEART_RATE, true}, // {COMPASS, false}, {SLEEP, true}, {BLOODOXGEN, false}, diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp index 266042f2f..e60c6addf 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -35,8 +35,8 @@ namespace OHOS // 严格按照Id对应 static const MainViewMapper CardMapper[] = { {WATCH_FACE, &MainViewSample::InitWatchFacePage}, - {HEART_RATE, &MainViewSample::InitHeartRatePage}, {TRAINING, &MainViewSample::InitTrainingPage}, + {HEART_RATE, &MainViewSample::InitHeartRatePage}, // {COMPASS, &MainViewSample::InitCompassPage}, {SLEEP, &MainViewSample::InitSleepPage}, {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},