1、audio PA 放到 default_config.py中,添加g3p配置给棋牌一代硬件
authorsnickersun <snickersun@163.com>
Sat, 13 Jun 2026 06:43:24 +0000 (14:43 +0800)
committersnickersun <snickersun@163.com>
Sat, 13 Jun 2026 06:43:24 +0000 (14:43 +0800)
2、优化vad参数,与wifi项目同步,modVad.c
3、优化Ai按键打断到 开始录音时间过长问题,start.mp3播放更靠前。
4、优化VC_Play_end停止时间过长问题。(异步处理)

14 files changed:
.cursor/rules/003-bugfix.mdc
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/g3p/default_config.py [new file with mode: 0644]
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/products/product_g3p.ini [new file with mode: 0644]
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/source/modVad.c
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ui.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_common.py
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_proto.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

index 01fb226..d09840a 100644 (file)
@@ -4,6 +4,7 @@ alwaysApply: true
 # 修复 Bug 强制规则\r
 1. 先定位根因,再给修复方案\r
 2. 最小改动,不扩散影响范围\r
-3. 必须说明:原因 → 影响 → 修复点\r
+3. 必须说明:原因 → 影响(正面、负面) → 修复点\r
 4. 修复后要验证边界 case\r
-5. 不改无关代码、不引入新问题
\ No newline at end of file
+5. 不改无关代码、不引入新问题\r
+6. 代码修改,要经过自检
\ No newline at end of file
index 89e9031..8509ad3 100644 (file)
@@ -51,6 +51,7 @@ BT_POWER_MOTOR_ENABLED = False
 PIN_BT_ON_GPIO = None
 PIN_MOT_GPIO = None
 AUDIO_QDAI_CFG = None  # 非 None 时调用 audio.set_qdai_cfg(...)
+AUDIO_PA_PIN_GPIO = "GPIO29"   # 音频功放使能(可为 None/Pin.GPIOxx)
 
 # --- 2.5 蓝牙↔4G 唤醒(本机型关闭)---
 BT_WAKEUP_4G_ENABLED = False
@@ -94,6 +95,8 @@ SIGNAL_WEAK_CSQ = 10  # 0≤CSQ<此值 → signal=weak(REQ-ERR-02)
 BATTERY_LOW_SOC_PERCENT = 25       # <25% 低电语音
 BATTERY_EMPTY_SOC_PERCENT = 5      # <5% LED 空电态;不单独触发关机
 BATTERY_LOW_WARN_INTERVAL_MS = 300000  # 低电语音间隔 5min
+# 充电 SoC 实时映射时,低于此值不播「已满」TTS(防低电后立即误报;须配合 is_charge_full)
+BATTERY_CHARGE_FULL_TTS_MIN_SOC = 50
 BATTERY_EMPTY_FLASH_COUNT = 3
 BATTERY_EMPTY_FLASH_PERIOD_MS = 500    # 空电红快闪约 2 次/秒
 
@@ -182,7 +185,7 @@ VC_AUDIO_PLAYED_ACK = 0          # V2.5 播完上报 audio.played;V3 联调建
 VC_AGENT_ID = None               # V3 start.agent_id;None 时用 VC_BOT_ID
 VC_AUDIO_ENCRYPTION = 0          # V3 二进制帧加密(首版保持 0)
 # VC_API_KEY = ""                # VC_WS_AUTH_MODE=api_key 时使用
-VC_PROTO_TX_LOG = 1              # 1=打印出站摘要 + 原始 JSON(过长分 json_partN 输出)
+VC_PROTO_TX_LOG = 0              # 1=打印出站摘要 + 原始 JSON(过长分 json_partN 输出);0=仅必要的状态一行
 
 # V3 start.welcome_options:0=关闭服务端自动欢迎 TTS(由设备 synthesis/notify 播报)
 VC_WELCOME_SERVER_ENABLED = 0
index 38cc673..3f98081 100644 (file)
@@ -111,9 +111,11 @@ def main_init():
     ui.post_processor_after_instantiation()
 
 
-    from vc_utils import apply_aud_volume, playback_volume_pct_default
+    from vc_utils import apply_aud_volume, playback_volume_pct_default, cfg_attr
     aud = audio.Audio(0)
-    aud.set_pa(Pin.GPIO29)
+    _pa_gpio = cfg_attr("AUDIO_PA_PIN_GPIO", "GPIO29")
+    if _pa_gpio:
+        aud.set_pa(getattr(Pin, _pa_gpio))
     apply_aud_volume(aud, playback_volume_pct_default())
     aud.play(1, 1, 'U:/static/R_POWER_1.mp3')  #播放开机铃声
 
diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/configs/g3p/default_config.py
new file mode 100644 (file)
index 0000000..c98d8e2
--- /dev/null
@@ -0,0 +1,337 @@
+# -*- coding: utf-8 -*-
+# k8v3 产品 — 设备侧默认配置(RVC WebSocket V3;编译期 freeze 进固件)
+#
+# 加载优先级(vc_config.py):
+#   1) usr/default_config.py(现场覆盖)
+#   2) 本文件(由 new_clean.bat 按 product_k8v3.ini 的 DEV_TYPE 拷贝到 core/default_config.py)
+#
+# 约定:仅放「机型/产品差异」常量,勿放运行态变量。
+
+# =============================================================================
+# 1. 产品与区域
+# =============================================================================
+
+# 硬件平台类型(与 products/configs/<DEV_TYPE>/ 目录名一致)
+DEV_TYPE = "7PIN"
+
+# 文案/逻辑用语言(如 zh / en)
+LANG = "zh"
+
+# 设备鉴权(device_res_author:HMAC 签名与 AES 加解密)产品名“小量博士” 、“浪漫挂坠”
+PRODUCT_PID = "cqxJZi5CNgzjS3mX21Zw"
+PRODUCT_KEY = "uKLrChwrxA1LklgBc3VwawYjUkbT3BgX"  # 32 字节,运行时转为 bytes
+
+# =============================================================================
+# 2. GPIO 引脚
+# =============================================================================
+
+# --- 2.1 三色 LED(Pin 属性名字符串,vc_config 转为 Pin.GPIOxx)---
+LED_GPIO = ("GPIO36", "GPIO21", "GPIO19")  # (R, G, B)
+
+# 点亮电平:False=高电平亮;True=低电平亮;仅某路反相用 LED_ACTIVE_LOW_RGB
+LED_ACTIVE_LOW = False
+LED_ACTIVE_LOW_RGB = None  # 例 (True, False, False) 仅红灯反相
+
+# --- 2.2 按键 ExtInt ---
+EXTINT_AI_GPIO = "GPIO22"   # AI 键
+PWK_KEY_GPIO = "GPIO41"     # 电源键(短按/双击切模式等)
+
+# btn_device_ec800m:扩展按键(本机型未用)
+BTN_WECHAT_GPIO = None
+BTN_SOS_GPIO = None
+
+# --- 2.3 马达(motor.py / motorEventManager)---
+MOTOR_PIN_GPIO = "GPIO20"   # None 表示无马达
+MOTOR_TICK_MS = 100
+MOTOR_ACTIVE_LOW = False
+MOTOR_BOOT_VIBRATE_MS = 200  # 开机震动时长(ms)
+
+# --- 2.4 蓝牙电源 / 音频 IIS(本机型关闭)---
+BT_POWER_MOTOR_ENABLED = False
+PIN_BT_ON_GPIO = None
+PIN_MOT_GPIO = None
+AUDIO_QDAI_CFG = None  # 非 None 时调用 audio.set_qdai_cfg(...)
+AUDIO_PA_PIN_GPIO = "GPIO29"   # 音频功放使能(可为 None/Pin.GPIOxx)
+
+# --- 2.5 蓝牙↔4G 唤醒(本机型关闭)---
+BT_WAKEUP_4G_ENABLED = False
+EXTINT_WAKEUP_CTA1_GPIO = None
+PIN_WAKEUP_BT_GPIO = None
+
+# =============================================================================
+# 3. LED 灯效策略(AI_led / ai_VC,对齐交互规范)
+# =============================================================================
+
+# 正常待机 idle:off=灭灯(REQ-BAT-01);green_blink=旧工程绿灯慢闪
+LED_IDLE_MODE = "off"
+
+# green_blink 模式下的亮/灭时长(ms);LED_IDLE_MODE=off 时不生效
+LED_IDLE_GREEN_BLINK_MS = 1000
+LED_IDLE_GREEN_BLINK_OFF_MS = 2000
+
+# LLM 思考阶段:flicker_blue_green | open_red_green
+THINKING_LED_MODE = "flicker_blue_green"
+
+# 收到 vad.active 是否强制回蓝灯(长对话)
+VAD_ACTIVE_BLUE_LED = True
+# 长对话本地 imsl VAD 打断(录音线程 vad.process)
+LOCAL_VAD_ENABLE = True
+# False=本地 VAD 驱动断句;True=仅打日志,仍用云端 VAD
+LOCAL_VAD_DEBUG_ONLY = False
+
+# 收音 listening:长对话蓝慢闪(1000ms)、单对话蓝快闪(250ms) 由 VC_mode 在 AI_led 内切换,无需本文件单独配置
+
+# =============================================================================
+# 4. 电池与硬件状态(AI_hw_status / AI_dev)
+# =============================================================================
+
+HW_STATUS_PERIOD_MS = 10000
+# 电池电压:全机约每 10s 采样 1 次 getVbatt,10 点滑动平均(见 vc_hw._BatteryCfg)
+VBATT_AVG_LEN = 10
+VBATT_PUSH_MIN_MS = 9000   # 同周期内 AI_hw / protocol 去重,避免重复读电压
+SIGNAL_WEAK_CSQ = 10  # 0≤CSQ<此值 → signal=weak(REQ-ERR-02)
+
+# SoC 门限:仅低电提示/LED 空电闪(REQ-BAT-02/03);关机见 VBATT_EMPTY_MV
+BATTERY_LOW_SOC_PERCENT = 25       # <25% 低电语音
+BATTERY_EMPTY_SOC_PERCENT = 5      # <5% LED 空电态;不单独触发关机
+BATTERY_LOW_WARN_INTERVAL_MS = 300000  # 低电语音间隔 5min
+# 充电 SoC 实时映射时,低于此值不播「已满」TTS(防低电后立即误报;须配合 is_charge_full)
+BATTERY_CHARGE_FULL_TTS_MIN_SOC = 50
+BATTERY_EMPTY_FLASH_COUNT = 3
+BATTERY_EMPTY_FLASH_PERIOD_MS = 500    # 空电红快闪约 2 次/秒
+
+# =============================================================================
+# 电池 SoC 曲线(502631-510,4.35V 体系)
+# 数据来源:1.doc/K8_diaozhui/502631-510(充放电数据).xlsx Record 页(0.5C=255mA)
+# - 放电表 BATTERY_OCV_MAP:cycle1 step3,0.5C 恒流放电端电压→SoC;放电逻辑沿用此表插值
+# - 充电表 BATTERY_CHARGE_OCV_MAP:cycle2 step5,0.5C CCCV 充电端电压→SoC
+#   * 仅当配置了充电表时,充电(插 USB)期间才按充电电压实时映射 SoC 上报;未配置则沿用“冻结插入前 SoC”
+#   * CV 恒压段(>~4296mV)电压饱和;100% 锚定 4300mV(实测 CV 顶约 4.35V,量产能差,统一按 4.30V 满)
+#   * 充满灯态 charging=full 仍以 VBATT_CHARGE_FULL_MV + 平台检测为准
+# 重新标定:同型电池做“满充→0.5C 放空→0.5C 充满”,按每 5% SoC 取端电压覆盖下表即可
+# =============================================================================
+# 电压门限(mV):充满 / 低电 / 空电(与 get_battery、simple 模式共用)
+USE_SIMPLE_VBATT_THRESH = False  # True 时忽略 BATTERY_OCV_MAP,仅用三档电压
+VBATT_CHARGE_FULL_MV = 4300   # 充满判断电压门限(mV):CV 平台顶按 4.30V,与充电表 100% 锚点对齐
+VBATT_LOW_MV = 3630           # 0.5C 放电约 35%(带载门限,沿用旧值不动)
+VBATT_EMPTY_MV = 3400         # 未充电:滑动平均电压 < 此值 → 低电关机(唯一关机条件)
+# 充满判断:电压达阈值 + 平台稳定 + 最短充电时间(三条件同时满足才 latch full)
+# 防止"原来就满/高电量插 USB"时电压立刻超阈就误报 full
+VBATT_CHARGE_FULL_PLATEAU_MV = 15   # 平台窗口内电压波动 ≤ 此值(mV)
+VBATT_CHARGE_FULL_PLATEAU_N  = 18   # 平台窗口样本数(18×10s=3min)
+VBATT_CHARGE_FULL_MIN_SEC    = 600  # 插 USB 后最少充电时间(s)才允许判满;从高 SoC 充满约 10-20min
+
+# 放电 OCV 表(mV→SoC,降序):502631-510 0.5C 放电端电压实测
+# 0% 锚定 3400mV(设备关机点);3400mV 以下条目已去除(设备不会工作在此区间)
+BATTERY_OCV_MAP = {
+    4299: 100, 4184: 95, 4118: 90, 4055: 85, 3993: 80, 3936: 75, 3874: 70, 3828: 65,
+    3784: 60, 3744: 55, 3709: 50, 3680: 45, 3657: 40, 3634: 35, 3607: 30, 3571: 25,
+    3529: 20, 3484: 15, 3430: 10, 3400: 0,
+}
+
+# 充电曲线表(mV→SoC,降序):502631-510 cycle2 step5 0.5C CCCV 充电端电压实测(每 5% 容量取点)
+# 0% 锚定 3640mV(设备关机后才开始充电);3640mV 以下已去除
+# 100% 锚定 4300mV(量产能差,不用实验室 CV 顶 4353mV);85~100% CV 段补 4297/4298 插值点
+# 置 None/删除此变量则充电期间不实时更新 SoC,沿用插 USB 前冻结值
+BATTERY_CHARGE_OCV_MAP = {
+    4300: 100, 4298: 95, 4297: 90, 4296: 85, 4237: 80, 4176: 75, 4105: 70, 4058: 65,
+    4015: 60, 3981: 55, 3956: 50, 3936: 45, 3918: 40, 3904: 35, 3889: 30, 3870: 25,
+    3811: 20, 3731: 15, 3656: 10, 3640: 0,
+}
+
+# 录音麦克增益:record.gain_set(codec_gain, dsp_gain)
+# codec_gain 0~4(编解码模拟增益 默认4);dsp_gain -36~12(数字增益,原工程常用 10)
+RECORD_CODEC_GAIN = 2
+RECORD_DSP_GAIN = 6
+
+# =============================================================================
+# 5. 可选外设与协议
+# =============================================================================
+
+GNSS_ENABLED = False           # 无 GNSS 硬件时 False,避免 import quecgnss
+UART_SUPPORTED = False
+BT_OTA_ENABLED = False
+UPLOAD_START_TONE_ENABLED = False  # 开始上传语音时是否播成功提示音
+AI_ALARM_ENABLED = False         # K8 吊坠无闹钟/日程硬件
+
+# =============================================================================
+# 6. 按键逻辑(AI_dev / btn_device)
+# =============================================================================
+
+KEY_RELEASE_DEBOUNCE_COUNT = 5
+AI_KEY_LONG_PRESS_MS = 800              # PTT 长按开录阈值(ms);定时器 100ms  tick
+AI_LONG_PRESS_POWER_OFF_ENABLED = False  # AI 键长按 8s 关机
+SOS_ENABLED = False                      # AI 长按 3s SOS、板载 SOS 入口
+
+# =============================================================================
+# 6.1 看门狗(WDT)
+# =============================================================================
+WDT_ENABLED = False
+WDT_TIMEOUT_S = 30  # 需大于喂狗周期(默认 10s),建议 >= 15
+
+# =============================================================================
+# 7. VC 会话 / WebSocket / 空闲与休眠
+# =============================================================================
+
+# 语音 WS 路径段(无首尾斜杠);主机见 srv_configs/beike_dev_v3/default_srv.py AMP_SERVER
+VC_WS_PATH = "rvc-service/api/v3/ws"
+VC_WS_NATIVE_PING_ENABLE = 0   # 0=不发标准 PING(入站 PING 仍回 PONG);1=客户端也发标准 PING
+VC_WS_PING_INTERVAL_SEC = 0    # V3 无自定义文本心跳;仅 V2.5 使用(>0 时发 "ping")
+
+# VC 协议:v3(RVC);环境 SRV_TYPE=beike_dev_v3
+VC_PROTOCOL_VERSION = "v3"
+VC_WS_AUTH_MODE = "dmp_dt"       # dmp_dt | api_key
+VC_AUDIO_PLAYED_ACK = 0          # V2.5 播完上报 audio.played;V3 联调建议 0
+VC_AGENT_ID = None               # V3 start.agent_id;None 时用 VC_BOT_ID
+VC_AUDIO_ENCRYPTION = 0          # V3 二进制帧加密(首版保持 0)
+# VC_API_KEY = ""                # VC_WS_AUTH_MODE=api_key 时使用
+VC_PROTO_TX_LOG = 0              # 1=打印出站摘要 + 原始 JSON(过长分 json_partN 输出);0=仅必要的状态一行
+
+# V3 start.welcome_options:0=关闭服务端自动欢迎 TTS(由设备 synthesis/notify 播报)
+VC_WELCOME_SERVER_ENABLED = 0
+# VC_WELCOME_SERVER_MESSAGE = ""  # VC_WELCOME_SERVER_ENABLED=1 时可选文案
+
+# 协议 failed / websocket_error 是否 synthesis 播报错误原文(联调=1,量产=0)
+# =1 会绕过技术错误过滤、把"ASR error/转写错误/idle too long"等原文整段朗读,量产须为 0
+VC_ERROR_TTS_ENABLED = 0
+# 是否累积并打印 AI 回复文本(llm.delta):联调=1 可在日志看到回复;量产=0 省 recv 线程开销
+VC_LLM_DELTA_LOG = 0
+# V3 start.output_mode:audio=仅下发 TTS 音频(默认);both/text=服务端额外下发 llm.delta 文本,
+# 配合 VC_LLM_DELTA_LOG=1 可在日志看到 AI 回复文字。需云端 agent 支持文本输出方有效。
+VC_OUTPUT_MODE = "audio"
+# 服务端 tts.done 后立刻 clean-close WS 时,Close 前等待本地 PCM 放完尾音的最大时长(ms),
+# 防"对话播报一半就停";仅对正常收尾且仍在播放时生效
+VC_CLEAN_CLOSE_DRAIN_MS = 3000
+
+# 长对话 L1:轮次间隙无 TTS 下行累计达此秒 Close(听/想/播/录、保活帧不计;最小 5)
+VC_IDLE_AUTO_CLOSE_SEC = 20
+VC_IDLE_AUTO_CLOSE_SEC_PTT = 0  # 单对话预留,当前与 idle 统一处理
+
+# 业务 idle 达此秒数触发深睡断开(最小 10;ENABLE=0 关闭)
+VC_IDLE_DEEP_SLEEP_SEC = 60
+VC_IDLE_DEEP_SLEEP_ENABLE = 1
+
+# 本地 imsl 断句静音(ms);映射 rule2/3;可被 storage vad_silence 覆盖
+VAD_SILENCE_DEFAULT = 1000
+# 本地 VAD 判句末后追加采集的尾音(ms),到点再发 audio.completed;防句尾渐弱音被关闸截断。0=立即收尾
+LOCAL_VAD_ENDPOINT_HANGOVER_MS = 200
+# 本地 imsl VAD 能量阈值:越低越灵敏(易触发说话),越高越钝;imsl 推荐 10000。
+# 现场若本地 VAD 不出 speech start/end(全靠 asr_silence_fallback 收尾),调低(如 6000)
+VAD_ENERGY_THRESHOLD = 10000
+# imsl auth_vad:DMP 区域 0=海外 dmp-global.raisound.com 1=国内正式服务器 dmp.raisound.com  2=国内测试服务器 dmp-dev.raisound.com 3=测试服2 dmp-intl.raisound.com(与 imsl_vad.h AuthInfo.server_addr 一致)
+VAD_DMP_SERVER_ADDR = 2
+# 开机有网时运行 transport HTTP 测试(VAD.transport_test → test_func)
+VAD_TRANSPORT_TEST_ON_BOOT = False
+
+# 长对话:单轮最长录音(ms)、asr.completed 后续说 merge 窗(ms);0=不限制
+# 说明:MAX_TURN_MS 解决"场景②一直说话太久"——强制提交截断输入;
+#       NO_SPEECH_MS 解决"场景①开麦后一直没说话"——停录回 idle 省电,不提交。两者动作不同。
+LONG_DIALOGUE_MAX_TURN_MS = 25000
+LONG_DIALOGUE_ASR_CONTINUE_MS = 1000
+# 句末续说拼接开关:1=开(句末等 CONTINUE_MS 看是否续说,支持连续读,时延高)
+#                  0=关(本地 VAD 判句末立即停麦提交,时延低)。与“连续读”互斥,按场景择一。
+LONG_DIALOGUE_ASR_MERGE_EN = 0
+# 场景①:开麦后本轮始终无本地 VAD 说话起点且无服务端 asr.result,超此(ms)停录回 idle;0=不限制
+LONG_DIALOGUE_NO_SPEECH_MS = 12000
+# llm 已起后连续 canceled 达此次数则冻结续说、停麦等回复(避免一直录无 TTS)
+LONG_DIALOGUE_LLM_CANCEL_MAX = 2
+
+# =============================================================================
+# 8. 语音对话 / TTS / 智能体
+# =============================================================================
+
+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 或让服务端绑定该音色
+VC_TTS_VOICE_KEY_DEFAULT = "男"
+VC_TTS_VOICE_TYPE_DEFAULT = {
+    "男": {
+        "bot_name": "柒先生",
+        "voice": "zh_male_wennuanahu_moon_bigtts",
+        "lang": "zh-cn",
+    },
+    "女": {
+        "bot_name": "柒妹妹",
+        "voice": "zh_female_wanwanxiaohe_moon_bigtts",
+        "lang": "zh-cn",
+    },
+    "童": {
+        "bot_name": "柒乐乐",
+        "voice": "ICL_zh_female_huoponvhai_tob",
+        "lang": "zh-cn",
+    },
+}
+
+DIALOG_BOT_OPTION = None           # {"bot_id", "workflow_id", "use_workflow"}
+VC_BOT_ID = "7462617881076351002"
+VC_WORKFLOW_ID = "7462621757327196187"
+DIALOG_PROVIDER_DEFAULT = None
+KEYWORDS_FROM_VOICE_TYPE = False
+
+BT_VOICE_FEATURES_ENABLED = False
+
+# Opus 编解码(需固件 CONFIG_OPUS=y)。默认关:与原 PCM 链路行为完全一致。
+# 开启后联动 RVC V3 start.audio_config:上行→input.format=opus,下行→output.format=opus。
+# 上下行可独立开:仅上行=省上行带宽;仅下行=省下行带宽。
+VC_OPUS_UPLINK_ENABLED = False      # 上行:录音 PCM 分帧 opus 编码后发送(联调中)
+VC_OPUS_DOWNLINK_ENABLED = True    # 下行:服务端 opus 包解码为 PCM 后播放(联调中)
+# Opus 帧时长(ms):合法 2.5/5/10/20/40/60;16kHz 单声道。上行按此分帧(60ms=1920字节PCM)。
+VC_OPUS_FRAME_MS = 60
+
+# 对话中途传输瞬断(ECONNRESET 等)自动重连:
+# True=对话进行中瞬断时静默重连+重开麦续录,不立刻播报错音;30s 窗口内超 MAX 次(抖动/真断网)才回退报错音。
+# 服务端 Start 不带 dialog_id,重连=新会话,无法续接服务端上下文,仅端侧重开麦。
+VC_RESUME_RECONNECT_ENABLED = True
+VC_RESUME_RECONNECT_MAX = 3
+
+# 本地 VAD 线程化:True=VAD 检测移到独立 worker 线程(配合 modVad GIL 释放可与录音/编码/发送并行),
+# 录音线程读 PCM 后立刻走上行、不再被 VAD(~50ms)阻塞;VAD 结果滞后约 1 帧供端侧断句判定。
+# 默认关:先验证重连+GIL 这版稳定,再单独打开验证 VAD 线程化(一次只引入一个并发变量)。
+VC_VAD_THREAD_ENABLED = True
+
+# =============================================================================
+# 9. 本地指令与固定话术
+# =============================================================================
+
+# protocol.ai_cmd_handle:云端 NLP 扩展(会议纪要 / 实时翻译 / 历史留言)
+NLP_EXTENDED_CMDS = False
+
+CMD_TOGGLE_MODE_TO_PTT_TTS = "已切换到单对话模式"
+CMD_TOGGLE_MODE_TO_LONG_TTS = "已切换到长对话模式"
+POWEROFF_CMD_CLOSE_ONLY = False     # 「关机」指令仅 Close,不真断电
+
+KWS_PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 "
+PTT_HINT = "请您按住圆形的按钮开始讲话,讲完松开即可 "
+
+ASR_EMPTY_HINT_TTS = "我没有听清,请再说一遍"   # asr.completed 无有效识别时 Notify 播报
+
+# =============================================================================
+# 10. 开录音 / PTT 时序(对齐「录音上传与播放」设计稿)
+# =============================================================================
+# 无按键确认音:不按 key_prompt;仅按键/PTT 开录时播 start.mp3(自动续聊不播)
+# PTT idle 短按:notify 话术 PTT_HINT;长按开录:start.mp3
+
+RECORD_START_TONE_FILE = "U:/static/start.mp3"    # 按键/PTT 开录提示音(非 server.started 自动开麦)
+RECORD_START_TONE_GAP_MS = 180
+
+PTT_MIN_RECORD_MS = 400
+PTT_RECORD_TOO_SHORT_TTS = "录音时间太短,请按住圆形按钮说话"  # notify
+
+PTT_RELEASE_END_SPEECH_DELAY_MS = 200   # 松手后发 audio.completed 前延迟
+PTT_CANCEL_WAIT_MS = 2500               # 打断后等 canceled 最长时间
+PTT_POST_MUTE_MS = 30                   # 本地硬静音后 codec 收尾
+
+# =============================================================================
+# 11. 调试开关(量产可全 False)
+# =============================================================================
+
+LED_DEBUG = True
+LED_STATE_DEBUG = True
+KEY_LED_DEBUG = True
+HW_STATUS_DEBUG = True
\ No newline at end of file
index 89e9031..8509ad3 100644 (file)
@@ -51,6 +51,7 @@ BT_POWER_MOTOR_ENABLED = False
 PIN_BT_ON_GPIO = None
 PIN_MOT_GPIO = None
 AUDIO_QDAI_CFG = None  # 非 None 时调用 audio.set_qdai_cfg(...)
+AUDIO_PA_PIN_GPIO = "GPIO29"   # 音频功放使能(可为 None/Pin.GPIOxx)
 
 # --- 2.5 蓝牙↔4G 唤醒(本机型关闭)---
 BT_WAKEUP_4G_ENABLED = False
@@ -94,6 +95,8 @@ SIGNAL_WEAK_CSQ = 10  # 0≤CSQ<此值 → signal=weak(REQ-ERR-02)
 BATTERY_LOW_SOC_PERCENT = 25       # <25% 低电语音
 BATTERY_EMPTY_SOC_PERCENT = 5      # <5% LED 空电态;不单独触发关机
 BATTERY_LOW_WARN_INTERVAL_MS = 300000  # 低电语音间隔 5min
+# 充电 SoC 实时映射时,低于此值不播「已满」TTS(防低电后立即误报;须配合 is_charge_full)
+BATTERY_CHARGE_FULL_TTS_MIN_SOC = 50
 BATTERY_EMPTY_FLASH_COUNT = 3
 BATTERY_EMPTY_FLASH_PERIOD_MS = 500    # 空电红快闪约 2 次/秒
 
@@ -182,7 +185,7 @@ VC_AUDIO_PLAYED_ACK = 0          # V2.5 播完上报 audio.played;V3 联调建
 VC_AGENT_ID = None               # V3 start.agent_id;None 时用 VC_BOT_ID
 VC_AUDIO_ENCRYPTION = 0          # V3 二进制帧加密(首版保持 0)
 # VC_API_KEY = ""                # VC_WS_AUTH_MODE=api_key 时使用
-VC_PROTO_TX_LOG = 1              # 1=打印出站摘要 + 原始 JSON(过长分 json_partN 输出)
+VC_PROTO_TX_LOG = 0              # 1=打印出站摘要 + 原始 JSON(过长分 json_partN 输出);0=仅必要的状态一行
 
 # V3 start.welcome_options:0=关闭服务端自动欢迎 TTS(由设备 synthesis/notify 播报)
 VC_WELCOME_SERVER_ENABLED = 0
diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_g3p.ini b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/products/product_g3p.ini
new file mode 100644 (file)
index 0000000..e8a8fdb
--- /dev/null
@@ -0,0 +1,3 @@
+DEV_TYPE=g3p
+SRV_TYPE=beike_dev_v3
+VERSION=V1.8
\ No newline at end of file
index 0c866d8..d2dac18 100644 (file)
 
 #if CONFIG_VAD
 
+// VAD 调试日志门控:release=0 关闭所有 C 层 VAD 打印(包括库内部回调);调试时改为 1
+#define VAD_DEBUG 0
+
+#if VAD_DEBUG
 #define QPY_VAD_LOG(msg, ...) custom_log("modvad", msg, ##__VA_ARGS__)
+#else
+#define QPY_VAD_LOG(msg, ...) do {} while (0)
+#endif
 
 typedef struct _mp_obj_VAD_t {
     mp_obj_base_t base;
@@ -49,13 +56,13 @@ static void vad_setup_printf(void)
 static void vad_fill_defaults(struct VadConfig *conf)
 {
     memset(conf, 0, sizeof(*conf));
-    conf->vad_log_level = 1;
+    conf->vad_log_level = 0;  /* 0=不输出 VAD 库内部调试日志 */
     conf->sil_threshold = 63;
-    conf->energy_threshold = 10000;
+    conf->energy_threshold = 15000;
     conf->min_speech_length = 240;
     conf->silence_detect_length = 300;
     conf->rule1_min_tailing_silence = 480;
-    conf->rule2_min_tailing_silence = 960;
+    conf->rule2_min_tailing_silence = 500;
     conf->rule3_min_tailing_silence = 960;
 }
 
index 19e871a..5409d7c 100644 (file)
-import utime\r
-import osTimer\r
-import EventMesh\r
-from machine import Timer\r
-import voiceCall\r
-import osTimer\r
-import constants\r
-from misc import Power\r
-import pm\r
-import ujson\r
-import audio\r
-import ql_fs\r
-import audio\r
-import sms\r
-from machine import Pin\r
-from misc import PWM\r
-import uos\r
-import gc\r
-import _thread\r
-from queue import Queue\r
-from machine import RTC\r
-import usys\r
-def audio_cb(event):\r
-    if event == 0:\r
-        EventMesh.publish("set_audio_state", 1)\r
-        EventMesh.debug_log('audio-play start.') \r
-    elif event == 7:\r
-        EventMesh.publish("set_audio_state", 0)\r
-        EventMesh.debug_log('audio-play finish.')\r
-CALL_LOG_MAX = 50\r
-aud = audio.Audio(0)\r
-aud.setCallback(audio_cb)\r
-\r
-def msg_cb(args):\r
-    index = args[1]\r
-    storage = args[2]\r
-    # EventMesh.debug_log("index:{}".format(index))\r
-    sms_data = sms.getSaveLoc()\r
-    sms_max = sms_data[0][2]\r
-    if index != -1:\r
-        tmp = sms.searchTextMsg(index)\r
-        detail = tmp[1]#内容\r
-        # EventMesh.debug_log("msg_cb:detail {}".format,detail)\r
-\r
-        if  detail.find("SETIP:") != -1:#寻找是否有这个字符串\r
-            tmp_test = detail.split("SETIP:")[1]\r
-            if  tmp_test.find(":") != -1:\r
-                new_ip = tmp_test.split(':')[0]\r
-                # EventMesh.debug_log("tmp_test:{} new_ip:{}".format(tmp_test,new_ip))\r
-                new_com = tmp_test.split(':')[1]\r
-                # new_md5 = detail.split(':')[3]\r
-                if len(new_ip) > 0 and len(new_com) > 0:\r
-                    EventMesh.publish("set_new_ip_com", [new_ip,new_com,tmp[0]])#\r
-                    # EventMesh.publish("set_new_ip_com", [new_ip,new_com,new_md5])#设置关机时间\r
-        if detail.find("ts#") != -1:\r
-            EventMesh.publish("send_devinfo_event", tmp[0])#删除短信\r
-            pass\r
-        if detail.find("SETWHITEPHB:1") != -1:\r
-            EventMesh.publish("set_storage_config",["WLKEY","2"])#打开自动接听\r
-            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')\r
-            pass\r
-        if detail.find("SETWHITEPHB:0") != -1:\r
-            EventMesh.publish("set_storage_config",["WLKEY","0"])#关闭自动接听\r
-            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')\r
-            pass\r
-        if detail.find("factory#") != -1:#恢复出厂设置\r
-            EventMesh.publish("app_factory",tmp[0])#app恢复出厂\r
-        \r
-        if detail.find("reset#") != -1:#重启\r
-            EventMesh.publish("app_restart",tmp[0])#\r
-\r
-        if detail.find("fota:http://u-oss.thisiot.com/test/") != -1:#固件升级\r
-            EventMesh.publish("firware_download",tmp[0])#\r
-        \r
-    if index >= sms_max-1:#删除短信\r
-        EventMesh.publish("delete_sms_event")#删除短信\r
-sms.setCallback(msg_cb)\r
-\r
-import audio\r
-from machine import Pin\r
-\r
-\r
-\r
-#from usr.ui_WatchFaceScreen import WatchFaceScreen\r
-class UI(object):\r
-    def __init__(self):\r
-        #self.screen = WatchFaceScreen()\r
-        #self.screen_old = self.screen\r
-        self.ui_queue = Queue()\r
-        _thread.stack_size(13*1024)\r
-        _thread.start_new_thread(self.ui_queue_thread, ())\r
-        _thread.stack_size(8*1024)\r
-        self.screen = None\r
-        self.screen_old = None\r
-        self.screen_prev = None\r
-        self.screen_list = []\r
-        #self.lv = lv\r
-        self.system_sleep_timer = osTimer()\r
-        self.system_sleep_timer_count = 0\r
-        self.sleep_flag = 1\r
-        self.level = 6\r
-        self.read_data = {}\r
-        self.aud = audio.Audio(0)\r
-        self.aud.set_pa(Pin.GPIO29)\r
-        self.aud.setVolume(11)\r
-        # self.level = EventMesh.publish("get_brightness_level")\r
-        self.read_data = EventMesh.publish("get_storage_data")\r
-        self.main_flag = 0\r
-        self.main_id = 0\r
-        self.set_interrup_flag = 0\r
-        self.UI_high_priority_flag = 0 #如果=1,则当前ui不被打断\r
-        # EventMesh.debug_log("self.read_data:{} self.level:{}".format(self.read_data,self.level))\r
-        # check = ql_fs.path_exists("/usr/static/storage_file/config.json")\r
-        # if check == True:\r
-        #     with open("/usr/static/storage_file/config.json","r") as fd:\r
-        #         self.read_data = ujson.load(fd)\r
-        #         if self.read_data != {}:\r
-        #             b = str("brightness_level") in self.read_data.keys()\r
-        #             if b == True:\r
-        #                 self.level = self.read_data["brightness_level"]\r
-        #             else:\r
-        #                 self.level = 6\r
-        #                 self.read_data["brightness_level"] = self.level\r
-        #                 EventMesh.publish("set_storage_data", self.read_data)\r
-        #                 with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd:\r
-        #                     ujson.dump(self.read_data,fd)\r
-        # else:\r
-        #     self.level = 6 #默认是6级别\r
-        \r
-        # if self.level == None:\r
-        #     self.level = 6\r
-        # self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10)\r
-        # self.PWM_backlight.open()\r
-        self.sleep_lock = 0\r
-\r
-    def post_processor_after_instantiation(self):\r
-        # EventMesh.subscribe("load_screen", self.load_screen_cb)\r
-\r
-        # EventMesh.subscribe("btn1_press", self.btn_press)\r
-        # EventMesh.subscribe("btn8_press", self.btn_press)\r
-        # EventMesh.subscribe("btn8_long_press", self.btn_press)\r
-\r
-        # EventMesh.subscribe("btn1_release", self.btn_release)\r
-        # EventMesh.subscribe("btn8_release", self.btn_release)\r
-\r
-        # EventMesh.subscribe("done_left_to_right", self.ui_press)\r
-        # EventMesh.subscribe("done_right_to_left", self.ui_press)\r
-        # EventMesh.subscribe("done_bottom_to_top", self.ui_press)\r
-        # EventMesh.subscribe("done_top_to_bottom", self.ui_press)\r
-        # EventMesh.subscribe("done_return", self.ui_press)\r
-        # EventMesh.subscribe("done_click", self.ui_press)\r
-        # EventMesh.subscribe("done_error", self.ui_press)\r
-        # EventMesh.subscribe("done_press", self.ui_press)\r
-        # EventMesh.subscribe("call_in", self.publish_call_in)\r
-\r
-        # EventMesh.subscribe("get_lcd_state", self.get_lcd_state)\r
-        # EventMesh.subscribe("set_lcd_state", self.set_lcd_state)\r
-        \r
-        #EventMesh.subscribe("call_in", self.publish_call_in)\r
-        #EventMesh.subscribe("set_bg_img", self.set_bg_img)\r
-\r
-        EventMesh.subscribe(constants.EVENT.SYSTEM_SLEEP, self.system_sleep)\r
-        EventMesh.subscribe(constants.EVENT.SYSTEM_UP, self.system_up)\r
-        EventMesh.subscribe("system_sleep_rest", self.system_sleep_rest)\r
-        # EventMesh.subscribe("set_UI_high_priority", self.set_UI_high_priority)\r
-        # EventMesh.subscribe("get_UI_high_priority", self.get_UI_high_priority)\r
-\r
-        # EventMesh.subscribe("set_interrup_incall", self.set_interrup_incall)\r
-        # EventMesh.subscribe("get_interrup_incall", self.get_interrup_incall)\r
-        # EventMesh.subscribe("get_screen_NAME",self.get_screen_NAME)\r
-        EventMesh.subscribe("publish_message_event_ui",self.publish_message_event_ui)\r
-        # EventMesh.subscribe("return_prev_screen",self.return_prev_screen)\r
-\r
-        self.system_sleep_timer.start(500, 1, self.system_sleep_timer_cb)\r
-\r
-    def publish_message_event_ui(self,event,msg):\r
-        self.ui_queue.put(msg)\r
-\r
-    #ui的消息队列处理,防止内存越界 格式:{函数名,数据}\r
-    def ui_queue_thread(self):\r
-        while True:\r
-            data = self.ui_queue.get()\r
-            #EventMesh.debug_log("ui_queue_thread:data = {}".format(data))\r
-            if data != None:\r
-                try:\r
-                    data["func"](data["data"])\r
-                except Exception as e:\r
-                    usys.print_exception(e)\r
-                    EventMesh.debug_log("ui_queue_thread:ERROR:{}".format(e))\r
-            # for scr in self.screen_list:\r
-            #     if scr.handle_message_event(data) == 1 :\r
-            #         break\r
-    def return_prev_screen(self, event, msg):\r
-        if self.screen_prev != None:\r
-            EventMesh.publish("load_screen", {"screen": self.screen_prev.NAME})\r
-\r
-    def set_interrup_incall(self, event, msg):\r
-        self.set_interrup_flag = msg\r
-        \r
-    def get_interrup_incall(self, event, msg):\r
-        return self.set_interrup_flag\r
-    \r
-    def set_UI_high_priority(self, event, msg):\r
-        self.UI_high_priority_flag = msg\r
-\r
-    def get_UI_high_priority(self, event, msg):\r
-        return self.UI_high_priority_flag\r
-\r
-    def get_lcd_state(self, event, key):\r
-        return self.sleep_flag\r
-    \r
-    def set_lcd_state(self, event, key):\r
-        EventMesh.debug_log("key_:{}".format(key))\r
-        self.sleep_flag = key\r
-    \r
-    def system_sleep_rest(self, event, key):\r
-        #EventMesh.debug_log("system_sleep_rest!!!!!")\r
-        self.system_sleep_timeout_rest()\r
-\r
-    \r
-\r
-    def __lcd_on(self):\r
-        self.system_sleep_timeout_rest()\r
-        \r
-        if self.sleep_flag == 0 :\r
-            EventMesh.publish("sys_up_cb")#唤醒前回调\r
-            EventMesh.debug_log("__lcd_on")\r
-            if self.sleep_lock == 1:\r
-                EventMesh.debug_log("__lcd_on:sleep_lock:error!")\r
-            self.sleep_lock = 1\r
-            self.sleep_flag = 1\r
-            \r
-            \r
-            #lcd_ctrl.write(1)\r
-            #utime.sleep(10)\r
-            \r
-            self.system_sleep_timer.start(500, 1, self.system_sleep_timer_cb)\r
-            EventMesh.publish("set_lcd_state",self.sleep_flag)\r
-           \r
-            #lv.autoSleep(0)\r
-            pm.autosleep(0)\r
-            pm.sclkEx_set(0, 1, 5)\r
-            \r
-            \r
-           \r
-            self.sleep_lock = 0\r
-            \r
-\r
-    def __lcd_off(self):\r
-        \r
-        if self.sleep_flag == 1 :\r
-            EventMesh.debug_log("__lcd_off")\r
-            if self.sleep_lock == 1:\r
-                EventMesh.debug_log("__lcd_on:sleep_lock:error!")\r
-            self.sleep_lock = 1\r
-            self.sleep_flag = 0\r
-            EventMesh.publish("sys_sleep_cb")#休眠前回调\r
-            #lcd_ctrl.write(0)\r
-            #\r
-            #lv.autoSleep(1)\r
-            pm.autosleep(1)\r
-            pm.sclkEx_set(1, 1, 5)\r
-            #utime.sleep_ms(2)\r
-           \r
-            #utime.sleep_ms(80)\r
-            #EventMesh.publish("set_lcd_state",self.sleep_flag)\r
-            \r
-            self.sleep_lock = 0\r
-           \r
-            self.system_sleep_timer.stop()\r
-            EventMesh.publish("Hsensor_set_sleep") #让系统更快休眠\r
-\r
-    def system_sleep(self, event, msg) :\r
-        self.__lcd_off()\r
-\r
-    def system_up(self, event, msg):\r
-        self.__lcd_on()\r
-\r
-    def system_sleep_timer_cb(self, *args):\r
-        EventMesh.publish("publish_message_event_ui",{"func":self.system_sleep_timer_,"data":0})  \r
-    def system_sleep_timer_(self,data):\r
-        time = EventMesh.publish("get_brightness_time")\r
-        if time == None:\r
-            time = 20\r
-        self.system_sleep_timer_count += 1\r
-        if self.system_sleep_timer_count >= time :\r
-            self.system_sleep_timer_count = 0\r
-            self.__lcd_off()\r
-\r
-    def system_sleep_timeout_rest(self) :\r
-        #EventMesh.debug_log("system_sleep_timeout_rest")\r
-        self.system_sleep_timer_count = 0\r
-\r
-    def start(self):\r
-        #self.post_processor_after_instantiation()\r
-        pass\r
-\r
-    def add_screen(self, screen):\r
-        self.screen_list.append(screen)\r
-        return self\r
-    \r
-    def get_screen_NAME(self, event, msg):\r
-        return 0\r
-    \r
-    def load_screen_cb(self, topic, msg):\r
-        EventMesh.publish("publish_message_event_ui",{"func":self.load_screen,"data":msg})  \r
-\r
-    def load_screen(self, msg):\r
-        EventMesh.debug_log("msg1={}".format(msg))\r
-        if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面\r
-            return\r
-        if self.screen :\r
-            if self.screen.NAME == msg["screen"]:\r
-                return\r
-        for scr in self.screen_list:\r
-            if scr.NAME == msg["screen"]:\r
-                # 每次屏幕切换开始息屏倒计时\r
-                \r
-                if scr.NAME == 'main_menu':\r
-                    self.main_flag = 1\r
-                else :\r
-                    self.main_flag = 0\r
-                mem = gc.mem_free()\r
-                EventMesh.debug_log('1剩余内存RAM:{} KB'.format(mem / 1024))\r
-    \r
-                self.screen = scr\r
-                \r
-\r
-                if self.screen_old != None :\r
-                    self.screen_old.Close() #先关闭上一次界面\r
-                    # self.lv.img.cache_invalidate_src(None) #清img cache\r
-                    # self.lv.img.cache_set_size(16) #开img cache\r
-                    if self.screen_old.meta_type != "popup": #不是弹窗,保存上一个界面,用来返回\r
-                        self.screen_prev = self.screen_old #\r
-                self.screen_old = self.screen\r
-                if msg.get("meta"):\r
-                    self.screen.meta_info = msg.get("meta")\r
-                EventMesh.debug_log("load_screen:post_processor_before_initialization")\r
-                self.screen.post_processor_before_initialization()\r
-                EventMesh.debug_log("load_screen:initialization")\r
-                # self.screen.initialization()\r
-                \r
-                EventMesh.debug_log("load_screen.load()")\r
-                # self.screen.load()\r
-                # self.lv.scr_load(self.screen.get_meta())\r
-                \r
-                self.screen.post_processor_after_initialization()\r
-                # self.__lcd_on()\r
-                mem = gc.mem_free()\r
-                EventMesh.debug_log('2剩余内存RAM:{} KB'.format(mem / 1024))\r
-\r
-                \r
-\r
-\r
-\r
+import utime
+import osTimer
+import EventMesh
+from machine import Timer
+import voiceCall
+import osTimer
+import constants
+from misc import Power
+import pm
+import ujson
+import audio
+import ql_fs
+import audio
+import sms
+from machine import Pin
+from misc import PWM
+import uos
+import gc
+import _thread
+from queue import Queue
+from machine import RTC
+import usys
+def audio_cb(event):
+    if event == 0:
+        EventMesh.publish("set_audio_state", 1)
+        EventMesh.debug_log('audio-play start.') 
+    elif event == 7:
+        EventMesh.publish("set_audio_state", 0)
+        EventMesh.debug_log('audio-play finish.')
+CALL_LOG_MAX = 50
+aud = audio.Audio(0)
+aud.setCallback(audio_cb)
+
+def msg_cb(args):
+    index = args[1]
+    storage = args[2]
+    # EventMesh.debug_log("index:{}".format(index))
+    sms_data = sms.getSaveLoc()
+    sms_max = sms_data[0][2]
+    if index != -1:
+        tmp = sms.searchTextMsg(index)
+        detail = tmp[1]#内容
+        # EventMesh.debug_log("msg_cb:detail {}".format,detail)
+
+        if  detail.find("SETIP:") != -1:#寻找是否有这个字符串
+            tmp_test = detail.split("SETIP:")[1]
+            if  tmp_test.find(":") != -1:
+                new_ip = tmp_test.split(':')[0]
+                # EventMesh.debug_log("tmp_test:{} new_ip:{}".format(tmp_test,new_ip))
+                new_com = tmp_test.split(':')[1]
+                # new_md5 = detail.split(':')[3]
+                if len(new_ip) > 0 and len(new_com) > 0:
+                    EventMesh.publish("set_new_ip_com", [new_ip,new_com,tmp[0]])#
+                    # EventMesh.publish("set_new_ip_com", [new_ip,new_com,new_md5])#设置关机时间
+        if detail.find("ts#") != -1:
+            EventMesh.publish("send_devinfo_event", tmp[0])#删除短信
+            pass
+        if detail.find("SETWHITEPHB:1") != -1:
+            EventMesh.publish("set_storage_config",["WLKEY","2"])#打开自动接听
+            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')
+            pass
+        if detail.find("SETWHITEPHB:0") != -1:
+            EventMesh.publish("set_storage_config",["WLKEY","0"])#关闭自动接听
+            sms.sendPduMsg(tmp[0], 'set ok', 'UCS2')
+            pass
+        if detail.find("factory#") != -1:#恢复出厂设置
+            EventMesh.publish("app_factory",tmp[0])#app恢复出厂
+        
+        if detail.find("reset#") != -1:#重启
+            EventMesh.publish("app_restart",tmp[0])#
+
+        if detail.find("fota:http://u-oss.thisiot.com/test/") != -1:#固件升级
+            EventMesh.publish("firware_download",tmp[0])#
+        
+    if index >= sms_max-1:#删除短信
+        EventMesh.publish("delete_sms_event")#删除短信
+sms.setCallback(msg_cb)
+
+import audio
+from machine import Pin
+from vc_utils import cfg_attr
+
+
+
+#from usr.ui_WatchFaceScreen import WatchFaceScreen
+class UI(object):
+    def __init__(self):
+        #self.screen = WatchFaceScreen()
+        #self.screen_old = self.screen
+        self.ui_queue = Queue()
+        _thread.stack_size(13*1024)
+        _thread.start_new_thread(self.ui_queue_thread, ())
+        _thread.stack_size(8*1024)
+        self.screen = None
+        self.screen_old = None
+        self.screen_prev = None
+        self.screen_list = []
+        #self.lv = lv
+        self.system_sleep_timer = osTimer()
+        self.system_sleep_timer_count = 0
+        self.sleep_flag = 1
+        self.level = 6
+        self.read_data = {}
+        self.aud = audio.Audio(0)
+        _pa_gpio = cfg_attr("AUDIO_PA_PIN_GPIO", "GPIO29")
+        if _pa_gpio:
+            self.aud.set_pa(getattr(Pin, _pa_gpio))
+        self.aud.setVolume(11)
+        # self.level = EventMesh.publish("get_brightness_level")
+        self.read_data = EventMesh.publish("get_storage_data")
+        self.main_flag = 0
+        self.main_id = 0
+        self.set_interrup_flag = 0
+        self.UI_high_priority_flag = 0 #如果=1,则当前ui不被打断
+        # EventMesh.debug_log("self.read_data:{} self.level:{}".format(self.read_data,self.level))
+        # check = ql_fs.path_exists("/usr/static/storage_file/config.json")
+        # if check == True:
+        #     with open("/usr/static/storage_file/config.json","r") as fd:
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("brightness_level") in self.read_data.keys()
+        #             if b == True:
+        #                 self.level = self.read_data["brightness_level"]
+        #             else:
+        #                 self.level = 6
+        #                 self.read_data["brightness_level"] = self.level
+        #                 EventMesh.publish("set_storage_data", self.read_data)
+        #                 with open("/usr/static/storage_file/config.json","w",encoding="utf-8") as fd:
+        #                     ujson.dump(self.read_data,fd)
+        # else:
+        #     self.level = 6 #默认是6级别
+        
+        # if self.level == None:
+        #     self.level = 6
+        # self.PWM_backlight = PWM(PWM.PWM1, PWM.ABOVE_MS, self.level, 10)
+        # self.PWM_backlight.open()
+        self.sleep_lock = 0
+
+    def post_processor_after_instantiation(self):
+        # EventMesh.subscribe("load_screen", self.load_screen_cb)
+
+        # EventMesh.subscribe("btn1_press", self.btn_press)
+        # EventMesh.subscribe("btn8_press", self.btn_press)
+        # EventMesh.subscribe("btn8_long_press", self.btn_press)
+
+        # EventMesh.subscribe("btn1_release", self.btn_release)
+        # EventMesh.subscribe("btn8_release", self.btn_release)
+
+        # EventMesh.subscribe("done_left_to_right", self.ui_press)
+        # EventMesh.subscribe("done_right_to_left", self.ui_press)
+        # EventMesh.subscribe("done_bottom_to_top", self.ui_press)
+        # EventMesh.subscribe("done_top_to_bottom", self.ui_press)
+        # EventMesh.subscribe("done_return", self.ui_press)
+        # EventMesh.subscribe("done_click", self.ui_press)
+        # EventMesh.subscribe("done_error", self.ui_press)
+        # EventMesh.subscribe("done_press", self.ui_press)
+        # EventMesh.subscribe("call_in", self.publish_call_in)
+
+        # EventMesh.subscribe("get_lcd_state", self.get_lcd_state)
+        # EventMesh.subscribe("set_lcd_state", self.set_lcd_state)
+        
+        #EventMesh.subscribe("call_in", self.publish_call_in)
+        #EventMesh.subscribe("set_bg_img", self.set_bg_img)
+
+        EventMesh.subscribe(constants.EVENT.SYSTEM_SLEEP, self.system_sleep)
+        EventMesh.subscribe(constants.EVENT.SYSTEM_UP, self.system_up)
+        EventMesh.subscribe("system_sleep_rest", self.system_sleep_rest)
+        # EventMesh.subscribe("set_UI_high_priority", self.set_UI_high_priority)
+        # EventMesh.subscribe("get_UI_high_priority", self.get_UI_high_priority)
+
+        # EventMesh.subscribe("set_interrup_incall", self.set_interrup_incall)
+        # EventMesh.subscribe("get_interrup_incall", self.get_interrup_incall)
+        # EventMesh.subscribe("get_screen_NAME",self.get_screen_NAME)
+        EventMesh.subscribe("publish_message_event_ui",self.publish_message_event_ui)
+        # EventMesh.subscribe("return_prev_screen",self.return_prev_screen)
+
+        self.system_sleep_timer.start(500, 1, self.system_sleep_timer_cb)
+
+    def publish_message_event_ui(self,event,msg):
+        self.ui_queue.put(msg)
+
+    #ui的消息队列处理,防止内存越界 格式:{函数名,数据}
+    def ui_queue_thread(self):
+        while True:
+            data = self.ui_queue.get()
+            #EventMesh.debug_log("ui_queue_thread:data = {}".format(data))
+            if data != None:
+                try:
+                    data["func"](data["data"])
+                except Exception as e:
+                    usys.print_exception(e)
+                    EventMesh.debug_log("ui_queue_thread:ERROR:{}".format(e))
+            # for scr in self.screen_list:
+            #     if scr.handle_message_event(data) == 1 :
+            #         break
+    def return_prev_screen(self, event, msg):
+        if self.screen_prev != None:
+            EventMesh.publish("load_screen", {"screen": self.screen_prev.NAME})
+
+    def set_interrup_incall(self, event, msg):
+        self.set_interrup_flag = msg
+        
+    def get_interrup_incall(self, event, msg):
+        return self.set_interrup_flag
+    
+    def set_UI_high_priority(self, event, msg):
+        self.UI_high_priority_flag = msg
+
+    def get_UI_high_priority(self, event, msg):
+        return self.UI_high_priority_flag
+
+    def get_lcd_state(self, event, key):
+        return self.sleep_flag
+    
+    def set_lcd_state(self, event, key):
+        EventMesh.debug_log("key_:{}".format(key))
+        self.sleep_flag = key
+    
+    def system_sleep_rest(self, event, key):
+        #EventMesh.debug_log("system_sleep_rest!!!!!")
+        self.system_sleep_timeout_rest()
+
+    
+
+    def __lcd_on(self):
+        self.system_sleep_timeout_rest()
+        
+        if self.sleep_flag == 0 :
+            EventMesh.publish("sys_up_cb")#唤醒前回调
+            EventMesh.debug_log("__lcd_on")
+            if self.sleep_lock == 1:
+                EventMesh.debug_log("__lcd_on:sleep_lock:error!")
+            self.sleep_lock = 1
+            self.sleep_flag = 1
+            
+            
+            #lcd_ctrl.write(1)
+            #utime.sleep(10)
+            
+            self.system_sleep_timer.start(500, 1, self.system_sleep_timer_cb)
+            EventMesh.publish("set_lcd_state",self.sleep_flag)
+           
+            #lv.autoSleep(0)
+            pm.autosleep(0)
+            pm.sclkEx_set(0, 1, 5)
+            
+            
+           
+            self.sleep_lock = 0
+            
+
+    def __lcd_off(self):
+        
+        if self.sleep_flag == 1 :
+            EventMesh.debug_log("__lcd_off")
+            if self.sleep_lock == 1:
+                EventMesh.debug_log("__lcd_on:sleep_lock:error!")
+            self.sleep_lock = 1
+            self.sleep_flag = 0
+            EventMesh.publish("sys_sleep_cb")#休眠前回调
+            #lcd_ctrl.write(0)
+            #
+            #lv.autoSleep(1)
+            pm.autosleep(1)
+            pm.sclkEx_set(1, 1, 5)
+            #utime.sleep_ms(2)
+           
+            #utime.sleep_ms(80)
+            #EventMesh.publish("set_lcd_state",self.sleep_flag)
+            
+            self.sleep_lock = 0
+           
+            self.system_sleep_timer.stop()
+            EventMesh.publish("Hsensor_set_sleep") #让系统更快休眠
+
+    def system_sleep(self, event, msg) :
+        self.__lcd_off()
+
+    def system_up(self, event, msg):
+        self.__lcd_on()
+
+    def system_sleep_timer_cb(self, *args):
+        EventMesh.publish("publish_message_event_ui",{"func":self.system_sleep_timer_,"data":0})  
+    def system_sleep_timer_(self,data):
+        time = EventMesh.publish("get_brightness_time")
+        if time == None:
+            time = 20
+        self.system_sleep_timer_count += 1
+        if self.system_sleep_timer_count >= time :
+            self.system_sleep_timer_count = 0
+            self.__lcd_off()
+
+    def system_sleep_timeout_rest(self) :
+        #EventMesh.debug_log("system_sleep_timeout_rest")
+        self.system_sleep_timer_count = 0
+
+    def start(self):
+        #self.post_processor_after_instantiation()
+        pass
+
+    def add_screen(self, screen):
+        self.screen_list.append(screen)
+        return self
+    
+    def get_screen_NAME(self, event, msg):
+        return 0
+    
+    def load_screen_cb(self, topic, msg):
+        EventMesh.publish("publish_message_event_ui",{"func":self.load_screen,"data":msg})  
+
+    def load_screen(self, msg):
+        EventMesh.debug_log("msg1={}".format(msg))
+        if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面
+            return
+        if self.screen :
+            if self.screen.NAME == msg["screen"]:
+                return
+        for scr in self.screen_list:
+            if scr.NAME == msg["screen"]:
+                # 每次屏幕切换开始息屏倒计时
+                
+                if scr.NAME == 'main_menu':
+                    self.main_flag = 1
+                else :
+                    self.main_flag = 0
+                mem = gc.mem_free()
+                EventMesh.debug_log('1剩余内存RAM:{} KB'.format(mem / 1024))
+    
+                self.screen = scr
+                
+
+                if self.screen_old != None :
+                    self.screen_old.Close() #先关闭上一次界面
+                    # self.lv.img.cache_invalidate_src(None) #清img cache
+                    # self.lv.img.cache_set_size(16) #开img cache
+                    if self.screen_old.meta_type != "popup": #不是弹窗,保存上一个界面,用来返回
+                        self.screen_prev = self.screen_old #
+                self.screen_old = self.screen
+                if msg.get("meta"):
+                    self.screen.meta_info = msg.get("meta")
+                EventMesh.debug_log("load_screen:post_processor_before_initialization")
+                self.screen.post_processor_before_initialization()
+                EventMesh.debug_log("load_screen:initialization")
+                # self.screen.initialization()
+                
+                EventMesh.debug_log("load_screen.load()")
+                # self.screen.load()
+                # self.lv.scr_load(self.screen.get_meta())
+                
+                self.screen.post_processor_after_initialization()
+                # self.__lcd_on()
+                mem = gc.mem_free()
+                EventMesh.debug_log('2剩余内存RAM:{} KB'.format(mem / 1024))
+
+                
+
+
+
index aa92429..2fa4739 100644 (file)
@@ -246,11 +246,11 @@ class AI_dev(Abstract):
         print("timer:{}!!!!!!!!\r\n".format(utime.localtime()))
     def usb_event_cb(self, state):
         # USB 插拔抖动过滤(日志中 powerKey 与 usb_evt 0/1 连跳会导致误播 OUT/IN)
+        # 注意:必须同时过滤状态相同(硬件重复回调)和状态翻转(接插件抖动)的情况
         try:
             now = utime.ticks_ms()
             last_ms = getattr(self, "_usb_evt_last_ms", 0)
-            last_st = getattr(self, "_usb_evt_last_state", -1)
-            if last_ms and utime.ticks_diff(now, last_ms) < 800 and last_st != state:
+            if last_ms and utime.ticks_diff(now, last_ms) < 800:
                 return
             self._usb_evt_last_ms = now
             self._usb_evt_last_state = state
@@ -269,10 +269,12 @@ class AI_dev(Abstract):
 
     def usb_event(self, state):    
         status = state
-        self.usb_charge_flag = 0
         if status == 1:#插入USB
+            self.usb_charge_flag = 0
             print("charge R_CHARGE_in")
             self.usb_status = 1
+            # 插 USB:清队列中已过期的低电/拔出提示,避免「低电→已满→已移除」串播
+            self._montage_defer_purge(("low", "out"))
             VC_satrt_flag = EventMesh.publish("get_VC_satrt_flag")#获取vc是否在运行
             if VC_satrt_flag == None:
                 VC_satrt_flag = 0
@@ -300,6 +302,9 @@ class AI_dev(Abstract):
             pass
         elif status == 0:#拨出usbs
             self.usb_status = 0
+            self.usb_charge_flag = 0
+            # 拔 USB:清队列中未播的插入/已满,避免状态翻转后补播矛盾提示
+            self._montage_defer_purge(("in", "full"))
             VC_satrt_flag = EventMesh.publish("get_VC_satrt_flag")#获取vc是否在运行
             if VC_satrt_flag == None:
                 VC_satrt_flag = 0
@@ -674,7 +679,7 @@ class AI_dev(Abstract):
         """单电源键:按下瞬间走原 AI 键按下链路(松手走 AI_key_release,不按电源短按 Close)。"""
         try:
             current_time = utime.ticks_ms()
-            if utime.ticks_diff(current_time, self.last_ai_key_time) < 1:
+            if utime.ticks_diff(current_time, self.last_ai_key_time) < 50:
                 return
             self.last_ai_key_time = current_time
             if EventMesh.publish("get_wait_voice_flag") == 1:
@@ -705,11 +710,9 @@ class AI_dev(Abstract):
             if self.extint_AI is None:
                 return
             #print("AI_btn:keyAI_extint_cb{}".format(args[1]))
-            #定义最短触发间隔
-            MIN_TRIGGER_INTERVAL = 1  # 可根据需求调整,单位ms
-            #记录上次按键触发时间(初始化放类的__init__里:self.last_ai_key_time = 0)
-            current_time = utime.ticks_ms()  # 获取当前毫秒时间
-            #重复按下,直接返回
+            #定义最短触发间隔(50ms,覆盖硬件抖动;即使 _ai_int_disable_for_hold 有延迟也够)
+            MIN_TRIGGER_INTERVAL = 50  # ms
+            current_time = utime.ticks_ms()
             if utime.ticks_diff(current_time, self.last_ai_key_time) < MIN_TRIGGER_INTERVAL:
                 print("AI按键触发过频,忽略本次操作")
                 return
@@ -941,32 +944,54 @@ class AI_dev(Abstract):
             voice_record_satrt_flag = 0
         _bcfg = _BatteryCfg.instance()
         Vbatt = _bcfg.get_vbatt_mv_charge() if self.usb_status == 1 else _bcfg.get_vbatt_mv()
+        soc = None
+        try:
+            soc = self.get_battery()
+        except Exception:
+            pass
         if self.usb_status == 1 and VC_satrt_flag == 0 and voice_record_satrt_flag == 0:
             try:
                 if not cfg_bool("USE_MIN_HW_STATUS", True):
                     EventMesh.publish("set_led_state", {"charging": "charging"})#充电红灯常亮
             except Exception:
                 pass
-        if self.usb_status == 1 and Vbatt >= _bcfg.charge_full_mv and VC_satrt_flag == 0 and voice_record_satrt_flag == 0:
+        v_chg = Vbatt
+        if self.usb_status == 1:
+            try:
+                v_chg = _bcfg.get_vbatt_mv_charge()
+            except Exception:
+                pass
+        charge_full = False
+        try:
+            charge_full = bool(self.usb_status == 1 and _bcfg.is_charge_full(v_chg))
+        except Exception:
+            charge_full = False
+        if charge_full and VC_satrt_flag == 0 and voice_record_satrt_flag == 0:
             try:
                 if not cfg_bool("USE_MIN_HW_STATUS", True):
                     EventMesh.publish("set_led_state", {"charging": "full"})
             except Exception:
                 pass
-            if self.usb_charge_flag == 0 :
-                EventMesh.publish("audio_montage_play",["R_CHARGE_FULL.mp3"])
-                #self.aud.play(1,0,'U:/static/R_CHARGE_FULL.mp3')#充电已满
-                self.usb_charge_flag = 1
+            if self.usb_charge_flag == 0:
+                full_min_soc = cfg_int("BATTERY_CHARGE_FULL_TTS_MIN_SOC", 50)
+                soc_ok = True
+                # 有充电 SoC 曲线时才做语义门限;无曲线(冻结 SoC)时仅依赖 is_charge_full
+                if soc is not None and _bcfg.charge_ocv_volts:
+                    try:
+                        soc_ok = int(soc) >= int(full_min_soc)
+                    except Exception:
+                        soc_ok = True
+                if soc_ok:
+                    print("[BAT] charge full tts soc={} v_chg={}".format(soc, v_chg))
+                    EventMesh.publish("audio_montage_play", ["R_CHARGE_FULL.mp3"])
+                    self.usb_charge_flag = 1
+                else:
+                    print("[BAT] charge full skip tts soc={} min={}".format(soc, full_min_soc))
         try:
             low_soc = int(_bcfg.low_soc)
         except Exception:
             low_soc = 25
         warn_interval_ms = cfg_int("BATTERY_LOW_WARN_INTERVAL_MS", 300000)
-        soc = None
-        try:
-            soc = self.get_battery()
-        except Exception:
-            soc = None
         if self.usb_status == 0:
             if _bcfg.should_shutdown_empty(Vbatt):
                 if getattr(self, "_empty_shutdown_done", 0) == 0:
@@ -1022,6 +1047,47 @@ class AI_dev(Abstract):
             pass
         return False
 
+    def _montage_msg_kinds(self, msg):
+        kinds = set()
+        try:
+            for i in (msg or []):
+                n = str(i)
+                if "Low_power" in n:
+                    kinds.add("low")
+                elif "R_CHARGE_IN" in n:
+                    kinds.add("in")
+                elif "R_CHARGE_FULL" in n:
+                    kinds.add("full")
+                elif "R_CHARGE_OUT" in n:
+                    kinds.add("out")
+        except Exception:
+            pass
+        return kinds
+
+    def _montage_defer_purge(self, drop_kinds):
+        """USB/电池状态变化时剔除延时队列中已过期的充电/低电提示。"""
+        try:
+            q = getattr(self, "_montage_defer", None)
+            if not q:
+                return 0
+        except Exception:
+            return 0
+        drop = set(drop_kinds or ())
+        if not drop:
+            return 0
+        kept = []
+        removed = 0
+        for item in q:
+            if self._montage_msg_kinds(item) & drop:
+                removed += 1
+                continue
+            kept.append(item)
+        self._montage_defer = kept
+        if removed:
+            print("[audio-arb] defer purge drop={} removed={} left={}".format(
+                drop, removed, len(kept)))
+        return removed
+
     def _shutdown_tone_play_and_powerdown(self):
         """关机提示音:先断 VC TTS,再播 zhengzaiguanji,最后断电。"""
         self._persist_vc_mode_before_powerdown()
index c0c819e..2c2e85c 100644 (file)
@@ -82,9 +82,9 @@ VC_HEARTBEAT_LOG = 0
 #       若误关会导致问候结束后首轮用户说话无 vad/asr。
 VC_PROTO_GUARDS = 0
 # 1=打印 VC WebSocket 每条收发的完整文本(流量大、易刷屏);0 仅一行 event 摘要(llm.delta 省略)
-VC_WS_IO_LOG = 1
-# 1=打印出站 JSON 摘要(start 音色/TTS 参数、synthesis 文本等);联调 TTS 建议开启
-VC_PROTO_TX_LOG = 1
+VC_WS_IO_LOG = 0
+# 1=打印出站 JSON 摘要(start 音色/TTS 参数、synthesis 文本等);0=仅必要的状态一行
+VC_PROTO_TX_LOG = 0
 # 长对话 L1(VC_IDLE_AUTO_CLOSE_SEC):仅 tts.* / started / TTS 音频下行重置 close_timerout。
 # 保活不计入 L1:V2.5 文本 ping/pong、JSON heartbeat;RFC6455 OP_PING/OP_PONG(uwebsocket 内处理)。
 # V2.5:默认不发标准 PING,发文本 "ping"(VC_WS_PING_INTERVAL_SEC>0);须响应入站标准 PING→PONG。
index 6bc5734..63a5ef4 100644 (file)
@@ -420,7 +420,8 @@ def vc_proto_log_start_from_v25(json_data, vc_mode=-1):
               ))
         try:
             # 内部 V2.5 草稿,不经 pack_wire,不会上 WebSocket
-            _log_wire_json("start_draft_v25", ujson.dumps(json_data))
+            if _proto_tx_log_enabled():
+                _log_wire_json("start_draft_v25", ujson.dumps(json_data))
         except Exception:
             pass
         if is_v3():
@@ -438,8 +439,8 @@ def vc_proto_log_start_from_v25(json_data, vc_mode=-1):
                           list(ac_out.keys()),
                       ))
                 # V3 pack 预览,未上链;链路上仅 start_wire_SENT 一条
-                _log_wire_json("start_preview_v3", ujson.dumps({"type": "start", "data": d}))
-                print("[VC][proto] start_log_note 链路上仅发 start_wire_SENT(type:start)")
+                if _proto_tx_log_enabled():
+                    _log_wire_json("start_preview_v3", ujson.dumps({"type": "start", "data": d}))
             except Exception:
                 pass
     except Exception:
index 8c824c7..8be98ca 100644 (file)
@@ -790,13 +790,14 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
         if not self._vc_is_long_dialogue_mode():
             return False
         try:
-            if getattr(self, "_vc_pending_interrupt_uplink", 0) == 1:
-                return False
-            if getattr(self, "VC_record_state_flag", 0) == 0:
-                return False
             settled = getattr(self, "_long_dialogue_interrupt_settled_ms", 0)
             if not settled:
                 return False
+            # 早开(no_wait)场景:pending_uplink=1 但 settled_ms 已设 = 打断已提前发起开录
+            if getattr(self, "_vc_pending_interrupt_uplink", 0) == 1:
+                return True
+            if getattr(self, "VC_record_state_flag", 0) == 0:
+                return False
             return utime.ticks_diff(utime.ticks_ms(), settled) < 5000
         except Exception:
             return False
@@ -1601,24 +1602,20 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
         return False
 
     def _long_dialogue_interrupt_on_short_press(self):
-        """长对话 TTS/思考中短按:停播 + cancel;canceled(或 cancel 超时)后开麦。"""
+        """长对话 TTS/思考中短按:停播 + cancel;不等 canceled 回复,立即开录。"""
         if not self._vc_is_long_dialogue_mode():
             return
         try:
             self._vc_turn_bump("long_interrupt")
             self.Close_flag = 0
             self.fsm.await_played = False
-            wait_ms = cfg_int("LONG_DIALOGUE_CANCEL_WAIT_MS", 800)
-            if getattr(self, "_intr", None) is not None:
-                self._intr.begin(
-                    self, InterruptContext.KIND_LONG_SHORT,
-                    pending_uplink=1, cancel_wait_ms=wait_ms,
-                )
-            else:
-                self.is_ruppt_tts = 1
-                self._drop_tts_audio = 1
-                self._vc_pending_interrupt_uplink = 1
-                self._vc_cancel_deadline_ms = utime.ticks_add(utime.ticks_ms(), wait_ms)
+            self.is_ruppt_tts = 1
+            self._drop_tts_audio = 1
+            self._vc_pending_interrupt_uplink = 1
+            # 记录早开时刻,供迟到 canceled 判断 stale
+            self._long_dialogue_interrupt_settled_ms = utime.ticks_ms()
+            # 清 cancel_deadline,防止 _vc_tick_cancel_deadline 重复入队
+            self._vc_cancel_deadline_ms = 0
         except Exception:
             pass
         try:
@@ -1637,6 +1634,11 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract):
                 self.fsm.turn = VCTurnState.Listening
         except Exception:
             pass
+        # 立即开录,不等 canceled 回复(cancel 已飞出去)
+        # _vc_pending_interrupt_uplink=1 保持到 btn 队列执行开麦门控
+        if getattr(self, "VC_record_state_flag", 0) == 0:
+            self.request_uplink_start("canceled")
+            print("[KEY] long_dialogue interrupt -> immediate uplink (no wait)")
 
     def _ptt_stop_tts_on_short_press(self):
         """单对话短按:停本地+下行 TTS、灭灯;发 cancel,不换 sid、不开录。"""
index 394379b..85ebc88 100644 (file)
@@ -112,6 +112,16 @@ class VCSessionIoMixin:
                 if hasattr(self, "_long_dialogue_on_server_tts_started"):
                     self._long_dialogue_on_server_tts_started()
         if ev == "canceled":
+            # 预先判断:打断后已提前开录,迟到 canceled 不计 storm、不停下行
+            try:
+                if (
+                    self._vc_is_long_dialogue_mode()
+                    and self._long_dialogue_is_stale_server_cancel()
+                ):
+                    print("[ORCH] stale canceled (no wait -> keep recording)")
+                    return
+            except Exception:
+                pass
             try:
                 keep_speech = False
                 if self._vc_is_long_dialogue_mode():
@@ -188,12 +198,14 @@ class VCSessionIoMixin:
             self._vc_on_ptt_cancel_settled(via="canceled")
 
     def _vc_dispatch_server_event(self, ev, jsload_data=None):
-        """recv 线程:仅入编排队列,不在此修改 FSM。"""
+        """recv 线程:仅入编排队列,不在此修改 FSM。tts.started 走高优队列减小播放延迟。"""
         gen = self._vc_turn_current()
+        priority = 1 if ev == "tts.started" else 0
         self._vc_enqueue_btn(
             self._vc_orchestrator_server_event_cb,
             (ev, jsload_data, gen),
             track_gen=True,
+            priority=priority,
         )
     def request_send_start(self):
         EventMesh.publish("publish_AI_btnInfo", {"func": self.AI_client_VC_start_requset})
index 51774d0..dacb870 100644 (file)
@@ -1867,7 +1867,13 @@ class VCSessionMediaMixin:
                         for i in range(_open_retries):
                             try:
                                 if not _ptt_fast_open:
-                                    utime.sleep_ms(80 + i * 60)
+                                    _delay = 80
+                                    try:
+                                        if getattr(self, "VC_record_state_flag", 0) == 0:
+                                            _delay = 20
+                                    except Exception:
+                                        pass
+                                    utime.sleep_ms(_delay + i * 60)
                                 self.play_pcm = audio.Audio.PCM(0, 1, self.VC_play_samplerate, 1, 1, 2)
                                 ret = self.play_pcm.stream_write_start()
                                 print("self.record_pcm.stream_write_start:ret:{}".format(ret))