From: George Date: Sat, 7 Oct 2023 02:55:40 +0000 (+0800) Subject: 修改表盘和指针 X-Git-Tag: release_V1.2.70_20241020_135402~1425 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=fd8e1d213caff4ce7ce0b339ccf4cc8b585bb4e8;p=mirrors%2FFD230.git 修改表盘和指针 --- diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h index 5b783808e..6c9d35441 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h @@ -64,25 +64,10 @@ namespace OHOS { namespace OHOS { static const int DIR_MASK=0xfff00000; static const int PNG_MASK=0x000fffff; - static const int CLOCK_BIGCIRCLE_IMAGE_PATH = 0x100001; - static const int CLOCK_CIRCLE_IMAGE_PATH = 0x100002; - static const int CLOCK_FIRDAY_IMAGE_PATH = 0x100003; - static const int CLOCK_HAND24HOUR_IMAGE_PATH = 0x100004; - static const int CLOCK_HEARTRATE_IMAGE_PATH = 0x100005; - static const int CLOCK_HOURHAND = 0x100006; - static const int CLOCK_MAIN_FACE_IMAGE = 0x100007; - static const int CLOCK_MEDCIRCLE_IMAGE_PATH = 0x100008; - static const int CLOCK_MINUTEHAND = 0x100009; - static const int CLOCK_MONDAY_IMAGE_PATH = 0x10000a; - static const int CLOCK_PROGRESS_IMAGE_PATH = 0x10000b; - static const int CLOCK_SATURDAY_IMAGE_PATH = 0x10000c; - static const int CLOCK_SECONDHAND = 0x10000d; - static const int CLOCK_SHOE_IMAGE = 0x10000e; - static const int CLOCK_SMALLCIRCLE_IMAGE_PATH = 0x10000f; - static const int CLOCK_SUNDAY_IMAGE_PATH = 0x100010; - static const int CLOCK_THURSDAY_IMAGE_PATH = 0x100011; - static const int CLOCK_TUESDAY_IMAGE_PATH = 0x100012; - static const int CLOCK_WEDNESDAY_IMAGE_PATH = 0x100013; + static const int CLOCK_CLASSIC_GEOMETRY = 0x100001; + static const int CLOCK_HOUR = 0x100002; + static const int CLOCK_MINUTE = 0x100003; + static const int CLOCK_SECOND = 0x100004; static const int COMPASS_COMPASS = 0x200001; static const int COMPASS_CORRESPONDENCE_DEGREE = 0x200002; static const int COMPASS_ROTATE_CENTER_IMAGE = 0x200003; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp index 4dc8baece..d3e9d2072 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp @@ -16,6 +16,8 @@ namespace OHOS { static MainClockView *g_pMainClockView = nullptr; + +#if 0 static constexpr uint16_t FONT_DEFAULT_SIZE = 25; static constexpr uint16_t FONT_TEXT_SIZE = 24; static constexpr uint16_t STEP_LABEL_X = 100; @@ -48,6 +50,27 @@ static constexpr uint16_t SMALLCIRCLE_POSITION_X = 202; static constexpr uint16_t SMALLCIRCLE_POSITION_Y = 202; static constexpr uint16_t WEEKDAY_POSITION_X = 193; static constexpr uint16_t WEEKDAY_POSITION_Y = 127; +#endif + +static constexpr uint16_t SECOND_POINT_POSITION_X = 221; +static constexpr uint16_t SECOND_POINT_POSITION_Y = 28; +static constexpr uint16_t MINUTE_POINT_POSITION_X = 221; +static constexpr uint16_t MINUTE_POINT_POSITION_Y = 33; +static constexpr uint16_t HOUR_POINT_POSITION_X = 221; +static constexpr uint16_t HOUR_POINT_POSITION_Y = 87; + +static constexpr uint16_t SECOND_POINT_CENTER_X = 12; +static constexpr uint16_t SECOND_POINT_CENTER_Y = 205; +static constexpr uint16_t MINUTE_POINT_CENTER_X = 12; +static constexpr uint16_t MINUTE_POINT_CENTER_Y = 200; +static constexpr uint16_t HOUR_POINT_CENTER_X = 12; +static constexpr uint16_t HOUR_POINT_CENTER_Y = 146; + + + + + + MainClockView::MainClockView() { @@ -64,6 +87,7 @@ MainClockView::~MainClockView() clockAnimator = nullptr; } mainSweepClock->RemoveAll(); + #if 0 delete curFace; curFace = nullptr; delete stepLabel; @@ -99,6 +123,7 @@ MainClockView::~MainClockView() Remove(mainSweepClock); delete mainSweepClock; mainSweepClock = nullptr; +#endif g_pMainClockView = nullptr; } @@ -109,6 +134,7 @@ MainClockView *MainClockView::GetInstance(void) void MainClockView::InitStepValue() { +#if 0 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::InitStepValue"); uint32_t stepValue; int weekToday = ActivityModel::GetInstance()->GetWeekToday(); @@ -126,10 +152,12 @@ void MainClockView::InitStepValue() stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::RELEASED); stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::PRESSED); stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::INACTIVE); +#endif } bool MainClockView::InitLabelView(void) { +#if 0 UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance(); stepLabel = new UILabelButton(); if (stepLabel == nullptr) { @@ -176,11 +204,13 @@ bool MainClockView::InitLabelView(void) weekLabel->SetText("2"); weekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_TEXT_SIZE); weekLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT); +#endif return true; } bool MainClockView::InitCenterCircleView(void) { +#if 0 bigCircle = new Image(); if (bigCircle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bigCircle new fail"); @@ -207,6 +237,7 @@ bool MainClockView::InitCenterCircleView(void) if (LoadClockImage(smallCircle, CLOCK_CIRCLE_IMAGE_PATH) == false) { return false; } +#endif return true; } @@ -217,7 +248,7 @@ bool MainClockView::InitHandView(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "secondHand new fail"); return false; } - if (LoadClockImage(secondHand, CLOCK_SECONDHAND) == false) { + if (LoadClockImage(secondHand, CLOCK_SECOND) == false) { return false; } @@ -226,7 +257,7 @@ bool MainClockView::InitHandView(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "minuteHand new fail"); return false; } - if (LoadClockImage(minuteHand, CLOCK_MINUTEHAND) == false) { + if (LoadClockImage(minuteHand, CLOCK_MINUTE) == false) { return false; } hourHand = new Image(); @@ -234,10 +265,10 @@ bool MainClockView::InitHandView(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hourHand new fail"); return false; } - if (LoadClockImage(hourHand, CLOCK_HOURHAND) == false) { + if (LoadClockImage(hourHand, CLOCK_HOUR) == false) { return false; } - +#if 0 hand24Hour = new Image(); if (hand24Hour == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hand24Hour new fail"); @@ -246,6 +277,7 @@ bool MainClockView::InitHandView(void) if (LoadClockImage(hand24Hour, CLOCK_HAND24HOUR_IMAGE_PATH) == false) { return false; } +#endif return true; } @@ -282,11 +314,12 @@ bool MainClockView::InitSweepClock(void) } curFace->SetPosition(0, 0); - if (LoadClockImage(curFace, CLOCK_MAIN_FACE_IMAGE) == false) { + if (LoadClockImage(curFace, CLOCK_CLASSIC_GEOMETRY) == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace LoadClockImage CLOCK_MAIN_FACE_IMAGE fail"); return false; } +#if 0 if (InitLabelView() == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelView() fail"); return false; @@ -316,8 +349,9 @@ bool MainClockView::InitSweepClock(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "progress LoadClockImage CLOCK_PROGRESS_IMAGE_PATH fail"); return false; } - +#endif InitHandView(); +#if 0 weekDay = new UIImageView(); if (weekDay == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay new fail"); @@ -328,6 +362,7 @@ bool MainClockView::InitSweepClock(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay LoadClockImage CLOCK_THURSDAY_IMAGE_PATH fail"); return false; } +#endif return true; } @@ -344,7 +379,9 @@ bool MainClockView::InitView(void *caller) return false; } + mainSweepClock->Add(curFace); +#if 0 mainSweepClock->Add(stepLabel); mainSweepClock->Add(heartRate); mainSweepClock->Add(weekLabel); @@ -352,6 +389,7 @@ bool MainClockView::InitView(void *caller) mainSweepClock->Add(weekDay); mainSweepClock->Add(progress); mainSweepClock->Add(batteryLabel); +#endif Add(mainSweepClock); mainSweepClock->SetDragParentInstead(true); @@ -359,18 +397,19 @@ bool MainClockView::InitView(void *caller) // {214, 3}: position x, y {14, 223}: center x, y mainSweepClock->SetHandImage(UISweepClock::HandType::SECOND_HAND, *secondHand, - { POINT_POSITION_X, SECOND_POINT_POSITION_Y }, { POINT_CENTER_X, POINT_CENTER_Y }); + { SECOND_POINT_POSITION_X, SECOND_POINT_POSITION_Y }, { SECOND_POINT_CENTER_X, SECOND_POINT_CENTER_Y }); mainSweepClock->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *minuteHand, - { POINT_POSITION_X, POINT_POSITION_Y }, { POINT_CENTER_X, POINT_CENTER_Y }); - mainSweepClock->SetHandImage(UISweepClock::HandType::HOUR_HAND, *hourHand, { POINT_POSITION_X, POINT_POSITION_Y }, - { POINT_CENTER_X, POINT_CENTER_Y }); + { MINUTE_POINT_POSITION_X, MINUTE_POINT_POSITION_Y }, { MINUTE_POINT_CENTER_X, MINUTE_POINT_CENTER_Y }); + mainSweepClock->SetHandImage(UISweepClock::HandType::HOUR_HAND, *hourHand, { HOUR_POINT_POSITION_X, HOUR_POINT_POSITION_Y }, + { HOUR_POINT_CENTER_X, HOUR_POINT_CENTER_Y }); +#if 0 mainSweepClock->SetHandCircleImage(UISweepClock::HandType::SECOND_HAND, *smallCircle, { SMALLCIRCLE_POSITION_X, SMALLCIRCLE_POSITION_Y }); mainSweepClock->SetHandCircleImage(UISweepClock::HandType::MINUTE_HAND, *medCircle, { MEDCIRCLE_POSITION_X, MEDCIRCLE_POSITION_Y }); mainSweepClock->SetHandCircleImage(UISweepClock::HandType::HOUR_HAND, *bigCircle, { BIGCIRCLE_POSITION_X, BIGCIRCLE_POSITION_Y }); - +#endif mainSweepClock->SetInitTime24Hour(0, 0, 0); mainSweepClock->SetWorkMode(UISweepClock::WorkMode::NORMAL); InitDateTime(); @@ -391,14 +430,17 @@ bool MainClockView::InitView(void *caller) void MainClockView::RefreshStep(int step) { +#if 0 char stepChar[STEP_CHAR_NUM] = {0}; (void)sprintf_s(stepChar, STEP_CHAR_NUM, "%d", step); stepLabel->SetText(stepChar); +#endif } void MainClockView::RefreshHeartRate(int value) { +#if 0 if (value == 0) { heartRateLabel->SetText("--"); return; @@ -407,6 +449,7 @@ void MainClockView::RefreshHeartRate(int value) (void)sprintf_s(heartRateChar, STEP_CHAR_NUM, "%d", value); heartRateLabel->SetText(heartRateChar); +#endif } void MainClockView::InitDateTime(void) diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp index 082bfc43d..1c7d0a349 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp @@ -169,7 +169,7 @@ bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t r void ScreenModels::PreLoadAppimages(void) { LoadAppMultiImages(PLAYER_IAMGES, PLAYER_PLAYERSMODEL_RANDOM, PLAYER_PLAYERHIGHLIGHT); - LoadAppMultiImages(CLOCK_IAMGES, CLOCK_HAND24HOUR_IMAGE_PATH, CLOCK_TUESDAY_IMAGE_PATH); + LoadAppMultiImages(CLOCK_IAMGES, CLOCK_CLASSIC_GEOMETRY, CLOCK_SECOND); LoadAppMultiImages(COMPASS_IAMGES, COMPASS_ROTATE_CENTER_IMAGE, COMPASS_COMPASS); LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_DROPDOWN_BLUETOOTH, DROPDOWN_DROPDOWN_BRI_SCREEN_B); LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP); diff --git a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c index f97ee8eef..f857e8828 100644 --- a/code/sdk/application/wearable/service/power_manager/src/power_display_service.c +++ b/code/sdk/application/wearable/service/power_manager/src/power_display_service.c @@ -20,7 +20,7 @@ #include "touch_screen_def.h" #include "display_state_machine.h" -#define DISPLAY_AUTO_POWER_OFF_PERIOD_MS 5000 +#define DISPLAY_AUTO_POWER_OFF_PERIOD_MS (5*60*1000) #define DISPLAY_DEFAULT_BRIGHTNESS 50 #define POWER_DISPLAY_QUEUE_MAX_SIZE 64 #define POWER_DISPLAY_MAX_SIZE 0x10 diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a index 91a244cf8..1dc704d67 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a index ec37f391f..e056ad04f 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a index 4f33eb417..db1df9412 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a index 530d98b06..314d6e03f 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a index 0d90b72a0..7de15ec88 100644 Binary files a/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a and b/code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a differ diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a index 99fa98f23..485321036 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a differ diff --git a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a index 7492be5cd..1fcc4d0b6 100644 Binary files a/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a and b/code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a index 973f54172..a4422dfaa 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a differ diff --git a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a index 81f8e2ca6..8f5a74ec9 100644 Binary files a/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a and b/code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a differ diff --git a/picture/clock/BIGCIRCLE_IMAGE_PATH.png b/picture/clock/BIGCIRCLE_IMAGE_PATH.png deleted file mode 100644 index dff99f631..000000000 Binary files a/picture/clock/BIGCIRCLE_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/CIRCLE_IMAGE_PATH.png b/picture/clock/CIRCLE_IMAGE_PATH.png deleted file mode 100644 index bb6600e04..000000000 Binary files a/picture/clock/CIRCLE_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/Classic_Geometry.png b/picture/clock/Classic_Geometry.png new file mode 100644 index 000000000..7a664ac4d Binary files /dev/null and b/picture/clock/Classic_Geometry.png differ diff --git a/picture/clock/FIRDAY_IMAGE_PATH.png b/picture/clock/FIRDAY_IMAGE_PATH.png deleted file mode 100644 index 8f663f9b1..000000000 Binary files a/picture/clock/FIRDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/HAND24HOUR_IMAGE_PATH.png b/picture/clock/HAND24HOUR_IMAGE_PATH.png deleted file mode 100644 index 7e85d081a..000000000 Binary files a/picture/clock/HAND24HOUR_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/HEARTRATE_IMAGE_PATH.png b/picture/clock/HEARTRATE_IMAGE_PATH.png deleted file mode 100644 index d48be34ec..000000000 Binary files a/picture/clock/HEARTRATE_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/HOURHAND.png b/picture/clock/HOURHAND.png deleted file mode 100644 index b2739b681..000000000 Binary files a/picture/clock/HOURHAND.png and /dev/null differ diff --git a/picture/clock/MAIN_FACE_IMAGE.png b/picture/clock/MAIN_FACE_IMAGE.png deleted file mode 100644 index 7713dd6d7..000000000 Binary files a/picture/clock/MAIN_FACE_IMAGE.png and /dev/null differ diff --git a/picture/clock/MEDCIRCLE_IMAGE_PATH.png b/picture/clock/MEDCIRCLE_IMAGE_PATH.png deleted file mode 100644 index 653d4a709..000000000 Binary files a/picture/clock/MEDCIRCLE_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/MINUTEHAND.png b/picture/clock/MINUTEHAND.png deleted file mode 100644 index 2d9af81b9..000000000 Binary files a/picture/clock/MINUTEHAND.png and /dev/null differ diff --git a/picture/clock/MONDAY_IMAGE_PATH.png b/picture/clock/MONDAY_IMAGE_PATH.png deleted file mode 100644 index d05be30ce..000000000 Binary files a/picture/clock/MONDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/PROGRESS_IMAGE_PATH.png b/picture/clock/PROGRESS_IMAGE_PATH.png deleted file mode 100644 index 1f97cb8da..000000000 Binary files a/picture/clock/PROGRESS_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/SATURDAY_IMAGE_PATH.png b/picture/clock/SATURDAY_IMAGE_PATH.png deleted file mode 100644 index bcf720947..000000000 Binary files a/picture/clock/SATURDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/SECONDHAND .png b/picture/clock/SECONDHAND .png deleted file mode 100644 index 39602bd51..000000000 Binary files a/picture/clock/SECONDHAND .png and /dev/null differ diff --git a/picture/clock/SHOE_IMAGE.png b/picture/clock/SHOE_IMAGE.png deleted file mode 100644 index 79372b9ff..000000000 Binary files a/picture/clock/SHOE_IMAGE.png and /dev/null differ diff --git a/picture/clock/SMALLCIRCLE_IMAGE_PATH.png b/picture/clock/SMALLCIRCLE_IMAGE_PATH.png deleted file mode 100644 index 7bf21c128..000000000 Binary files a/picture/clock/SMALLCIRCLE_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/SUNDAY_IMAGE_PATH.png b/picture/clock/SUNDAY_IMAGE_PATH.png deleted file mode 100644 index 19b5e9b5a..000000000 Binary files a/picture/clock/SUNDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/THURSDAY_IMAGE_PATH.png b/picture/clock/THURSDAY_IMAGE_PATH.png deleted file mode 100644 index 085c21c80..000000000 Binary files a/picture/clock/THURSDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/TUESDAY_IMAGE_PATH.png b/picture/clock/TUESDAY_IMAGE_PATH.png deleted file mode 100644 index 1b73164ab..000000000 Binary files a/picture/clock/TUESDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/WEDNESDAY_IMAGE_PATH.png b/picture/clock/WEDNESDAY_IMAGE_PATH.png deleted file mode 100644 index 1360f90a1..000000000 Binary files a/picture/clock/WEDNESDAY_IMAGE_PATH.png and /dev/null differ diff --git a/picture/clock/hour.png b/picture/clock/hour.png new file mode 100644 index 000000000..0ff802390 Binary files /dev/null and b/picture/clock/hour.png differ diff --git a/picture/clock/minute.png b/picture/clock/minute.png new file mode 100644 index 000000000..5b29cf02a Binary files /dev/null and b/picture/clock/minute.png differ diff --git a/picture/clock/second.png b/picture/clock/second.png new file mode 100644 index 000000000..277cf92b4 Binary files /dev/null and b/picture/clock/second.png differ diff --git a/res/res/clock/clock.bin b/res/res/clock/clock.bin index 29b382e5c..20bb1a908 100644 Binary files a/res/res/clock/clock.bin and b/res/res/clock/clock.bin differ