From: luozheng <1732036298@qq.com> Date: Thu, 14 Mar 2024 11:21:09 +0000 (+0800) Subject: 录音界面:添加清除录音播放器资源接口 X-Git-Tag: release_V1.2.70_20241020_135402~1274^2~8^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3a83228b1a517b649c3026f637e6aa8748e46f60;p=mirrors%2FFD230.git 录音界面:添加清除录音播放器资源接口 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h index fee695fb5..1b29cbeae 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h @@ -58,6 +58,7 @@ namespace OHOS void NextPlayout(void); int ResetSourceAndPrepare(void); int ResetPlayerModuleStatus(void); + void ClearRecordingPlayer(void); /* -------------------------------------------------------------------------- */ void InitRecordingListItem(); std::vector &GetRecordinglistItems(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp index 4dc917977..f3e4e3471 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp @@ -202,6 +202,21 @@ namespace OHOS return OHOS_SUCCESS; } + /* + * @brief 退出录音播放界面后清除播放器资源 + */ + void RecordingModel::ClearRecordingPlayer(void) + { + if (GetPlayerCtr() != nullptr) + { + GetPlayerCtr()->Reset(); + GetPlayerCtr()->Release(); + SetAudioInitStatus(false); + ClearActivateAudioInterrupt(); + GetPlayerCtr().reset(); + } + } + /* * @brief 播放器状态的控制 */ @@ -209,7 +224,7 @@ namespace OHOS { int ret; /* ------------------------------ 设置播放器的回调函数。 ----------------------------- */ - if (GetRecordingPlayerState() != PlayerStates::PLAYER_PREPARED) //如果录音播放器状态为Prepared状态无需重置回到IDLE状态和setsource,Prepare + if (GetRecordingPlayerState() != PlayerStates::PLAYER_PREPARED) // 如果录音播放器状态为Prepared状态无需重置回到IDLE状态和setsource,Prepare { ResetPlayerModuleStatus(); ResetSourceAndPrepare(); @@ -615,7 +630,7 @@ namespace OHOS static constexpr int16 NUM_TIME_MIN = 60; static constexpr int16 NUM_TIME_HOUR = 3600; static constexpr int32 NUM_TIME_DAY = 86400; - + /* * @brief 显示录音时长 */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp index bbaad50a0..bb1d8e943 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp @@ -55,15 +55,7 @@ namespace OHOS void RecordingPresenter::OnStop(void) { Presenter::OnStop(); - if (p_RecordingModel->GetPlayerCtr() != nullptr) - { - // p_RecordingModel->GetPlayerCtr()->Stop(); - p_RecordingModel->GetPlayerCtr()->Reset(); - p_RecordingModel->GetPlayerCtr()->Release(); - p_RecordingModel->SetAudioInitStatus(false); - p_RecordingModel->ClearActivateAudioInterrupt(); - p_RecordingModel->GetPlayerCtr().reset(); - } + p_RecordingModel->ClearRecordingPlayer(); ScreenAlwaysOnCtr(0); }