From: penglei <1624952103@qq.com> Date: Mon, 19 Aug 2024 02:17:26 +0000 (+0800) Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~638^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f923433d62afe025588d796b360e30ddc528bc46;p=mirrors%2FFD230.git Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 --- f923433d62afe025588d796b360e30ddc528bc46 diff --cc code/sdk/drivers/peripheral/config/include/ConfigModelC.h index 24e0c5881,631c7ceba..43951f82c --- a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h +++ b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h @@@ -1,8 -1,8 +1,8 @@@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-17 09:32:03 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-17 14:11:36 + * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-08-17 10:47:17 ++ * @LastEditTime: 2024-08-19 10:16:53 * @FilePath: /FD230/code/sdk/drivers/peripheral/config/include/ConfigModelC.h */ #ifndef _CONFIG_MODEL_C_H_ diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c index f320e8b54,6dc2e61bd..d07253f7c --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@@ -2292,11 -2287,10 +2292,12 @@@ void uapi_enter_power_saving_mode(void //进入normal模式 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE,NULL); + //关闭运动识别 + if(uapi_dev_runtime_get_motion_recognition_status()) + do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CLOSE_AR_ALERT,NULL); + //关闭音乐 + mmi_stop_music_play(); }