From: Caisking <3449750381@qq.com> Date: Mon, 1 Apr 2024 08:40:14 +0000 (+0800) Subject: 优化卡片UI X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~1 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=60495bef22d5a3915bc35e7a2dc67483706ff841;p=mirrors%2FFD230.git 优化卡片UI --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 808961600..193221731 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -15,11 +15,11 @@ STR_EXERCISE_YOGAHERO1$Yoga hero1 STR_EXERCISE_YOGAHERO2$Yoga hero2 STR_EXERCISE_YOGAHERO3$Yoga hero3 STR_EXERCISE_YOGAROLLING$Yoga rolling -STR_EXERCISE_OUTDOORWALKING$Outdoor walking -STR_EXERCISE_OUTDOORRUNNING$Outdoor running +STR_EXERCISE_OUTDOORWALKING$Walk +STR_EXERCISE_OUTDOORRUNNING$Run STR_EXERCISE_INDOORWALKING$Indoor walking STR_EXERCISE_INDOORRUNNING$Indoor running -STR_EXERCISE_OUTDOORBIKING$Outdoor biking +STR_EXERCISE_OUTDOORBIKING$Biking STR_EXERCISE_JUMPINGROPE$Jumping rope STR_EXERCISE_PILATES$Pilates STR_EXERCISE_CROSS_FIT$Cross fit diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index a388d876a..e10e23d03 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -16,11 +16,11 @@ - - + + - + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index b35d38e61..a61b10894 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 1b3c051f7..21590c0a7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -48,9 +48,9 @@ struct QuickTraining std::string training3_Image; QuickTraining() - : training1_Text(STR_EXERCISE_OUTDOORWALKING), - training2_Text(STR_EXERCISE_OUTDOORBIKING), - training3_Text(STR_EXERCISE_OUTDOORRUNNING), + : training1_Text(OHOS::STR_EXERCISE_OUTDOORWALKING), + training2_Text(OHOS::STR_EXERCISE_OUTDOORBIKING), + training3_Text(OHOS::STR_EXERCISE_OUTDOORRUNNING), training1_Image(OHOS::WALKING_60_IMAGE), training2_Image(OHOS::RIDING_60_IMAGE), training3_Image(OHOS::RUNNING_60_IMAGE) {} diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp index 88521dead..ca983b7eb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -20,27 +20,27 @@ namespace OHOS static constexpr uint16_t LABEL_FONT_SIZE = 30; static constexpr uint16_t LABEL_X_SIZE = 200; static constexpr uint16_t LABEL_Y_SIZE = 60; - static constexpr uint16_t TITLE_LABEL_X = 181; + static constexpr uint16_t TITLE_LABEL_X = 130; static constexpr uint16_t TITLE_LABEL_Y = 52; - static constexpr uint16_t BTN1_LABEL_X = 135; + static constexpr uint16_t BTN1_LABEL_X = 65; static constexpr uint16_t BTN1_LABEL_Y = 210; - static constexpr uint16_t BTN2_LABEL_X = 286; + static constexpr uint16_t BTN2_LABEL_X = 206; static constexpr uint16_t BTN2_LABEL_Y = 210; - static constexpr uint16_t BTN3_LABEL_X = 131; + static constexpr uint16_t BTN3_LABEL_X = 65; static constexpr uint16_t BTN3_LABEL_Y = 365; // 图片设置 static constexpr uint16_t BTN_IMAGE_SIZE = 100; static constexpr uint16_t BTN1_IMAGE_X = 126; - static constexpr uint16_t BTN1_IMAGE_Y = 148; + static constexpr uint16_t BTN1_IMAGE_Y = 143; static constexpr uint16_t BTN2_IMAGE_X = 276; - static constexpr uint16_t BTN2_IMAGE_Y = 148; + static constexpr uint16_t BTN2_IMAGE_Y = 143; static constexpr uint16_t BTN3_IMAGE_X = 129; - static constexpr uint16_t BTN3_IMAGE_Y = 298; + static constexpr uint16_t BTN3_IMAGE_Y = 293; static constexpr uint16_t BTNMORE_IMAGE_X = 276; static constexpr uint16_t BTNMORE_IMAGE_Y = 324; @@ -74,7 +74,7 @@ namespace OHOS { // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel"); // 初始化标签 - TraingModel::GetInstance()->InitLabel(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", "快速训练", DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); + TraingModel::GetInstance()->InitLabelExt(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); TraingModel::GetInstance()->InitLabelExt(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", data->training1_Text, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); TraingModel::GetInstance()->InitLabelExt(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", data->training2_Text, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index a3ed1b8d6..a61b10894 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index ba90556f0..bd78e0587 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -198,7 +198,57 @@ enum UIResourceTextId : uint16_t { STR_OTHER_TITLE = 185, STR_EXERCISE_TITLE = 186, STR_TRAINING = 187, - STR_MAX_ID = 188, + STR_LANGUAGE = 188, + STR_RAPID_TRAINING = 189, + STR_SET_GOALS = 190, + STR_DURATION = 191, + STR_DURATION_SETTING = 192, + STR_MINUTES = 193, + STR_CALORIE = 194, + STR_CALORIE_SETTING = 195, + STR_KILOCALORIE = 196, + STR_DISTANCE = 197, + STR_RANGE_SETTING = 198, + STR_METER = 199, + STR_KILOMETRE = 200, + STR_STEP_NUMBER = 201, + STR_STEP_SETTING = 202, + STR_STEP = 203, + STR_HEART_RATE = 204, + STR_MEAN_HEART_RATE = 205, + STR_TIMES_PER_MIN = 206, + STR_MEAN_HEART_RATE_MIN = 207, + STR_IN_THE = 208, + STR_LOWER_STRENGTH = 209, + STR_MEDIUM_STRENGTH = 210, + STR_HIGH_STRENGTH = 211, + STR_ULTRA_HIGH_STRENGTH = 212, + STR_TRAINING_INTENSITY = 213, + STR_TRAINING_INTENSITY_DESCRIPTION = 214, + STR_INTENSITY_INTERVAL_DESCRIPTION = 215, + STR_TRAINING_STATE_MEANING = 216, + STR_WARM_UP_EXERCISE = 217, + STR_FAT_BURNING_ZONE = 218, + STR_IMPROVE_CARDIOPULMONARY_FUNCTION = 219, + STR_PROFESSIONAL_ATHLETE = 220, + STR_TRAINING_INTENSITY_NOTE = 221, + STR_TRAINING_IN_PROGRESS = 222, + STR_BREAK_TRAINING = 223, + STR_FINISH = 224, + STR_PAUSE = 225, + STR_RESUME = 226, + STR_GOAL_ACHIEVED = 227, + STR_ACCOMPLISH_GOAL = 228, + STR_OK = 229, + STR_LOOK_OUT = 230, + STR_INSUFFICIENT_EXERCISE_AMOUNT = 231, + STR_END_MOVEMENT = 232, + STR_END_THIS_MOVEMENT = 233, + STR_GOAL_ACCOMPLISHMENT_DEGREE = 234, + STR_TRAINING_DURATION = 235, + STR_OFF = 236, + STR_MORE = 237, + STR_MAX_ID = 238, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index 18730d308..4360731cc 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ