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], ); }