统一管理音量,默认每次重新播放音频都设置音量。
authorsnickersun <snickersun@163.com>
Fri, 5 Jun 2026 11:29:17 +0000 (19:29 +0800)
committersnickersun <snickersun@163.com>
Fri, 5 Jun 2026 11:29:17 +0000 (19:29 +0800)
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/default_config.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/main_init.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/k8v3/default_config.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_buttons.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_utils.py

index bcf5e80..c67fc1e 100644 (file)
@@ -235,6 +235,9 @@ LONG_DIALOGUE_LLM_CANCEL_MAX = 2
 POWER_ON_TONE_ENABLED = True
 POWER_ON_TONE_DEFAULT = "你好,我来了"
 
+# 播音音量默认(0~100);storage VC_TTS_volume 可覆盖;aud.setVolume 使用 pct//10(>0 时最小 1)
+VC_TTS_VOLUME_DEFAULT = 100
+
 # 默认音色(无 storage / usr 覆盖时生效)
 # - voice:start → audio_config.output.voice,须与 RVC V3 服务端已配置的 speaker 一致
 # - 联调若报 resource ID mismatched with speaker,改 voice 或让服务端绑定该音色
index 57122db..38cc673 100644 (file)
@@ -111,10 +111,11 @@ def main_init():
     ui.post_processor_after_instantiation()
 
 
+    from vc_utils import apply_aud_volume, playback_volume_pct_default
     aud = audio.Audio(0)
     aud.set_pa(Pin.GPIO29)
-    aud.play(1, 1, 'U:/static/R_POWER_1.mp3')  #播放开机铃声 
-    aud.setVolume(11)
+    apply_aud_volume(aud, playback_volume_pct_default())
+    aud.play(1, 1, 'U:/static/R_POWER_1.mp3')  #播放开机铃声
 
     app = watchApp()
     app.set_ui(ui)
index bcf5e80..c67fc1e 100644 (file)
@@ -235,6 +235,9 @@ LONG_DIALOGUE_LLM_CANCEL_MAX = 2
 POWER_ON_TONE_ENABLED = True
 POWER_ON_TONE_DEFAULT = "你好,我来了"
 
+# 播音音量默认(0~100);storage VC_TTS_volume 可覆盖;aud.setVolume 使用 pct//10(>0 时最小 1)
+VC_TTS_VOLUME_DEFAULT = 100
+
 # 默认音色(无 storage / usr 覆盖时生效)
 # - voice:start → audio_config.output.voice,须与 RVC V3 服务端已配置的 speaker 一致
 # - 联调若报 resource ID mismatched with speaker,改 voice 或让服务端绑定该音色
index fe414f2..5d638cc 100644 (file)
@@ -20,7 +20,10 @@ import _thread
 from queue import Queue
 from misc import Power, USB, PowerKey
 import constants
-from vc_utils import cfg_bool, cfg_attr, cfg_int, cfg_uart_supported
+from vc_utils import (
+    cfg_bool, cfg_attr, cfg_int, cfg_uart_supported,
+    playback_volume_pct_default, playback_volume_pct_clamp, apply_aud_volume,
+)
 from vc_hw import set_ipv4_datacall, _BatteryCfg
 from vc_uart import AI_UART
 
@@ -191,11 +194,13 @@ class AI_dev(Abstract):
         self.Low_power_warning_flag = 0
         self._low_warn_last_ms = 0
         self._empty_shutdown_done = 0
-        self.VC_TTS_volume =  EventMesh.publish("get_storage_config","VC_TTS_volume")#音量配置
-        if self.VC_TTS_volume == None:
-            self.VC_TTS_volume = 100
-        self.aud.setVolume(self.VC_TTS_volume //10)
-        EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume])
+        self.VC_TTS_volume = EventMesh.publish("get_storage_config", "VC_TTS_volume")
+        if self.VC_TTS_volume is None:
+            self.VC_TTS_volume = playback_volume_pct_default()
+        else:
+            self.VC_TTS_volume = playback_volume_pct_clamp(self.VC_TTS_volume)
+        apply_aud_volume(self.aud, self.VC_TTS_volume)
+        EventMesh.publish("set_storage_config", ["VC_TTS_volume", self.VC_TTS_volume])
         #self.aud.play(1,0,'U:/static/xianyikaiji.mp3')#开机音频
         #EventMesh.publish("audio_montage_play",["xianyikaiji.mp3"])
         #EventMesh.publish("publish_AI_btnInfo",{"func":self.ntptime_cb})
index 7b2ffe7..3f4366a 100644 (file)
@@ -15,7 +15,7 @@ from vc_notify import (
     OP_PTT_ROUND, OP_UPLOAD_TONE,
 )
 from vc_mode_strategy import strategy_for_mode
-from vc_utils import cfg_bool, cfg_int, cfg_attr
+from vc_utils import cfg_bool, cfg_int, cfg_attr, playback_volume_pct_default, playback_volume_pct_clamp
 
 class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
     def _vc_fsm_log_snip(self):
@@ -1677,6 +1677,15 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
             self._skip_started_uplink_once = 0
             self._vc_reset_long_idle_timer("key.press/continue")
             self._vc_long_dialogue_key_arm_session()
+            # no_speech 停录后 turn 已拉回 Idle;按键续聊须先恢复 Listening,否则 uplink 门控拒开麦
+            try:
+                if getattr(self.fsm, "session", None) == VCSessionState.Started:
+                    if getattr(self.fsm, "turn", VCTurnState.Idle) == VCTurnState.Idle:
+                        self.fsm.turn = VCTurnState.Listening
+                        self.fsm.reset_rx_phases()
+                        self._vc_no_speech_idle = 0
+            except Exception:
+                pass
             self._long_dialogue_publish_listening("key.press/continue")
             self._vc_clear_stale_record_state("key.press/continue")
             self.request_uplink_start("key.press/continue")
@@ -2744,7 +2753,9 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
         self.commands_mode = 2 #=1用大模型判断命令,=0用服务器本地插件判断命令 =2用设备本地判断方式
         self.commands = []
         if self.VC_TTS_volume == None:
-            self.VC_TTS_volume = 100
+            self.VC_TTS_volume = playback_volume_pct_default()
+        else:
+            self.VC_TTS_volume = playback_volume_pct_clamp(self.VC_TTS_volume)
         #可ota配置的参数变量
         self.emotion = EventMesh.publish("get_storage_config","emotion")#情绪
         if self.emotion == None:
@@ -2833,12 +2844,12 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
                 pass
         self.aud = audio.Audio(0)
         self.aud.setCallback(self.audio_cb)
+        self._vc_set_playback_volume(reason="AI_VC_start")
         # 确保 record/aud 已创建后再打印硬件/音频诊断信息(需要 gain_get/type(record))
         try:
             self._print_hw_diag()
         except Exception as e:
             usys.print_exception(e)
-        #self.aud.setVolume(self.VC_TTS_volume //10)
         self.audio_play_state = 1 #音频播放完状态
         self.close_timerout = 0
         self._idle_deep_sec = 0
@@ -3133,8 +3144,10 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
                                             EventMesh.publish("set_storage_config",["ota_update_notice",self.ota_update_notice])
                                             print("配置ota_update_notice成功")
                                         if "VC_TTS_volume" in data["data"]:
-                                            self.VC_TTS_volume =int(data["data"]["VC_TTS_volume"])
-                                            EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume])
+                                            self.VC_TTS_volume = playback_volume_pct_clamp(
+                                                int(data["data"]["VC_TTS_volume"]))
+                                            EventMesh.publish("set_storage_config", ["VC_TTS_volume", self.VC_TTS_volume])
+                                            self._vc_set_playback_volume(reason="ota/VC_TTS_volume")
                                             print("配置VC_TTS_volume成功")
                                             
                     except Exception as e:
index 3215d3d..533adce 100644 (file)
@@ -1521,7 +1521,7 @@ class VCSessionIoMixin:
                 self.AI_TTS_str = "音量调整超出范围了,只能0-100哦"
             else:
                 self.VC_TTS_volume = volume
-                self.aud.setVolume(self.VC_TTS_volume // 10)
+                self._vc_set_playback_volume(reason="volume_set")
                 EventMesh.publish("set_storage_config", ["VC_TTS_volume", self.VC_TTS_volume])
                 self.AI_TTS_str = "了解,音量已经调整,当前音量是{}".format(self.VC_TTS_volume)
                 EventMesh.publish("post_device_state")
@@ -1535,7 +1535,7 @@ class VCSessionIoMixin:
                 self.AI_TTS_str = "音量已经是最大啦" if llm_style_tts else "音量已最大"
                 self.VC_TTS_volume = 100
             else:
-                self.aud.setVolume(self.VC_TTS_volume // 10)
+                self._vc_set_playback_volume(reason="volume_up")
                 EventMesh.publish("set_storage_config", ["VC_TTS_volume", self.VC_TTS_volume])
                 EventMesh.publish("post_device_state")
                 EventMesh.publish("adjust_volume_toBle", self.VC_TTS_volume)
@@ -1553,7 +1553,7 @@ class VCSessionIoMixin:
                 self.VC_TTS_volume = 0
                 self.AI_TTS_str = "音量已经是最小啦" if llm_style_tts else "音量已最小"
             else:
-                self.aud.setVolume(self.VC_TTS_volume // 10)
+                self._vc_set_playback_volume(reason="volume_down")
                 EventMesh.publish("set_storage_config", ["VC_TTS_volume", self.VC_TTS_volume])
                 EventMesh.publish("post_device_state")
                 EventMesh.publish("adjust_volume_toBle", self.VC_TTS_volume)
index 53b98d7..e1b64ff 100644 (file)
@@ -1,10 +1,44 @@
 # -*- coding: utf-8 -*-
 """AI_VC mixin:ASR 上行/录音、TTS 下行、播放队列与本地采播。"""
 from vc_session_imports import *  # noqa: F401,F403
-from vc_utils import cfg_bool, cfg_int, cfg_attr
+from vc_utils import (
+    cfg_bool, cfg_int, cfg_attr,
+    playback_volume_pct_default, playback_volume_pct_clamp, apply_aud_volume,
+)
 import _thread
 
 class VCSessionMediaMixin:
+    def _vc_playback_volume_pct(self):
+        """当前播音音量百分比:实例值 > storage > default_config。"""
+        try:
+            v = getattr(self, "VC_TTS_volume", None)
+            if v is not None:
+                return playback_volume_pct_clamp(v)
+        except Exception:
+            pass
+        try:
+            v = EventMesh.publish("get_storage_config", "VC_TTS_volume")
+            if v is not None:
+                return playback_volume_pct_clamp(v)
+        except Exception:
+            pass
+        return playback_volume_pct_default()
+
+    def _vc_set_playback_volume(self, aud=None, reason=""):
+        """统一播音音量:新建 Audio / 每次播前 / 实时调音量后均走此入口。"""
+        try:
+            a = aud if aud is not None else getattr(self, "aud", None)
+            if a is None:
+                return 0
+            pct = self._vc_playback_volume_pct()
+            self.VC_TTS_volume = pct
+            lv = apply_aud_volume(a, pct)
+            if cfg_bool("VC_VOLUME_DEBUG", False):
+                print("[VC][volume] apply pct={} level={} reason={}".format(pct, lv, reason or "-"))
+            return lv
+        except Exception:
+            return 0
+
     def get_vc_tts_playback_active(self, *args, **kwargs):
         try:
             return 1 if self._vc_tts_playback_active() else 0
@@ -444,6 +478,7 @@ class VCSessionMediaMixin:
         except Exception:
             pass
         try:
+            self._vc_set_playback_volume(reason="local_play")
             self.aud.play(play_mode, loop, path)
         except Exception as e:
             try:
@@ -1053,15 +1088,11 @@ class VCSessionMediaMixin:
                 pass
             self._vc_led_sync_from_fsm()
     def set_tts_volume(self,event,msg):
-        EventMesh.publish("set_storage_config",["VC_TTS_volume",msg])#音量配置
-        self.VC_TTS_volume = msg
-        print("set_tts_volume:{} {}".format(self.VC_TTS_volume,msg))
-        if int(msg) <= 10:  #最小一定要设置1要不然没有声音
-            volume = 10 //10
-            self.aud.setVolume(volume)
-        else:
-            self.aud.setVolume(self.VC_TTS_volume //10)
-        pass
+        pct = playback_volume_pct_clamp(msg)
+        self.VC_TTS_volume = pct
+        EventMesh.publish("set_storage_config", ["VC_TTS_volume", pct])
+        print("set_tts_volume:{} {}".format(self.VC_TTS_volume, msg))
+        self._vc_set_playback_volume(reason="set_tts_volume")
     def get_audio_play_state(self, event=None, msg = None):
         return self.audio_play_state
     def set_VC_record_state_flag(self,data):
@@ -1800,6 +1831,7 @@ class VCSessionMediaMixin:
                     self.aud.stopAll()
                 except Exception:
                     pass
+                self._vc_set_playback_volume(reason="VC_Play_Start")
                 # 资源互斥:播放前确保录音上行已停止(无 AEC 场景)
                 # 长对话打断后已开麦:迟到 TTS 不得抢停录
                 try:
@@ -2248,7 +2280,8 @@ class VCSessionMediaMixin:
                 self.VC_TTS_volume = 0
                 return 0
             else:
-                self.aud.setVolume(self.VC_TTS_volume //10)
+                self.VC_TTS_volume = playback_volume_pct_clamp(self.VC_TTS_volume)
+                self._vc_set_playback_volume(reason="change_volume/down")
                 EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume])
                 EventMesh.publish("post_device_state")
                 EventMesh.publish("adjust_volume_toBle",self.VC_TTS_volume)
@@ -2259,7 +2292,8 @@ class VCSessionMediaMixin:
                 self.VC_TTS_volume = 100
                 return 0
             else:
-                self.aud.setVolume(self.VC_TTS_volume //10)
+                self.VC_TTS_volume = playback_volume_pct_clamp(self.VC_TTS_volume)
+                self._vc_set_playback_volume(reason="change_volume/up")
                 EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume])
                 EventMesh.publish("post_device_state")
                 EventMesh.publish("adjust_volume_toBle",self.VC_TTS_volume)
@@ -2269,8 +2303,8 @@ class VCSessionMediaMixin:
                 self.VC_TTS_volume = 100
                 return 0
             else:
-                self.VC_TTS_volume = msg - 100#还原数据
-                self.aud.setVolume(self.VC_TTS_volume //10)
+                self.VC_TTS_volume = playback_volume_pct_clamp(msg - 100)
+                self._vc_set_playback_volume(reason="change_volume/set")
                 EventMesh.publish("set_storage_config",["VC_TTS_volume",self.VC_TTS_volume])
                 EventMesh.publish("post_device_state")
                 EventMesh.publish("adjust_volume_toBle",self.VC_TTS_volume)
index 28403cc..5495688 100644 (file)
@@ -43,6 +43,45 @@ def cfg_led_gpio_tuple(default):
     return default\r
 \r
 \r
+def playback_volume_pct_default():\r
+    """播音音量默认百分比(0~100);storage VC_TTS_volume 可覆盖。"""\r
+    return cfg_int("VC_TTS_VOLUME_DEFAULT", 100)\r
+\r
+\r
+def playback_volume_pct_clamp(pct):\r
+    try:\r
+        p = int(pct)\r
+    except Exception:\r
+        p = playback_volume_pct_default()\r
+    if p < 0:\r
+        return 0\r
+    if p > 100:\r
+        return 100\r
+    return p\r
+\r
+\r
+def aud_level_from_volume_pct(pct):\r
+    """0~100% 映射 aud.setVolume 档位 0~10;>0 时最小为 1 避免无声。"""\r
+    p = playback_volume_pct_clamp(pct)\r
+    if p <= 0:\r
+        return 0\r
+    lv = p // 10\r
+    if lv < 1:\r
+        lv = 1\r
+    if lv > 10:\r
+        lv = 10\r
+    return lv\r
+\r
+\r
+def apply_aud_volume(aud, volume_pct):\r
+    """对 audio.Audio 实例应用统一播音音量。"""\r
+    if aud is None:\r
+        return 0\r
+    lv = aud_level_from_volume_pct(volume_pct)\r
+    aud.setVolume(lv)\r
+    return lv\r
+\r
+\r
 def num_str_to_chinese(num_str):\r
     num_map = {\r
         '0': '零', '1': '一', '2': '二', '3': '三', '4': '四',\r