From: 袁清梦 <3449750381@qq.com> Date: Tue, 15 Oct 2024 12:41:40 +0000 (+0000) Subject: Merge #1193 into sdk602patch0911 from refs/changes/1193/head X-Git-Tag: release_V1.2.70_20241020_135402~5^2~28 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8cad019093c563be687282c60f1aa37382fdd55e;p=mirrors%2FFD230.git Merge #1193 into sdk602patch0911 from refs/changes/1193/head Code review from 袁清梦 * refs/changes/1193/head: (15 commits squashed) - 训练:优化配速表心率表的存储 - 表盘:水母表盘更新 - 表盘:小狗表盘更新 - 表盘;小猫表盘更新 - 表盘:星空表盘更新 - 表盘:绿叶表盘更新 - 表盘:宇航员表盘更新 - 表盘:卫星表盘更新 - 表盘:飞鸟表盘更新 - 表盘:更新晨曦智影与镜影行者 - 表盘:自定义表盘电池坐标优化 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。 - 系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符 - 表盘:优化运动表盘 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1193 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp index 7e1849ce1..f91c6f512 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantView.cpp @@ -87,7 +87,7 @@ void AssistantView::InitView() { AssistantScrollView[ASSISTANT_MAIN_VIEW]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); //初始化label TODO::多国语言 - InitLabel(noteLabel, 53, 339, 360, 35, "label", "点击唤醒语音助手", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(noteLabel, 53, 339, 360, 35, "label", "点击唤醒语音助手", DEFAULT_VECTOR_FONT_FILENAME_EN, 30); //初始化button InitButton(wakeButton, 128, 91, 210, 210, WAKE_ASSISTANT); wakeButton->SetImageSrc(WAKE_IMAGE, WAKE_IMAGE); 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 00f003761..e19938cf1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp @@ -371,9 +371,9 @@ namespace OHOS // 设置位置 batteryicon->SetPosition(186, 52, 100, 100); - batteryiamge->SetPosition(173, 52, 100, 100); + batteryiamge->SetPosition(176, 52, 100, 100); - batteryprogress->SetPosition(180, 58, 30, 18); + batteryprogress->SetPosition(182, 58, 30, 18); batteryprogress->SetViewId("progress"); batteryprogress->SetBackgroundStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); batteryprogress->SetBackgroundStyle(STYLE_BACKGROUND_OPA, 0x00); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h index 94cbc63f0..466a2a2fc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h @@ -155,6 +155,10 @@ public: void handleLowHeartRate(); void handleHighHeartRate(); + void heart_start_screen60s_timer(uint32_t interval = 30 * 1000); + void heart_stop_screen60s_timer(); + void reset_heart_screen60s_timer_time(); + private: HealthAllDatas healthDatas; uint16_t pretime{0}; @@ -169,12 +173,13 @@ private: bool wearStatus{true}; uint16_t index_ = 0; - uint16_t displayheart = 0; // 显示心率 - uint16_t currentheart = 0; // 保存心率 + uint16_t displayheart = 0; // 显示心率 + uint16_t currentheart = 0; // 保存心率 uint16_t displayheart_max = 0; // 显示最大心率 uint16_t displayheart_min = 0; // 显示最小心率 - uint32 timestamp_ms; // 检测时间(存(时、分),大于24小时,改为1天前,小于1分钟为刚刚) + uint32 + timestamp_ms; // 检测时间(存(时、分),大于24小时,改为1天前,小于1分钟为刚刚) bool initstatus = true; bool heartstate = false; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp index 2c2570c20..ecbcc8840 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp @@ -32,8 +32,6 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartPresenter::HeartChartPresenter"); g_pHeartChartPresenter = this; - display_time = DisplayBrightnessModel::GetInstance()->GetScreenDurationTime(); - display_api->set_screen_auto_off_timeout(300 * 1000); // 设置常亮 #ifdef MEM_CHECK MemCheck::GetInstance()->EnableLeakCheck(true); #endif @@ -41,7 +39,6 @@ namespace OHOS HeartChartPresenter::~HeartChartPresenter() { - display_api->set_screen_auto_off_timeout(display_time); // 恢复 g_pHeartChartPresenter = nullptr; #ifdef MEM_CHECK MemCheck::GetInstance()->EnableLeakCheck(false); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp index 0f584115c..7c832ae05 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp @@ -425,37 +425,37 @@ void HeartChartView::InitChartLabel() { uheart_->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); //上一次检测信息 InitLabel(lastheart_, 53, 130, 360, 35, "label", "--", - DEFAULT_VECTOR_FONT_FILENAME, 30); + DEFAULT_VECTOR_FONT_FILENAME_EN, 30); //最小心率 不居中 InitLabelAdapt(minheart_, 293, 380, 200, 35, "label", "--", - DEFAULT_VECTOR_FONT_FILENAME, 35); + DEFAULT_VECTOR_FONT_FILENAME_EN, 35); //最大心率 不居中 InitLabelAdapt(maxheart_, 158, 380, 200, 35, "label", "--", - DEFAULT_VECTOR_FONT_FILENAME, 35); + DEFAULT_VECTOR_FONT_FILENAME_EN, 35); //动态心率最大 InitLabel(maxheart_dynamic_, 30, 190, 50, 20, "label", "220", - DEFAULT_VECTOR_FONT_FILENAME, 20); + DEFAULT_VECTOR_FONT_FILENAME_EN, 20); maxheart_dynamic_->SetTextColor( Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff)); //动态心率3/4 InitLabel(maxheart_dynamic_3_, 30, 218, 50, 20, "label", "160", - DEFAULT_VECTOR_FONT_FILENAME, 20); + DEFAULT_VECTOR_FONT_FILENAME_EN, 20); maxheart_dynamic_3_->SetTextColor( Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff)); //动态心率2/4 InitLabel(maxheart_dynamic_2_, 30, 247, 50, 20, "label", "110", - DEFAULT_VECTOR_FONT_FILENAME, 20); + DEFAULT_VECTOR_FONT_FILENAME_EN, 20); maxheart_dynamic_2_->SetTextColor( Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff)); //动态心率1/4 InitLabel(maxheart_dynamic_1_, 30, 277, 50, 20, "label", "50", - DEFAULT_VECTOR_FONT_FILENAME, 20); + DEFAULT_VECTOR_FONT_FILENAME_EN, 20); maxheart_dynamic_1_->SetTextColor( Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff)); //动态心率最小 InitLabel(minheart_dynamic_, 30, 306, 50, 20, "label", "0", - DEFAULT_VECTOR_FONT_FILENAME, 20); + DEFAULT_VECTOR_FONT_FILENAME_EN, 20); minheart_dynamic_->SetTextColor( Color::GetColorFromRGBA(0x33, 0x33, 0x33, 0xff)); diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp index b199a4e6f..b42dca9ed 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -11,15 +11,30 @@ #include "heartrate/include/HeartRateView.h" #include "heartrate/include/HeartResultPresenter.h" +#include "ConfigModel.h" #include "DialModelHeartRate.h" #include "custom_runtime.h" #include "custom_utils.h" #include "health_service.h" #include "ppg_service.h" +#include "settings/include/SettingModel.h" +#include "uiservice/include/ui_service.h" +#include "wearable_log.h" #include +#include +#include +#include +#include #include #include +#include #include +#include +#include +#include +#include +#include +#include #include "battery_hal.h" #include "ui_service.h" @@ -397,6 +412,10 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); heartstate = false; + if (checkstate == HeartCheck::CARDCHECK) { + //重置传感器状态 + sensorstate = false; + } // 复原检测状态 checkstate = HeartCheck::RESTSTSTE; } else if (state == HeartState::Start && heartstate == false) { @@ -429,7 +448,12 @@ void HeartModel::Heart_Start(HeartCheck check) { sensorstate = true; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始心率检测"); // 设置runtime - uapi_dev_runtime_set_heartrate_detect_status(1); + if (uapi_dev_runtime_get_heartrate_detect_status() == 0) { + uapi_dev_runtime_set_heartrate_detect_status(1); + ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); + // 主动检测的亮屏60s + heart_start_screen60s_timer(); + } } } @@ -456,11 +480,21 @@ void HeartModel::Heart_Stop() { return; } + // 恢复正常亮屏 + HeartModel::GetInstance()->heart_stop_screen60s_timer(); + // 取消常亮屏 + ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); + //设置runtime uapi_dev_runtime_set_heartrate_detect_status(0); - sensorstate = false; Heart_Result(); // 处理结果 + + //为了防止主界面卡片一直重复开传感器 + if (checkstate != HeartCheck::CARDCHECK) { + //重置传感器状态 + sensorstate = false; + } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束"); } // 保存检测数据 @@ -787,4 +821,93 @@ std::string HeartModel::GetCheckString() { check_string.c_str()); // 打印最终检测结果 return check_string; } + +// 声明定时器变量 +static osTimerId_t g_screen60s_timer = nullptr; +static uint16_t SCREEN_60S_TIME = 60; + +static void heart_start_screen60s_timer_callbackProc(int data) { + WEARABLE_LOGE( + WEARABLE_LOG_MODULE_APP, + "HeartModel::heart_start_screen60s_timer_callbackProc,time = %d", + SCREEN_60S_TIME); + SCREEN_60S_TIME -= 30; + WEARABLE_LOGE( + WEARABLE_LOG_MODULE_APP, + "HeartModel::heart_start_screen60s_timer_callbackProc,time = %d", + SCREEN_60S_TIME); + if (SCREEN_60S_TIME <= 0) { + // 60s后息屏停止定时 + HeartModel::GetInstance()->heart_stop_screen60s_timer(); + // 取消常亮屏 + ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heart_stop_screen60s_timer"); + } +} +static void heart_start_screen60s_timer_callback(int data) { + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(heart_start_screen60s_timer_callbackProc, data)); +} +void HeartModel::heart_start_screen60s_timer(uint32_t interval) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "HeartModel::heart_start_screen60s_timer"); + /* -------------------------- 1.检查定时器是否已经存在,如果存在则返回 + * ------------------------- */ + if (g_screen60s_timer != nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Timer already exists!!"); + return; + } + /* --------------------------------- 2.创建定时器 + * -------------------------------- */ + g_screen60s_timer = + osTimerNew((osTimerFunc_t)heart_start_screen60s_timer_callback, + osTimerPeriodic, nullptr, nullptr); + // 检查定时器创建是否成功 + if (g_screen60s_timer == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Timer create failed!!"); + return; + } + /* ----------------------------- 3.将毫秒转换为系统时钟节拍数 + * ---------------------------- */ + int tick = osMs2Tick(interval); + /* --------------------------------- 4.启动定时器 + * -------------------------------- */ + osStatus_t ret = osTimerStart(g_screen60s_timer, tick); + /* -------------------- 5.检查定时器启动是否成功,如果启动失败,删除定时器并置为 + * nullptr -------------------- */ + if (ret != osOK) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", + ret); + if (g_screen60s_timer != nullptr) { + ret = osTimerDelete(g_screen60s_timer); + } + g_screen60s_timer = nullptr; + return; + } +} +void HeartModel::heart_stop_screen60s_timer(void) { + // 检查定时器是否存在 + if (g_screen60s_timer != nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "HeartModel::heart_stop_screen60s_timer"); + osTimerStop(g_screen60s_timer); + // 删除定时器并置为 nullptr + osStatus_t ret = osTimerDelete(g_screen60s_timer); + if (ret != osOK) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "osTimerDelete failed, ret = %lx!!", ret); + } + g_screen60s_timer = nullptr; + SCREEN_60S_TIME = 60; + } +} +void HeartModel::reset_heart_screen60s_timer_time() { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "reset_heart_screen60s_timer_time"); + SCREEN_60S_TIME = 60; + if (nullptr == g_screen60s_timer) { + ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 重新常亮屏 + heart_start_screen60s_timer(); // 开启定时器 + } +} + } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 0f86863a0..4afa7868e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -71,13 +71,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample"); g_pMainPresenterSample = nullptr; /*从主界面退出,关闭心率检测*/ -#if HEART_RATE_CHECK_TIMEOUT HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK); -#else - HeartModel::GetInstance()->Heart_Control(HeartState::End, - HeartCheck::INITIATIVE); -#endif } MainPresenterSample *MainPresenterSample::GetInstance(void) @@ -386,7 +381,7 @@ namespace OHOS { LogCardTransition(previousCardId, currentCardId); HeartModel::GetInstance()->Heart_Stop(); - HeartModel::GetInstance()->Heart_Control(HeartState::End,HeartCheck::INITIATIVE); //主动检测心率 + HeartModel::GetInstance()->Heart_Control(HeartState::End,HeartCheck::CARDCHECK); //主动检测心率 } // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面 diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp index 7cad67055..447a24c86 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatView.cpp @@ -121,7 +121,7 @@ namespace OHOS opa = OPA_TRANSPARENT; // 如果处于无状态,设置为完全透明 } - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize); + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, fontSize); label_->SetStyle(STYLE_TEXT_OPA, opa); // 更新标签样式 } @@ -160,7 +160,7 @@ namespace OHOS } // 更新标签的字体和样式 - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize); + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, fontSize); label_->SetStyle(STYLE_TEXT_OPA, opa); } @@ -296,7 +296,7 @@ namespace OHOS // 初始化标签文本和样式 label_->SetText(" "); - label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE / 2); // 设置字体为一半大小 + label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, LABEL_FONT_SIZE / 2); // 设置字体为一半大小 label_->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); // 设置标签为不透明 } @@ -492,7 +492,7 @@ namespace OHOS batteryprogress->SetStyle(STYLE_BACKGROUND_OPA, 0xff); batterylabel->SetPosition(228, 54, 200, 60); - batterylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26); + batterylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 26); batterylabel->SetTextColor(Color::White()); batteryprogress->SetForegroundStyle(STYLE_BACKGROUND_COLOR, 0xffffc300); @@ -518,7 +518,7 @@ namespace OHOS timelabel->SetTextColor(Color::GetColorFromRGBA(0x49, 0xef, 0x13, 0xff)); timelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); timelabel->SetRollSpeed(0); - timelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 100); + timelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 100); container_->Add(timelabel); /*日期*/ @@ -538,7 +538,7 @@ namespace OHOS datelabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff)); datelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); datelabel->SetRollSpeed(0); - datelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + datelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); container_->Add(datelabel); } void SaveBatView::InitButtonView() @@ -590,7 +590,7 @@ namespace OHOS curren_label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); curren_label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); curren_label->SetRollSpeed(0); - curren_label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); + curren_label->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); container_->Add(curren_label); curren_label->SetVisible(false); #if ANIMATION_TEST @@ -647,7 +647,7 @@ namespace OHOS countlabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); countlabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); countlabel->SetRollSpeed(0); - countlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); + countlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40); container_->Add(countlabel); countlabel->SetVisible(false); #else diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp index 96d99c252..b229224e1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepNapView.cpp @@ -94,8 +94,9 @@ bool SleepNapView::InitPage(void) { CreateLine(verticalline, 232, 191, 2, 82, "verticalline"); /* -------------------------------- title初始化 * -------------------------------- */ + //TODO:多国语言 InitLabel(naptitle, 83, 90, 300, 35, "resttitle", "小睡数据", - DEFAULT_VECTOR_FONT_FILENAME, 30); + DEFAULT_VECTOR_FONT_FILENAME_EN, 30); InitLabelExt(napsleeptitle, 21, 203, 200, 35, "sleeptitle", STR_SLEEPTIME, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabelExt(napwaketitle, 213, 203, 300, 35, "waketitle", STR_WALKTIME, @@ -107,11 +108,11 @@ bool SleepNapView::InitPage(void) { * ------------------------------- */ napsleepStr = "--"; InitLabel(napsleep, 10, 238, 230, 47, "sleeplabel", napsleepStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 40); + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); napsleep->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff)); napwakeStr = "--"; InitLabel(napwake, 245, 238, 230, 47, "wakelabel", napwakeStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 40); + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); napwake->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff)); /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp index d26290426..292c1d135 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepTimeView.cpp @@ -146,18 +146,19 @@ bool SleepTimeView::InitPage(void) { goaltime->SetTextColor(Color::Gray()); /* ------------------------------- 数据label初始化 * ------------------------------- */ + //DEFAULT_VECTOR_FONT_FILENAME_EN restStr = "--"; InitLabel(goal, 83, 90, 300, 50, "restlabel", restStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 40); + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); // goal->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); goal->SetTextColor(Color::Gray()); sleepStr = "--"; InitLabel(sleep, 10, 238, 230, 47, "sleeplabel", sleepStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 40); + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); sleep->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff)); wakeStr = "--"; InitLabel(wake, 245, 238, 230, 47, "wakelabel", wakeStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 40); + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); wake->SetTextColor(Color::GetColorFromRGBA(0x53, 0x20, 0xE2, 0xff)); /* -------------------------------- 将组件添加到根视图 diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp index 3407cdd68..b45690e10 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp @@ -75,9 +75,10 @@ namespace OHOS // 更新时间 if (sleep_update_time != nullptr) { - std::string update_time = sleepModel.GetUpdateSleepTime(); - if (!update_time.empty()) // 检查返回值是否有效 - { + std::string update_time = sleepModel.GetUpdateSleepTime(); + if (!update_time.empty()) // 检查返回值是否有效 + { + //TODO:多国语言 std::string update_time_str = update_time + " 更新"; // 拼接字符串 sleep_update_time->SetText(update_time_str.c_str()); // UpdateLabel(sleep_update_time, sleep_goal, STR_SLEEPMGOAL); // TODO: 多国语言支持 @@ -162,7 +163,8 @@ namespace OHOS InitImageView(upiconimage, 213, 420, 40, 40, "image", upimagePath); InitImageView(progress_image, 28, 80, 100, 100, "image", prossimagePath); /*初始化目标时间*/ - InitLabelExt(sleep_update_time, 83, 330, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME, 30); + //DEFAULT_VECTOR_FONT_FILENAME_EN + InitLabelExt(sleep_update_time, 83, 330, 300, 35, "lablegoal", STR_SLEEPMGOAL, DEFAULT_VECTOR_FONT_FILENAME_EN, 30); sleep_update_time->SetTextColor(Color::Gray()); /*初始化睡眠时间*/ time_hour = new UILabel(); 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 f1a9f6f8a..c9548ad0f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -339,6 +339,8 @@ public: // 打印配置 void printTrainingData(const Trainingdata &data); /*打印数据*/ void printf_data(SportData *data); /*打印函数*/ + void PrintHeartRateTable(); + void PrintPaceTable(); //配置用户信息 void SetUserSportdata(); @@ -379,9 +381,8 @@ private: std::vector heartRateTable; // 心率表 std::vector paceTable; // 配速表 - const size_t MAX_ENTRIES = 10000; // 规定最大进场条目数 - /*std::unique_ptr sportdata;*/ // 使用 std::unique_ptr 管理 - // SportData 对象 + const size_t MAX_ENTRIES = 100000; // 规定最大进场条目数 + int user_maxHeart{190}; // 用户最高心率 int user_Age{20}; // 用户年龄 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 98abd868c..cdbc3598e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -179,8 +179,8 @@ void store_sport_data() { OHOS::TraingModel::GetInstance()->RecordSportData(); return; } -namespace OHOS { #if TIMER +namespace OHOS { // 声明定时器变量 static osTimerId_t g_startCounting = NULL; // 定时器 static constexpr uint64_t MS_ONE_SECONDS = 1000; @@ -1213,9 +1213,40 @@ bool TraingModel::AddPaceData(uint32_t timestamp, uint16_t pace) { paceTable.push_back(newEntry); return true; // 返回成功 } +//心率表打印 +void TraingModel::PrintHeartRateTable() { + size_t heartRateCount = heartRateTable.size(); + if (heartRateCount == 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "心率表为空,无法打印。"); + return; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Heart Rate Table:"); + for (const auto &entry : heartRateTable) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "时间戳: %u, 心率: %d", + entry.timestamp, entry.heartRate); + } +} +//配速表打印 +void TraingModel::PrintPaceTable() { + size_t paceCount = paceTable.size(); + if (paceCount == 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "配速表为空,无法打印。"); + return; + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Pace Table:"); + for (const auto &entry : paceTable) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "时间戳: %u, 配速: %.2f", + entry.timestamp, entry.pace); + } +} // 保存心率表 bool TraingModel::SaveHeartTable() { + + //打印数组 + PrintHeartRateTable(); + CreateDirectoryIfNotExists(TRAINING_HEART_FILE); size_t heartRateCount = heartRateTable.size(); @@ -1251,6 +1282,10 @@ bool TraingModel::SaveHeartTable() { // 保存配速表 bool TraingModel::SavePaceTable() { + + //打印数组 + PrintPaceTable(); + CreateDirectoryIfNotExists(TRAINING_PACE_FILE); size_t paceCount = paceTable.size(); @@ -1438,9 +1473,9 @@ void TraingModel::SendLiveDataIfNecessary() { } } -// 每分钟进行配速和心率数据存储 +// 每10秒进行配速和心率数据存储 void TraingModel::StoreDataIfMinutePassed() { - if (sportdata->duration % 60 == 0) { + if (sportdata->duration % 10 == 0) { uint32_t timestamp; if (uapi_get_timestampe_ss(×tamp) == ERRCODE_SUCC) { AddHeartRateData(timestamp, sportdata->heart); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index e16e5b5e9..32fc92413 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -479,8 +479,9 @@ void TraingCardView::ShowGetTagView() { InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30); getView->Add(labelgettag); + //DEFAULT_VECTOR_FONT_FILENAME_EN InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", - DEFAULT_VECTOR_FONT_FILENAME, 30); + DEFAULT_VECTOR_FONT_FILENAME_EN, 30); getView->Add(labelpre); // 初始化按键 @@ -517,9 +518,10 @@ void TraingCardView::ShowHeartView() { int maxheart = ConfigModel::GetInstance()->get_configData_int( ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX); + //TODO 多国语言 std::string heartStr = "当前心率高于" + std::to_string(maxheart) + "次/分钟"; InitLabel(labelnote, 53, 269, 360, 35, "label3", heartStr.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 30); + DEFAULT_VECTOR_FONT_FILENAME_EN, 30); heartView->Add(labelnote); InitImageView(heartiamge, 193, 149, 80, 80, "note", WARNING_IMAGE); @@ -593,8 +595,11 @@ void TraingCardView::InitImageAnimator() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, tagString.c_str()); + + //DEFAULT_VECTOR_FONT_FILENAME_EN InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), - DEFAULT_VECTOR_FONT_FILENAME, 80); + DEFAULT_VECTOR_FONT_FILENAME_EN, 80); + labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); getView->Add(labeltag); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp index 342cd287d..9660fb5a0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp @@ -61,7 +61,7 @@ void TrainingControlView::InitView() { InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", STR_TRAINING_IN_PROGRESS, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(labeltimer, 45, 110, 360, 80, "label2", "00:00:00", - DEFAULT_VECTOR_FONT_FILENAME, 65); + DEFAULT_VECTOR_FONT_FILENAME_EN, 65); InitLabelExt(labelend, 81, 330, 130, 35, "label3", STR_FINISH, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabelExt(labelstop, 251, 330, 130, 35, "label4", STR_PAUSE, diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp index 212bc3a24..8734a04f2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp @@ -77,13 +77,14 @@ bool TrainingDataView ::InitPage() { DEFAULT_VECTOR_FONT_FILENAME, 30); sportlabel->SetTextColor(Color::Gray()); + //数字统一使用DEFAULT_VECTOR_FONT_FILENAME_EN InitLabel(curtimelabel, 155, 60, 150, 50, "label1", "23:54", - DEFAULT_VECTOR_FONT_FILENAME, 40); - + DEFAULT_VECTOR_FONT_FILENAME_EN, 40); InitLabel(timerlabel, 0, 163, 466, 150, "label3", "00:00:00", - DEFAULT_VECTOR_FONT_FILENAME, 80); + DEFAULT_VECTOR_FONT_FILENAME_EN, 80); InitLabel(heartlabel, 85, 284, 230, 80, "label4", "--", - DEFAULT_VECTOR_FONT_FILENAME, 60); + DEFAULT_VECTOR_FONT_FILENAME_EN, 60); + InitLabel(ubpmlabel, 218, 284, 230, 80, "label5", "bpm", DEFAULT_VECTOR_FONT_FILENAME, 60); ubpmlabel->SetTextColor(Color::Gray()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp index f078f693d..528eca306 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp @@ -62,12 +62,14 @@ bool TrainingDetailView ::InitPage() { u_stepslabel->SetTextColor(Color::Gray()); u_calorielabel->SetTextColor(Color::Gray()); + //数字统一使用DEFAULT_VECTOR_FONT_FILENAME_EN InitLabel(milelabel, 17, 160, 200, 80, "label6", "13.21", - DEFAULT_VECTOR_FONT_FILENAME, 65); + DEFAULT_VECTOR_FONT_FILENAME_EN, 65); InitLabel(calorielabel, 230, 160, 200, 80, "label7", "28312", - DEFAULT_VECTOR_FONT_FILENAME, 65); + DEFAULT_VECTOR_FONT_FILENAME_EN, 65); InitLabel(steplabel, 133, 285, 200, 80, "label8", "210.03", - DEFAULT_VECTOR_FONT_FILENAME, 65); + DEFAULT_VECTOR_FONT_FILENAME_EN, 65); + Add(u_milelabel); Add(u_stepslabel); Add(u_calorielabel); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp index 5facc50f2..5931d70a4 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/charge_notification.cpp @@ -278,7 +278,7 @@ namespace OHOS UILabel_Chargeing->SetTextColor(Color::GetColorFromRGBA(0x4F, 0xC3, 0x4C, 0xff)); UILabel_Chargeing->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); UILabel_Chargeing->SetRollSpeed(0); - UILabel_Chargeing->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + UILabel_Chargeing->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); UILabel_Chargeing->SetVisible(true); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp index 76603aa65..39f2cb214 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp @@ -131,7 +131,7 @@ namespace OHOS // sleepnotifylabel->SetTextId(textId); sleepnotifylabel->SetText(sleep_note.c_str()); sleepnotifylabel->SetTextColor(Color::Gray()); - sleepnotifylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + sleepnotifylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); sleepnotifylabel->SetLineBreakMode(UILabel::LINE_BREAK_CLIP); // 换行裁剪 sleepnotifylabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 居中显示 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleepnotifylabel is ok"); diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma index 179a709db..a8647cc60 100644 Binary files a/tools/dial_converter_tool/dial_lzma/101/sport.lzma and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma index be0e63f23..2ea153ef3 100644 Binary files a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.lzma b/tools/dial_converter_tool/dial_lzma/104/dog.lzma index 55e24c950..3bd661acf 100644 Binary files a/tools/dial_converter_tool/dial_lzma/104/dog.lzma and b/tools/dial_converter_tool/dial_lzma/104/dog.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/105/kitty.lzma b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma index abb915d4c..5d9e924b5 100644 Binary files a/tools/dial_converter_tool/dial_lzma/105/kitty.lzma and b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma index e81723f11..5b4c11184 100644 Binary files a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma and b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma index 266f2fea0..630da34aa 100644 Binary files a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma and b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma index fbbbc92e3..d93b0696a 100644 Binary files a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma and b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma index 6756dfae6..b1b072e8e 100644 Binary files a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma and b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma index c73d4f1f1..fe6d3da6d 100644 Binary files a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma and b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma differ diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml index d8ad6065b..4c18bfb35 100644 --- a/tools/dial_converter_tool/instance/101/sport.xml +++ b/tools/dial_converter_tool/instance/101/sport.xml @@ -3,22 +3,22 @@ - + - + - + - + diff --git a/tools/dial_converter_tool/instance/103/jellyfish.xml b/tools/dial_converter_tool/instance/103/jellyfish.xml index 5fa44a14a..39bf61bd1 100644 --- a/tools/dial_converter_tool/instance/103/jellyfish.xml +++ b/tools/dial_converter_tool/instance/103/jellyfish.xml @@ -10,18 +10,21 @@ - + - + - + - + - + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/104/dog.xml b/tools/dial_converter_tool/instance/104/dog.xml index 296364d5f..382716cb0 100644 --- a/tools/dial_converter_tool/instance/104/dog.xml +++ b/tools/dial_converter_tool/instance/104/dog.xml @@ -10,9 +10,9 @@ - + - + diff --git a/tools/dial_converter_tool/instance/105/kitty.xml b/tools/dial_converter_tool/instance/105/kitty.xml index 7b191302c..fa9264e22 100644 --- a/tools/dial_converter_tool/instance/105/kitty.xml +++ b/tools/dial_converter_tool/instance/105/kitty.xml @@ -17,8 +17,10 @@ - + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/106/galaxy.xml b/tools/dial_converter_tool/instance/106/galaxy.xml index 0d17f69e7..0ab47cfd3 100644 --- a/tools/dial_converter_tool/instance/106/galaxy.xml +++ b/tools/dial_converter_tool/instance/106/galaxy.xml @@ -15,25 +15,28 @@ --> - + - + - + - + - + - + - + + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml index b5acde1a1..567235484 100644 --- a/tools/dial_converter_tool/instance/109/succulents.xml +++ b/tools/dial_converter_tool/instance/109/succulents.xml @@ -16,10 +16,12 @@ - + - + - + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml index 1221f16c2..3a89a210a 100644 --- a/tools/dial_converter_tool/instance/110/spaceman.xml +++ b/tools/dial_converter_tool/instance/110/spaceman.xml @@ -18,10 +18,12 @@ - + - + - + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml index a6d869084..8c4abba0a 100644 --- a/tools/dial_converter_tool/instance/111/satellite.xml +++ b/tools/dial_converter_tool/instance/111/satellite.xml @@ -18,10 +18,12 @@ - + - + - + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/112/birdie.xml b/tools/dial_converter_tool/instance/112/birdie.xml index 710db34b7..c36096f4e 100644 --- a/tools/dial_converter_tool/instance/112/birdie.xml +++ b/tools/dial_converter_tool/instance/112/birdie.xml @@ -17,10 +17,12 @@ - + - + - + + + \ No newline at end of file diff --git a/tools/dial_converter_tool/instance/113/Battery/Battery.png b/tools/dial_converter_tool/instance/113/Battery/Battery.png deleted file mode 100644 index 916febe86..000000000 Binary files a/tools/dial_converter_tool/instance/113/Battery/Battery.png and /dev/null differ diff --git a/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png deleted file mode 100644 index 4c26888f3..000000000 Binary files a/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png and /dev/null differ diff --git a/tools/dial_converter_tool/instance/113/HOURHAND.png b/tools/dial_converter_tool/instance/113/HOURHAND.png deleted file mode 100644 index 6d6cbbdc9..000000000 Binary files a/tools/dial_converter_tool/instance/113/HOURHAND.png and /dev/null differ diff --git a/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png index b03740b49..e2fea4050 100644 Binary files a/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/113/MINUTEHAND.png b/tools/dial_converter_tool/instance/113/MINUTEHAND.png deleted file mode 100644 index 3ee2d1941..000000000 Binary files a/tools/dial_converter_tool/instance/113/MINUTEHAND.png and /dev/null differ diff --git a/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/113/dawninsight.png similarity index 100% rename from tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png rename to tools/dial_converter_tool/instance/113/dawninsight.png diff --git a/tools/dial_converter_tool/instance/116/time.xml b/tools/dial_converter_tool/instance/113/dawninsight.xml similarity index 52% rename from tools/dial_converter_tool/instance/116/time.xml rename to tools/dial_converter_tool/instance/113/dawninsight.xml index 83a6cd1fb..4c3953733 100644 --- a/tools/dial_converter_tool/instance/116/time.xml +++ b/tools/dial_converter_tool/instance/113/dawninsight.xml @@ -1,4 +1,4 @@ - + diff --git a/tools/dial_converter_tool/instance/113/golden_ball.png b/tools/dial_converter_tool/instance/113/golden_ball.png deleted file mode 100644 index 238060ffa..000000000 Binary files a/tools/dial_converter_tool/instance/113/golden_ball.png and /dev/null differ diff --git a/tools/dial_converter_tool/instance/113/golden_ball.xml b/tools/dial_converter_tool/instance/113/golden_ball.xml deleted file mode 100644 index cc5a38422..000000000 --- a/tools/dial_converter_tool/instance/113/golden_ball.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tools/dial_converter_tool/instance/116/time.png b/tools/dial_converter_tool/instance/116/time.png deleted file mode 100644 index e2fea4050..000000000 Binary files a/tools/dial_converter_tool/instance/116/time.png and /dev/null differ