From: snickersun Date: Mon, 15 Jun 2026 08:28:21 +0000 (+0800) Subject: PTT 取消ai长按键,用press和release进行逻辑处理。加快PTT 反应速度。 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ad7ba3ac6a1a96fcaabb7dafe40c2b32ee252310;p=mirrors%2FASR1603_G5.git PTT 取消ai长按键,用press和release进行逻辑处理。加快PTT 反应速度。 --- diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py index 672425fd..407bf109 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_key_router.py @@ -17,8 +17,6 @@ class KeyRouter(object): @staticmethod def dispatch_press(vc): try: - if int(getattr(vc, "VC_mode", 0)) == 1: - return KeyRouter._ptt_press(vc) return KeyRouter._long_ai_press(vc) except Exception as e: try: @@ -101,10 +99,6 @@ class KeyRouter(object): except Exception: return False - @staticmethod - def _ptt_press(vc): - return True - @staticmethod def ptt_release_after_long_press(vc): """PTT 长按松手:录音过短 → notify TTS + idle。""" diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_mode_strategy.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_mode_strategy.py index 8122593e..d865b931 100644 --- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_mode_strategy.py +++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/vc_mode_strategy.py @@ -31,31 +31,14 @@ class LongDialogueStrategy(VCModeStrategy): return False def on_key_long_press(self, vc): - if vc._vc_ms_keys_blocked("AI_long_press"): - return True - if getattr(vc, "trans_flag", 0) == 1: - vc.Close() - EventMesh.publish("start_voice_record", 4) - vc.AI_key_long_press_flag = 1 - if hasattr(vc, "_vc_key_router_press_cb"): - vc._vc_enqueue_btn(vc._vc_key_router_press_cb, priority=1) - else: - vc._vc_enqueue_btn(vc._ai_key_press_long_dialogue_dispatch, priority=1) - return True + # 长对话:long press 是 press 的延迟版,press 已覆盖所有场景 + return False class PTTStrategy(VCModeStrategy): def on_key_press(self, vc): - if KeyRouter is not None: - return KeyRouter.dispatch_press(vc) - return True - - def on_key_release(self, vc): - vc._ai_key_release_handle_ptt() - return True - - def on_key_long_press(self, vc): - if vc._vc_ms_keys_blocked("AI_long_press"): + # PTT:按下即开录,不再依赖 long press + if vc._vc_ms_keys_blocked("AI_press"): return True if getattr(vc, "trans_flag", 0) == 1: vc.Close() @@ -63,10 +46,16 @@ class PTTStrategy(VCModeStrategy): vc.AI_key_long_press_flag = 1 vc._ptt_idle_latch = 0 vc._ptt_short_press_stop = 0 - # 已在 btn 线程,直接开录,避免二次入队排队(打断 TTS 时常见 ~500ms+ 延迟) vc.ptt_begin() return True + def on_key_release(self, vc): + vc._ai_key_release_handle_ptt() + return True + + def on_key_long_press(self, vc): + return False + def strategy_for_mode(vc_mode): if int(vc_mode) == 1: 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 a139d47b..47d43cb2 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 @@ -1947,7 +1947,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): pass def _ai_key_release_handle_ptt(self): - """单对话 PTT 松手:仅在上行录音中时 end_speech;禁止误触发 AI_VC_start(否则新 sid / cancel 竞态)。""" + """单对话 PTT 松手:上行录音中时 end_speech,未录上时 abort 提示。""" if not self._vc_is_ptt_mode(): return if self.AI_key_long_press_flag == 0: @@ -1966,6 +1966,7 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): if self.AI_key_long_press_flag == 1: try: from vc_key_router import KeyRouter + # 先判时长:录上了但太短 → abort 提示 if KeyRouter.ptt_release_after_long_press(self): return except Exception: @@ -1984,28 +1985,9 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): self._ptt_record_open_ms = 0 except Exception: pass - elif getattr(self, "_ptt_audio_created", 0) == 1 or getattr( - self, "_ptt_defer_speech_until_asr", 0 - ) == 1: - self.AI_key_long_press_flag = 0 - try: - self._ptt_defer_speech_until_asr = 0 - self._ptt_audio_created = 0 - self._ptt_abort_interrupt_arm() - if getattr(self, "AI_client_VC_isconnect", 0) == 1: - self.AI_client_VC_send( - ujson.dumps({"event": "cancel", "payload": {}})) - print("[PTT] release cancel pending audio.create (no record)") - except Exception: - pass else: - self.AI_key_long_press_flag = 0 - try: - if getattr(self, "_ptt_short_press_stop", 0) == 1: - self._ptt_short_press_stop = 0 - except Exception: - pass - print("[PTT] release_no_uplink_skip") + # 没录上(pending arm / cancel wait / session 未就绪):统一 abort + 提示 + self._vc_handle_release_no_record_ptt() return try: if getattr(self, "_ptt_short_press_stop", 0) == 1: @@ -2030,6 +2012,13 @@ class AI_VC(VCSessionIoMixin, VCSessionMediaMixin, Abstract): def _ptt_end_led_suppress(self): # 保持 _vc_play_end_suppress_idle_led / _ptt_led_lock_listening 直至真开录(VC_Speech_Start) pass + + def _vc_handle_release_no_record_ptt(self): + """PTT press 后 release 时没录上:清状态 + abort + idle。""" + tts = cfg_attr("PTT_RECORD_TOO_SHORT_TTS", + "录音时间太短,请按住圆形按钮说话") or "录音时间太短,请按住圆形按钮说话" + self._ptt_abort_short_record(tts) + def _ptt_should_drop_inbound_tts(self): """单对话打断窗口:丢弃迟到 TTS 帧 / 禁止起播。""" if not self._vc_is_ptt_mode():