From f6b74825da3cc3dd2fffea599a64cd2bb0e11adb Mon Sep 17 00:00:00 2001 From: birdstudy-nj Date: Fri, 22 May 2026 17:49:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=8B=E5=A4=9A=E5=8F=B0=E5=B0=8F=E7=88=B1?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=B8=AD=E4=B8=80=E5=8F=B0=E4=BC=9A=E8=8E=AB?= =?UTF-8?q?=E5=90=8D=E2=80=9C=E5=B0=8Fmusic=E6=94=B6=E5=88=B0=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E6=88=96=E9=9D=99=E9=9F=B3=E4=BD=86=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E7=81=AF=E4=B8=8D=E5=81=9C=E9=97=AA=E7=83=81=20(#883)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/online_music.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xiaomusic/online_music.py b/xiaomusic/online_music.py index e454f5b..20dcd11 100644 --- a/xiaomusic/online_music.py +++ b/xiaomusic/online_music.py @@ -604,7 +604,7 @@ class OnlineMusicService: # 在线播放:在线搜索、播放 async def online_play(self, did="", arg1="", **kwargs): - await self._before_play() + await self._before_play(did) parts = arg1.split("|") search_key = parts[0].strip() if parts[0] else "" name = parts[1].strip() if len(parts) > 1 else search_key @@ -635,7 +635,7 @@ class OnlineMusicService: async def online_playlist_play(self, did="", arg1="", **kwargs): """执行语音搜歌单并播放""" - await self._before_play() + await self._before_play(did) search_key = str(arg1).strip() if arg1 else "" if not search_key: return await self.xiaomusic.handle_fatal_error( @@ -709,7 +709,7 @@ class OnlineMusicService: ) async def singer_play(self, did="", arg1="", **kwargs): - await self._before_play() + await self._before_play(did) parts = arg1.split("|") search_key = parts[0].strip() if parts[0] else "" name = parts[1].strip() if len(parts) > 1 else search_key @@ -820,14 +820,14 @@ class OnlineMusicService: # return proxy_base + "/static/search.mp3" return f"{proxy_base}/static/{name}" - async def _before_play(self, prompt_audio=None): + async def _before_play(self, did, prompt_audio=None): """播放搜歌前的提示音或静默音(核心作用:打断小爱的原生语音)""" if prompt_audio is None: prompt_audio = getattr( self.xiaomusic.config, "search_prompt_audio", "xiaomusic_ok.mp3" ) before_url = self.default_url(prompt_audio) - await self.xiaomusic.play_url(self.xiaomusic.get_cur_did(), before_url) + await self.xiaomusic.play_url(did, before_url) def _convert_song_list_to_music_items(self, song_list): """