From 50366de1d04d17fa25426007ced6fee92c5ee8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Mon, 23 Dec 2024 09:56:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=90=AC=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../star_chart_h264/star_chart_page.dart      | 19 +++++++++----------
 lib/talk/startChart/start_chart_manage.dart   |  5 +++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/main/lockDetail/monitoring/star_chart_h264/star_chart_page.dart b/lib/main/lockDetail/monitoring/star_chart_h264/star_chart_page.dart
index d264a752..8508c58e 100644
--- a/lib/main/lockDetail/monitoring/star_chart_h264/star_chart_page.dart
+++ b/lib/main/lockDetail/monitoring/star_chart_h264/star_chart_page.dart
@@ -98,10 +98,7 @@ class _StarChartPageState extends State<StarChartPage> {
           label: '挂断'.tr,
           color: Colors.red,
           onTap: () async {
-            if (!state.isClickHangUp.value) {
-              logic.initiateHangUpCommand();
-              state.isClickHangUp.value = true;
-            }
+            logic.initiateHangUpCommand();
           },
         ),
         buildIconButton(
@@ -122,17 +119,19 @@ class _StarChartPageState extends State<StarChartPage> {
 
   Widget buildAnswerButton() {
     return Obx(() {
-      final bool isDuringCall =
-          state.talkStatus.value == TalkStatus.duringCall.index;
+      // final bool isDuringCall =
+      //     state.talkStatus.value == TalkStatus.duringCall.index;
       return buildIconButton(
-        icon: isDuringCall
+        icon: state.talkStatus.value == TalkStatus.duringCall.index
             ? 'images/main/icon_lockDetail_monitoringUnTalkback.png'
             : 'images/main/icon_lockDetail_monitoringAnswerCalls.png',
-        label: isDuringCall ? '长按说话'.tr : '接听'.tr,
+        label: state.talkStatus.value == TalkStatus.duringCall.index
+            ? '长按说话'.tr
+            : '接听'.tr,
         onTap: () async {
-          if (!state.isClickAnswer.value) {
+          if (state.talkStatus.value == TalkStatus.waitingAnswer.index) {
             logic.initiateAnswerCommand();
-            state.isClickAnswer.value = true;
+            setState(() {});
           }
         },
         onLongPress: () {
diff --git a/lib/talk/startChart/start_chart_manage.dart b/lib/talk/startChart/start_chart_manage.dart
index 6592d0c3..eaf223fe 100644
--- a/lib/talk/startChart/start_chart_manage.dart
+++ b/lib/talk/startChart/start_chart_manage.dart
@@ -80,7 +80,7 @@ class StartChartManage {
   // 默认通话的期望数据格式
   TalkExpect defaultTalkExpect = TalkExpect(
     videoType: [TalkExpect_VideoTypeE.IMAGE],
-    audioType: [],
+    audioType: [TalkExpect_AudioTypeE.G711],
   );
 
   // 默认通话数据
@@ -295,7 +295,8 @@ class StartChartManage {
       // 取到分包数据
       List<int> packet = payload.sublist(start, end);
 
-      final messageId = MessageCommand.getNextMessageId(toPeerId, increment: false);
+      final messageId =
+          MessageCommand.getNextMessageId(toPeerId, increment: false);
       // 组装分包数据
       final message = MessageCommand.echoMessage(
         ToPeerId: toPeerId,