From 049e1a2c38c0b30f4ca7cfe2849b81c8acb9fd9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Fri, 28 Jun 2024 01:47:27 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=A7=A6=E5=B1=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=8D=E8=83=BD=E6=92=AD=E6=94=BE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/config.py | 2 ++ xiaomusic/xiaomusic.py | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xiaomusic/config.py b/xiaomusic/config.py index 367694d..683336b 100644 --- a/xiaomusic/config.py +++ b/xiaomusic/config.py @@ -1,8 +1,10 @@ from __future__ import annotations + import argparse import json import os from dataclasses import dataclass + from xiaomusic.utils import validate_proxy # 默认口令 diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py index f4976de..15d156c 100644 --- a/xiaomusic/xiaomusic.py +++ b/xiaomusic/xiaomusic.py @@ -10,20 +10,22 @@ import time import traceback import urllib.parse from pathlib import Path + from aiohttp import ClientSession, ClientTimeout from miservice import MiAccount, MiIOService, MiNAService + from xiaomusic import ( __version__, ) +from xiaomusic.config import ( + KEY_WORD_ARG_BEFORE_DICT, + Config, +) from xiaomusic.const import ( COOKIE_TEMPLATE, LATEST_ASK_API, SUPPORT_MUSIC_TYPE, ) -from xiaomusic.config import ( - KEY_WORD_ARG_BEFORE_DICT, - Config, -) from xiaomusic.httpserver import StartHTTPServer from xiaomusic.utils import ( custom_sort_key, @@ -647,11 +649,15 @@ class XiaoMusic: async def _play_by_music_url(self, device_id, url): audio_id = get_random(30) + audio_type = "" + if self.config.hardware in ['LX04', 'X10A', 'X08A']: + audio_type = "MUSIC" music = { "payload": { "audio_items": [ {"item_id": {"audio_id": audio_id}, "stream": {"url": url}} ], + "audio_type": audio_type, } } return await self.mina_service.ubus_request(