From 9a0a40702299e11bd753f33d4a093430e9603cfa Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 22 Aug 2025 09:57:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=8E=BB=E9=99=A4=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=80=81=E5=8F=96=E5=87=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catEyeCustomMode_page.dart | 42 +++++++++---------- .../catEyeSet/catEyeSet/catEyeSet_page.dart | 12 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart b/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart index 6e472015..2db21e69 100755 --- a/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart +++ b/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart @@ -89,27 +89,27 @@ class _CatEyeCustomModePageState extends State { SizedBox( height: 30.h, ), - Container( - margin: EdgeInsets.only(left: 20.w), - child: CommonItem( - leftTitel: '实时画面'.tr, - rightTitle: state.realTimeMode.value, - isHaveLine: false, - isHaveDirection: true, - isHaveRightWidget: false, - action: () { - Navigator.pushNamed(context, Routers.liveVideoPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value, - 'catEyeConfigData': state.lockSetInfoData.value - .lockSettingInfo!.catEyeConfig!.isNotEmpty - ? state.lockSetInfoData.value.lockSettingInfo! - .catEyeConfig![0] - : null - }); - }, - ), - ) + // Container( + // margin: EdgeInsets.only(left: 20.w), + // child: CommonItem( + // leftTitel: '实时画面'.tr, + // rightTitle: state.realTimeMode.value, + // isHaveLine: false, + // isHaveDirection: true, + // isHaveRightWidget: false, + // action: () { + // Navigator.pushNamed(context, Routers.liveVideoPage, + // arguments: { + // 'lockSetInfoData': state.lockSetInfoData.value, + // 'catEyeConfigData': state.lockSetInfoData.value + // .lockSettingInfo!.catEyeConfig!.isNotEmpty + // ? state.lockSetInfoData.value.lockSettingInfo! + // .catEyeConfig![0] + // : null + // }); + // }, + // ), + // ) ], ), ), diff --git a/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart b/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart index cfda3b88..c1c88f63 100755 --- a/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart +++ b/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart @@ -80,12 +80,12 @@ class _CatEyeSetPageState extends State { isHaveRightWidget: true, rightWidget: _otherToDoSwitch(2), )), - Obx(() => CommonItem( - leftTitel: '异常警告'.tr, - rightTitle: '', - isHaveLine: true, - isHaveRightWidget: true, - rightWidget: _otherToDoSwitch(3))), + // Obx(() => CommonItem( + // leftTitel: '异常警告'.tr, + // rightTitle: '', + // isHaveLine: true, + // isHaveRightWidget: true, + // rightWidget: _otherToDoSwitch(3))), //ToDo 需增加国际化 CommonItem( leftTitel: '呼叫目标'.tr, From 3e15966c64bc7b487c475a03af1c8eba7cae2c05 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 22 Aug 2025 13:35:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=AF=B9=E8=AE=B2?= =?UTF-8?q?=E9=9F=B3=E9=A2=91=E5=8F=91=E9=80=81=E9=80=9F=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starChart/views/native/talk_view_native_decode_logic.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f93699e..657ce2a6 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 @@ -815,7 +815,7 @@ class TalkViewNativeDecodeLogic extends BaseGetXController { return result; } static const int chunkSize = 320; // 每次发送320字节(10ms G.711) - static const int intervalMs = 40; // 每40ms发送一次(4个chunk) + static const int intervalMs = 35; // 每40ms发送一次(4个chunk) void _sendAudioChunk(Timer timer) async { if (_bufferedAudioFrames.length < chunkSize) { // 数据不足,等待下一周期