diff --git a/xiaomusic/httpserver.py b/xiaomusic/httpserver.py index 6eb1cb6..7750857 100644 --- a/xiaomusic/httpserver.py +++ b/xiaomusic/httpserver.py @@ -22,6 +22,13 @@ def allcmds(): return KEY_WORD_DICT +@app.route("/getvolume") +def getvolume(): + return { + "volume": xiaomusic.get_volume(), + } + + @app.route("/", methods=["GET"]) def redirect_to_index(): return send_from_directory("static", "index.html") diff --git a/xiaomusic/static/app.js b/xiaomusic/static/app.js index 1f3f5c5..6cd9349 100644 --- a/xiaomusic/static/app.js +++ b/xiaomusic/static/app.js @@ -1,69 +1,55 @@ $(function(){ - // 拉取所有可操作的命令 - $.get("/allcmds", function(data, status) { - console.log(data, status); + $container=$("#cmds"); + append_op_button_name("下一首"); + append_op_button_name("全部循环"); + append_op_button_name("关机"); + append_op_button_name("单曲循环"); + append_op_button_name("播放歌曲"); + append_op_button_name("随机播放"); - $container=$("#cmds"); - // 遍历数据 - for (const [key, value] of Object.entries(data)) { - if (key != "分钟后关机" - && key != "放歌曲" - && key != "停止播放" - && !key.includes("#")) { - append_op_button_name(key); - } - } + $container.append($("
")); - $container.append($("
")); - append_op_button_name("10分钟后关机"); - append_op_button_name("30分钟后关机"); - append_op_button_name("60分钟后关机"); + append_op_button_name("10分钟后关机"); + append_op_button_name("30分钟后关机"); + append_op_button_name("60分钟后关机"); - $container.append($("
")); - append_op_button_volume("声音设为5", 5); - append_op_button_volume("声音设为10", 10); - append_op_button_volume("声音设为30", 30); - append_op_button_volume("声音设为50", 50); - append_op_button_volume("声音设为80", 80); - append_op_button_volume("声音设为100", 100); + // 拉取声音 + $.get("/getvolume", function(data, status) { + console.log(data, status, data["volume"]); + $("#volume").val(data.volume); }); - function append_op_button_volume(name, value) { - append_op_button(name, "set_volume#"+value); - } function append_op_button_name(name) { append_op_button(name, name); } + function append_op_button(name, cmd) { - // 创建按钮 - const $button = $(" diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py index e4cf2e5..60267fe 100644 --- a/xiaomusic/xiaomusic.py +++ b/xiaomusic/xiaomusic.py @@ -65,6 +65,7 @@ class XiaoMusic: self.cur_music = "" self._next_timer = None self._timeout = 0 + self._volume = 50 # 关机定时器 self._stop_timer = None @@ -516,4 +517,8 @@ class XiaoMusic: async def set_volume(self, **kwargs): value = kwargs["arg1"] await self.do_set_volume(value) + self._volume = int(value) self.log.info(f"声音设置为{value}") + + def get_volume(self): + return self._volume