添加小程序控制进入翻译模式功能

修改NLP查询卡号，信号，电量的bug
添加设备解绑语音提示
修改日程提醒文字框架

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
index 1bb9513..0bf8e01 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
@@ -5505,17 +5505,21 @@ class AI_VC(Abstract):
         if "电量" in msg:
             battery = EventMesh.publish("get_battery")
             print("电量查询：{}".format(battery))
-            self.AI_TTS_str = "电量剩余百分之{}.format(battery)"
+            tts_play_str = "电量剩余百分之{}".format(battery)
+            # print("电量！！！！！！！！！！！")
         elif "信号" in msg:
             signal = net.csqQueryPoll()
-            self.AI_TTS_str = "当前信号{}".format(signal)
+            tts_play_str = "当前信号{}".format(signal)
+            # print("信号！！！！！！！！！！！")
         elif "卡号" in msg:
+            # print("卡号！！！！！！！！！！！")
             iccid = sim.getIccid()
             if iccid != -1 and len(iccid) > 5:
                 print("iccid{}".format(iccid))
-                self.AI_TTS_str = "当前卡号为:{}".format(iccid)
+                tts_play_str = "当前卡号为:{}".format(iccid)
             else:
-                self.AI_TTS_str = "卡号查询失败"
+                tts_play_str = "卡号查询失败"
+        EventMesh.publish("play_tts",[tts_play_str,0])
     #改变音色判断
     def change_voice(self,event ,msg):
         voice = msg

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
index 4e1baae..84b28d6 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_alarm.py
@@ -951,7 +951,7 @@ class schedule(Abstract):
                     AringTimes = 1
                 repeat_sentence = (alarm_TTS_str + ",")  # 重复5次并加逗号分隔
                 final_sentence = repeat_sentence.rstrip(",")
-                final_sentence = "日程提醒: " + final_sentence
+                final_sentence = "日程提醒: 您设置的" + final_sentence + "时间到了,请留意"
                 self.schedule_play_count = AringTimes
                 EventMesh.publish("play_tts",[final_sentence,1])  #播放tts闹钟文本内容
                 self.schedule_array.pop(current_index)

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py
index 68ab734..cab3d7f 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py
@@ -250,7 +250,8 @@ def main_init():
             pcr.add_support(pro.IOTWeb_user_unbind_devProtoCol())
             pcr.add_support(pro.IOTWeb_play_MusicProtoCol())
             pcr.add_support(pro.IOTWeb_Nlp_ConfigProtoCol())
-            pcr.add_support(pro.IOTWeb_play_trans_TTSProtoCol())
+            pcr.add_support(pro.IOTWeb_play_trans_TTSProtoCol())#播放下发翻译音频
+            pcr.add_support(pro.IOTWeb_come_transProtoCol())#接收小程序控制进入翻译
             sm = pro.SockMangager()
 
             sm.add_support_resolver(pcr)

diff --git 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
index 5e1f91b..4d535c9 100644 (file)
--- 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
@@ -2668,6 +2668,35 @@ class IOTWeb_Nlp_ConfigProtoCol(ProtoCol):
         ai_cmd_handle(cmdName)
         print("recv push_music{}".format(msg))
 
+#接收小程序控制进入翻译
+class IOTWeb_come_transProtoCol(ProtoCol):
+    """translate_app_enter"""
+    TYPE = "translate_app_enter"
+
+    def send(self, event, msg):
+        # print("translate_app_enter{}".format(msg))
+        # 通过websocket发送到服务器端
+        date_tmp = utime.localtime()
+        time_tmp = utime.mktime(date_tmp)
+        come_trans = {
+            "cmd":"translate_device_complete",
+            "ts":time_tmp,
+            "msg":"进入成功",
+            "data":None
+        }
+        send_data = b''
+        send_data = protocol_send_total_data(come_trans)
+        print("send_data translate_app_enter{}".format(send_data))
+        EventMesh.publish("CHANNEL_IOT_WEB_SEND", send_data)
+
+    def recv(self, event, msg):
+        """
+        @param event:上行下发push_music
+        @param msg: 接收到的下行数据
+        """
+        EventMesh.publish("come_trans_mode")#进入AI翻译纪要
+        print("recv tts_audio_url{}".format(msg))
+
 #翻译播放TTS
 class IOTWeb_play_trans_TTSProtoCol(ProtoCol):
     """tts_audio_url"""
@@ -3074,6 +3103,8 @@ class IOTWeb_user_unbind_devProtoCol(ProtoCol):
         EventMesh.publish("set_storage_config",["switch_bt_state","1"])
         EventMesh.publish("send_bt_switch_toble","1")
         EventMesh.publish(WEB_CMD_ENUM.USER_UNBIND_DEV_S)
+        tts_play_str = "设备已解绑"
+        EventMesh.publish("play_tts",[tts_play_str,1])
         # ret = 0
         # ret = ql_fs.path_exists("/usr/static/storage_file")#配置文件
         # if ret == True:

diff --git a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index da4c2ac..2dd9720 100644 (file)
Binary files a/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ