From 9c85daf7125c8f39266b2cb24cdae4364378756a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Mon, 7 Oct 2024 04:28:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=20/cmdstatus=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=A5=E5=88=A4=E6=96=AD=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/static/default/app.js | 14 +++++++++++++- xiaomusic/static/default/debug.html | 4 ++-- xiaomusic/static/default/downloadtool.html | 4 ++-- xiaomusic/static/default/index.html | 6 +++--- xiaomusic/static/default/m3u.html | 2 +- xiaomusic/static/default/setting.html | 6 +++--- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/xiaomusic/static/default/app.js b/xiaomusic/static/default/app.js index aa3f472..ada9b88 100644 --- a/xiaomusic/static/default/app.js +++ b/xiaomusic/static/default/app.js @@ -248,6 +248,18 @@ $(function(){ }); }); + function check_status_refresh_music_list(retries) { + $.get("/cmdstatus", function(data) { + if (data.status === "finish") { + refresh_music_list(); + } else if (retries > 0) { + setTimeout(function() { + check_status_refresh_music_list(retries - 1); + }, 1000); // 等待1秒后重试 + } + }); + } + function sendcmd(cmd) { $.ajax({ type: "POST", @@ -256,7 +268,7 @@ $(function(){ data: JSON.stringify({did: did, cmd: cmd}), success: () => { if (cmd == "刷新列表") { - setTimeout(refresh_music_list, 3000); + check_status_refresh_music_list(3); // 最多重试3次 } if (["全部循环", "单曲循环", "随机播放"].includes(cmd)) { location.reload(); diff --git a/xiaomusic/static/default/debug.html b/xiaomusic/static/default/debug.html index 4cdf95e..40749ab 100644 --- a/xiaomusic/static/default/debug.html +++ b/xiaomusic/static/default/debug.html @@ -6,9 +6,9 @@ Debug For XiaoMusic - + - + diff --git a/xiaomusic/static/default/downloadtool.html b/xiaomusic/static/default/downloadtool.html index 86fff2c..61f3086 100644 --- a/xiaomusic/static/default/downloadtool.html +++ b/xiaomusic/static/default/downloadtool.html @@ -4,8 +4,8 @@ 歌曲下载工具 - - + + diff --git a/xiaomusic/static/default/index.html b/xiaomusic/static/default/index.html index e88f485..566c6a2 100644 --- a/xiaomusic/static/default/index.html +++ b/xiaomusic/static/default/index.html @@ -4,9 +4,9 @@ 小爱音箱操控面板 - - - + + + diff --git a/xiaomusic/static/default/m3u.html b/xiaomusic/static/default/m3u.html index 19480aa..6738285 100644 --- a/xiaomusic/static/default/m3u.html +++ b/xiaomusic/static/default/m3u.html @@ -5,7 +5,7 @@ M3U to JSON Converter - + diff --git a/xiaomusic/static/default/setting.html b/xiaomusic/static/default/setting.html index 6e0076a..8b15967 100644 --- a/xiaomusic/static/default/setting.html +++ b/xiaomusic/static/default/setting.html @@ -4,9 +4,9 @@ 小爱音箱操控面板 - - - + + +