修改提示音

添加语速查询

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 660c540..24c81fe 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
@@ -46,8 +46,8 @@ PRESS_AUDIO_MODE = 0 #是按键音 0 是使用音频文件
 #dev_type = "7PIN_BK_coze"#k扣子小瑞
 #dev_type = "7PIN_BK_EU"#英文小瑞
 #dev_type = "7PIN_coze"#柒牌扣子
-# dev_type = "7PIN"#柒牌
-dev_type = "7PIN_1_5"#柒牌1.5
+dev_type = "7PIN"#柒牌
+# dev_type = "7PIN_1_5"#柒牌1.5
 #dev_type = 'momo'#食梦貘
 #dev_type = 'sjgq'#四季甘泉
 #dev_type = 'szbst'#深圳百事通
@@ -2985,9 +2985,10 @@ class AI_VC(Abstract):
         EventMesh.subscribe("get_wait_voice_flag",self.get_wait_voice_flag)#获取60S等待留言播放定时器状态
         EventMesh.subscribe("set_wait_voice_flag",self.set_wait_voice_flag)#修改60S等待留言播放定时器状态
         EventMesh.subscribe("rate_move",self.rate_move)#NLP修改语速
+        EventMesh.subscribe("find_rate",self.find_rate)#NLP查询语速
         EventMesh.subscribe("set_pwk_notice_flag",self.set_pwk_notice_flag)#设置未读状态
         # EventMesh.subscribe("get_voicerupt_flag",self.get_voicerupt_flag)#获取留言播放状态
-        # EventMesh.subscribe("chenggong_tone",self.chenggong_tone)
+        EventMesh.subscribe("chenggong_tone",self.chenggong_tone)
         
         pass
         EventMesh.publish("close_led")
@@ -3069,20 +3070,30 @@ class AI_VC(Abstract):
                 self.speech_rate -= 10
         EventMesh.publish("set_storage_config",["speech_rate",self.speech_rate])
         print("set_speech_rate:{}".format(self.speech_rate))
+    def find_rate(self,event,msg):#查询APP语速
+        print("查询语速处理：原始数据为：{}".format(self.speech_rate))
+        y = 1
+        if self.speech_rate >= -50 and self.speech_rate < 0:#负数
+            y = 0.01 * self.speech_rate 
+        elif self.speech_rate <= 50 and self.speech_rate >= 0:#正数
+            y = 0.02 * self.speech_rate + 1.0
+        print("处理后数据为{}".format(y))
+        rate = str(y) + "倍"
+        return rate
     def set_pwk_notice_flag(self,event,msg):#设置未读状态
         self.pwk_notice_flag =  msg
     #获取60S等待留言播放定时器状态
     def get_wait_voice_flag(self,event,msg):
         return self.wait_voice_flag
     def set_wait_voice_flag(self,event,msg):
-        print("未读留言标记修改为:{}".format(msg))
+        # print("未读留言标记修改为:{}".format(msg))
         self.wait_voice_flag = msg
 
     #查看历史留言状态修改
     def get_history_voice_flag(self,event,msg):
         return self.history_voice_flag
     def set_history_voice_flag(self,event,msg):
-        print("历史留言标记修改为:{}".format(msg))
+        # print("历史留言标记修改为:{}".format(msg))
         self.history_voice_flag = msg
     def clean_unread_vocie(self,event,msg):
         self.pwk_cnt_voice = 0
@@ -3313,9 +3324,12 @@ class AI_VC(Abstract):
         pass
     def ai_key_press_audio_cb1(self, event=None, msg = None):
         print("播放按键音!!!!!!!!!!")
-        self.aud.aud_tone_play(10,400)#播放按键音
+        EventMesh.publish("audio_montage_play",["chenggong.mp3"])  
+        # self.chenggong_tone()
+        # self.aud.aud_tone_play(10,400)#播放按键音
     def ai_key_press_audio_cb2(self, event=None, msg = None):
-        self.chenggong_tone() #播放按键音
+        EventMesh.publish("audio_montage_play",["chenggong.mp3"])  
+        # self.chenggong_tone() #播放按键音
 
     def AI_key_press(self, event=None, msg = None):#按键按下
         EventMesh.publish(constants.EVENT.SYSTEM_UP)#唤醒休眠
@@ -3343,7 +3357,9 @@ class AI_VC(Abstract):
         self.get_config_timer_count = 0
         self.key_state = 1
         if dev_type == "7PIN": #2代产品要延时播放按键音 为了连接蓝牙后不播放按键音的问题
-            self.aud.aud_tone_play(10,400)#播放按键音
+            # self.aud.aud_tone_play(10,400)#播放按键音
+            EventMesh.publish("audio_montage_play",["chenggong.mp3"])  
+            # self.chenggong_tone() #播放按键音
         elif dev_type == "7PIN_1_5": #2代产品要延时播放按键音 为了连接蓝牙后不播放按键音的问题
             self.ai_key_press_audio.stop()
             self.ai_key_press_audio.start(300, 0, self.ai_key_press_audio_cb1)
@@ -3357,6 +3373,7 @@ class AI_VC(Abstract):
                 else:
                     pass
                     # self.aud.aud_tone_play(10,200)#播放按键音
+        utime.sleep_ms(500)
         self.Close()
         if PRESS_AUDIO_MODE == 0:
             if dev_type == "7PIN" or dev_type == "7PIN_1_5":
@@ -3404,7 +3421,9 @@ class AI_VC(Abstract):
         print("AI_key_press")
         self.get_config_timer_count = 0
         self.key_state = 1
-        self.aud.aud_tone_play(10,400)#播放按键音
+        # self.aud.aud_tone_play(10,400)#播放按键音
+        EventMesh.publish("audio_montage_play",["chenggong.mp3"])  
+        # self.chenggong_tone() #播放按键音
         if PRESS_AUDIO_MODE == 1:
             if dev_type == "7PIN" or dev_type == "7PIN_1_5":
                 pass
@@ -5687,7 +5706,8 @@ class AI_VC(Abstract):
                     return
                 elif  EventMesh.publish("get_voice_record_mode") == 1: #静默录音需要打断
                     EventMesh.publish("stop_voice_record")#停止静默录音
-            self.aud.aud_tone_play(10,400)
+            # self.aud.aud_tone_play(10,400)
+            EventMesh.publish("audio_montage_play",["chenggong.mp3"])  
             if PRESS_AUDIO_MODE == 1:
                 if dev_type == "7PIN" or dev_type == "7PIN_1_5" :
                     # self.aud.aud_tone_play(10,200)
@@ -5812,6 +5832,9 @@ class AI_VC(Abstract):
         elif "音量" in msg :
             tts_play_str = "当前音量是{}".format(self.VC_TTS_volume)
             EventMesh.publish("play_tts",[tts_play_str,0])
+        elif "语速" in msg :
+            tts_play_str = "当前语速是{}".format(EventMesh.publish("find_rate"))
+            EventMesh.publish("play_tts",[tts_play_str,0])
     
     #改变音色判断
     def change_voice(self,event ,msg):

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 a23aa79..c599a04 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
@@ -5,8 +5,8 @@ import machine
 import EventMesh
 import usys
 
-# dev_type = "7PIN"#柒牌1代  
-dev_type = "7PIN_1_5"#柒牌1.5代  
+dev_type = "7PIN"#柒牌1代  
+# dev_type = "7PIN_1_5"#柒牌1.5代  
 resp=bytearray(50)
 # atcmd.sendSync('AT+log=52,1\r\n',resp,'',200)
 # EventMesh.debug_log("AT+log=52,1:{}".format(resp))

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 fe26336..83e99b6 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
@@ -25,8 +25,8 @@ import umqtt
 import modem
 SHA256 = uhashlib.sha256
 import SecureData
-# dev_type = "7PIN"#柒牌1代  
-dev_type = "7PIN_1_5"#柒牌1.5代  
+dev_type = "7PIN"#柒牌1代  
+# dev_type = "7PIN_1_5"#柒牌1.5代  
 def server_init(server_type = None):
     #服务器选择1，防走丢，2大锤,3三基同创,4童信，5云米,6荣为 8:ds未知 dey.hinwatch. com:9968  9:183.62.239.121:31869 10:183.62.239.121:33461
     if server_type == None:
@@ -2745,7 +2745,9 @@ def ai_cmd_handle(cmd):
     elif "这个不支持哦，请换一个" in cmd:
         tts_play_str = "抱歉呀，暂不支持该方言，请换一个"
         EventMesh.publish("play_tts",[tts_play_str,0])
-
+    elif "不支持的操作" in cmd:
+        tts_play_str = "抱歉呀，暂不支持该命令"
+        EventMesh.publish("play_tts",[tts_play_str,0])
 #NLP指令
 class IOTWeb_Nlp_ConfigProtoCol(ProtoCol):
     """ai_cmd"""