血氧检测失败
authorCaisking <3449750381@qq.com>
Fri, 24 Nov 2023 03:37:09 +0000 (11:37 +0800)
committerCaisking <3449750381@qq.com>
Fri, 24 Nov 2023 03:37:09 +0000 (11:37 +0800)
14 files changed:
Resource/res/Blood/warning.bin [deleted file]
code/sdk/application/wearable/nativeapp/CMakeLists.txt
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodCheckPresenter.cpp
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a
code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a
code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a
code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a
code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a
code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a

diff --git a/Resource/res/Blood/warning.bin b/Resource/res/Blood/warning.bin
deleted file mode 100644 (file)
index b8120b8..0000000
Binary files a/Resource/res/Blood/warning.bin and /dev/null differ
index c7c3515..8995e0d 100644 (file)
@@ -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
index 98e5731..21424ce 100644 (file)
@@ -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";
index 9af6dd0..7f10eb3 100644 (file)
@@ -705,13 +705,13 @@ void NativeLauncher::InitBloodShowSlice(void)
 void NativeLauncher::InitBloodErrorSlice(void) 
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodSlice");
-    // SliceProxy *blooderrorview = new AbilitySliceProxy<BloodErrorView, BloodErrorPresenter>;
-    // if (blooderrorview == nullptr)
-    // {
-    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodview");
-    //     return;
-    // }
-    // NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODERROR, blooderrorview);
+    SliceProxy *blooderrorview = new AbilitySliceProxy<BloodErrorView, BloodErrorPresenter>;
+    if (blooderrorview == nullptr)
+    {
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodview");
+        return;
+    }
+    NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOODERROR, blooderrorview);
 }
 
 void NativeLauncher::InitBloodCheckSlice(void)
index 38b2453..4f607c1 100644 (file)
@@ -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;
index 3da807d..1c3f99e 100644 (file)
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
index b4f168f..51f94c1 100644 (file)
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
index 2f6554c..daa3778 100644 (file)
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
index 9a19567..a95b537 100644 (file)
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
index 0eab7d7..fbb974f 100644 (file)
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
index fce8985..529711e 100644 (file)
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
index bda18c0..20cb1ec 100644 (file)
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
index aac6771..0f60e9c 100644 (file)
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
index 4d311e5..cdd9d93 100644 (file)
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