From: SnickerSun Date: Mon, 15 Jun 2026 01:49:34 +0000 (+0800) Subject: 但对话也优化ai键响应,pcmplay常开。 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=e2ca1995ff874ca856efd05c26545bfc499443bb;p=mirrors%2FASR1603_G5.git 但对话也优化ai键响应,pcmplay常开。 长对话ai键录音时打断补充回也有start音,应该还有些bug --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_media_arb.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_media_arb.py index fcc0ab08..dcfd1220 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_media_arb.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_media_arb.py @@ -24,7 +24,10 @@ class MediaArbiter(object): return try: vc._ptt_hard_mute_local_playback() - vc.VC_Play_End() + if hasattr(vc, "_vc_downlink_stop_playback"): + vc._vc_downlink_stop_playback("media_arb/local") + else: + vc.VC_Play_End() except Exception: pass diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py index 5468962c..a139d47b 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session.py @@ -1308,6 +1308,11 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._long_dialogue_publish_listening("server.started") except Exception: pass + try: + if getattr(self, "_long_dialogue_key_arm", 0) == 1: + self._vc_pcm_prewarm_session_handle("server.started/key") + except Exception: + pass try: self._vc_on_server_record_uplink_ready("server.started") except Exception: @@ -1374,6 +1379,11 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._ptt_force_record_on_started = 0 except Exception: pass + try: + if _ptt_rec: + self._vc_pcm_prewarm_session_handle("server.started/ptt") + except Exception: + pass try: self.AI_client_VC_send_speech() except Exception: @@ -1859,8 +1869,23 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): EventMesh.publish("set_led_state", {"alert": "rb_flash_2"}) except Exception: pass + def _vc_clear_key_restart_round_state(self): + """录音中短按重开:清 merge/VAD/ASR 残留,作废未说完的一轮。""" + try: + self.AI_ASR_str = "" + self.AI_ASR_str_tmp = "" + self.AI_ASR_flag = 0 + self._vc_pending_asr_completed_stop = 0 + self._vc_defer_vad_uplink_stop = 0 + self._vc_endpoint_hangover_until = 0 + self._server_vad_silence = 0 + self._vc_asr_continue_merge = 0 + self.fsm.await_played = False + except Exception: + pass + def _vc_restart_record_same_dialog(self): - """长对话 recording+短按:停录后立即重开(旧 sid,对齐设计稿)。""" + """长对话 recording+短按:停录 → cancel(旧 sid) → æ»´ → 再开麦。""" if not self._vc_is_long_dialogue_mode(): return False try: @@ -1869,9 +1894,24 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._vc_reset_long_idle_timer("key.restart") self._vc_long_dialogue_key_arm_session() self._long_dialogue_publish_listening("key.restart") + self._vc_clear_key_restart_round_state() self._vc_clear_stale_record_state("key.restart/pre") self.request_uplink_stop("key.restart/stop") self._vc_clear_stale_record_state("key.restart/post") + self._vc_key_restart_arm = 1 + try: + if getattr(self, "AI_client_VC_isconnect", 0) == 1: + self.AI_client_VC_send( + ujson.dumps({"event": "cancel", "payload": {}})) + print("[KEY] long_dialogue restart -> cancel (keep sid)") + except Exception: + pass + try: + self.fsm.reset_rx_phases() + if getattr(self.fsm, "session", None) == VCSessionState.Started: + self.fsm.turn = VCTurnState.Listening + except Exception: + pass self.request_uplink_start("key.restart/start") return True except Exception as e: @@ -2139,8 +2179,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): except Exception: pass try: - if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None: - self.VC_Play_End() + self._vc_downlink_stop_playback("local_priority_mute") except Exception: pass def _vc_turn_current(self): @@ -2228,7 +2267,18 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): except Exception: pass try: - if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None: + if getattr(self, "VC_Play_flag", 0) == 1: + self._vc_soft_stop_tts_pcm("ptt_deferred_cleanup") + elif ( + getattr(self, "play_pcm", None) is not None + and self._vc_pcm_session_keep_open() + ): + try: + self.play_pcm.stream_stop() + except Exception: + pass + self.VC_Play_flag = 0 + elif getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None: self.VC_Play_End() except Exception: pass @@ -2426,8 +2476,14 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): pass if in_session: try: - if getattr(self, "VC_Play_flag", 0) == 1 or getattr(self, "play_pcm", None) is not None: - self.VC_Play_End() + if getattr(self, "VC_Play_flag", 0) == 1: + self._vc_soft_stop_tts_pcm("ptt_begin") + elif getattr(self, "play_pcm", None) is not None: + try: + self.play_pcm.stream_stop() + except Exception: + pass + self.VC_Play_flag = 0 except Exception: pass try: @@ -2777,6 +2833,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._ptt_idle_latch = 0 self._ptt_short_press_stop = 0 self._long_dialogue_key_arm = 0 + self._vc_key_restart_arm = 0 # AI 键短/长按开录:置位后等 server.started / asr.started(或会话已 started)再播 start.mp3 self._vc_pending_record_start_tone = 0 # PTT:已 started 时等 asr.started 滴后再 VC_Speech_Start @@ -4188,6 +4245,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._vc_pending_record_start_tone = 0 self._vc_pending_key_press_tone = 0 self._ptt_defer_speech_until_asr = 0 + self._vc_key_restart_arm = 0 except Exception: pass try: diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py index 3d4b8ce5..064dc572 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_io.py @@ -176,6 +176,12 @@ class VCSessionIoMixin: a for a in (actions or []) if a and a[0] != "uplink_start" ] + elif getattr(self, "_vc_key_restart_arm", 0) == 1: + actions = [ + a for a in (actions or []) + if a and a[0] != "uplink_start" + ] + print("[ORCH] key.restart arm -> skip canceled uplink_start") except Exception: pass self._fsm_apply_actions(actions) @@ -188,6 +194,7 @@ class VCSessionIoMixin: self._vc_is_long_dialogue_mode() and hasattr(self, "_long_dialogue_end_interrupt") and not preserve + and not getattr(self, "_vc_key_restart_arm", 0) and not ( hasattr(self, "_long_dialogue_is_stale_server_cancel") and self._long_dialogue_is_stale_server_cancel() diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py index fc51cc3f..a1fdb854 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_session_media.py @@ -205,6 +205,8 @@ class VCSessionMediaMixin: r = str(reason or "") if r.startswith("key.press") or r.startswith("BT_AI_key_press"): return True + if r.startswith("key.restart"): + return True if r.startswith("ptt_begin") or r == "asr.started/defer": return True if r == "canceled" and ( @@ -255,6 +257,9 @@ class VCSessionMediaMixin: try: self._vc_defer_listening_led = 0 self._vc_skip_local_play_stop_record = 0 + r = str(reason or "") + if r.startswith("key.restart"): + self._vc_key_restart_arm = 0 except Exception: pass try: @@ -445,7 +450,7 @@ class VCSessionMediaMixin: except Exception: pass try: - if self._vc_pcm_session_keep_open() and self._vc_is_long_dialogue_mode(): + if self._vc_pcm_session_keep_open(): self.VC_Play_SoftEnd() else: self.VC_Play_End() @@ -550,7 +555,7 @@ class VCSessionMediaMixin: usys.print_exception(e) def _vc_pcm_session_keep_open(self): - """长对话会话内保留 play_pcm WRITE handle(对话结束/Close 前不 close)。""" + """长对话/PTT 会话内保留 play_pcm WRITE handle(Close 前不 close)。""" try: if getattr(self, "VC_satrt_flag", 0) != 1: return False @@ -562,13 +567,29 @@ class VCSessionMediaMixin: return False if int(getattr(self, "VC_play_samplerate", 0)) != 16000: return False + if not (self._vc_is_long_dialogue_mode() or self._vc_is_ptt_mode()): + return False return True except Exception: return False + def _vc_pcm_prewarm_session_handle(self, via=""): + """server.started / 开录前预开 play_pcm,减小 start.pcm 与首包 TTS 延迟。""" + try: + if not self._vc_pcm_session_keep_open(): + return False + if getattr(self, "play_pcm", None) is not None: + return True + self._vc_play_pcm_stream_begin(after_file=0) + print("[VC] pcm_prewarm via={}".format(via or "-")) + return True + except Exception as e: + usys.print_exception(e) + return False + def _vc_downlink_stop_playback(self, reason="", force_hard=0): - """停下行/TTS:长对话优先软停保留 handle;montage/Close/PTT 等走硬关。""" - if not force_hard and self._vc_pcm_session_keep_open() and self._vc_is_long_dialogue_mode(): + """停下行/TTS:会话内优先软停保留 handle;Close/montage 等走硬关。""" + if not force_hard and self._vc_pcm_session_keep_open(): self._vc_soft_stop_tts_pcm(reason or "downlink_stop") return try: