From: luozheng <1732036298@qq.com> Date: Sat, 17 Aug 2024 06:16:12 +0000 (+0800) Subject: 增加省电模式停止当前音乐接口 X-Git-Tag: release_V1.2.70_20241020_135402~638^2~5^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=42f4c11b36bb85b63677580c2e1b2a90c2a78ab4;p=mirrors%2FFD230.git 增加省电模式停止当前音乐接口 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModelC.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModelC.h new file mode 100644 index 000000000..ee3a7484c --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModelC.h @@ -0,0 +1,26 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-17 14:06:51 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-17 14:08:25 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModelC.h + */ + +#ifndef MUSIC_PLAYERS_MODELC_H +#define MUSIC_PLAYERS_MODELC_H + +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif +#endif +#include + void stopPlayingMusic(void); + +#ifdef __cplusplus +#if __cplusplus +} +#endif +#endif +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp index ade1d8112..60517bcce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -6,6 +6,7 @@ */ #include "player/include/PlayersModel.h" +#include "player/include/PlayersModelC.h" #include "thread_adapter.h" #include "UiConfig.h" #include "bts_avrcp_controller.h" @@ -804,4 +805,24 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) } return false; } -} \ No newline at end of file +} + +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif /* __cplusplus */ +#endif /* __cplusplus */ + + /*关闭音乐播放*/ + void stopPlayingMusic(void) + { + OHOS::PlayersModel::GetInstance()->PlayerStop(); + OHOS::PlayersModel::GetInstance()->ClearActivateAudioInterrupt(); + } + +#ifdef __cplusplus +#if __cplusplus +} +#endif /* __cplusplus */ +#endif /* __cplusplus */ \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h index 6ab78b721..631c7ceba 100644 --- a/code/sdk/drivers/peripheral/config/include/ConfigModelC.h +++ b/code/sdk/drivers/peripheral/config/include/ConfigModelC.h @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-17 09:32:03 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-08-15 18:23:37 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-17 14:11:36 * @FilePath: /FD230/code/sdk/drivers/peripheral/config/include/ConfigModelC.h */ #ifndef _CONFIG_MODEL_C_H_ @@ -123,6 +123,9 @@ bool mmi_play_audio_is_permitted(void); // play vibrate judgement bool mmi_play_vibrate_is_permitted(void); +/*停止音乐播放*/ +void mmi_stop_music_play(void); + #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp index 87bc8892d..57cdbfa06 100644 --- a/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp +++ b/code/sdk/drivers/peripheral/config/src/ConfigModel.cpp @@ -5,6 +5,7 @@ #include "cat1_server.h" #include "kv_store.h" #include "kvstore_env.h" +#include "player/include/PlayersModelC.h" #if DEBUG_CONFIGMODEL #define CONFIG_DEBUG(fmt, arg...) printf("ConfigModel|" fmt, ##arg) #else @@ -1585,6 +1586,12 @@ bool mmi_play_vibrate_is_permitted(void) return true; } +// stop play music +void mmi_stop_music_play(void) +{ + stopPlayingMusic(); +} + #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index e60196c5b..6ff5de753 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -2286,6 +2286,7 @@ void uapi_enter_power_saving_mode(void) do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE,NULL); //关闭音乐 + mmi_stop_music_play(); } void uapi_exit_power_saving_mode(void)