From cd7144d03f7a38f74bd78e4c9f368c2b2f467f12 Mon Sep 17 00:00:00 2001 From: xue <2144439972@qq.com> Date: Tue, 24 Jun 2025 16:10:59 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E9=87=8D?= =?utf8?q?=E7=BD=AE=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/applist/src/ApplistModel.cpp | 10 +++++----- .../nativeui/fatiguelevel/include/FatigueModel.h | 3 ++- .../nativeui/fatiguelevel/src/FatigueMeasureView.cpp | 2 +- .../nativeui/fatiguelevel/src/FatigueModel.cpp | 10 +++++----- .../nativeui/fatiguelevel/src/FatiguePresenter.cpp | 8 +++++--- .../fatiguelevel/src/FatigueUnderMeasureView.cpp | 2 +- .../fd230app/nativeui/stress/include/StressModel.h | 3 ++- .../fd230app/nativeui/stress/src/StressModel.cpp | 10 +++++----- .../fd230app/nativeui/stress/src/StressPresenter.cpp | 8 +++++--- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 6e6a9f3df..bc4a4e9b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -67,15 +67,15 @@ namespace OHOS // #if defined(BOARD_N9) // /*N9Slice写宏里面* // #endif -#if defined(BOARD_W9) || defined(BOARD_N9) + #if defined(BOARD_W9) || defined(BOARD_N9) //ECG - //{VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr}, + {VIEW_ECG, PNG_APPLIST_ECG_IMAGE_BIG, PNG_APPLIST_ECG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "ECG", STR_BP_CHECK, nullptr}, //情绪 - {VIEW_EMOTION, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr}, + {VIEW_UNCONNECTED, PNG_APPLIST_EMOTION_IMAGE_BIG, PNG_APPLIST_EMOTION_IMAGE, PNG_APPLIST_DEFAULT_IMG, "情绪", STR_EMOTION, nullptr}, //压力 - //{VIEW_PRESSURE, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_STRESS, nullptr}, + {VIEW_PRESSURE, PNG_APPLIST_STRESS_IMAGE_BIG, PNG_APPLIST_STRESS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "压力", STR_PRESSURE, nullptr}, //疲劳度 - {VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_BP_CHECK, nullptr}, + {VIEW_FATIGUE, PNG_APPLIST_FATIGUE_IMAGE_BIG, PNG_APPLIST_FATIGUE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "疲劳度", STR_FATIGUE_LEVEL, nullptr}, #endif {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr}, {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr}, diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueModel.h b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueModel.h index 9a8ef78ef..daedc2dd6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/include/FatigueModel.h @@ -9,7 +9,7 @@ namespace OHOS { // 血压检测状态 enum class FatigueState { //结束 - FATIGUE_End = 0, + FATIGUE_END = 0, //疲劳度检测中 FATIGUE_MEASURE, //结果分析中 @@ -39,6 +39,7 @@ public: FatigueModel(); ~FatigueModel(); static FatigueModel *GetInstance(); + static FatigueState statefalg; //当前状态管理 void Fatigue_SetState(FatigueState state); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp index f17df75f4..f55d2ac7d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueMeasureView.cpp @@ -85,7 +85,7 @@ namespace OHOS bool FatigueMeasureView::InitLable() { - InitLabelExt(titleLable, 188, 30, 95, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 170, 30, 120, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueModel.cpp index 3ce8c97a9..99bfb0546 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueModel.cpp @@ -31,7 +31,7 @@ namespace OHOS // 声明定时器变量 static osTimerId_t g_timer = nullptr; static int Time = 30; - static FatigueState statefalg = FatigueState::FATIGUE_MEASURE; + FatigueState FatigueModel::statefalg= FatigueState::FATIGUE_MEASURE; FatigueModel::FatigueModel() {} FatigueModel::~FatigueModel() {} @@ -123,19 +123,19 @@ namespace OHOS { FatigueModel::GetInstance()->Fatigue_StopTimer(); FatigueModel::GetInstance()->Fatigue_SetState(FatigueState::FATIGUE_NORMAL); - if (statefalg == FatigueState::FATIGUE_ANALYSIS) //在分析中 + if ( FatigueModel::statefalg == FatigueState::FATIGUE_ANALYSIS) //在分析中 { FatigueMainView::GetInstance()->ChangeView(FATIGUEANALYSISEVIEW,FATIGUERESULTVIEW); FatigueAnalysisView::GetInstance()->startorstopAnalysisAni(false); - statefalg = FatigueState::FATIGUE_MEASURE; + FatigueModel::statefalg = FatigueState::FATIGUE_MEASURE; } - else if(statefalg == FatigueState::FATIGUE_MEASURE)//在检测中 + else if( FatigueModel::statefalg == FatigueState::FATIGUE_MEASURE)//在检测中 { // 测量成功 FatigueModel::GetInstance()->Fatigue_Control(FatigueState::FATIGUE_ANALYSIS); FatigueMainView::GetInstance()->ChangeView(FATIGUEUNDERMEASUREVIEW, FATIGUEANALYSISEVIEW); FatigueAnalysisView::GetInstance()->startorstopAnalysisAni(true); - statefalg = FatigueState::FATIGUE_ANALYSIS; + FatigueModel::statefalg = FatigueState::FATIGUE_ANALYSIS; // 测量失败 diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatiguePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatiguePresenter.cpp index d9565c8ba..6eeb62922 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatiguePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatiguePresenter.cpp @@ -43,7 +43,6 @@ namespace OHOS { static constexpr uint16_t PROGRESS_VALUE_MIN = 0; static constexpr uint16_t PROGRESS_VALUE_MAX = 10; - static int16_t passflag = 0; // 第几次校准成功标志位 static FatiguePresenter *g_pFatiguePresenter; /* -------------------------------------------------------------------------- */ @@ -87,7 +86,8 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + FatigueModel::GetInstance()->Fatigue_Control(FatigueState::FATIGUE_END); + FatigueModel::GetInstance()->Fatigue_StopTimer(); NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); return true; } @@ -101,7 +101,8 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + FatigueModel::GetInstance()->Fatigue_Control(FatigueState::FATIGUE_END); + FatigueModel::GetInstance()->Fatigue_StopTimer(); NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; @@ -112,6 +113,7 @@ namespace OHOS if (strcmp(view.GetViewId(), STARTBUTTON_FATIGUE) == 0) { + FatigueModel::statefalg = FatigueState::FATIGUE_MEASURE;//定时器标志位 FatigueModel::GetInstance()->Fatigue_Control(FatigueState::FATIGUE_MEASURE); FatigueMainView::GetInstance()->ChangeView(FATIGUEMEASUREVIEW, FATIGUEUNDERMEASUREVIEW); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp index 432c45aca..c215263e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/fatiguelevel/src/FatigueUnderMeasureView.cpp @@ -85,7 +85,7 @@ namespace OHOS bool FatigueUnderMeasureView::InitLable() { - InitLabelExt(titleLable, 188, 30, 95, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabelExt(titleLable, 170, 30, 120, 45, "titleLable", STR_FATIGUE_LEVEL, DEFAULT_VECTOR_FONT_FILENAME, 35); InitLabel(resultremindLable, 68, 239, 337, 100, "resultremindLable", "---", DEFAULT_VECTOR_FONT_FILENAME, 100); resultremindLable->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); resultremindLable->SetTextColor(Color::White()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressModel.h b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressModel.h index c7b13fd0b..82e0e8cb4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/include/StressModel.h @@ -9,7 +9,7 @@ namespace OHOS { // 血压检测状态 enum class StressState { //结束 - STRESS_End = 0, + STRESS_END = 0, //压力检测中 STRESS_MEASURE, //结果分析中 @@ -39,6 +39,7 @@ public: StressModel(); ~StressModel(); static StressModel *GetInstance(); + static StressState statefalg ;//定时器标志位 //当前状态管理 void Stress_SetState(StressState state); diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressModel.cpp index bef951330..edb64688c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressModel.cpp @@ -31,7 +31,7 @@ namespace OHOS // 声明定时器变量 static osTimerId_t g_timer = nullptr; static int Time = 30; - static StressState statefalg = StressState::STRESS_MEASURE; + StressState StressModel::statefalg = StressState::STRESS_MEASURE; StressModel::StressModel() {} StressModel::~StressModel() {} @@ -123,19 +123,19 @@ namespace OHOS { StressModel::GetInstance()->Stress_StopTimer(); StressModel::GetInstance()->Stress_SetState(StressState::STRESS_NORMAL); - if (statefalg == StressState::STRESS_ANALYSIS) //在分析中 + if (StressModel::statefalg == StressState::STRESS_ANALYSIS) //在分析中 { StressMainView::GetInstance()->ChangeView(STRESSANALYSISEVIEW,STRESSRESULTVIEW); StressAnalysisView::GetInstance()->startorstopAnalysisAni(false); - statefalg = StressState::STRESS_MEASURE; + StressModel::statefalg = StressState::STRESS_MEASURE; } - else if(statefalg == StressState::STRESS_MEASURE)//在检测中 + else if(StressModel::statefalg == StressState::STRESS_MEASURE)//在检测中 { // 测量成功 StressModel::GetInstance()->Stress_Control(StressState::STRESS_ANALYSIS); StressMainView::GetInstance()->ChangeView(STRESSUNDERMEASUREVIEW, STRESSANALYSISEVIEW); StressAnalysisView::GetInstance()->startorstopAnalysisAni(true); - statefalg = StressState::STRESS_ANALYSIS; + StressModel::statefalg = StressState::STRESS_ANALYSIS; // 测量失败 diff --git a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressPresenter.cpp index dfeaa201b..6f9600ae4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stress/src/StressPresenter.cpp @@ -43,7 +43,6 @@ namespace OHOS { static constexpr uint16_t PROGRESS_VALUE_MIN = 0; static constexpr uint16_t PROGRESS_VALUE_MAX = 10; - static int16_t passflag = 0; // 第几次校准成功标志位 static StressPresenter *g_pStressPresenter; /* -------------------------------------------------------------------------- */ @@ -87,7 +86,8 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + StressModel::GetInstance()->Stress_Control(StressState::STRESS_END); + StressModel::GetInstance()->Stress_StopTimer();//停止定时器 NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); return true; } @@ -101,7 +101,8 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { - // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + StressModel::GetInstance()->Stress_Control(StressState::STRESS_END); + StressModel::GetInstance()->Stress_StopTimer(); NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; @@ -112,6 +113,7 @@ namespace OHOS if (strcmp(view.GetViewId(), STARTBUTTON) == 0) { + StressModel::statefalg == StressState::STRESS_MEASURE;//重置标志位 StressModel::GetInstance()->Stress_Control(StressState::STRESS_MEASURE); StressMainView::GetInstance()->ChangeView(STRESSMEASUREVIEW, STRESSUNDERMEASUREVIEW); } -- 2.17.1