From 79f2d95314c4070a96845bbfea82796bdbfe80c2 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Thu, 8 May 2025 15:37:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=9D=99=E9=9F=B3=E6=97=B6=E5=8F=91=E9=80=81=E6=9C=9F=E6=9C=9B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A2=AB=E6=94=B9=E4=B8=BAiamge=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starChart/constant/talk_constant.dart     |  4 ----
 .../handle/impl/udp_talk_request_handler.dart | 23 -------------------
 .../native/talk_view_native_decode_logic.dart |  4 ++--
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/lib/talk/starChart/constant/talk_constant.dart b/lib/talk/starChart/constant/talk_constant.dart
index fd5092c9..ff8a6727 100644
--- a/lib/talk/starChart/constant/talk_constant.dart
+++ b/lib/talk/starChart/constant/talk_constant.dart
@@ -20,8 +20,4 @@ class TalkConstant {
     videoType: [VideoTypeE.H264_720P],
     audioType: [AudioTypeE.G711],
   );
-  static  TalkExpectReq H264_720P_Expect = TalkExpectReq(
-    videoType: [VideoTypeE.H264_720P],
-    audioType: [AudioTypeE.G711],
-  );
 }
diff --git a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart
index 615c7316..55a2ac27 100644
--- a/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart
+++ b/lib/talk/starChart/handle/impl/udp_talk_request_handler.dart
@@ -214,27 +214,4 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
       print('app主动发请求，收到回复后发送的预期数据=======锁不支持H264和MJPEG，默认发送图像视频格式期望数据');
     }
   }
-
-  /// app主动发请求，收到回复后发送的预期数据
-  void _handleResponseSendExpect() {
-    final LockListInfoItemEntity currentKeyInfo =
-        CommonDataManage().currentKeyInfo;
-    final isH264 = currentKeyInfo.lockFeature?.isH264 == 1;
-    final isMJpeg = currentKeyInfo.lockFeature?.isMJpeg == 1;
-
-    // 优先使用H264，其次是MJPEG
-    if (isH264) {
-      // 锁支持H264，发送H264视频和G711音频期望
-      startChartManage.sendH264VideoAndG711AudioTalkExpectData();
-      print('锁支持H264，发送H264视频格式期望数据');
-    } else if (isMJpeg) {
-      // 锁只支持MJPEG，发送图像视频和G711音频期望
-      startChartManage.sendImageVideoAndG711AudioTalkExpectData();
-      print('锁不支持H264，支持MJPEG，发送MJPEG视频格式期望数据');
-    } else {
-      // 默认使用图像视频
-      startChartManage.sendImageVideoAndG711AudioTalkExpectData();
-      print('锁不支持H264和MJPEG，默认发送图像视频格式期望数据');
-    }
-  }
 }
diff --git a/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart b/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart
index f416f98b..033c3f57 100644
--- a/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart
+++ b/lib/talk/starChart/views/native/talk_view_native_decode_logic.dart
@@ -519,13 +519,13 @@ class TalkViewNativeDecodeLogic extends BaseGetXController {
     state.isOpenVoice.value = !state.isOpenVoice.value;
     if (!state.isOpenVoice.value) {
       talkExpectReq = TalkExpectReq(
-        videoType: [VideoTypeE.IMAGE],
+        videoType: [VideoTypeE.H264],
         audioType: [],
       );
       showToast('已静音'.tr);
     } else {
       talkExpectReq = TalkExpectReq(
-        videoType: [VideoTypeE.IMAGE],
+        videoType: [VideoTypeE.H264],
         audioType: [AudioTypeE.G711],
       );
     }