From: Caisking <3449750381@qq.com> Date: Fri, 24 Nov 2023 03:37:09 +0000 (+0800) Subject: 血氧检测失败 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fb2dd5a72d81b372ed0f47b710c6b1483b31b440;p=mirrors%2FFD230.git 血氧检测失败 --- diff --git a/Resource/res/Blood/warning.bin b/Resource/res/Blood/warning.bin deleted file mode 100644 index b8120b857..000000000 Binary files a/Resource/res/Blood/warning.bin and /dev/null differ diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt index c7c3515d0..8995e0dbb 100644 --- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt @@ -229,6 +229,8 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodShowPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/blood/src/BloodCheckView.cpp ${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/dial/src/DialView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/DialPresenter.cpp diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h index 98e5731ea..21424ced0 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h @@ -252,7 +252,8 @@ namespace OHOS static constexpr const char *PNG_SAVEELE_BATE_IMAGE = APP_RES_PATH "/Save_Ele/Battery-E.bin"; static constexpr const char *PNG_SAVEELE_BATF_IMAGE = APP_RES_PATH "/Save_Ele/Battery-F.bin"; 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_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 9af6dd0a4..7f10eb3c8 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -705,13 +705,13 @@ void NativeLauncher::InitBloodShowSlice(void) void NativeLauncher::InitBloodErrorSlice(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodSlice"); - // SliceProxy *blooderrorview = new AbilitySliceProxy; - // if (blooderrorview == nullptr) - // { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodview"); - // return; - // } - // NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODERROR, blooderrorview); + SliceProxy *blooderrorview = new AbilitySliceProxy; + if (blooderrorview == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodview"); + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODERROR, blooderrorview); } void NativeLauncher::InitBloodCheckSlice(void) 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 38b245365..4f607c1f7 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp @@ -68,7 +68,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), "labelButton1") == 0) { - NativeAbility::GetInstance().ChangeSlice(VIEW_BLOOD); + NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODERROR); } 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 3da807d30..1c3f99e71 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 b4f168f90..51f94c1bb 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 2f6554cce..daa377890 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 9a19567a5..a95b5376d 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 0eab7d7ff..fbb974f95 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 fce89853c..529711ee3 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 bda18c055..20cb1ec31 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 aac6771bf..0f60e9c4d 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 4d311e5f4..cdd9d93ca 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