From 513b5bdc04ef656e532656b334919cd3283c90d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Thu, 30 Oct 2025 11:08:54 +0000 Subject: [PATCH] Merge #2646 into sdk650pathc0423 from refs/changes/2646/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/2646/head: (22 commits squashed) - 增加经期开始与结束的列表 - 增加女性健康算法 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - 修复运动数据显示不连续 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - 优化星历下载的UI - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - GPS只支持室外走路 室外跑步 骑行 - 272.、n9屏蔽息屏表盘功能 - 272开机动画背景设置为黑色 - 修改272开机动画logo - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - 增加nextday - ln release V1.0.1 Signed-off-by: Caisking <3449750381@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2646 --- autobuild.sh | 6 +++--- .../nativeui/traing/src/TraingModel.cpp | 9 +++------ .../msg_center/src/msg_center_customer.cpp | 5 +---- .../src/ShutDownImageAnimatorView.cpp | 2 +- .../nativeui/settings/src/SettingModel.cpp | 2 +- .../nativeui/traing/src/TraingModel.cpp | 11 ++++------- .../nativeui/settings/src/SettingModel.cpp | 2 +- .../nativeui/traing/src/TraingModel.cpp | 11 ++++------- .../fd272/fs/user/system/FOOING_LOGO.bin | Bin 146040 -> 146040 bytes .../service/src/graphic_service_wrapper.cpp | 2 +- 10 files changed, 19 insertions(+), 31 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index fc9a5f490..6ea0b67dc 100644 --- a/autobuild.sh +++ b/autobuild.sh @@ -59,9 +59,9 @@ declare -A PROJECT_VERSIONS=( ["w9"]="1.3.107" ["lt22"]="1.3.107" ["n9"]="1.3.110" - ["ln"]="1.0.0" - ["lnppp"]="1.1.0" - ["n9ln"]="1.0.0" + ["ln"]="1.0.1" + ["lnppp"]="1.1.1" + ["n9ln"]="1.0.0" # 特殊功能版本 ["u8m"]="1.3.107" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp index ff45122e6..699bd3995 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp @@ -403,12 +403,9 @@ bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) { //跑步 走路 骑行需要GPS switch (sportId_) { - case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING: - case UIResourceTextId::STR_EXERCISE_INDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_INDOORWALKING: - case UIResourceTextId::STR_EXERCISE_TREADMILL: - case UIResourceTextId::STR_EXERCISE_STROLLMACHINE: + case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步 + case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路 + case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行 return true; default: return false; diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp index 6e189cab9..2b9a8d395 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp @@ -365,7 +365,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req) unused(req); AlarmClockModel::GetInstance()->NextDayNotify(); // current_year = 0; -#if 0 printf("******nextday is begin******\r\n"); // 存储nextday执行日志 start_report_nextday_log_start(); @@ -398,7 +397,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req) nextday_clear_popup_windows_log(); printf("******nextday is end******\r\n"); -#endif #ifdef SUPPORT_CYWEE_SERVICE /* --------------------------------- 每日目标相关 --------------------------------- */ cywee_reset_history_daily_data(); //清除运动相关数据 @@ -409,7 +407,6 @@ void MsgCenterNotifyNextDayProc(const Topic topic, Request *req) set_Is_show_flag(1,i); } - do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESET_DAILY_DATA, NULL); // SendMsgToUIService(UI_UPDATE_GOAL, 0, nullptr, 0); @@ -437,7 +434,7 @@ void MsgCenterNotifyONtimeProc(const Topic topic, Request* req) cywee_stand_history_save(time->value); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "保存每小时卡路里数据"); - cywee_calories_history_save(time->value); + cywee_calories_history_save(time->value); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "保存每小时距离数据"); cywee_distances_history_save(time->value); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp index 5f32cb3cd..fd5f4c584 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp @@ -154,7 +154,7 @@ namespace OHOS ShutDownImageInfo[i].height = SHUTDOWN_IMAGE_ANIMATOR_VIEW_H; } shutDownImageAnimatorView->SetPosition(SHUTDOWN_IMAGE_ANIMATOR_VIEW_X, SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y, SHUTDOWN_IMAGE_ANIMATOR_VIEW_W, SHUTDOWN_IMAGE_ANIMATOR_VIEW_H); - shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); + shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); shutDownImageAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); shutDownImageAnimatorView->SetImageAnimatorSrc(ShutDownImageInfo, SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100); shutDownImageAnimatorView->SetRepeat(false); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp index c661010e2..ecf67875e 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp @@ -42,7 +42,7 @@ namespace OHOS settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true}; settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true}; settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true}; - settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true}; + // settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true}; settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true}; settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true}; settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true}; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp index c755e30d5..699bd3995 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingModel.cpp @@ -198,7 +198,7 @@ // TraingModel::GetInstance()->AnalysisExtraData(cyweeInfo_ext); // delete cyweeInfo_ext; // 释放内存 // } - // //训练心率 + //训练心率 // if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) { // uint8_t heart = *((u_int8_t *)(request->data)); // 进行类型转换 // TraingModel::GetInstance()->AnalysisHeartData(heart); @@ -403,12 +403,9 @@ bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) { //跑步 走路 骑行需要GPS switch (sportId_) { - case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING: - case UIResourceTextId::STR_EXERCISE_INDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_INDOORWALKING: - case UIResourceTextId::STR_EXERCISE_TREADMILL: - case UIResourceTextId::STR_EXERCISE_STROLLMACHINE: + case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步 + case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路 + case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行 return true; default: return false; diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp index c661010e2..ecf67875e 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/settings/src/SettingModel.cpp @@ -42,7 +42,7 @@ namespace OHOS settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true}; settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true}; settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true}; - settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true}; + // settings[index++] = {VIEW_SET_AODDIAL, PNG_SETTINGS_AOD_DIAL, STR_SCREEN_OFF_DISPLAY, true}; settings[index++] = {VIEW_DNOTDISTURB, PNG_SETTINGS_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true}; settings[index++] = {VIEW_ADD_CARD, PNG_SETTINGS_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true}; settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_SETTINGS_CHANGEDIAL_IMAGE, STR_DIAL_BROWSING_SPECIAL_EFFECTS, true}; diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp index c755e30d5..699bd3995 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp @@ -198,7 +198,7 @@ // TraingModel::GetInstance()->AnalysisExtraData(cyweeInfo_ext); // delete cyweeInfo_ext; // 释放内存 // } - // //训练心率 + //训练心率 // if (request->msgId == TOPIC_EVENT_HEARTRATE_UPDATA) { // uint8_t heart = *((u_int8_t *)(request->data)); // 进行类型转换 // TraingModel::GetInstance()->AnalysisHeartData(heart); @@ -403,12 +403,9 @@ bool TraingModel::IsNeedGPS(UIResourceTextId sportId_) { //跑步 走路 骑行需要GPS switch (sportId_) { - case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING: - case UIResourceTextId::STR_EXERCISE_INDOORRUNNING: - case UIResourceTextId::STR_EXERCISE_INDOORWALKING: - case UIResourceTextId::STR_EXERCISE_TREADMILL: - case UIResourceTextId::STR_EXERCISE_STROLLMACHINE: + case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING://室外跑步 + case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING://室外走路 + case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING://室外骑行 return true; default: return false; diff --git a/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin b/code/sdk/files/fd272/fs/user/system/FOOING_LOGO.bin index 4661987600bf1fa8900b2849ea7418e552e96aa5..6291d303ca8c7c864990b0a791946c6680f09017 100644 GIT binary patch delta 5639 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 E4}ED4LI3~& literal 146040 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

!E1{#fZMn< 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, REBOOT_IMAGE_ANIMATOR_VIEW_Y, REBOOT_IMAGE_ANIMATOR_VIEW_W, REBOOT_IMAGE_ANIMATOR_VIEW_H); - ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xffffffff); + ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_COLOR, 0xff000000); ReBootImageAnimatorView->SetStyle(OHOS::STYLE_BACKGROUND_OPA, 0xff); ReBootImageAnimatorView->SetImageAnimatorSrc(ReBootImageInfo, REBOOT_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, 100); #if defined(LEINIAO) -- 2.17.1