From: dxy <1731678236qq.com>
Date: Mon, 18 Aug 2025 03:04:44 +0000 (+0800)
Subject: Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0e05a6e9e3335ebe2b4dfd998240d512f6adbbc5;p=mirrors%2FASR1603_G5.git

Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
---

0e05a6e9e3335ebe2b4dfd998240d512f6adbbc5
diff --cc 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
index 40fb71e8,0ce7676b..67ac1d16
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/protocol.py
@@@ -1289,13 -1294,13 +1294,13 @@@ class SockMangager(Abstract)
          if len(self.new_voice_list) != 0:
              
              for i,data in enumerate(self.new_voice_list):
-                 print("play_new_voice_list:{}".format(data))
+                 print("data:{}".format(data))
                  self.voice_index = i
-                 self.voice_id = data["id"]
-                 url = data["url"]
+                 self.voice_id = str(data["id"])
+                 url = str(data["url"])
                  # url = "http://qipaiai-oss1.tos-cn-beijing.volces.com/qi_pai_ringtone/2025_08_11/742659759219544064test.mp3"
                  self.play_new_voice_state = 1
 -                EventMesh.publish("play_new_voice",[url,1])
 +                EventMesh.publish("play_new_voice",[url,0])
                  
                  break
              pass
@@@ -3101,45 -3164,7 +3164,45 @@@ class IOTWeb_disconnect_btProtoCol(Prot
              mac = msg["data"]
              EventMesh.publish("send_disconnect_bt_mac",mac)
          print("recv disconnect_bt{}".format(msg))
-         EventMesh.publish(WEB_CMD_ENUM.DISCONNECT_BT_S,None)
+         EventMesh.publish(WEB_CMD_ENUM.DISCONNECT_BT_S)
 +class IOTWeb_get_chat_configProtoCol(ProtoCol):
 +    """get_chat_config"""
 +    TYPE = "get_chat_config"
 +
 +    def send(self, event, msg):
 +        # print("send get_chat_config{}".format(msg))
 +        # 通过websocket发送到服务器端
 +        date_tmp = utime.localtime()
 +        time_tmp = utime.mktime(date_tmp)
 +        get_chat_config = {
 +            "cmd":"get_chat_config",
 +            "ts":time_tmp,
 +            "msg":"获取AI对话配置",
 +            "data":None
 +        }
 +        send_data = b''
 +        send_data = protocol_send_total_data(get_chat_config)
 +        print("send_data get_chat_config{}".format(send_data))
 +        EventMesh.publish("CHANNEL_IOT_WEB_SEND", send_data)
 +
 +    def recv(self, event, msg):
 +        """
 +
 +        @param event:上行下发get_chat_config
 +        @param msg: 接收到的下行数据
 +        """
 +        # {
 +        #     "cmd":"post_rest",
 +        #     "ts":1738283829,
 +        #     "msg":"消息收到响应",
 +        #     "data":{
 +        #         "cmd":"get_chat_config",
 +        #         "rest":"success|error",
 +        #         "msg":"收到获取AI对话配置请求"
 +        #     }
 +        # }
 +        print("RECV get_chat_config{}".format(msg))
 +
  
  class LK_ProtoCol(ProtoCol):
      """链路保持"""