From: Caisking <3449750381@qq.com> Date: Sat, 25 Nov 2023 02:25:47 +0000 (+0800) Subject: 血氧值太低提醒 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=950987b5f9f693e7f6781fbf4fc6d9cbd05387c3;p=mirrors%2FFD230.git 血氧值太低提醒 --- diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt index 8995e0dbb..728cc8418 100644 --- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt @@ -231,6 +231,8 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodCheckPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodErrorView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodErrorPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodNoteView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodNotePresenter.cpp #���� ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/DialView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/DialPresenter.cpp diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h index 1d1e00db5..de1c566c0 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h @@ -51,6 +51,7 @@ typedef enum : uint16_t VIEW_BLOODSHOW, // 血氧说明 VIEW_BLOODCHECK, // 血氧检查 VIEW_BLOODERROR, // 血氧监测错误 + VIEW_BLOODNOTE, // 血氧过低提醒 VIEW_DIAL, // 表盘 VIEW_DIALSETUP, // 表盘安装 VIEW_DIALSUCCES, // 表盘安装成功 diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h index 9872fc3cb..8ac739c10 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h @@ -53,6 +53,7 @@ public: void InitBloodShowSlice(void); void InitBloodCheckSlice(void); void InitBloodErrorSlice(void); + void InitBloodNoteSlice(void); void InitDialSlice(void); void InitPhoneSlice(void); void InitPhoneCallSlice(void); diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h index 21424ced0..dc6546628 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h @@ -254,6 +254,7 @@ namespace OHOS static constexpr const char *PNG_SAVEELE_FINGER_IMAGE = APP_RES_PATH "/Save_Ele/finger.bin"; // 血氧 static constexpr const char *PNG_BLOOD_ERROR_IMAGE = APP_RES_PATH "/Blood/Error.bin"; + static constexpr const char *PNG_BLOOD_NOTE_IMAGE = APP_RES_PATH "/Blood/boutton.bin"; static constexpr const char *PNG_PHONE_FINGER_IMAGE = APP_RES_PATH "/Save_Ele/finger.bin"; static constexpr const char *PNG_VOICE_ASSISTANT_IMAGE01 = APP_RES_PATH "/VOICE_ASSISTANT_01.bin"; diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp index 7f10eb3c8..5dec0b82b 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -96,6 +96,8 @@ #include "blood/include/BloodShowView.h" #include "blood/include/BloodErrorView.h" #include "blood/include/BloodErrorPresenter.h" +#include "blood/include/BloodNoteView.h" +#include "blood/include/BloodNotePresenter.h" #include "dial/include/DialPresenter.h" #include "dial/include/DialView.h" #include "displaybrightness/include/DisplayBrightnessPresenter.h" @@ -204,6 +206,7 @@ static const AppViewMapper SLICE_MAPPER[] = { {VIEW_BLOODSHOW, &NativeLauncher::InitBloodShowSlice}, {VIEW_BLOODCHECK, &NativeLauncher::InitBloodCheckSlice}, {VIEW_BLOODERROR, &NativeLauncher::InitBloodErrorSlice}, + {VIEW_BLOODNOTE, &NativeLauncher::InitBloodNoteSlice}, {VIEW_DIAL, &NativeLauncher::InitDialSlice}, //表盘 {VIEW_DISPLAY_BRIGHTNESS,&NativeLauncher::InitUIDisplayBrightnessSlice}, //显示与亮度的实例化地址 {VIEW_CONNECT_BLUETOOTH,&NativeLauncher::InitBlueToothSettingSlice}, //蓝牙设置的实例化地址 @@ -726,6 +729,18 @@ void NativeLauncher::InitBloodCheckSlice(void) NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODCHECK, bloodcheckview); } +void NativeLauncher::InitBloodNoteSlice(void) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodSlice"); + SliceProxy *bloodnoteview = new AbilitySliceProxy; + if (bloodnoteview == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodnoteview"); + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODNOTE, bloodnoteview); +} + void NativeLauncher::InitDialSlice(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodSlice"); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp index 4f607c1f7..ec6711fc9 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp @@ -54,11 +54,11 @@ namespace OHOS bool BloodCheckPresenter::OnDrag(UIView &view, const DragEvent &event) { - // if (event.GetDragDirection() == DragEvent::DIRECTION_RIGHT_TO_LEFT) - // { - // printf("draglistene is ok!\n"); - // NativeAbility::GetInstance().ChangeSlice(VIEW_PHONE); - // } + if (event.GetDragDirection() == DragEvent::DIRECTION_RIGHT_TO_LEFT) + { + printf("draglistene is ok!\n"); + NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODNOTE); + } UNUSED(view); return true; } 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 1c3f99e71..6145db3d2 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 51f94c1bb..f7a7bae10 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 daa377890..dddf258ca 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 a95b5376d..ea52cf6a9 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 fbb974f95..cdad8c421 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 529711ee3..2e5418f9c 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 20cb1ec31..897f63758 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 0f60e9c4d..013e4495e 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 cdd9d93ca..d61991057 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/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/media_video_play.cpp b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/media_video_play.cpp index e6192c907..4bca012d8 100644 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/media_video_play.cpp +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/media_video_play.cpp @@ -326,6 +326,7 @@ void *MediaVideoPlay::VideoPlayThread(void *arg) MediaVideoPlay *videoPlay = (MediaVideoPlay *)arg; if (videoPlay->isPlayed_) { GRAPHIC_LOGE("the video is playing.\n"); + printf("the video is playing.\n"); return nullptr; } bool success = RequsetAudioFocus(videoPlay); @@ -338,6 +339,7 @@ void *MediaVideoPlay::VideoPlayThread(void *arg) if (ret != 0) { GRAPHIC_LOGE("run video play failed\n"); (void)ReleaseAudioFocus(videoPlay); + printf("run video play failed\n"); return nullptr; } diff --git a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin index 0e4ddefd3..6014e12a3 100644 Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ