From: 袁清梦 <3449750381@qq.com> Date: Tue, 24 Sep 2024 12:41:44 +0000 (+0000) Subject: Merge #1010 into sdk602patch0626 from refs/changes/1010/head X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1991d3070d171306347bb034f70aeba273430011;p=mirrors%2FFD230.git Merge #1010 into sdk602patch0626 from refs/changes/1010/head Code review from 袁清梦 * refs/changes/1010/head: (20 commits squashed) - 修改心率曲线图Y轴数字 - #144 手表，心率测量开始测量的时候显示的心率值太大，需要优化开始显示的心率值 - #678 心率初始出值不稳定，偏差太大。 - #560 运动，徒步运动设置目标1KM，实际放桌子上未动，提示我目标达成 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #446 运动界面，上下滑，下界面是覆盖式的，优化为U6那种滑动式界面 - #667 运动结束界面，数据不完整，数据内容不丰富，没有设置目标也会显示目标完成度 - #700 运动时间显示花屏，显示逻辑不对（两台测试样机都有） - #687 省电模式-有长按不起反应现象 - #819 手表，表盘步数显示-31441，实际步数99631 - 修改表盘距离数据为uint32_t - #448 运动结束训练记录滑动会遮挡，并且运动结束会显示训练历史记录 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - 修改运动获取实时数据traningauto为1 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #314 手表，消息通知，长消息超出框外显示 - 移除训练的uapi_add_sport_vote（）修改运动结束逻辑 - 增加新表盘原文件 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/1010 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp index 12b4ad39b..7ed7bff6c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp @@ -348,6 +348,8 @@ namespace OHOS data.labelTitle = messageInfo->title; data.timestamp = messageInfo->time; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddMessageData data.isRead is %d,data.labelDetails is %s,data.labelTitle is %s,data.timestamp is %d", data.isRead, data.labelDetails.c_str(), data.labelTitle.c_str(), data.timestamp); + char labelTime[20]; if (uapi_get_TIME_STR(data.timestamp, labelTime, '.', ':', DATE_Y_M_D_H_M) != ERRCODE_SUCC) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp index 306d9a429..3cc5de923 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp @@ -136,7 +136,7 @@ namespace OHOS int updatedLabelWidth = baseLabelWidth + (additionalLines * extraLabelWidthPerLine); // 输出配置结果 - messageButton->SetPosition(33, 157, 400, updatedRectWidth); + messageButton->SetPosition(33, 157, 380, updatedRectWidth); deleteButton->SetPosition(43, 157 + updatedRectWidth + 20, 380, 100); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "updatedRectWidth %d updatedLabelWidth %d lines %d \r\n", updatedRectWidth, updatedLabelWidth, lines); @@ -176,12 +176,18 @@ namespace OHOS time->SetVisible(true); /* -------------------------------------------------------------------------- */ /*初始化消息内容*/ - InitializeButton(messageButton, 33, 157, 400, defaultRectWidth, "message"); - messageButton->SetStyle(STYLE_BORDER_RADIUS, 30); + InitializeButton(messageButton, 33, 157, 380, defaultRectWidth, "message"); + messageButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + messageButton->SetStyle(STYLE_BORDER_RADIUS, 20); + messageButton->SetStyle(STYLE_PADDING_LEFT, 15); + messageButton->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff)); messageButton->SetAlign(TEXT_ALIGNMENT_LEFT); - messageButton->SetTextColor(Color::Gray()); + messageButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + messageButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); + messageButton->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); + messageButton->SetStyleForState(STYLE_BORDER_RADIUS, 20, UIButton::PRESSED); messageButton->SetTouchable(false); - // messageButton->SetText(messageStr.c_str()); + messageButton->SetText(messageStr.c_str()); // messageButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ InitUILabel(message, 63, 165, 340, 100, "message", messageStr.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 30); @@ -194,7 +200,7 @@ namespace OHOS container_->Add(title); container_->Add(time); container_->Add(messageButton); - container_->Add(message); + // container_->Add(message); container_->Add(deleteButton); /* -------------------------------------------------------------------------- */ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView is ok!"); 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 982df613c..dc2b49db9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -428,18 +428,10 @@ namespace OHOS if (state != ExerciseState::General) { /*运动开始并且是app发起的运动*/ - if (Openingway == true) + if (Openingway == true && state != ExerciseState::End) { sendtraningstatedata(static_cast(state), sportdata->duration); } - else - { - /*手表发起并且是结束状态*/ - if (state == ExerciseState::End) - { - sendtraningstateend(); - } - } } sportState_ = state; } @@ -713,6 +705,16 @@ namespace OHOS sportTag_ = 0; sportTagType_ = ExerciseTag::UNKNOW; #endif + /*运动结束并且是手表发起的运动*/ + if (Openingway == false) + { + sendtraningstateend(); + } + /*运动结束并且是app发起的运动*/ + else + { + sendtraningstatedata(0, sportdata->duration); + } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "结束运动"); } 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 29a583e35..f5d312a86 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 @@ -74,7 +74,7 @@ TraingCardView::TraingCardView() { TraingModel::GetInstance()->SetSportState( ExerciseState::Start); // 设置运动状态为开始 TraingModel::GetInstance()->SetTimestamp(); - uapi_add_sport_vote(); // 保护进程 + // uapi_add_sport_vote(); // 保护进程 g_pTraingCardView = this; } @@ -87,7 +87,7 @@ TraingCardView::~TraingCardView() { g_pTraingCardView = nullptr; DisableTimer(); // 关闭计时器 TraingModel::GetInstance()->SetTimestamp(); - uapi_remove_sport_vote(); // 移除 + // uapi_remove_sport_vote(); // 移除 } TraingCardView *TraingCardView::GetInstance() { return g_pTraingCardView; } diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h index 60d9723b1..db1c87a3f 100644 --- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h +++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h @@ -335,7 +335,7 @@ namespace OHOS {ConfigDataType::DATATYPE_BOOL, "a2dp", "true" },// CONFIGMODEL_ITEM_A2DP {ConfigDataType::DATATYPE_BOOL, "spp", "true" },// CONFIGMODEL_ITEM_SPP,//SPP蓝牙开关 {ConfigDataType::DATATYPE_INT, "traningfreq", "10" },// CONFIGMODEL_ITEM_TRANING_FREQ //训练实时数据上传频率//单位秒 - {ConfigDataType::DATATYPE_INT, "traningauto", "0" },//CONFIGMODEL_ITEM_TRANING_AUTO,//开启关闭自动获取实时数据 + {ConfigDataType::DATATYPE_INT, "traningauto", "1" },//CONFIGMODEL_ITEM_TRANING_AUTO,//开启关闭自动获取实时数据 {ConfigDataType::DATATYPE_INT, "traningheart", "190" },//CONFIGMODEL_ITEM_TRAINING_HEART_MAX//训练最高心率 //心率相关 {ConfigDataType::DATATYPE_INT, "heartrate_freq", "30" },// CONFIGMODEL_ITEM_HEARTRATE_DETECTED//心率周期检测频率 diff --git a/tools/dial_converter_tool/dial_lzma/115/pointer.lzma b/tools/dial_converter_tool/dial_lzma/115/pointer.lzma new file mode 100644 index 000000000..eed5bb1ca Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/115/pointer.lzma differ diff --git a/tools/dial_converter_tool/dial_lzma/116/time.lzma b/tools/dial_converter_tool/dial_lzma/116/time.lzma new file mode 100644 index 000000000..170b47d5d Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/116/time.lzma differ diff --git a/tools/dial_converter_tool/instance/115/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/115/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..742bb51fe Binary files /dev/null and b/tools/dial_converter_tool/instance/115/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/115/pointer.png b/tools/dial_converter_tool/instance/115/pointer.png new file mode 100644 index 000000000..742bb51fe Binary files /dev/null and b/tools/dial_converter_tool/instance/115/pointer.png differ diff --git a/tools/dial_converter_tool/instance/115/pointer.xml b/tools/dial_converter_tool/instance/115/pointer.xml new file mode 100644 index 000000000..c8d611f43 --- /dev/null +++ b/tools/dial_converter_tool/instance/115/pointer.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png new file mode 100644 index 000000000..e2fea4050 Binary files /dev/null and b/tools/dial_converter_tool/instance/116/MAIN_FACE_IMAGE.png differ diff --git a/tools/dial_converter_tool/instance/116/time.png b/tools/dial_converter_tool/instance/116/time.png new file mode 100644 index 000000000..e2fea4050 Binary files /dev/null and b/tools/dial_converter_tool/instance/116/time.png differ diff --git a/tools/dial_converter_tool/instance/116/time.xml b/tools/dial_converter_tool/instance/116/time.xml new file mode 100644 index 000000000..83a6cd1fb --- /dev/null +++ b/tools/dial_converter_tool/instance/116/time.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tools/image_converter_tool/test/kumi_clocks/pointer.png b/tools/image_converter_tool/test/kumi_clocks/pointer.png new file mode 100644 index 000000000..742bb51fe Binary files /dev/null and b/tools/image_converter_tool/test/kumi_clocks/pointer.png differ diff --git a/tools/image_converter_tool/test/kumi_clocks/time.png b/tools/image_converter_tool/test/kumi_clocks/time.png new file mode 100644 index 000000000..e2fea4050 Binary files /dev/null and b/tools/image_converter_tool/test/kumi_clocks/time.png differ