From: Caisking <3449750381@qq.com> Date: Tue, 3 Sep 2024 09:34:52 +0000 (+0800) Subject: 增加previousCardId成员变量;增加心率卡片到其他Slice关闭心率检测 X-Git-Tag: release_V1.2.70_20241020_135402~529^2~19^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a8353a634da75c0e48a882adf5da631adc37613b;p=mirrors%2FFD230.git 增加previousCardId成员变量;增加心率卡片到其他Slice关闭心率检测 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h index f8b19964a..8b58ce58c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainPresenterSample.h @@ -106,6 +106,7 @@ namespace OHOS int64_t playerMusicDuration_{0}; int64_t playerProgressValue_{0}; bool isCompassSensorOpened_{false}; + CardId previousCardId{WATCH_FACE}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index b04b62eee..f3f82bbc9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -74,8 +74,10 @@ namespace OHOS MainPresenterSample::~MainPresenterSample() { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample"); g_pMainPresenterSample = nullptr; + /*从主界面退出,关闭心率检测*/ + HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK); } MainPresenterSample *MainPresenterSample::GetInstance(void) @@ -404,7 +406,6 @@ namespace OHOS void MainPresenterSample::Notify(void) { CardId currentCardId = view_->GetHorCurrentCard(); - static CardId previousCardId = WATCH_FACE; // 从心率卡片变为其他卡片时关闭心率检测 if (previousCardId == HEART_RATE && currentCardId != HEART_RATE) @@ -412,14 +413,14 @@ namespace OHOS LogCardTransition(previousCardId, currentCardId); HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK); } - +#if 1 // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面 if (previousCardId == SLEEP && currentCardId != SLEEP) { LogCardTransition(previousCardId, currentCardId); ResetSleepCardView(); } - +#endif // 更新上一个卡片的值 previousCardId = currentCardId; @@ -444,6 +445,10 @@ namespace OHOS case WEATHER: UpdateWeather(); break; + + // case SLEEP: + // ResetSleepCardView(); + // break; } } /*打印日志*/