From: Caisking <3449750381@qq.com> Date: Tue, 22 Oct 2024 10:03:11 +0000 (+0800) Subject: 系统:增加亮屏函数打印 X-Git-Tag: fd230_release_V1.3.102~203 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a2301387923e189d5543ed8eef09330679494067;p=mirrors%2FFD230.git 系统:增加亮屏函数打印 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 701d7b6fb..20d502958 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -382,13 +382,12 @@ private: std::vector heartRateTable; // 心率表 std::vector paceTable; // 配速表 - const size_t MAX_ENTRIES = 100000; // 规定最大进场条目数 - + const size_t MAX_ENTRIES = 100000; // 规定最大进场条目数 int user_maxHeart{190}; // 用户最高心率 - int user_Age{20}; // 用户年龄 - int user_autoget{1}; // 自动获取设置 - int user_freq{10}; // 训练频率 + int user_Age{20}; // 用户年龄 + int user_autoget{1}; // 自动获取设置 + int user_freq{10}; // 训练频率 int user_Intensity{160}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 7bdc5e8d9..f95a61c8d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -625,9 +625,9 @@ void TraingModel::SetTimestamp() { Endstate = true; #if 0 - // 重置训练目标 [发生在训练前] - sportTag_ = 0; - sportTagType_ = ExerciseTag::UNKNOW; + // 重置训练目标 [发生在训练前] + sportTag_ = 0; + sportTagType_ = ExerciseTag::UNKNOW; #endif /*运动结束并且是手表发起的运动*/ if (Openingway == false) { @@ -964,7 +964,8 @@ int TraingModel::GetGoaldegree() { /* 训练目标校验 */ void TraingModel::CheckSportTag() { - if (sportdata->tag) { + // 运动开始才计算 + if (sportdata->tag && sportState_!= ExerciseState::General) { sportdata->goaldegree = GetGoaldegree(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sportdata->goaldegree %d", sportdata->goaldegree); diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 26cb5ea9f..0a3ebde0b 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -1199,14 +1199,17 @@ int32_t uapi_get_screen_state(void) /** * @brief 亮屏函数 */ -void uapi_set_screen_on_api(void) -{ +void uapi_set_screen_on_api(void) { + PRINT("执行亮屏函数!\n"); const power_display_svr_api_t *display_api = power_display_svr_get_api(); - display_api->set_screen_set_keepon_timeout(0); - if (display_api->get_screen_state() != SCREEN_ON) - { + // display_api->set_screen_set_keepon_timeout(0); + PRINT("目前屏幕状态:%d\n",display_api->get_screen_state()); + if (display_api->get_screen_state() != SCREEN_ON) { + PRINT("执行亮屏操作!\n"); display_api->turn_on_screen(); + return; } + PRINT("亮屏函数执行失败!\n"); // 设置屏幕亮5000 // display_api->set_screen_set_keepon_timeout(5000); }