修复卡片管理资源

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 8469ad2..72cb840 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -65,13 +65,13 @@ namespace OHOS
     static constexpr const char *DEFAULT_DIAL_PATH = APP_RES_PATH "/KUMI.bin";
     static constexpr const char *PNG_SET_CARD_ADD = APP_RES_PATH "/MainCard/CARD_ADD.bin";
     static constexpr const char *PNG_SET_CARD_DEL = APP_RES_PATH "/MainCard/CARD_DEL.bin";
-    static constexpr const char *PNG_SET_CARD_HEART = APP_RES_PATH "/MainCard/HeartCrad.bin";
+    static constexpr const char *PNG_SET_CARD_HEART = APP_RES_PATH "/MainCard/HeartCard.bin";
     static constexpr const char *PNG_SET_CARD_BLOOD = APP_RES_PATH "/MainCard/BloodOxygenCard.bin";
     static constexpr const char *PNG_SET_CARD_TRAIN = APP_RES_PATH "/MainCard/TrainingCard.bin";
     static constexpr const char *PNG_SET_CARD_COMPASS = APP_RES_PATH "/MainCard/CompassCard.bin";
     static constexpr const char *PNG_SET_CARD_PLAYER = APP_RES_PATH "/MainCard/MusicCard.bin";
     static constexpr const char *PNG_SET_CARD_WEATHER = APP_RES_PATH "/MainCard/WeatherCard.bin";
-    static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH "/MainCard/CARD_ACTIVITY.bin";
+    static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH "/MainCard/SportCard.bin";
     static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/MainCard/dropdown.bin";
     static constexpr const char *CLOCK_IAMGES = APP_RES_PATH "/MainCard/clock.bin";
     static constexpr const char *PLAYER_IAMGES = APP_RES_PATH "/MainCard/player.bin";

diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
index f720ce0..114c202 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp
@@ -362,6 +362,7 @@ namespace OHOS
         return false;
     }
 #endif
+        InitLabelView();
         return true;
     }
 
@@ -393,6 +394,10 @@ namespace OHOS
         {
             return false;
         }
+        mainSweepClock->Add(stepLabel);
+        mainSweepClock->Add(weekLabel);
+        mainSweepClock->Add(heartRateLabel);
+        mainSweepClock->Add(stepLabel);
 #if 0
         mainSweepClock->Add(curFace);
         mainSweepClock->Add(stepLabel);
@@ -401,7 +406,7 @@ namespace OHOS
         mainSweepClock->Add(heartRateLabel);
         mainSweepClock->Add(weekDay);
         mainSweepClock->Add(progress);
-        mainSweepClock->Add(batteryLabel);
+   c
         Add(mainSweepClock);
 
         mainSweepClock->SetDragParentInstead(true);

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 133bb56..01ada55 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -19,10 +19,10 @@ namespace OHOS
     const CardInfo cardInfoMap[] = {\r
         {HEART_RATE, PNG_SET_CARD_HEART},\r
         {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
+        {TRAINING, PNG_SET_CARD_TRAIN},\r
         {COMPASS, PNG_SET_CARD_COMPASS},\r
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\r
         {WEATHER, PNG_SET_CARD_WEATHER},\r
-        {TRAINING, PNG_SET_CARD_TRAIN},\r
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\r
         {ACTIVITY, PNG_SET_CARD_ACTIVITY},\r
     };\r
 \r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin
index c982ded..4a646e6 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin
index dea7f06..cef79c2 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin
index 88d44bb..b6f4bce 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin
index 6bd7e86..c8d32c1 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SportCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SportCard.bin
new file mode 100644 (file)
index 0000000..7b1a5ea
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/SportCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin
index 131fc33..949a7dd 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin
index 57a6878..2e0b506 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin differ