From 1e9d68be6ea104294b637286019eee1ea14c3355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Tue, 10 Dec 2024 18:33:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=091=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=90=AC=E3=80=81=E6=8C=82=E6=96=AD=E9=93=83=E5=A3=B0=E6=9C=AA?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=97=AE=E9=A2=98=20=092=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8C=82=E6=96=AD=E5=90=8E=E6=9C=AA=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E5=AF=B9=E8=AE=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoring/monitoring/lockMonitoring_page.dart           | 5 +++--
 .../lockDetail/monitoring/monitoring/star_chart_logic.dart   | 1 +
 lib/talk/other/audio_player_manager.dart                     | 3 ++-
 lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart | 1 +
 lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart b/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
index 61385d0f..b640ed92 100755
--- a/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
+++ b/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
@@ -155,8 +155,9 @@ class _LockMonitoringPageState extends State<LockMonitoringPage> {
           label: '挂断'.tr,
           color: Colors.red,
           onTap: () async {
-            logic.stopProcessing();
-            CallTalk().finishAVData();
+            // logic.stopProcessing();
+            // CallTalk().finishAVData();
+
             if (!state.isClickHangUp.value) {
               // logic.initiateUdpHangUpAction(3);
               logic.initiateHangUpCommand();
diff --git a/lib/main/lockDetail/monitoring/monitoring/star_chart_logic.dart b/lib/main/lockDetail/monitoring/monitoring/star_chart_logic.dart
index 6f7bdb92..759f60fa 100644
--- a/lib/main/lockDetail/monitoring/monitoring/star_chart_logic.dart
+++ b/lib/main/lockDetail/monitoring/monitoring/star_chart_logic.dart
@@ -90,6 +90,7 @@ class StarChartLogic extends BaseGetXController {
       // 拒绝
       StartChartManage().sendTalkRejectMessage();
     }
+    Get.back();
   }
 
   Future<void> _onFrame(List<int> frame) async {
diff --git a/lib/talk/other/audio_player_manager.dart b/lib/talk/other/audio_player_manager.dart
index 1e429d15..ff6ffa4c 100644
--- a/lib/talk/other/audio_player_manager.dart
+++ b/lib/talk/other/audio_player_manager.dart
@@ -17,7 +17,6 @@ class AudioPlayerManager {
   // 单例的 AudioPlayer 实例
   final AudioPlayer _audioPlayer = AudioPlayer();
 
-
   // 播放铃声
   Future<void> playRingtone() async {
     try {
@@ -33,7 +32,9 @@ class AudioPlayerManager {
   Future<void> stopRingtone() async {
     try {
       // 不需要设置 ReleaseMode，在停止时保持默认即可
+      _audioPlayer.setReleaseMode(ReleaseMode.loop);
       await _audioPlayer.stop();
+
       log(text: 'Ringtone stopped.');
     } catch (e) {
       log(text: 'Error stopping ringtone: $e');
diff --git a/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart
index 63bbc600..025b1215 100644
--- a/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart
+++ b/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart
@@ -34,6 +34,7 @@ class UdpTalkAcceptHandler extends ScpMessageBaseHandle
       _handleStartSendTalkExpectDataRequest();
       // 设置状态为接听中
       talkStatus.setDuringCall();
+      stopRingtone();
     }
   }
 
diff --git a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart
index 09899649..86b00c1e 100644
--- a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart
+++ b/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart
@@ -23,6 +23,7 @@ class UdpTalkHangUpHandler extends ScpMessageBaseHandle
     startChartManage.stopTalkPingMessageTimer();
     startChartManage.stopTalkExpectMessageTimer();
     talkStatus.setEnd();
+    stopRingtone();
   }
 
   @override
@@ -32,7 +33,7 @@ class UdpTalkHangUpHandler extends ScpMessageBaseHandle
     startChartManage.stopTalkPingMessageTimer();
     startChartManage.stopTalkExpectMessageTimer();
     talkStatus.setEnd();
-
+    stopRingtone();
   }
 
   @override