血氧值太低提醒
authorCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 02:25:47 +0000 (10:25 +0800)
committerCaisking <3449750381@qq.com>
Sat, 25 Nov 2023 02:25:47 +0000 (10:25 +0800)
17 files changed:
code/sdk/application/wearable/nativeapp/CMakeLists.txt
code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
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
code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/media_video_play.cpp
code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin

index 8995e0d..728cc84 100644 (file)
@@ -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
index 1d1e00d..de1c566 100644 (file)
@@ -51,6 +51,7 @@ typedef enum : uint16_t
     VIEW_BLOODSHOW,                       // 血氧说明
     VIEW_BLOODCHECK,                      // 血氧检查
     VIEW_BLOODERROR,                      // 血氧监测错误
+    VIEW_BLOODNOTE,                       // 血氧过低提醒
     VIEW_DIAL,                            // 表盘
     VIEW_DIALSETUP,                       // 表盘安装
     VIEW_DIALSUCCES,                      // 表盘安装成功
index 9872fc3..8ac739c 100644 (file)
@@ -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);
index 21424ce..dc65466 100644 (file)
@@ -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";
index 7f10eb3..5dec0b8 100644 (file)
@@ -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<BloodNoteView, BloodNotePresenter>;
+    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");
index 4f607c1..ec6711f 100644 (file)
@@ -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;
     }
index 1c3f99e..6145db3 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 51f94c1..f7a7bae 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 daa3778..dddf258 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 a95b537..ea52cf6 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 fbb974f..cdad8c4 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 529711e..2e5418f 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 20cb1ec..897f637 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 0f60e9c..013e449 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 cdd9d93..d619910 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
index e6192c9..4bca012 100644 (file)
@@ -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;
     }
 
index 0e4ddef..6014e12 100644 (file)
Binary files a/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin and b/code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin differ