优化卡片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 8089616..1932217 100644 (file)
--- 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\r
 STR_EXERCISE_YOGAHERO3$Yoga hero3\r
 STR_EXERCISE_YOGAROLLING$Yoga rolling\r
-STR_EXERCISE_OUTDOORWALKING$Outdoor walking\r
-STR_EXERCISE_OUTDOORRUNNING$Outdoor running\r
+STR_EXERCISE_OUTDOORWALKING$Walk\r
+STR_EXERCISE_OUTDOORRUNNING$Run\r
 STR_EXERCISE_INDOORWALKING$Indoor walking\r
 STR_EXERCISE_INDOORRUNNING$Indoor running\r
-STR_EXERCISE_OUTDOORBIKING$Outdoor biking\r
+STR_EXERCISE_OUTDOORBIKING$Biking\r
 STR_EXERCISE_JUMPINGROPE$Jumping rope\r
 STR_EXERCISE_PILATES$Pilates\r
 STR_EXERCISE_CROSS_FIT$Cross fit\r

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 a388d87..e10e23d 100644 (file)
--- 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 @@
        <lanstr id="STR_EXERCISE_YOGAHERO2" value="Yoga hero2"/>
        <lanstr id="STR_EXERCISE_YOGAHERO3" value="Yoga hero3"/>
        <lanstr id="STR_EXERCISE_YOGAROLLING" value="Yoga rolling"/>
-       <lanstr id="STR_EXERCISE_OUTDOORWALKING" value="Outdoor walking"/>
-       <lanstr id="STR_EXERCISE_OUTDOORRUNNING" value="Outdoor running"/>
+       <lanstr id="STR_EXERCISE_OUTDOORWALKING" value="Walk"/>
+       <lanstr id="STR_EXERCISE_OUTDOORRUNNING" value="Run"/>
        <lanstr id="STR_EXERCISE_INDOORWALKING" value="Indoor walking"/>
        <lanstr id="STR_EXERCISE_INDOORRUNNING" value="Indoor running"/>
-       <lanstr id="STR_EXERCISE_OUTDOORBIKING" value="Outdoor biking"/>
+       <lanstr id="STR_EXERCISE_OUTDOORBIKING" value="Biking"/>
        <lanstr id="STR_EXERCISE_JUMPINGROPE" value="Jumping rope"/>
        <lanstr id="STR_EXERCISE_PILATES" value="Pilates"/>
        <lanstr id="STR_EXERCISE_CROSS_FIT" value="Cross fit"/>

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 b35d38e..a61b108 100644 (file)
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 1b3c051..21590c0 100644 (file)
--- 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 88521de..ca983b7 100644 (file)
--- 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;\r
     static constexpr uint16_t LABEL_X_SIZE = 200;\r
     static constexpr uint16_t LABEL_Y_SIZE = 60;\r
-    static constexpr uint16_t TITLE_LABEL_X = 181;\r
+    static constexpr uint16_t TITLE_LABEL_X = 130;\r
     static constexpr uint16_t TITLE_LABEL_Y = 52;\r
 \r
-    static constexpr uint16_t BTN1_LABEL_X = 135;\r
+    static constexpr uint16_t BTN1_LABEL_X = 65;\r
     static constexpr uint16_t BTN1_LABEL_Y = 210;\r
-    static constexpr uint16_t BTN2_LABEL_X = 286;\r
+    static constexpr uint16_t BTN2_LABEL_X = 206;\r
     static constexpr uint16_t BTN2_LABEL_Y = 210;\r
-    static constexpr uint16_t BTN3_LABEL_X = 131;\r
+    static constexpr uint16_t BTN3_LABEL_X = 65;\r
     static constexpr uint16_t BTN3_LABEL_Y = 365;\r
 \r
     // 图片设置\r
     static constexpr uint16_t BTN_IMAGE_SIZE = 100;\r
 \r
     static constexpr uint16_t BTN1_IMAGE_X = 126;\r
-    static constexpr uint16_t BTN1_IMAGE_Y = 148;\r
+    static constexpr uint16_t BTN1_IMAGE_Y = 143;\r
 \r
     static constexpr uint16_t BTN2_IMAGE_X = 276;\r
-    static constexpr uint16_t BTN2_IMAGE_Y = 148;\r
+    static constexpr uint16_t BTN2_IMAGE_Y = 143;\r
 \r
     static constexpr uint16_t BTN3_IMAGE_X = 129;\r
-    static constexpr uint16_t BTN3_IMAGE_Y = 298;\r
+    static constexpr uint16_t BTN3_IMAGE_Y = 293;\r
 \r
     static constexpr uint16_t BTNMORE_IMAGE_X = 276;\r
     static constexpr uint16_t BTNMORE_IMAGE_Y = 324;\r
@@ -74,7 +74,7 @@ namespace OHOS
     {\r
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel");\r
         //  初始化标签\r
-        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);\r
+        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);\r
 \r
         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);\r
         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);\r

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 a3ed1b8..a61b108 100644 (file)
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 ba90556..bd78e05 100644 (file)
--- 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,\r
     STR_EXERCISE_TITLE = 186,\r
     STR_TRAINING = 187,\r
-    STR_MAX_ID = 188,\r
+    STR_LANGUAGE = 188,\r
+    STR_RAPID_TRAINING = 189,\r
+    STR_SET_GOALS = 190,\r
+    STR_DURATION = 191,\r
+    STR_DURATION_SETTING = 192,\r
+    STR_MINUTES = 193,\r
+    STR_CALORIE = 194,\r
+    STR_CALORIE_SETTING = 195,\r
+    STR_KILOCALORIE = 196,\r
+    STR_DISTANCE = 197,\r
+    STR_RANGE_SETTING = 198,\r
+    STR_METER = 199,\r
+    STR_KILOMETRE = 200,\r
+    STR_STEP_NUMBER = 201,\r
+    STR_STEP_SETTING = 202,\r
+    STR_STEP = 203,\r
+    STR_HEART_RATE = 204,\r
+    STR_MEAN_HEART_RATE = 205,\r
+    STR_TIMES_PER_MIN = 206,\r
+    STR_MEAN_HEART_RATE_MIN = 207,\r
+    STR_IN_THE = 208,\r
+    STR_LOWER_STRENGTH = 209,\r
+    STR_MEDIUM_STRENGTH = 210,\r
+    STR_HIGH_STRENGTH = 211,\r
+    STR_ULTRA_HIGH_STRENGTH = 212,\r
+    STR_TRAINING_INTENSITY = 213,\r
+    STR_TRAINING_INTENSITY_DESCRIPTION = 214,\r
+    STR_INTENSITY_INTERVAL_DESCRIPTION = 215,\r
+    STR_TRAINING_STATE_MEANING = 216,\r
+    STR_WARM_UP_EXERCISE = 217,\r
+    STR_FAT_BURNING_ZONE = 218,\r
+    STR_IMPROVE_CARDIOPULMONARY_FUNCTION = 219,\r
+    STR_PROFESSIONAL_ATHLETE = 220,\r
+    STR_TRAINING_INTENSITY_NOTE = 221,\r
+    STR_TRAINING_IN_PROGRESS = 222,\r
+    STR_BREAK_TRAINING = 223,\r
+    STR_FINISH = 224,\r
+    STR_PAUSE = 225,\r
+    STR_RESUME = 226,\r
+    STR_GOAL_ACHIEVED = 227,\r
+    STR_ACCOMPLISH_GOAL = 228,\r
+    STR_OK = 229,\r
+    STR_LOOK_OUT = 230,\r
+    STR_INSUFFICIENT_EXERCISE_AMOUNT = 231,\r
+    STR_END_MOVEMENT = 232,\r
+    STR_END_THIS_MOVEMENT = 233,\r
+    STR_GOAL_ACCOMPLISHMENT_DEGREE = 234,\r
+    STR_TRAINING_DURATION = 235,\r
+    STR_OFF = 236,\r
+    STR_MORE = 237,\r
+    STR_MAX_ID = 238,\r
 }; // UIResourceTextId\r
 
 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 18730d3..4360731 100644 (file)
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