diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7d3446b..9361b44 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,8 @@ name: ci
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - "*"
   workflow_dispatch:
 
 jobs:
diff --git a/config-example.json b/config-example.json
index dc7be86..1444065 100644
--- a/config-example.json
+++ b/config-example.json
@@ -1,81 +1,81 @@
 {
-    "hardware": "L07A",
-    "account": "",
-    "password": "",
-    "mi_did": "",
-    "cookie": "",
-    "verbose": false,
-    "music_path": "music",
-    "conf_path": null,
-    "hostname": "192.168.2.5",
-    "port": 8090,
-    "public_port": 0,
-    "proxy": null,
-    "search_prefix": "bilisearch:",
-    "ffmpeg_location": "./ffmpeg/bin",
-    "active_cmd": "play,random_play,playlocal,play_music_list,stop",
-    "exclude_dirs": "@eaDir",
-    "music_path_depth": 10,
-    "disable_httpauth": true,
-    "httpauth_username": "admin",
-    "httpauth_password": "admin",
-    "music_list_url": "",
-    "music_list_json": "",
-    "disable_download": false,
-    "key_word_dict": {
-        "播放歌曲": "play",
-        "播放本地歌曲": "playlocal",
-        "关机": "stop",
-        "下一首": "play_next",
-        "单曲循环": "set_play_type_one",
-        "全部循环": "set_play_type_all",
-        "随机播放": "random_play",
-        "分钟后关机": "stop_after_minute",
-        "播放列表": "play_music_list",
-        "刷新列表": "gen_music_list",
-        "set_volume#": "set_volume",
-        "get_volume#": "get_volume",
-        "本地播放歌曲": "playlocal",
-        "放歌曲": "play",
-        "暂停": "stop",
-        "停止": "stop",
-        "停止播放": "stop",
-        "测试自定义口令": "exec#code1(\"hello\")",
-        "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
-    },
-    "key_match_order": [
-        "set_volume#",
-        "get_volume#",
-        "分钟后关机",
-        "播放歌曲",
-        "下一首",
-        "单曲循环",
-        "全部循环",
-        "随机播放",
-        "关机",
-        "刷新列表",
-        "播放列表",
-        "播放本地歌曲",
-        "本地播放歌曲",
-        "放歌曲",
-        "暂停",
-        "停止",
-        "停止播放",
-        "测试自定义口令",
-        "测试链接"
-    ],
-    "use_music_api": false,
-    "use_music_audio_id": "1582971365183456177",
-    "use_music_id": "355454500",
-    "log_file": "/tmp/xiaomusic.txt",
-    "fuzzy_match_cutoff": 0.6,
-    "enable_fuzzy_match": true,
-    "stop_tts_msg": "收到,再见",
-    "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
-    "keywords_play": "播放歌曲,放歌曲",
-    "keywords_stop": "关机,暂停,停止,停止播放",
-    "user_key_word_dict": {
-        "测试自定义口令": "exec#code1(\"hello\")",
-        "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
-    }
+  "account": "",
+  "password": "",
+  "mi_did": "",
+  "cookie": "",
+  "verbose": false,
+  "music_path": "music",
+  "download_path": "",
+  "conf_path": null,
+  "hostname": "192.168.2.5",
+  "port": 8090,
+  "public_port": 0,
+  "proxy": null,
+  "search_prefix": "bilisearch:",
+  "ffmpeg_location": "./ffmpeg/bin",
+  "active_cmd": "play,set_random_play,playlocal,play_music_list,stop",
+  "exclude_dirs": "@eaDir",
+  "music_path_depth": 10,
+  "disable_httpauth": true,
+  "httpauth_username": "",
+  "httpauth_password": "",
+  "music_list_url": "",
+  "music_list_json": "",
+  "disable_download": false,
+  "key_word_dict": {
+    "播放歌曲": "play",
+    "播放本地歌曲": "playlocal",
+    "关机": "stop",
+    "下一首": "play_next",
+    "单曲循环": "set_play_type_one",
+    "全部循环": "set_play_type_all",
+    "随机播放": "set_random_play",
+    "分钟后关机": "stop_after_minute",
+    "播放列表": "play_music_list",
+    "刷新列表": "gen_music_list",
+    "本地播放歌曲": "playlocal",
+    "放歌曲": "play",
+    "暂停": "stop",
+    "停止": "stop",
+    "停止播放": "stop",
+    "测试自定义口令": "exec#code1(\"hello\")",
+    "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
+  },
+  "key_match_order": [
+    "分钟后关机",
+    "播放歌曲",
+    "下一首",
+    "单曲循环",
+    "全部循环",
+    "随机播放",
+    "关机",
+    "刷新列表",
+    "播放列表",
+    "播放本地歌曲",
+    "本地播放歌曲",
+    "放歌曲",
+    "暂停",
+    "停止",
+    "停止播放",
+    "测试自定义口令",
+    "测试链接"
+  ],
+  "use_music_api": false,
+  "use_music_audio_id": "1582971365183456177",
+  "use_music_id": "355454500",
+  "log_file": "/tmp/xiaomusic.txt",
+  "fuzzy_match_cutoff": 0.6,
+  "enable_fuzzy_match": true,
+  "stop_tts_msg": "收到,再见",
+  "enable_config_example": true,
+  "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
+  "keywords_play": "播放歌曲,放歌曲",
+  "keywords_stop": "关机,暂停,停止,停止播放",
+  "user_key_word_dict": {
+    "测试自定义口令": "exec#code1(\"hello\")",
+    "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
+  },
+  "enable_force_stop": false,
+  "devices": {},
+  "group_list": ""
 }
\ No newline at end of file
diff --git a/xiaomusic/config.py b/xiaomusic/config.py
index 6e847f3..f894f0c 100644
--- a/xiaomusic/config.py
+++ b/xiaomusic/config.py
@@ -18,12 +18,10 @@ def default_key_word_dict():
         "下一首": "play_next",
         "单曲循环": "set_play_type_one",
         "全部循环": "set_play_type_all",
-        "随机播放": "random_play",
+        "随机播放": "set_random_play",
         "分钟后关机": "stop_after_minute",
         "播放列表": "play_music_list",
         "刷新列表": "gen_music_list",
-        "set_volume#": "set_volume",
-        "get_volume#": "get_volume",
     }
 
 
@@ -43,8 +41,6 @@ KEY_WORD_ARG_BEFORE_DICT = {
 # 口令匹配优先级
 def default_key_match_order():
     return [
-        "set_volume#",
-        "get_volume#",
         "分钟后关机",
         "播放歌曲",
         "下一首",
@@ -57,12 +53,22 @@ def default_key_match_order():
     ]
 
 
+@dataclass
+class Device:
+    did: str = ""
+    device_id: str = ""
+    hardware: str = ""
+    name: str = ""
+    play_type: int = ""
+    cur_music: str = ""
+    cur_playlist: str = ""
+
+
 @dataclass
 class Config:
     account: str = os.getenv("MI_USER", "")
     password: str = os.getenv("MI_PASS", "")
     mi_did: str = os.getenv("MI_DID", "")  # 逗号分割支持多设备
-    hardware: str = os.getenv("MI_HARDWARE", "L07A")  # 逗号分割支持多设备
     cookie: str = ""
     verbose: bool = os.getenv("XIAOMUSIC_VERBOSE", "").lower() == "true"
     music_path: str = os.getenv(
@@ -79,7 +85,7 @@ class Config:
     )  # "bilisearch:" or "ytsearch:"
     ffmpeg_location: str = os.getenv("XIAOMUSIC_FFMPEG_LOCATION", "./ffmpeg/bin")
     active_cmd: str = os.getenv(
-        "XIAOMUSIC_ACTIVE_CMD", "play,random_play,playlocal,play_music_list,stop"
+        "XIAOMUSIC_ACTIVE_CMD", "play,set_random_play,playlocal,play_music_list,stop"
     )
     exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir")
     music_path_depth: int = int(os.getenv("XIAOMUSIC_MUSIC_PATH_DEPTH", "10"))
@@ -123,7 +129,10 @@ class Config:
     enable_force_stop: bool = (
         os.getenv("XIAOMUSIC_ENABLE_FORCE_STOP", "false").lower() == "true"
     )
-    play_type: int = int(os.getenv("XIAOMUSIC_PLAY_TYPE", "2"))
+    devices: dict[str, Device] = field(default_factory=dict)
+    group_list: str = os.getenv(
+        "XIAOMUSIC_GROUP_LIST", ""
+    )  # did2:group_name,did2:group_name
 
     def append_keyword(self, keys, action):
         for key in keys.split(","):
@@ -150,7 +159,7 @@ class Config:
         if self.enable_config_example:
             with open("config-example.json", "w") as f:
                 data = asdict(self)
-                json.dump(data, f, ensure_ascii=False, indent=4)
+                json.dump(data, f, ensure_ascii=False, indent=2)
 
     @classmethod
     def from_options(cls, options: argparse.Namespace) -> Config:
@@ -171,6 +180,10 @@ class Config:
                     converted_value = False
                     if str(v).lower() == "true":
                         converted_value = True
+                elif expected_type == dict[str, Device]:
+                    converted_value = {}
+                    for kk, vv in v.items():
+                        converted_value[kk] = Device(**vv)
                 else:
                     converted_value = expected_type(v)
                 return converted_value
@@ -192,7 +205,7 @@ class Config:
         return result
 
     def update_config(self, data):
-        type_hints = get_type_hints(self)
+        type_hints = get_type_hints(self, globals(), locals())
 
         for k, v in data.items():
             converted_value = self.convert_value(k, v, type_hints)
diff --git a/xiaomusic/const.py b/xiaomusic/const.py
index e8d115c..570952d 100644
--- a/xiaomusic/const.py
+++ b/xiaomusic/const.py
@@ -9,3 +9,13 @@ SUPPORT_MUSIC_TYPE = [
 
 LATEST_ASK_API = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=2"
 COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={user_id}"
+
+PLAY_TYPE_ONE = 0  # 单曲循环
+PLAY_TYPE_ALL = 1  # 全部循环
+PLAY_TYPE_RND = 2  # 随机播放
+
+PLAY_TYPE_TTS = {
+    PLAY_TYPE_ONE: "已经设置为单曲循环",
+    PLAY_TYPE_ALL: "已经设置为全部循环",
+    PLAY_TYPE_RND: "已经设置为随机播放",
+}
diff --git a/xiaomusic/httpserver.py b/xiaomusic/httpserver.py
index 3503f9f..21e7dcc 100644
--- a/xiaomusic/httpserver.py
+++ b/xiaomusic/httpserver.py
@@ -53,11 +53,29 @@ def getversion():
 
 @app.route("/getvolume", methods=["GET"])
 @auth.login_required
-def getvolume():
-    volume = xiaomusic.get_volume_ret()
-    return {
-        "volume": volume,
-    }
+async def getvolume():
+    did = request.args.get("did")
+    if not xiaomusic.did_exist(did):
+        return {"volume": 0}
+
+    volume = await xiaomusic.call_main_thread_function(xiaomusic.get_volume, did=did)
+    return {"volume": volume}
+
+
+@app.route("/setvolume", methods=["POST"])
+@auth.login_required
+async def setvolume():
+    data = request.get_json()
+    did = data.get("did")
+    volume = data.get("volume")
+    if not xiaomusic.did_exist(did):
+        return {"ret": "Did not exist"}
+
+    log.info(f"set_volume {did} {volume}")
+    await xiaomusic.call_main_thread_function(
+        xiaomusic.set_volume, did=did, arg1=volume
+    )
+    return {"ret": "OK", "volume": volume}
 
 
 @app.route("/searchmusic", methods=["GET"])
@@ -70,13 +88,19 @@ def searchmusic():
 @app.route("/playingmusic", methods=["GET"])
 @auth.login_required
 def playingmusic():
-    return xiaomusic.playingmusic()
+    did = request.args.get("did")
+    if not xiaomusic.did_exist(did):
+        return ""
+    return xiaomusic.playingmusic(did)
 
 
 @app.route("/isplaying", methods=["GET"])
 @auth.login_required
 def isplaying():
-    return xiaomusic.isplaying()
+    did = request.args.get("did")
+    if not xiaomusic.did_exist(did):
+        return False
+    return xiaomusic.isplaying(did)
 
 
 @app.route("/", methods=["GET"])
@@ -88,10 +112,14 @@ def index():
 @auth.login_required
 async def do_cmd():
     data = request.get_json()
+    did = data.get("did")
     cmd = data.get("cmd")
+    if not xiaomusic.did_exist(did):
+        return {"ret": "Did not exist"}
+
     if len(cmd) > 0:
-        log.debug("docmd. cmd:%s", cmd)
-        xiaomusic.set_last_record(cmd)
+        log.info(f"docmd. did:{did} cmd:{cmd}")
+        xiaomusic.set_last_record(did, cmd)
         return {"ret": "OK"}
     return {"ret": "Unknow cmd"}
 
@@ -101,10 +129,9 @@ async def do_cmd():
 async def getsetting():
     config = xiaomusic.getconfig()
     data = asdict(config)
-    alldevices = await xiaomusic.call_main_thread_function(xiaomusic.getalldevices)
-    log.info(f"getsetting alldevices: {alldevices}")
-    data["mi_did_list"] = alldevices["did_list"]
-    data["mi_hardware_list"] = alldevices["hardware_list"]
+    device_list = await xiaomusic.call_main_thread_function(xiaomusic.getalldevices)
+    log.info(f"getsetting device_list: {device_list}")
+    data["device_list"] = device_list
     return data
 
 
@@ -127,7 +154,10 @@ async def musiclist():
 @app.route("/curplaylist", methods=["GET"])
 @auth.login_required
 async def curplaylist():
-    return xiaomusic.get_cur_play_list()
+    did = request.args.get("did")
+    if not xiaomusic.did_exist(did):
+        return ""
+    return xiaomusic.get_cur_play_list(did)
 
 
 @app.route("/delmusic", methods=["POST"])
@@ -149,7 +179,7 @@ def downloadjson():
         ret = "OK"
         content = downloadfile(url)
     except Exception as e:
-        log.warning(f"downloadjson failed. url:{url} e:{e}")
+        log.exception(f"Execption {e}")
         ret = "Download JSON file failed."
     return {
         "ret": ret,
@@ -166,9 +196,15 @@ def downloadlog():
 @app.route("/playurl", methods=["GET"])
 @auth.login_required
 async def playurl():
+    did = request.args.get("did")
     url = request.args.get("url")
-    log.info(f"play_url:{url}")
-    return await xiaomusic.call_main_thread_function(xiaomusic.play_url, arg1=url)
+    if not xiaomusic.did_exist(did):
+        return {"ret": "Did not exist"}
+
+    log.info(f"playurl did: {did} url: {url}")
+    return await xiaomusic.call_main_thread_function(
+        xiaomusic.play_url, did=did, arg1=url
+    )
 
 
 @app.route("/debug_play_by_music_url", methods=["POST"])
diff --git a/xiaomusic/static/app.js b/xiaomusic/static/app.js
index e3d9fc7..70556d8 100644
--- a/xiaomusic/static/app.js
+++ b/xiaomusic/static/app.js
@@ -13,11 +13,40 @@ $(function(){
   append_op_button_name("30分钟后关机");
   append_op_button_name("60分钟后关机");
 
-  // 拉取声音
-  sendcmd("get_volume#");
-  $.get("/getvolume", function(data, status) {
-    console.log(data, status, data["volume"]);
-    $("#volume").val(data.volume);
+  // 拉取现有配置
+  $.get("/getsetting", function(data, status) {
+    console.log(data, status);
+    localStorage.setItem('mi_did', data.mi_did);
+
+    var did = localStorage.getItem('cur_did');
+    if ((did == null || did == "") && data.mi_did != null) {
+      var dids = data.mi_did.split(',');
+      did = dids[0];
+      localStorage.setItem('cur_did', did);
+    }
+
+    window.did = did;
+    $.get(`/getvolume?did=${did}`, function(data, status) {
+      console.log(data, status, data["volume"]);
+      $("#volume").val(data.volume);
+    });
+    refresh_music_list();
+
+    $("#did").empty();
+    var dids = data.mi_did.split(',');
+    $.each(dids, function(index, value) {
+      var device = data.device_list.find(function(device) {
+        return device.miotDID == value;
+      });
+
+      if (device) {
+        var option = $('<option></option>')
+            .val(value)
+            .text(device.name)
+            .prop('selected', value === did);
+        $("#did").append(option);
+      }
+    });
   });
 
   // 拉取版本
@@ -47,13 +76,20 @@ $(function(){
       $('#music_list').trigger('change');
 
       // 获取当前播放列表
-      $.get("curplaylist", function(data, status) {
-        $('#music_list').val(data);
-        $('#music_list').trigger('change');
+      $.get(`curplaylist?did=${did}`, function(data, status) {
+        if (data != "") {
+          $('#music_list').val(data);
+          $('#music_list').trigger('change');
+        }
       })
     })
+
+    // 每3秒获取下正在播放的音乐
+    get_playing_music();
+    setInterval(() => {
+      get_playing_music();
+    }, 3000);
   }
-  refresh_music_list();
 
   $("#play_music_list").on("click", () => {
     var music_list = $("#music_list").val();
@@ -84,7 +120,7 @@ $(function(){
 
   $("#playurl").on("click", () => {
     var url = $("#music-url").val();
-    $.get(`/playurl?url=${url}`, function(data, status) {
+    $.get(`/playurl?url=${url}&did=${did}`, function(data, status) {
       console.log(data);
     });
   });
@@ -115,9 +151,18 @@ $(function(){
     sendcmd(cmd);
   });
 
-  $("#volume").on('input', function () {
+  $("#volume").on('change', function () {
     var value = $(this).val();
-    sendcmd("set_volume#"+value);
+    $.ajax({
+      type: "POST",
+      url: "/setvolume",
+      contentType: "application/json; charset=utf-8",
+      data: JSON.stringify({did: did, volume: value}),
+      success: () => {
+      },
+      error: () => {
+      }
+    });
   });
 
   function sendcmd(cmd) {
@@ -125,7 +170,7 @@ $(function(){
       type: "POST",
       url: "/cmd",
       contentType: "application/json; charset=utf-8",
-      data: JSON.stringify({cmd: cmd}),
+      data: JSON.stringify({did: did, cmd: cmd}),
       success: () => {
         if (cmd == "刷新列表") {
           setTimeout(refresh_music_list, 3000);
@@ -160,18 +205,12 @@ $(function(){
   });
 
   function get_playing_music() {
-    $.get("/playingmusic", function(data, status) {
+    $.get(`/playingmusic?did=${did}`, function(data, status) {
       console.log(data);
       $("#playering-music").text(data);
     });
   }
 
-  // 每3秒获取下正在播放的音乐
-  get_playing_music();
-  setInterval(() => {
-    get_playing_music();
-  }, 3000);
-
   function custom_sort_key(a, b) {
     // 使用正则表达式提取数字前缀
     const numericPrefixA = a.match(/^(\d+)/) ? parseInt(a.match(/^(\d+)/)[1], 10) : null;
diff --git a/xiaomusic/static/index.html b/xiaomusic/static/index.html
index aaf17f6..d5cd80e 100644
--- a/xiaomusic/static/index.html
+++ b/xiaomusic/static/index.html
@@ -6,6 +6,12 @@
     <script src="/static/jquery-3.7.1.min.js"></script>
     <script src="/static/app.js"></script>
     <link rel="stylesheet" type="text/css" href="/static/style.css">
+
+<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<script>
+var vConsole = new window.VConsole();
+</script>
+
   </head>
   <body>
     <h2>小爱音箱操控面板
@@ -14,6 +20,8 @@
       </a>)
     </h2>
     <hr>
+      <select id="did">
+      </select>
     <div id="cmds">
     </div>
     <hr>
diff --git a/xiaomusic/static/setting.html b/xiaomusic/static/setting.html
index 767084b..010e8a8 100644
--- a/xiaomusic/static/setting.html
+++ b/xiaomusic/static/setting.html
@@ -24,8 +24,8 @@ var vConsole = new window.VConsole();
     <hr>
 
     <div class="rows">
-      <label for="mi_did_hardware">*勾选设备(至少勾选1个):</label>
-      <div id="mi_did_hardware">
+      <label for="mi_did">*勾选设备(至少勾选1个):</label>
+      <div id="mi_did">
       </div>
     </div>
     <br>
diff --git a/xiaomusic/static/setting.js b/xiaomusic/static/setting.js
index bd7d022..2982d48 100644
--- a/xiaomusic/static/setting.js
+++ b/xiaomusic/static/setting.js
@@ -16,23 +16,22 @@ $(function(){
     });
   };
 
-  function updateCheckbox(selector, mi_did_list, mi_did, mi_hardware_list) {
+  function updateCheckbox(selector, mi_did, device_list) {
     // 清除现有的内容
     $(selector).empty();
 
     // 将 mi_did 字符串通过逗号分割转换为数组，以便于判断默认选中项
     var selected_dids = mi_did.split(',');
 
-    // 遍历传入的 mi_did_list 和 mi_hardware_list
-    $.each(mi_did_list, function(index, did) {
-      // 获取硬件标识，假定列表是一一对应的
-      var hardware = mi_hardware_list[index];
-
+    $.each(device_list, function(index, device) {
+      var did = device.miotDID;
+      var hardware = device.hardware;
+      var name = device.name;
       // 创建复选框元素
       var checkbox = $('<input>', {
         type: 'checkbox',
         id: did,
-        value: `${did}|${hardware}`,
+        value: `${did}`,
         class: 'custom-checkbox', // 添加样式类
         // 如果mi_did中包含了该did，则默认选中
         checked: selected_dids.indexOf(did) !== -1
@@ -42,7 +41,7 @@ $(function(){
       var label = $('<label>', {
         for: did,
         class: 'checkbox-label', // 添加样式类
-        text: `【${hardware}】 ${did}` // 设定标签内容为did和hardware的拼接
+        text: `【${hardware}】${name}` // 设定标签内容
       });
 
       // 将复选框和标签添加到目标选择器元素中
@@ -50,29 +49,22 @@ $(function(){
     });
   }
 
-  function getSelectedDidsAndHardware(containerSelector) {
+  function getSelectedDids(containerSelector) {
     var selectedDids = [];
-    var selectedHardware = [];
 
     // 仅选择给定容器中选中的复选框
     $(containerSelector + ' .custom-checkbox:checked').each(function() {
-      // 解析当前复选框的值（值中包含了 did 和 hardware，使用 '|' 分割）
-      var parts = this.value.split('|');
-      selectedDids.push(parts[0]);
-      selectedHardware.push(parts[1]);
+      var did = this.value;
+      selectedDids.push(did);
     });
 
-    // 返回包含 did_list 和 hardware_list 的对象
-    return {
-      did_list: selectedDids.join(','),
-      hardware_list: selectedHardware.join(',')
-    };
+    return selectedDids.join(',');
   }
 
   // 拉取现有配置
   $.get("/getsetting", function(data, status) {
     console.log(data, status);
-    updateCheckbox("#mi_did_hardware", data.mi_did_list, data.mi_did, data.mi_hardware_list);
+    updateCheckbox("#mi_did", data.mi_did, data.device_list);
 
     // 初始化显示
     for (const key in data) {
@@ -103,9 +95,8 @@ $(function(){
         data[id] = $(this).val();
       }
     });
-    var selectedData = getSelectedDidsAndHardware("#mi_did_hardware");
-    data["mi_did"] = selectedData.did_list;
-    data["hardware"] = selectedData.hardware_list;
+    var did_list = getSelectedDids("#mi_did");
+    data["mi_did"] = did_list;
     console.log(data)
 
     $.ajax({
diff --git a/xiaomusic/utils.py b/xiaomusic/utils.py
index 6549886..8c30512 100644
--- a/xiaomusic/utils.py
+++ b/xiaomusic/utils.py
@@ -253,3 +253,19 @@ def deepcopy_data_no_sensitive_info(data, fields_to_anonymize=None):
                 setattr(copy_data, field, "******")
 
     return copy_data
+
+
+# k1:v1,k2:v2
+def parse_str_to_dict(s, d1=",", d2=":"):
+    # 初始化一个空字典
+    result = {}
+    parts = s.split(d1)
+
+    for part in parts:
+        # 根据冒号切割
+        subparts = part.split(d2)
+        if len(subparts) == 2:  # 防止数据不是成对出现
+            k, v = subparts
+            result[k] = v
+
+    return result
diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py
index 89c6389..837df8b 100644
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -3,11 +3,9 @@ import asyncio
 import json
 import logging
 import os
-import queue
 import random
 import re
 import time
-import traceback
 import urllib.parse
 from dataclasses import asdict
 from logging.handlers import RotatingFileHandler
@@ -22,10 +20,15 @@ from xiaomusic import (
 from xiaomusic.config import (
     KEY_WORD_ARG_BEFORE_DICT,
     Config,
+    Device,
 )
 from xiaomusic.const import (
     COOKIE_TEMPLATE,
     LATEST_ASK_API,
+    PLAY_TYPE_ALL,
+    PLAY_TYPE_ONE,
+    PLAY_TYPE_RND,
+    PLAY_TYPE_TTS,
     SUPPORT_MUSIC_TYPE,
 )
 from xiaomusic.httpserver import StartHTTPServer
@@ -38,46 +41,28 @@ from xiaomusic.utils import (
     get_local_music_duration,
     get_web_music_duration,
     parse_cookie_string,
+    parse_str_to_dict,
     traverse_music_directory,
 )
 
-EOF = object()
-
-PLAY_TYPE_ONE = 0  # 单曲循环
-PLAY_TYPE_ALL = 1  # 全部循环
-PLAY_TYPE_RND = 2  # 随机播放
-
 
 class XiaoMusic:
     def __init__(self, config: Config):
         self.config = config
 
         self.mi_token_home = Path.home() / ".mi.token"
-        self.last_timestamp = {}  # timestamp last call mi speaker
+        self.last_timestamp = {}  # key为 did. timestamp last call mi speaker
         self.last_record = None
         self.cookie_jar = None
         self.mina_service = None
         self.polling_event = asyncio.Event()
         self.new_record_event = asyncio.Event()
-        self.queue = queue.Queue()
-        self.device2hardware = {}
-        self.did2device = {}
+        self.call_queue = asyncio.Queue()
 
-        # 下载对象
-        self.download_proc = None
-        self.cur_music = ""
-        self._next_timer = None
-        self._timeout = 0
-        self._volume = 0
-        self._all_music = {}
+        self.all_music = {}
         self._all_radio = {}  # 电台列表
-        self._play_list = []
-        self._cur_play_list = ""
-        self._music_list = {}  # 播放列表 key 为目录名, value 为 play_list
-        self._playing = False
-
-        # 关机定时器
-        self._stop_timer = None
+        self.music_list = {}  # 播放列表 key 为目录名, value 为 play_list
+        self.devices = {}  # key 为 did
 
         # 初始化配置
         self.init_config()
@@ -91,9 +76,6 @@ class XiaoMusic:
         # 启动时重新生成一次播放列表
         self._gen_all_music_list()
 
-        # 启动时初始化获取声音
-        self.set_last_record("get_volume#")
-
         # 初始化插件
         self.plugin_manager = PluginManager(self)
 
@@ -101,8 +83,6 @@ class XiaoMusic:
         self.log.info(f"Startup OK. {debug_config}")
 
     def init_config(self):
-        # 单曲循环，全部循环
-        self.play_type = self.config.play_type
         self.music_path = self.config.music_path
         self.conf_path = self.config.conf_path
         if not self.conf_path:
@@ -120,15 +100,29 @@ class XiaoMusic:
         if self.public_port == 0:
             self.public_port = self.port
 
-        self.proxy = self.config.proxy
-        self.search_prefix = self.config.search_prefix
-        self.ffmpeg_location = self.config.ffmpeg_location
         self.active_cmd = self.config.active_cmd.split(",")
         self.exclude_dirs = set(self.config.exclude_dirs.split(","))
         self.music_path_depth = self.config.music_path_depth
 
+        self.update_devices()
+
+    def update_devices(self):
+        self.device_id_did = {}  # key 为 device_id
+        self.groups = {}  # key 为 group_name, value 为 device_id_list
+        XiaoMusicDevice.dict_clear(self.devices)  # 需要清理旧的定时器
+        did2group = parse_str_to_dict(self.config.group_list, d1=",", d2=":")
+        for did, device in self.config.devices.items():
+            group_name = did2group.get(did)
+            if not group_name:
+                group_name = device.name
+            if group_name not in self.groups:
+                self.groups[group_name] = []
+            self.groups[group_name].append(device.device_id)
+            self.device_id_did[device.device_id] = did
+            self.devices[did] = XiaoMusicDevice(self, device, group_name)
+
     def setup_logger(self):
-        log_format = f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s"
+        log_format = f"%(asctime)s [{__version__}] [%(levelname)s] %(filename)s:%(lineno)d: %(message)s"
         date_format = "[%X]"
         formatter = logging.Formatter(fmt=log_format, datefmt=date_format)
         logging.basicConfig(
@@ -145,6 +139,7 @@ class XiaoMusic:
         handler = RotatingFileHandler(
             self.config.log_file, maxBytes=10 * 1024 * 1024, backupCount=1
         )
+        handler.stream.flush()
         handler.setFormatter(formatter)
         self.log = logging.getLogger("xiaomusic")
         self.log.addHandler(handler)
@@ -161,7 +156,7 @@ class XiaoMusic:
                 # 拉取所有音箱的对话记录
                 tasks = [
                     self.get_latest_ask_from_xiaoai(session, device_id)
-                    for device_id in self.device2hardware
+                    for device_id in self.config.devices
                 ]
                 await asyncio.gather(*tasks)
 
@@ -196,17 +191,25 @@ class XiaoMusic:
         try:
             mi_dids = self.config.mi_did.split(",")
             hardware_data = await self.mina_service.device_list()
-            self.device2hardware = {}
-            self.did2device = {}
+            devices = {}
             for h in hardware_data:
                 device_id = h.get("deviceID", "")
                 hardware = h.get("hardware", "")
                 did = h.get("miotDID", "")
+                name = h.get("alias", "")
+                if not name:
+                    name = h.get("name", "未知名字")
                 if device_id and hardware and did and (did in mi_dids):
-                    self.device2hardware[device_id] = hardware
-                    self.did2device[did] = device_id
+                    device = self.config.devices.get(did, Device())
+                    device.did = did
+                    device.device_id = device_id
+                    device.hardware = hardware
+                    device.name = name
+                    devices[did] = device
+            self.config.devices = devices
+            self.log.info(f"选中的设备: {devices}")
         except Exception as e:
-            self.log.error(f"Execption {e}")
+            self.log.exception(f"Execption {e}")
 
     def get_cookie(self):
         if self.config.cookie:
@@ -221,23 +224,50 @@ class XiaoMusic:
             user_data = json.loads(f.read())
         user_id = user_data.get("userId")
         service_token = user_data.get("micoapi")[1]
-        device_id = self.get_one_device()
+        device_id = self.get_one_device_id()
         cookie_string = COOKIE_TEMPLATE.format(
             device_id=device_id, service_token=service_token, user_id=user_id
         )
         return parse_cookie_string(cookie_string)
 
-    def get_one_device(self):
-        device_id = next(iter(self.device2hardware), "")
+    def get_one_device_id(self):
+        device_id = next(iter(self.device_id_did), "")
         return device_id
 
+    def get_did(self, device_id):
+        return self.device_id_did.get(device_id, "")
+
+    def get_hardward(self, device_id):
+        device = self.get_device_by_device_id(device_id)
+        if not device:
+            return ""
+        return device.hardware
+
+    def get_group_device_id_list(self, group_name):
+        return self.groups[group_name]
+
+    def get_group_devices(self, group_name):
+        device_id_list = self.groups[group_name]
+        devices = {}
+        for device_id in device_id_list:
+            did = self.device_id_did.get(device_id, "")
+            if did:
+                devices[did] = self.devices[did]
+        return devices
+
+    def get_device_by_device_id(self, device_id):
+        did = self.device_id_did.get(device_id)
+        if not did:
+            return None
+        return self.config.devices.get(did)
+
     async def get_latest_ask_from_xiaoai(self, session, device_id):
         cookies = {"deviceId": device_id}
         retries = 3
         for i in range(retries):
             try:
                 timeout = ClientTimeout(total=15)
-                hardware = self.device2hardware[device_id]
+                hardware = self.get_hardward(device_id)
                 url = LATEST_ASK_API.format(
                     hardware=hardware,
                     timestamp=str(int(time.time() * 1000)),
@@ -245,14 +275,12 @@ class XiaoMusic:
                 self.log.debug(f"url:{url}")
                 r = await session.get(url, timeout=timeout, cookies=cookies)
             except Exception as e:
-                self.log.warning(
-                    "Execption when get latest ask from xiaoai: %s", str(e)
-                )
+                self.log.exception(f"Execption {e}")
                 continue
             try:
                 data = await r.json()
             except Exception as e:
-                self.log.warning(f"get latest ask from xiaoai error {e}, retry")
+                self.log.exception(f"Execption {e}")
                 if i == 2:
                     # tricky way to fix #282 #272 # if it is the third time we re init all data
                     self.log.info("Maybe outof date trying to re init it")
@@ -261,7 +289,8 @@ class XiaoMusic:
                 return self._get_last_query(device_id, data)
 
     def _get_last_query(self, device_id, data):
-        self.log.debug(f"_get_last_query device_id:{device_id} data:{data}")
+        did = self.get_did(device_id)
+        self.log.debug(f"_get_last_query device_id:{device_id} did:{did} data:{data}")
         if d := data.get("data"):
             records = json.loads(d).get("records")
             if not records:
@@ -269,166 +298,36 @@ class XiaoMusic:
             last_record = records[0]
             timestamp = last_record.get("time")
             # 首次用当前时间初始化
-            if device_id not in self.last_timestamp:
-                self.last_timestamp[device_id] = int(time.time() * 1000)
-            if timestamp > self.last_timestamp[device_id]:
-                self.last_timestamp[device_id] = timestamp
+            if did not in self.last_timestamp:
+                self.last_timestamp[did] = int(time.time() * 1000)
+            if timestamp > self.last_timestamp[did]:
+                self.last_timestamp[did] = timestamp
+                last_record["did"] = did
                 self.last_record = last_record
                 self.new_record_event.set()
 
-    # 手动发消息
-    def set_last_record(self, query):
+    # 手动插入消息
+    def set_last_record(self, did, query):
         self.last_record = {
+            "did": did,
             "query": query,
             "ctrl_panel": True,
         }
         self.new_record_event.set()
 
-    async def do_tts(self, value):
-        self.log.info(f"try do_tts value:{value}")
-        if not value:
-            self.log.info("do_tts no value")
-            return
-
-        await self.force_stop_xiaoai()
-        await self.text_to_speech(value)
-
-        # 最大等8秒
-        sec = min(8, int(len(value) / 3))
-        await asyncio.sleep(sec)
-        self.log.info(f"do_tts ok. cur_music:{self.cur_music}")
-        await self.check_replay()
-
-    async def text_to_speech_one(self, device_id, value):
-        try:
-            await self.mina_service.text_to_speech(device_id, value)
-        except Exception as e:
-            self.log.error(f"Execption {e}")
-
-    async def text_to_speech(self, value):
-        tasks = [
-            self.text_to_speech_one(device_id, value)
-            for device_id in self.device2hardware
-        ]
-        await asyncio.gather(*tasks)
-
-    # 继续播放被打断的歌曲
-    async def check_replay(self):
-        if self.isplaying() and not self.isdownloading():
-            # 继续播放歌曲
-            self.log.info("现在继续播放歌曲")
-            await self.play()
-        else:
-            self.log.info(
-                f"不会继续播放歌曲. isplaying:{self.isplaying()} isdownloading:{self.isdownloading()}"
-            )
-
-    async def do_set_volume(self, value):
-        value = int(value)
-        self._volume = value
-        self.log.info(f"声音设置为{value}")
-        await self.player_set_volume(value)
-
-    async def player_set_volume(self, value):
-        try:
-            for device_id in self.device2hardware:
-                await self.mina_service.player_set_volume(device_id, value)
-        except Exception as e:
-            self.log.error(f"Execption {e}")
-
-    async def get_if_xiaoai_is_playing(self, device_id):
-        playing_info = await self.mina_service.player_get_status(device_id)
-        self.log.info(playing_info)
-        # WTF xiaomi api
-        is_playing = (
-            json.loads(playing_info.get("data", {}).get("info", "{}")).get("status", -1)
-            == 1
-        )
-        return is_playing
-
-    async def stop_if_xiaoai_is_playing(self, device_id):
-        is_playing = await self.get_if_xiaoai_is_playing(device_id)
-        if is_playing or self.config.enable_force_stop:
-            # stop it
-            ret = await self.mina_service.player_stop(device_id)
-            self.log.info(
-                f"stop_if_xiaoai_is_playing player_stop device_id:{device_id} enable_force_stop:{self.config.enable_force_stop} ret:{ret}"
-            )
-
-    async def force_stop_one_xiaoai(self, device_id):
-        try:
-            ret = await self.mina_service.player_pause(device_id)
-            self.log.info(
-                f"force_stop_one_xiaoai player_pause device_id:{device_id} ret:{ret}"
-            )
-            await self.stop_if_xiaoai_is_playing(device_id)
-        except Exception as e:
-            self.log.error(f"Execption {e}")
-
-    async def force_stop_xiaoai(self):
-        tasks = [
-            self.force_stop_one_xiaoai(device_id) for device_id in self.device2hardware
-        ]
-        await asyncio.gather(*tasks)
-
-    # 是否在下载中
-    def isdownloading(self):
-        if not self.download_proc:
-            return False
-
-        if self.download_proc.returncode is not None:
-            self.log.info(
-                f"Process exited with returncode:{self.download_proc.returncode}"
-            )
-            return False
-
-        self.log.info("Download Process is still running.")
-        return True
-
-    # 下载歌曲
-    async def download(self, search_key, name):
-        if self.download_proc:
-            try:
-                self.download_proc.kill()
-            except ProcessLookupError:
-                pass
-
-        sbp_args = (
-            "yt-dlp",
-            f"{self.search_prefix}{search_key}",
-            "-x",
-            "--audio-format",
-            "mp3",
-            "--paths",
-            self.download_path,
-            "-o",
-            f"{name}.mp3",
-            "--ffmpeg-location",
-            f"{self.ffmpeg_location}",
-            "--no-playlist",
-        )
-
-        if self.proxy:
-            sbp_args += ("--proxy", f"{self.proxy}")
-
-        cmd = " ".join(sbp_args)
-        self.log.info(f"download cmd: {cmd}")
-        self.download_proc = await asyncio.create_subprocess_exec(*sbp_args)
-        await self.do_tts(f"正在下载歌曲{search_key}")
-
     def get_filename(self, name):
-        if name not in self._all_music:
-            self.log.debug("get_filename not in. name:%s", name)
+        if name not in self.all_music:
+            self.log.debug(f"get_filename not in. name:{name}")
             return ""
-        filename = self._all_music[name]
-        self.log.debug("try get_filename. filename:%s", filename)
+        filename = self.all_music[name]
+        self.log.debug(f"try get_filename. filename:{filename}")
         if os.path.exists(filename):
             return filename
         return ""
 
     # 判断本地音乐是否存在，网络歌曲不判断
     def is_music_exist(self, name):
-        if name not in self._all_music:
+        if name not in self.all_music:
             return False
         if self.is_web_music(name):
             return True
@@ -443,9 +342,9 @@ class XiaoMusic:
 
     # 是否是网络歌曲
     def is_web_music(self, name):
-        if name not in self._all_music:
+        if name not in self.all_music:
             return False
-        url = self._all_music[name]
+        url = self.all_music[name]
         return url.startswith(("http://", "https://"))
 
     # 获取歌曲播放时长，播放地址
@@ -472,20 +371,18 @@ class XiaoMusic:
 
     def get_music_url(self, name):
         if self.is_web_music(name):
-            url = self._all_music[name]
-            self.log.debug("get_music_url web music. name:%s, url:%s", name, url)
+            url = self.all_music[name]
+            self.log.debug(f"get_music_url web music. name:{name}, url:{url}")
             return url
 
         filename = self.get_filename(name).replace("\\", "/")
-        self.log.debug(
-            "get_music_url local music. name:%s, filename:%s", name, filename
-        )
+        self.log.debug(f"get_music_url local music. name:{name}, filename:{filename}")
         encoded_name = urllib.parse.quote(filename)
         return f"http://{self.hostname}:{self.public_port}/{encoded_name}"
 
     # 获取目录下所有歌曲,生成随机播放列表
     def _gen_all_music_list(self):
-        self._all_music = {}
+        self.all_music = {}
         all_music_by_dir = {}
         local_musics = traverse_music_directory(
             self.music_path,
@@ -508,24 +405,30 @@ class XiaoMusic:
                 # 歌曲名字相同会覆盖
                 filename = os.path.basename(file)
                 (name, _) = os.path.splitext(filename)
-                self._all_music[name] = file
+                self.all_music[name] = file
                 all_music_by_dir[dir_name][name] = True
 
-        self._play_list = list(self._all_music.keys())
-        self._cur_play_list = "全部"
-        self._gen_play_list()
-        self.log.debug(self._all_music)
+        self.log.debug(self.all_music)
 
-        self._music_list = {}
-        self._music_list["全部"] = self._play_list
+        self.music_list = {}
         for dir_name, musics in all_music_by_dir.items():
-            self._music_list[dir_name] = list(musics.keys())
-            self.log.debug("dir_name:%s, list:%s", dir_name, self._music_list[dir_name])
+            self.music_list[dir_name] = list(musics.keys())
+            self.log.debug("dir_name:%s, list:%s", dir_name, self.music_list[dir_name])
 
         try:
             self._append_music_list()
         except Exception as e:
-            self.log.error(f"Execption _append_music_list {e}")
+            self.log.exception(f"Execption {e}")
+
+        self.music_list["全部"] = list(self.all_music.keys())
+
+        # 歌单排序
+        for _, play_list in self.music_list.items():
+            play_list.sort(key=custom_sort_key)
+
+        # 更新每个设备的歌单
+        for device in self.devices.values():
+            device.update_playlist()
 
     # 给歌单里补充网络歌单
     def _append_music_list(self):
@@ -547,7 +450,7 @@ class XiaoMusic:
                     music_type = music.get("type")
                     if (not name) or (not url):
                         continue
-                    self._all_music[name] = url
+                    self.all_music[name] = url
                     one_music_list.append(name)
 
                     # 处理电台列表
@@ -555,72 +458,13 @@ class XiaoMusic:
                         self._all_radio[name] = url
                 self.log.debug(one_music_list)
                 # 歌曲名字相同会覆盖
-                self._music_list[list_name] = one_music_list
+                self.music_list[list_name] = one_music_list
             if self._all_radio:
-                self._music_list["所有电台"] = list(self._all_radio.keys())
-            self.log.debug(self._all_music)
-            self.log.debug(self._music_list)
+                self.music_list["所有电台"] = list(self._all_radio.keys())
+            self.log.debug(self.all_music)
+            self.log.debug(self.music_list)
         except Exception as e:
-            self.log.error(f"Execption music_list:{music_list} {e}")
-
-    # 歌曲排序或者打乱顺序
-    def _gen_play_list(self):
-        if self.play_type == PLAY_TYPE_RND:
-            random.shuffle(self._play_list)
-        else:
-            self._play_list.sort(key=custom_sort_key)
-            self.log.debug("play_list:%s", self._play_list)
-
-    # 把下载的音乐加入播放列表
-    def add_download_music(self, name):
-        self._all_music[name] = os.path.join(self.download_path, f"{name}.mp3")
-        if name not in self._play_list:
-            self._play_list.append(name)
-            self.log.debug("add_music %s", name)
-            self.log.debug(self._play_list)
-
-    # 获取下一首
-    def get_next_music(self):
-        play_list_len = len(self._play_list)
-        if play_list_len == 0:
-            self.log.warning("没有随机到歌曲")
-            return ""
-        # 随机选择一个文件
-        index = 0
-        try:
-            index = self._play_list.index(self.cur_music)
-        except ValueError:
-            pass
-        next_index = index + 1
-        if next_index >= play_list_len:
-            next_index = 0
-        name = self._play_list[next_index]
-        if not self.is_music_exist(name):
-            self._play_list.pop(next_index)
-            self.log.info(f"pop not exist music:{name}")
-            return self.get_next_music()
-        return name
-
-    # 设置下一首歌曲的播放定时器
-    async def set_next_music_timeout(self, sec):
-        if sec <= 0:
-            return
-
-        if self._next_timer:
-            self._next_timer.cancel()
-            self.log.info("旧定时器已取消")
-
-        self._timeout = sec
-
-        async def _do_next():
-            await asyncio.sleep(self._timeout)
-            try:
-                await self.play_next()
-            except Exception as e:
-                self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")
-
-        self._next_timer = asyncio.ensure_future(_do_next())
-        self.log.info(f"{sec}秒后将会播放下一首歌曲")
+            self.log.exception(f"Execption {e}")
 
     async def run_forever(self):
         StartHTTPServer(self.port, self.music_path, self)
@@ -633,8 +477,8 @@ class XiaoMusic:
                 keyword for keyword in self.config.key_match_order if "#" not in keyword
             ]
             joined_keywords = "/".join(filtered_keywords)
-            self.log.info(f"Running xiaomusic now, 用`{joined_keywords}`开头来控制")
-            self.log.info(self.config.key_word_dict)
+            self.log.info(f"语音控制已启动, 用【{joined_keywords}】开头来控制")
+            self.log.debug(f"key_word_dict: {self.config.key_word_dict}")
 
             while True:
                 self.polling_event.set()
@@ -644,36 +488,40 @@ class XiaoMusic:
                 if new_record is None:
                     # 其他线程的函数调用
                     try:
-                        func, callback, arg1 = self.queue.get(False)
-                        ret = await func(arg1=arg1)
+                        func, callback, kwargs = await self.call_queue.get()
+                        try:
+                            ret = await func(**kwargs)
+                        except Exception as e:
+                            self.log.exception(f"Execption {e}")
                         callback(ret)
-                    except queue.Empty:
-                        pass
+                    except Exception as e:
+                        self.log.exception(f"Execption {e}")
                     continue
                 self.polling_event.clear()  # stop polling when processing the question
                 query = new_record.get("query", "").strip()
+                did = new_record.get("did", "").strip()
                 ctrl_panel = new_record.get("ctrl_panel", False)
-                self.log.info("收到消息:%s 控制面板:%s", query, ctrl_panel)
+                self.log.info("收到消息:%s 控制面板:%s did:%s", query, ctrl_panel, did)
 
                 # 匹配命令
                 try:
-                    opvalue, oparg = self.match_cmd(query, ctrl_panel)
+                    opvalue, oparg = self.match_cmd(did, query, ctrl_panel)
                     if not opvalue:
                         await asyncio.sleep(1)
-                        await self.check_replay()
+                        await self.check_replay(did)
                         continue
 
                     func = getattr(self, opvalue)
-                    await func(arg1=oparg)
+                    await func(did=did, arg1=oparg)
                 except Exception as e:
-                    self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")
+                    self.log.exception(f"Execption {e}")
 
     # 检查是否匹配到完全一样的指令
-    def check_full_match_cmd(self, query, ctrl_panel):
+    def check_full_match_cmd(self, did, query, ctrl_panel):
         if query in self.config.key_match_order:
             opkey = query
             opvalue = self.config.key_word_dict.get(opkey)
-            if ctrl_panel or self.isplaying():
+            if ctrl_panel or self.isplaying(did):
                 return opvalue
             else:
                 if not self.active_cmd or opvalue in self.active_cmd:
@@ -681,9 +529,9 @@ class XiaoMusic:
         return None
 
     # 匹配命令
-    def match_cmd(self, query, ctrl_panel):
+    def match_cmd(self, did, query, ctrl_panel):
         # 优先处理完全匹配
-        opvalue = self.check_full_match_cmd(query, ctrl_panel)
+        opvalue = self.check_full_match_cmd(did, query, ctrl_panel)
         if opvalue:
             self.log.info(f"完全匹配指令. query:{query} opvalue:{opvalue}")
             # 自定义口令
@@ -715,7 +563,7 @@ class XiaoMusic:
 
             if (
                 (not ctrl_panel)
-                and (not self.isplaying())
+                and (not self.isplaying(did))
                 and self.active_cmd
                 and (opvalue not in self.active_cmd)
                 and (opkey not in self.active_cmd)
@@ -728,55 +576,12 @@ class XiaoMusic:
         self.log.info(f"未匹配到指令 {query} {ctrl_panel}")
         return (None, None)
 
-    # 判断是否播放下一首歌曲
-    def check_play_next(self):
-        # 当前歌曲不在当前播放列表
-        if self.cur_music not in self._play_list:
-            return True
-
-        # 当前没我在播放的歌曲
-        if self.cur_music == "":
-            return True
-        else:
-            # 当前播放的歌曲不存在了
-            if not self.is_music_exist(self.cur_music):
-                return True
-        return False
-
-    async def play_url(self, **kwargs):
-        url = kwargs.get("arg1", "")
-        return await self.all_player_play(url)
-
-    async def play_one_url(self, device_id, url):
-        try:
-            if self.config.use_music_api:
-                ret = await self.mina_service.play_by_music_url(device_id, url)
-                self.log.info(
-                    f"play_one_url play_by_music_url device_id:{device_id} ret:{ret} url:{url}"
-                )
-            else:
-                ret = await self.mina_service.play_by_url(device_id, url)
-                self.log.info(
-                    f"play_one_url play_by_url device_id:{device_id} ret:{ret} url:{url}"
-                )
-        except Exception as e:
-            self.log.error(f"Execption {e}")
-        return ret
-
-    async def all_player_play(self, url):
-        tasks = [
-            self.play_one_url(device_id, url) for device_id in self.device2hardware
-        ]
-        results = await asyncio.gather(*tasks)
-        self.log.info(f"all_player_play {url} {results}")
-        return results
-
     def find_real_music_name(self, name):
         if not self.config.enable_fuzzy_match:
             self.log.debug("没开启模糊匹配")
             return name
 
-        all_music_list = list(self._all_music.keys())
+        all_music_list = list(self.all_music.keys())
         real_name = find_best_match(
             name, all_music_list, cutoff=self.config.fuzzy_match_cutoff
         )
@@ -786,104 +591,27 @@ class XiaoMusic:
         self.log.info(f"没找到歌曲【{name}】")
         return name
 
-    # 播放本地歌曲
-    async def playlocal(self, **kwargs):
-        name = kwargs.get("arg1", "")
-        if name == "":
-            if self.check_play_next():
-                await self.play_next()
-                return
-            else:
-                name = self.cur_music
+    def did_exist(self, did):
+        return did in self.devices
 
-        self.log.info(f"playlocal. name:{name}")
+    # 播放一个 url
+    async def play_url(self, did="", arg1="", **kwargs):
+        url = arg1
+        return await self.devices[did].group_player_play(url)
 
-        # 本地歌曲不存在时下载
-        name = self.find_real_music_name(name)
-        if not self.is_music_exist(name):
-            await self.do_tts(f"本地不存在歌曲{name}")
-            return
-        await self._playmusic(name)
+    # 设置为单曲循环
+    async def set_play_type_one(self, did="", **kwargs):
+        await self.devices[did].set_play_type(PLAY_TYPE_ONE)
 
-    async def _playmusic(self, name):
-        self._playing = True
-        self.cur_music = name
-        self.log.info(f"cur_music {self.cur_music}")
-        sec, url = await self.get_music_sec_url(name)
-        await self.force_stop_xiaoai()
-        self.log.info(f"播放 {url}")
-        await self.play_url(arg1=url)
-        self.log.info("已经开始播放了")
-        # 设置下一首歌曲的播放定时器
-        await self.set_next_music_timeout(sec)
+    # 设置为全部循环
+    async def set_play_type_all(self, did="", **kwargs):
+        await self.devices[did].set_play_type(PLAY_TYPE_ALL)
 
-    # 播放歌曲
-    async def play(self, **kwargs):
-        parts = kwargs.get("arg1", "").split("|")
-        search_key = parts[0]
-        name = parts[1] if len(parts) > 1 else search_key
-        if name == "":
-            name = search_key
+    # 设置为随机播放
+    async def set_random_play(self, did="", **kwargs):
+        await self.devices[did].set_play_type(PLAY_TYPE_RND)
 
-        if search_key == "" and name == "":
-            if self.check_play_next():
-                await self.play_next()
-                return
-            else:
-                name = self.cur_music
-
-        self.log.info("play. search_key:%s name:%s", search_key, name)
-
-        # 本地歌曲不存在时下载
-        name = self.find_real_music_name(name)
-        if not self.is_music_exist(name):
-            if self.config.disable_download:
-                await self.do_tts(f"本地不存在歌曲{name}")
-                return
-            await self.download(search_key, name)
-            self.log.info(f"正在下载中 {search_key} {name}")
-            await self.download_proc.wait()
-            # 把文件插入到播放列表里
-            self.add_download_music(name)
-        await self._playmusic(name)
-
-    # 下一首
-    async def play_next(self, **kwargs):
-        self.log.info("开始播放下一首")
-        name = self.cur_music
-        self.log.debug("play_next. name:%s, cur_music:%s", name, self.cur_music)
-        if (
-            self.play_type == PLAY_TYPE_ALL
-            or self.play_type == PLAY_TYPE_RND
-            or name == ""
-        ):
-            name = self.get_next_music()
-        if name == "":
-            await self.do_tts("本地没有歌曲")
-            return
-        await self.play(arg1=name)
-
-    # 单曲循环
-    async def set_play_type_one(self, **kwargs):
-        self.play_type = PLAY_TYPE_ONE
-        self.save_play_type()
-        await self.do_tts("已经设置为单曲循环")
-
-    # 全部循环
-    async def set_play_type_all(self, **kwargs):
-        self.play_type = PLAY_TYPE_ALL
-        self._gen_play_list()
-        self.save_play_type()
-        await self.do_tts("已经设置为全部循环")
-
-    # 随机播放
-    async def random_play(self, **kwargs):
-        self.play_type = PLAY_TYPE_RND
-        self._gen_play_list()
-        self.save_play_type()
-        await self.do_tts("已经设置为随机播放")
-
-    # 刷新列表
+    # 设置为刷新列表
     async def gen_music_list(self, **kwargs):
         self._gen_all_music_list()
 
@@ -898,16 +626,17 @@ class XiaoMusic:
             self.log.info(f"del ${filename} success")
         except OSError:
             self.log.error(f"del ${filename} failed")
+        # TODO: 这里可以优化性能
         self._gen_all_music_list()
 
-    def find_real_music_list_name(self, list_name):
+    def _find_real_music_list_name(self, list_name):
         if not self.config.enable_fuzzy_match:
             self.log.debug("没开启模糊匹配")
             return list_name
 
         # 模糊搜一个播放列表
         real_name = find_best_match(
-            list_name, self._music_list, cutoff=self.config.fuzzy_match_cutoff
+            list_name, self.music_list, cutoff=self.config.fuzzy_match_cutoff
         )
         if real_name:
             self.log.info(f"根据【{list_name}】找到播放列表【{real_name}】")
@@ -917,90 +646,79 @@ class XiaoMusic:
         return list_name
 
     # 播放一个播放列表
-    async def play_music_list(self, **kwargs):
-        parts = kwargs.get("arg1").split("|")
+    async def play_music_list(self, did="", arg1="", **kwargs):
+        parts = arg1.split("|")
         list_name = parts[0]
 
-        list_name = self.find_real_music_list_name(list_name)
-        if list_name not in self._music_list:
-            await self.do_tts(f"播放列表{list_name}不存在")
+        list_name = self._find_real_music_list_name(list_name)
+        if list_name not in self.music_list:
+            await self.do_tts(did, f"播放列表{list_name}不存在")
             return
-        self._play_list = self._music_list[list_name]
-        self._cur_play_list = list_name
-        self._gen_play_list()
-        self.log.info(f"开始播放列表{list_name}")
 
         music_name = ""
         if len(parts) > 1:
             music_name = parts[1]
-        await self.play(arg1=music_name)
+        await self.devices[did].play_music_list(list_name, music_name)
 
-    async def stop(self, **kwargs):
-        self._playing = False
-        if kwargs.get("arg1", "") != "notts":
-            await self.do_tts(self.config.stop_tts_msg)
-        if self._next_timer:
-            self._next_timer.cancel()
-            self.log.info("定时器已取消")
-        await self.force_stop_xiaoai()
-        self.log.info("stop now")
+    # 播放
+    async def play(self, did="", arg1="", **kwargs):
+        parts = arg1.split("|")
+        search_key = parts[0]
+        name = parts[1] if len(parts) > 1 else search_key
+        if name == "":
+            name = search_key
 
-    async def stop_after_minute(self, **kwargs):
-        if self._stop_timer:
-            self._stop_timer.cancel()
-            self.log.info("关机定时器已取消")
-        minute = int(kwargs.get("arg1", 0))
+        return await self.devices[did].play(name, search_key)
 
-        async def _do_stop():
-            await asyncio.sleep(minute * 60)
-            try:
-                await self.stop(arg1="notts")
-            except Exception as e:
-                self.log.warning(f"执行出错 {str(e)}\n{traceback.format_exc()}")
+    # 本地播放
+    async def playlocal(self, did="", arg1="", **kwargs):
+        return await self.devices[did].playlocal(arg1)
 
-        self._stop_timer = asyncio.ensure_future(_do_stop())
-        await self.do_tts(f"收到,{minute}分钟后将关机")
+    async def play_next(self, did="", **kwargs):
+        return await self.devices[did].play_next()
 
-    async def set_volume(self, **kwargs):
-        value = kwargs.get("arg1", 0)
-        await self.do_set_volume(value)
+    # 停止
+    async def stop(self, did="", arg1="", **kwargs):
+        return await self.devices[did].stop(arg1=arg1)
 
-    async def get_volume(self, **kwargs):
-        # 取一个音箱的声音
-        device_id = self.get_one_device()
-        playing_info = await self.mina_service.player_get_status(device_id)
-        self.log.debug("get_volume. playing_info:%s", playing_info)
-        self._volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get(
-            "volume", 0
-        )
-        self.log.info("get_volume. volume:%s", self._volume)
+    # 定时关机
+    async def stop_after_minute(self, did="", arg1=0, **kwargs):
+        minute = int(arg1)
+        return await self.devices[did].stop_after_minute(minute)
 
-    def get_volume_ret(self):
-        return self._volume
+    # 获取音量
+    async def get_volume(self, did="", **kwargs):
+        return await self.devices[did].get_volume()
+
+    # 设置音量
+    async def set_volume(self, did="", arg1=0, **kwargs):
+        volume = int(arg1)
+        return await self.devices[did].set_volume(volume)
 
     # 搜索音乐
     def searchmusic(self, name):
-        all_music_list = list(self._all_music.keys())
+        all_music_list = list(self.all_music.keys())
         search_list = fuzzyfinder(name, all_music_list)
-        self.log.debug("searchmusic. name:%s search_list:%s", name, search_list)
+        self.log.debug(f"searchmusic. name:{name} search_list:{search_list}")
         return search_list
 
     # 获取播放列表
     def get_music_list(self):
-        return self._music_list
+        return self.music_list
 
     # 获取当前的播放列表
-    def get_cur_play_list(self):
-        return self._cur_play_list
+    def get_cur_play_list(self, did):
+        return self.devices[did].get_cur_play_list()
 
     # 正在播放中的音乐
-    def playingmusic(self):
-        self.log.debug("playingmusic. cur_music:%s", self.cur_music)
-        return self.cur_music
+    def playingmusic(self, did):
+        cur_music = self.devices[did].cur_music
+        self.log.debug(f"playingmusic. cur_music:{cur_music}")
+        return cur_music
 
     # 当前是否正在播放歌曲
-    def isplaying(self):
-        return self._playing
+    def isplaying(self, did):
+        return self.devices[did].isplaying()
 
     # 获取当前配置
     def getconfig(self):
@@ -1024,14 +742,14 @@ class XiaoMusic:
         except json.JSONDecodeError:
             self.log.warning(f"The file {filename} contains invalid JSON.")
         except Exception as e:
-            self.log.error(f"Execption init setting {e}")
+            self.log.exception(f"Execption {e}")
 
     # 保存配置并重新启动
     async def saveconfig(self, data):
-        # 配置文件落地
-        self.do_saveconfig(data)
         # 更新配置
         self.update_config_from_setting(data)
+        # 配置文件落地
+        self.save_cur_config()
         # 重新初始化
         await self.call_main_thread_function(self.reinit)
 
@@ -1040,7 +758,7 @@ class XiaoMusic:
         # 默认暂时配置保存到 music 目录下
         filename = self.getsettingfile()
         with open(filename, "w", encoding="utf-8") as f:
-            json.dump(data, f, ensure_ascii=False, indent=4)
+            json.dump(data, f, ensure_ascii=False, indent=2)
 
     # 把当前配置落地
     def save_cur_config(self):
@@ -1048,65 +766,42 @@ class XiaoMusic:
         self.do_saveconfig(data)
         self.log.info("save_cur_config ok")
 
-    # 播放类型落地
-    def save_play_type(self):
-        self.config.play_type = self.play_type
-        self.save_cur_config()
-
     def update_config_from_setting(self, data):
-        # 兼容旧配置:一段时间后清理这里的旧代码
-        self.config.hardware = data.get("mi_hardware")
-        self.config.search_prefix = data.get("xiaomusic_search")
-        self.config.proxy = data.get("xiaomusic_proxy")
-        self.config.music_list_url = data.get("xiaomusic_music_list_url")
-        self.config.music_list_json = data.get("xiaomusic_music_list_json")
-
         # 自动赋值相同字段的配置
         self.config.update_config(data)
 
         self.init_config()
         debug_config = deepcopy_data_no_sensitive_info(self.config)
-        self.log.info("update_config_from_setting ok. data:%s", debug_config)
+        self.log.info(f"update_config_from_setting ok. data:{debug_config}")
 
     # 重新初始化
     async def reinit(self, **kwargs):
         self.setup_logger()
         await self.init_all_data(self.session)
         self._gen_all_music_list()
-        self.log.info("reinit success")
+
+        debug_config = deepcopy_data_no_sensitive_info(self.config)
+        self.log.info(f"reinit success. data:{debug_config}")
 
     # 获取所有设备
     async def getalldevices(self, **kwargs):
-        did_list = []
-        hardware_list = []
+        device_list = []
         try:
-            hardware_data = await self.mina_service.device_list()
-            for h in hardware_data:
-                did = h.get("miotDID", "")
-                if did != "":
-                    did_list.append(did)
-                hardware = h.get("hardware", "")
-                if h.get("hardware", "") != "":
-                    hardware_list.append(hardware)
+            device_list = await self.mina_service.device_list()
         except Exception as e:
-            self.log.error(f"Execption {e}")
-        alldevices = {
-            "did_list": did_list,
-            "hardware_list": hardware_list,
-        }
-        return alldevices
+            self.log.exception(f"Execption {e}")
+        return device_list
 
     # 用于在web线程里调用
     # 获取所有设备
-    async def call_main_thread_function(self, func, arg1=None):
+    async def call_main_thread_function(self, func, **kwargs):
         loop = asyncio.get_event_loop()
         future = loop.create_future()
 
         def callback(ret):
-            nonlocal future
             loop.call_soon_threadsafe(future.set_result, ret)
 
-        self.queue.put((func, callback, arg1))
+        await self.call_queue.put((func, callback, kwargs))
         self.last_record = None
         self.new_record_event.set()
         result = await future
@@ -1116,7 +811,7 @@ class XiaoMusic:
         if arg1 is None:
             arg1 = {}
         data = arg1
-        device_id = self.get_one_device()
+        device_id = self.get_one_device_id()
         self.log.info(f"debug_play_by_music_url: {data} {device_id}")
         return await self.mina_service.ubus_request(
             device_id,
@@ -1125,6 +820,423 @@ class XiaoMusic:
             data,
         )
 
-    async def exec(self, arg1=None):
+    async def exec(self, did="", arg1=None, **kwargs):
+        self._cur_did = did
         code = arg1 if arg1 else 'code1("hello")'
         await self.plugin_manager.execute_plugin(code)
+
+    # 此接口用于插件中获取当前设备
+    def get_cur_did(self):
+        return self._cur_did
+
+    async def do_tts(self, did, value):
+        return await self.devices[did].do_tts(value)
+
+
+class XiaoMusicDevice:
+    def __init__(self, xiaomusic: XiaoMusic, device: Device, group_name: str):
+        self.group_name = group_name
+        self.device = device
+        self.config = xiaomusic.config
+        self.device_id = device.device_id
+        self.log = xiaomusic.log
+        self.xiaomusic = xiaomusic
+        self.download_path = xiaomusic.download_path
+        self.ffmpeg_location = self.config.ffmpeg_location
+
+        self._download_proc = None  # 下载对象
+        self.cur_music = self.device.cur_music
+        self._next_timer = None
+        self._timeout = 0
+        self._playing = False
+        # 关机定时器
+        self._stop_timer = None
+        self.update_playlist()
+
+    # 初始化播放列表
+    def update_playlist(self):
+        self._cur_play_list = self.device.cur_playlist
+        if self._cur_play_list not in self.xiaomusic.music_list:
+            self._cur_play_list = "全部"
+        self._play_list = self.xiaomusic.music_list.get(self._cur_play_list)
+
+    # 播放歌曲
+    async def play(self, name="", search_key=""):
+        if search_key == "" and name == "":
+            if self.check_play_next():
+                await self.play_next()
+                return
+            else:
+                name = self.cur_music
+        self.log.info(f"play. search_key:{search_key} name:{name}")
+
+        # 本地歌曲不存在时下载
+        name = self.xiaomusic.find_real_music_name(name)
+        if not self.xiaomusic.is_music_exist(name):
+            if self.config.disable_download:
+                await self.do_tts(f"本地不存在歌曲{name}")
+                return
+            await self.download(search_key, name)
+            self.log.info(f"正在下载中 {search_key} {name}")
+            await self._download_proc.wait()
+            # 把文件插入到播放列表里
+            self.add_download_music(name)
+        await self._playmusic(name)
+
+    # 下一首
+    async def play_next(self):
+        self.log.info("开始播放下一首")
+        name = self.cur_music
+        if (
+            self.device.play_type == PLAY_TYPE_ALL
+            or self.device.play_type == PLAY_TYPE_RND
+            or name == ""
+        ):
+            name = self.get_next_music()
+        self.log.info(f"play_next. name:{name}, cur_music:{self.cur_music}")
+        if name == "":
+            await self.do_tts("本地没有歌曲")
+            return
+        await self.play(name)
+
+    # 播放本地歌曲
+    async def playlocal(self, name):
+        if name == "":
+            if self.check_play_next():
+                await self.play_next()
+                return
+            else:
+                name = self.cur_music
+
+        self.log.info(f"playlocal. name:{name}")
+
+        # 本地歌曲不存在时下载
+        name = self.xiaomusic.find_real_music_name(name)
+        if not self.xiaomusic.is_music_exist(name):
+            await self.do_tts(f"本地不存在歌曲{name}")
+            return
+        await self._playmusic(name)
+
+    async def _playmusic(self, name):
+        self._playing = True
+        self.cur_music = name
+        self.log.info(f"cur_music {self.cur_music}")
+        sec, url = await self.xiaomusic.get_music_sec_url(name)
+        await self.group_force_stop_xiaoai()
+        self.log.info(f"播放 {url}")
+        await self.group_player_play(url)
+        self.log.info("已经开始播放了")
+
+        # 取消组内所有的下一首歌曲的定时器
+        self.cancel_group_next_timer()
+        # 设置下一首歌曲的播放定时器
+        await self.set_next_music_timeout(sec)
+
+    async def do_tts(self, value):
+        self.log.info(f"try do_tts value:{value}")
+        if not value:
+            self.log.info("do_tts no value")
+            return
+
+        await self.group_force_stop_xiaoai()
+        await self.text_to_speech(value)
+
+        # 最大等8秒
+        sec = min(8, int(len(value) / 3))
+        await asyncio.sleep(sec)
+        self.log.info(f"do_tts ok. cur_music:{self.cur_music}")
+        await self.check_replay()
+
+    async def force_stop_xiaoai(self, device_id):
+        try:
+            ret = await self.xiaomusic.mina_service.player_pause(device_id)
+            self.log.info(
+                f"force_stop_xiaoai player_pause device_id:{device_id} ret:{ret}"
+            )
+            await self.stop_if_xiaoai_is_playing(device_id)
+        except Exception as e:
+            self.log.exception(f"Execption {e}")
+
+    async def get_if_xiaoai_is_playing(self):
+        playing_info = await self.xiaomusic.mina_service.player_get_status(
+            self.device_id
+        )
+        self.log.info(playing_info)
+        # WTF xiaomi api
+        is_playing = (
+            json.loads(playing_info.get("data", {}).get("info", "{}")).get("status", -1)
+            == 1
+        )
+        return is_playing
+
+    async def stop_if_xiaoai_is_playing(self, device_id):
+        is_playing = await self.get_if_xiaoai_is_playing()
+        if is_playing or self.config.enable_force_stop:
+            # stop it
+            ret = await self.xiaomusic.mina_service.player_stop(device_id)
+            self.log.info(
+                f"stop_if_xiaoai_is_playing player_stop device_id:{device_id} enable_force_stop:{self.config.enable_force_stop} ret:{ret}"
+            )
+
+    # 是否在下载中
+    def isdownloading(self):
+        if not self._download_proc:
+            return False
+
+        if self._download_proc.returncode is not None:
+            self.log.info(
+                f"Process exited with returncode:{self._download_proc.returncode}"
+            )
+            return False
+
+        self.log.info("Download Process is still running.")
+        return True
+
+    # 下载歌曲
+    async def download(self, search_key, name):
+        if self._download_proc:
+            try:
+                self._download_proc.kill()
+            except ProcessLookupError:
+                pass
+
+        sbp_args = (
+            "yt-dlp",
+            f"{self.config.search_prefix}{search_key}",
+            "-x",
+            "--audio-format",
+            "mp3",
+            "--paths",
+            self.download_path,
+            "-o",
+            f"{name}.mp3",
+            "--ffmpeg-location",
+            f"{self.ffmpeg_location}",
+            "--no-playlist",
+        )
+
+        if self.config.proxy:
+            sbp_args += ("--proxy", f"{self.config.proxy}")
+
+        cmd = " ".join(sbp_args)
+        self.log.info(f"download cmd: {cmd}")
+        self._download_proc = await asyncio.create_subprocess_exec(*sbp_args)
+        await self.do_tts(f"正在下载歌曲{search_key}")
+
+    # 继续播放被打断的歌曲
+    async def check_replay(self):
+        if self.isplaying() and not self.isdownloading():
+            # 继续播放歌曲
+            self.log.info("现在继续播放歌曲")
+            await self.play()
+        else:
+            self.log.info(
+                f"不会继续播放歌曲. isplaying:{self.isplaying()} isdownloading:{self.isdownloading()}"
+            )
+
+    # 当前是否正在播放歌曲
+    def isplaying(self):
+        return self._playing
+
+    # 把下载的音乐加入播放列表
+    def add_download_music(self, name):
+        self.xiaomusic.all_music[name] = os.path.join(self.download_path, f"{name}.mp3")
+        if name not in self._play_list:
+            self._play_list.append(name)
+            self.log.info(f"add_download_music add_music {name}")
+            self.log.debug(self._play_list)
+
+    # 获取下一首
+    def get_next_music(self):
+        play_list_len = len(self._play_list)
+        if play_list_len == 0:
+            self.log.warning("当前播放列表没有歌曲")
+            return ""
+        index = 0
+        try:
+            index = self._play_list.index(self.cur_music)
+        except ValueError:
+            pass
+        if play_list_len == 1:
+            next_index = index  # 当只有一首歌曲时保持当前索引不变
+        else:
+            # 顺序往后找1个
+            next_index = index + 1
+            if next_index >= play_list_len:
+                next_index = 0
+            # 排除当前歌曲随机找1个
+            if self.device.play_type == PLAY_TYPE_RND:
+                indices = list(range(play_list_len))
+                indices.remove(index)
+                next_index = random.choice(indices)
+        name = self._play_list[next_index]
+        if not self.xiaomusic.is_music_exist(name):
+            self._play_list.pop(next_index)
+            self.log.info(f"pop not exist music:{name}")
+            return self.get_next_music()
+        return name
+
+    # 判断是否播放下一首歌曲
+    def check_play_next(self):
+        # 当前歌曲不在当前播放列表
+        if self.cur_music not in self._play_list:
+            return True
+
+        # 当前没我在播放的歌曲
+        if self.cur_music == "":
+            return True
+        else:
+            # 当前播放的歌曲不存在了
+            if not self.xiaomusic.is_music_exist(self.cur_music):
+                return True
+        return False
+
+    async def text_to_speech(self, value):
+        try:
+            await self.xiaomusic.mina_service.text_to_speech(self.device_id, value)
+        except Exception as e:
+            self.log.exception(f"Execption {e}")
+
+    # 同一组设备播放
+    async def group_player_play(self, url):
+        device_id_list = self.xiaomusic.get_group_device_id_list(self.group_name)
+        tasks = [self.play_one_url(device_id, url) for device_id in device_id_list]
+        results = await asyncio.gather(*tasks)
+        self.log.info(f"group_player_play {url} {device_id_list} {results}")
+        return results
+
+    async def play_one_url(self, device_id, url):
+        ret = None
+        try:
+            if self.config.use_music_api:
+                ret = await self.xiaomusic.mina_service.play_by_music_url(
+                    device_id, url
+                )
+                self.log.info(
+                    f"play_one_url play_by_music_url device_id:{device_id} ret:{ret} url:{url}"
+                )
+            else:
+                ret = await self.xiaomusic.mina_service.play_by_url(device_id, url)
+                self.log.info(
+                    f"play_one_url play_by_url device_id:{device_id} ret:{ret} url:{url}"
+                )
+        except Exception as e:
+            self.log.exception(f"Execption {e}")
+        return ret
+
+    # 设置下一首歌曲的播放定时器
+    async def set_next_music_timeout(self, sec):
+        if sec <= 0:
+            return
+
+        if self._next_timer:
+            self._next_timer.cancel()
+            self.log.info("旧定时器已取消")
+
+        self._timeout = sec
+
+        async def _do_next():
+            await asyncio.sleep(self._timeout)
+            try:
+                await self.play_next()
+            except Exception as e:
+                self.log.error(f"Execption {e}")
+
+        self._next_timer = asyncio.ensure_future(_do_next())
+        self.log.info(f"{sec} 秒后将会播放下一首歌曲")
+
+    async def set_volume(self, volume: int):
+        self.log.info("set_volume. volume:%d", volume)
+        try:
+            await self.xiaomusic.mina_service.player_set_volume(self.device_id, volume)
+        except Exception as e:
+            self.log.exception(f"Execption {e}")
+
+    async def get_volume(self):
+        playing_info = await self.xiaomusic.mina_service.player_get_status(
+            self.device_id
+        )
+        self.log.info(f"get_volume. playing_info:{playing_info}")
+        volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get(
+            "volume", 0
+        )
+        volume = int(volume)
+        self.log.info("get_volume. volume:%d", volume)
+        return volume
+
+    async def set_play_type(self, play_type):
+        self.device.play_type = play_type
+        self.xiaomusic.save_cur_config()
+        tts = PLAY_TYPE_TTS[play_type]
+        await self.do_tts(tts)
+
+    async def play_music_list(self, list_name, music_name):
+        self._cur_play_list = list_name
+        self._play_list = self.xiaomusic.music_list[list_name]
+        self.log.info(f"开始播放列表{list_name}")
+        await self.play(music_name)
+
+    async def stop(self, arg1=""):
+        self._playing = False
+        if arg1 != "notts":
+            await self.do_tts(self.config.stop_tts_msg)
+        if self._next_timer:
+            self._next_timer.cancel()
+            self._next_timer = None
+            self.log.info("定时器已取消")
+        await self.group_force_stop_xiaoai()
+        self.log.info("stop now")
+
+    async def group_force_stop_xiaoai(self):
+        device_id_list = self.xiaomusic.get_group_device_id_list(self.group_name)
+        self.log.info(f"group_force_stop_xiaoai {device_id_list}")
+        tasks = [self.force_stop_xiaoai(device_id) for device_id in device_id_list]
+        results = await asyncio.gather(*tasks)
+        self.log.info(f"group_force_stop_xiaoai {device_id_list} {results}")
+        return results
+
+    async def stop_after_minute(self, minute: int):
+        if self._stop_timer:
+            self._stop_timer.cancel()
+            self._stop_timer = None
+            self.log.info("关机定时器已取消")
+
+        async def _do_stop():
+            await asyncio.sleep(minute * 60)
+            try:
+                await self.stop(arg1="notts")
+            except Exception as e:
+                self.log.exception(f"Execption {e}")
+
+        self._stop_timer = asyncio.ensure_future(_do_stop())
+        await self.do_tts(f"收到,{minute}分钟后将关机")
+
+    def cancel_next_timer(self):
+        if self._next_timer:
+            self._next_timer.cancel()
+            self.log.info("下一曲定时器已取消")
+
+    def cancel_group_next_timer(self):
+        devices = self.xiaomusic.get_group_devices(self.group_name)
+        for device in devices.values():
+            device.cancel_next_timer()
+
+    def get_cur_play_list(self):
+        return self._cur_play_list
+
+    # 清空所有定时器
+    def cancel_all_timer(self):
+        self.log.info("in cancel_all_timer")
+        if self._next_timer:
+            self._next_timer.cancel()
+            self.log.info("cancel_all_timer _next_timer.cancel")
+
+        if self._stop_timer:
+            self._stop_timer.cancel()
+            self.log.info("cancel_all_timer _stop_timer.cancel")
+
+    @classmethod
+    def dict_clear(cls, d):
+        for key in list(d):
+            val = d.pop(key)
+            val.cancel_all_timer()