From: Caisking <3449750381@qq.com> Date: Wed, 31 Jul 2024 08:42:19 +0000 (+0800) Subject: 优化部分配置 X-Git-Tag: release_V1.2.70_20241020_135402~726 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8bbe0fefbd72ddb5190593706fd44840bd2a7daf;p=mirrors%2FFD230.git 优化部分配置 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 0e958a8db..c78c61374 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -167,6 +167,13 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckInvalidPresenter.cpp + #HeartCheck + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartModel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartDetectionView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartDetectionPresenter.cpp + #BloodCheck ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -236,12 +243,6 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/activity/src/ActivityPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/activity/src/ActivityModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartRateView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartModel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartBandoffView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartCheckView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartResultView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/AlarmClockModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/MainAlarmView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/alarm/src/AlarmConfigView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h index 6482f820d..e43dcd1e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-07-31 10:38:26 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenModel.h + */ #ifndef BLOOD_OXYGEN_MODEL_H #define BLOOD_OXYGEN_MODEL_H @@ -36,10 +42,7 @@ namespace OHOS uint32_t GetCheckTime(); void SetCheckTime(uint32_t time); - void SetWearStatus(int32_t wear); - bool GetWearStatus(); - void SetResult(BloodResult result); BloodResult GetResult(); @@ -52,12 +55,7 @@ namespace OHOS void ReInit(); private: - bool OxygenView; - bool BandoffView; - bool CheckView; - bool ResultView; - bool CheckStatus; - bool wearStatus; + uint16_t displayspo2; uint16_t currentspo2; uint32_t timestamp_ms; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index 86bc49572..f72d9fe21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -68,11 +68,6 @@ namespace OHOS } } - bool BloodOxygenModel::GetWearStatus() - { - return wearStatus; - } - uint16_t BloodOxygenModel::GetSPO2data() { return currentspo2; @@ -104,7 +99,7 @@ namespace OHOS // 开始检测 void BloodOxygenModel::Blood_Start() { - currentspo2 = 0; + displayspo2 = 0; SetResult(BloodResult::NOT_TESTED); // 成功检测 // 进行初始化操作 if (!sensorstate) @@ -204,7 +199,7 @@ namespace OHOS void BloodOxygenModel::SetWearStatus(int32_t wear) { // 设置佩戴状态 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear); // 计数更新 if (wear_ != 1 && wear != 1) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp index 47186319d..8fdce5bc6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -37,6 +37,9 @@ #include "power_display_service.h" #include "custom_utils.h" #include "cywee_service.h" +#include "battery_hal.h" + +#include"heart_blood/health_service/health_service.h" #define BLOODKEYABLE 1 namespace OHOS @@ -124,7 +127,18 @@ namespace OHOS { if (strcmp(view.GetViewId(), CLICK_BLOOD) == 0) { - NativeAbility::GetInstance().EnterSlice(VIEW_BLOODOXY_CHECK, TransitionType::TRANSITION_ZOOM); + // 如果正在充电进入提醒界面 + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); + } + else + { + NativeAbility::GetInstance().EnterSlice(VIEW_BLOOD_CHECK, TransitionType::TRANSITION_ZOOM); + } } WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPresenter::OnClick"); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp index 752474848..1cb3e4da4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp @@ -1,7 +1,7 @@ /*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-30 16:39:56 + * @LastEditTime: 2024-07-31 14:36:25 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp */ @@ -106,9 +106,9 @@ namespace OHOS /*初始化title*/ InitLabelExt(titleLabel, 83, 50, 300, 35, "title", STR_BLOOD, DEFAULT_VECTOR_FONT_FILENAME, 30); /*初始化血氧值label*/ - InitUILabel(bloodLabel, 83, 22, 300, 300, "bloodtext", "--", DEFAULT_VECTOR_FONT_FILENAME, 120); + InitUILabel(bloodLabel, 83, 32, 300, 300, "bloodtext", "--", DEFAULT_VECTOR_FONT_FILENAME, 140); /*初始化检测时间*/ - InitLabelExt(timeLabel, 53, 260, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30); // 设置来回滚动属性 timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); timeLabel->SetRollSpeed(70); 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 da7cec537..0c38bbfe3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -30,6 +30,8 @@ #include "traing/training_card/include/Training_CardView.h" #include "dnotdisturb/include/DnotDisturbModel.h" #include "weather/include/WeatherModel.h" +#include "heart_blood/health_service/health_service.h" + #if USE_OFFLINE_DIAL #include "DialViewGroup.h" #endif @@ -44,7 +46,7 @@ namespace OHOS {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB}, // 勿扰 {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE}, // 省电模式 {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE}, // 查找手机 - {MAIN_CLICK_BLOOD, VIEW_BLOODOXY_CHECK}, // 血氧检查 + {MAIN_CLICK_BLOOD, VIEW_BLOOD_CHECK}, // 血氧检查 {MAIN_CLICK_SETCARD, VIEW_ADD_CARD}, // 卡片管理 }; @@ -161,8 +163,15 @@ namespace OHOS { MainModel::GetInstance().SetFromSetCardView(true); MainModel::GetInstance().SetFromCardId(BLOODOXGEN); + // 如果正在充电进入提醒界面 + if (get_charge_stat()) + { + HealthState highHealthState; + highHealthState.checkType = CHARGE; + HealthService::GetInstance()->SetHealthCurrent(highHealthState); + NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID, TransitionType::TRANSITION_ZOOM); + } } - // 如果勿扰模式是开启状态,在下拉界面点击勿扰快捷入口会关闭勿扰模式不进入勿扰视图 if (g_jumpView[curViewId] == VIEW_DNOTDISTURB && DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled() == true) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h index 68070a034..fb8ef2c21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h @@ -55,9 +55,9 @@ namespace OHOS }; enum PopupType { - EndPopup, - GetTagPopup, - HeartPopup, + EndPopup, // 结束训练弹窗 + GetTagPopup, // 达到训练目标弹窗 + HeartPopup, // 达到最高心率弹窗 }; class TraingCardPresenter; class TrainingControlView; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index e4085cde7..a1c11e640 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -237,6 +237,7 @@ namespace OHOS // 定义点击事件映射 static const std::unordered_map> actionMap = { + // 暂停按键 {BUTTONSTOP, [&]() { auto currentState = TraingModel::GetInstance()->GetSportState(); @@ -249,26 +250,31 @@ namespace OHOS handleContinueState(); } }}, + // 结束按键 {BUTTONEND, [&]() { ControlSensor(ExerciseState::Pause); TraingCardView::GetInstance()->SetPopupViewStatus(EndPopup, true); TraingCardView::GetInstance()->RefreshEndView(); }}, + // 确定结束 {BUTTONEXIT, [&]() { handleEndState(); }}, + // 返回 {BUTTONBACK, [&]() { ControlSensor(ExerciseState::Continue); TraingCardView::GetInstance()->SetPopupViewStatus(EndPopup, false); }}, + // 确定达到目标 {BUTTONWINOK, [&]() { TraingCardView::GetInstance()->SetPopupViewStatus(GetTagPopup, false); TraingCardView::GetInstance()->GetAnimator()->Stop(); }}, + // 确定心率提醒 {BUTTONNOTE, [&]() { TraingCardView::GetInstance()->SetPopupViewStatus(HeartPopup, false); @@ -301,14 +307,14 @@ namespace OHOS { // 设置目标:在非运动情况下设置 [单指令,执行后退出] TraingModel::GetInstance()->SetSportTag(static_cast(cmd->sportTagType), cmd->sportTag); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetSportTag is succeed!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetSportTag is succeed!\r\n"); return true; } break; case SENDDATA: TraingModel::GetInstance()->SendLiveData(); // 发送实时数据 [单指令,执行后退出] - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SendLiveData is succeed!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SendLiveData is succeed!\r\n"); return true; default: break; @@ -338,10 +344,10 @@ namespace OHOS } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); ExerciseState cmdState = static_cast(cmd->controlmd); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ExerciseState::End [%d]\r\n", cmdState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ExerciseState::End [%d]\r\n", cmdState); switch (cmdState) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp index 02f000086..9f1d7ee64 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -2,7 +2,7 @@ #include "watchQRcode/include/WatchQRCodeView.h" #include "wearable_log.h" #include "custom_utils.h" -#include "language/font/ui_resource_string.h" +#include "ui_resource_string.h" #include "iostream" #include "string" namespace OHOS diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index 2068b3a77..9de9fec9d 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang deleted file mode 100644 index 3532e338d..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and /dev/null differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 920b223a4..02262a6ad 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -485,30 +485,14 @@ enum UIResourceTextId : uint16_t { STR_AIMODES_WENXINYIYAN = 472, STR_AIMODES_KIMI = 473, STR_AIMODES_CHATGPT = 474, - STR_SLIDE_TO_SHUTDOWN = 475, - STR_SLIDE_TO_REBOOT = 476, - STR_AI_FAMILY_MEALS = 477, - STR_CHAT = 478, - STR_PCY4GC_OR_AS = 479, - STR_API_KEYS = 480, - STR_PGTTAF = 481, - STR_DAFBS = 482, - STR_OPENAI_API_KEYS = 483, - STR_KHBB = 484, - STR_GTAS = 485, - STR_DYWTDAK = 486, - STR_CONNECTING = 487, - STR_CONNECTION_FAIL = 488, - STR_PTALORTM = 489, - STR_MOTION_DETECTION_NOTE = 490, - STR_PE4GC = 491, - STR_OBU_MESSAGE = 492, - STR_MAX_ID = 493, + STR_CHARGE = 475, + STR_CHARGE_NOTE = 476, + STR_MAX_ID = 477, }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index 9e273d90e..82dc2cf09 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h index cc7a89ab4..0fce9bdc8 100644 --- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h +++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h @@ -330,7 +330,7 @@ namespace OHOS {ConfigDataType::DATATYPE_INT, "heartrate_freq", "0" },// CONFIGMODEL_ITEM_HEARTRATE_DETECTED//心率周期检测频率 {ConfigDataType::DATATYPE_INT, "heartrate_remind", "0"},// CONFIGMODEL_ITEM_HEARTRATE_REMIND//提醒开关 - {ConfigDataType::DATATYPE_INT, "heartrate_threshold_value", "0"},// CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE// + {ConfigDataType::DATATYPE_INT, "heartrate_threshold_value", "0"},// CONFIGMODEL_ITEM_HEARTRATE_THRESHOLD_VALUE//心率值 {ConfigDataType::DATATYPE_INT, "heart_max_min", "0"},// CONFIGMODEL_ITEM_HEARTRATE_MAX_MIN//最大值或者最小值