From cd63c0924b04b1030c942f37a555ca460aad708f Mon Sep 17 00:00:00 2001 From: liyi Date: Wed, 11 Dec 2024 09:32:51 +0800 Subject: [PATCH] =?UTF-8?q?style:=E6=95=B4=E7=90=86=E6=98=9F=E5=9B=BE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handle/impl/udp_ble_passthrough_handler.dart | 13 ++++--------- .../handle/impl/udp_echo_test_handler.dart | 13 ++++--------- .../handle/impl/udp_gateway_reset_handler.dart | 4 ++-- .../handle/impl/udp_gateway_transfer_handler.dart | 10 ++-------- .../handle/impl/udp_go_online_handler.dart | 8 ++------ .../handle/impl/udp_heart_beat_handler.dart | 13 ++++--------- .../handle/impl/udp_remote_un_lock_handler.dart | 4 ++-- .../handle/impl/udp_talk_accept_handler.dart | 6 ++++-- .../handle/impl/udp_talk_expect_handler.dart | 4 ++-- .../handle/impl/udp_talk_hangup_handler.dart | 4 ++-- .../handle/impl/udp_talk_ping_handler.dart | 10 ++-------- .../handle/impl/udp_talk_push_handler.dart | 10 ++-------- .../impl/udp_talk_receiver_transfer_handler.dart | 4 ++-- .../handle/impl/udp_talk_reject_handler.dart | 8 ++++---- .../handle/impl/udp_talk_request_handler.dart | 11 +---------- lib/talk/startChart/start_chart_talk_status.dart | 2 +- 16 files changed, 40 insertions(+), 84 deletions(-) diff --git a/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart b/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart index 8bb2bad7..5cc8361b 100644 --- a/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_ble_passthrough_handler.dart @@ -10,9 +10,8 @@ import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; import '../../start_chart_manage.dart'; -class UdpBlePassThroughHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - - +class UdpBlePassThroughHandler extends ScpMessageBaseHandle + implements ScpMessageHandler { @override void handleReq(ScpMessage scpMessage) { final BleResp bleResp = scpMessage.Payload; @@ -25,12 +24,8 @@ class UdpBlePassThroughHandler extends ScpMessageBaseHandle implements ScpMessag } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart b/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart index 4f13ead1..a98870b5 100644 --- a/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_echo_test_handler.dart @@ -6,9 +6,8 @@ import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; import '../../start_chart_manage.dart'; -class UdpEchoTestHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - - +class UdpEchoTestHandler extends ScpMessageBaseHandle + implements ScpMessageHandler { @override void handleReq(ScpMessage scpMessage) { // TODO: 收到回声测试请求 @@ -21,12 +20,8 @@ class UdpEchoTestHandler extends ScpMessageBaseHandle implements ScpMessageHandl } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart b/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart index d4bb0b37..b02bb65b 100644 --- a/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_gateway_reset_handler.dart @@ -27,11 +27,11 @@ class UdpGateWayResetHandler extends ScpMessageBaseHandle implements ScpMessageH @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } diff --git a/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart b/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart index 9e032ce1..7eae5ae8 100644 --- a/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_gateway_transfer_handler.dart @@ -10,8 +10,6 @@ import '../../start_chart_manage.dart'; class UdpGateWayTransferHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - - @override void handleReq(ScpMessage scpMessage) { // TODO: 收到网关转移请求 @@ -27,12 +25,8 @@ class UdpGateWayTransferHandler extends ScpMessageBaseHandle } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_go_online_handler.dart b/lib/talk/startChart/handle/impl/udp_go_online_handler.dart index 74b75012..7f703f4a 100644 --- a/lib/talk/startChart/handle/impl/udp_go_online_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_go_online_handler.dart @@ -31,12 +31,8 @@ class UdpGoOnlineHandler extends ScpMessageBaseHandle } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart b/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart index abd7a434..de843012 100644 --- a/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_heart_beat_handler.dart @@ -7,9 +7,8 @@ import 'package:star_lock/talk/startChart/handle/scp_message_handle.dart'; import '../../start_chart_manage.dart'; -class UdpHeartBeatHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - - +class UdpHeartBeatHandler extends ScpMessageBaseHandle + implements ScpMessageHandler { @override void handleReq(ScpMessage scpMessage) { // TODO: 收到心跳消息请求 @@ -32,12 +31,8 @@ class UdpHeartBeatHandler extends ScpMessageBaseHandle implements ScpMessageHand } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart b/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart index 3e3f3729..4852ee40 100644 --- a/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_remote_un_lock_handler.dart @@ -25,11 +25,11 @@ class UdpRemoteUnLockHandler extends ScpMessageBaseHandle implements ScpMessageH @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } 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 a9716d90..c2f4aad4 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart @@ -42,12 +42,12 @@ class UdpTalkAcceptHandler extends ScpMessageBaseHandle @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } // 启动通话保持 @@ -63,6 +63,7 @@ class UdpTalkAcceptHandler extends ScpMessageBaseHandle startChartManage.stopTalkPingMessageTimer(); startChartManage.stopTalkExpectMessageTimer(); talkStatus.setNotTalkPing(); + talkStatus.setEnd(); }); } @@ -76,6 +77,7 @@ class UdpTalkAcceptHandler extends ScpMessageBaseHandle startChartManage.stopTalkPingMessageTimer(); startChartManage.stopTalkExpectMessageTimer(); talkStatus.setNotTalkData(); + talkStatus.setEnd(); }); } diff --git a/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart index 3a7dd4a4..f948b7f2 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_expect_handler.dart @@ -29,11 +29,11 @@ class UdpTalkExpectHandler extends ScpMessageBaseHandle @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } 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 86b00c1e..38b07c3b 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_hangup_handler.dart @@ -38,11 +38,11 @@ class UdpTalkHangUpHandler extends ScpMessageBaseHandle @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } diff --git a/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart index 05c90ec7..0c952f48 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_ping_handler.dart @@ -6,7 +6,6 @@ import 'package:star_lock/talk/startChart/proto/generic.pb.dart'; class UdpTalkPingHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - @override void handleReq(ScpMessage scpMessage) { // TODO: 收到通话保持请求 @@ -19,17 +18,12 @@ class UdpTalkPingHandler extends ScpMessageBaseHandle if (checkGenericRespSuccess(genericResp)) { // 收到消息，重新触发定时器 talkePingOverTimeTimerManager.receiveMessage(); - } } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart index fab49041..b7872213 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_push_handler.dart @@ -10,7 +10,6 @@ import '../../start_chart_manage.dart'; class UdpTalkPushHandler extends ScpMessageBaseHandle implements ScpMessageHandler { - @override void handleReq(ScpMessage scpMessage) { // TODO: 收到委托推送请求 @@ -24,13 +23,8 @@ class UdpTalkPushHandler extends ScpMessageBaseHandle } @override - void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq - } + void handleInvalidReq(ScpMessage scpMessage) {} @override - void handleRealTimeData(ScpMessage scpMessage - ) { - // TODO: implement handleRealTimeData - } + void handleRealTimeData(ScpMessage scpMessage) {} } diff --git a/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart index 5b17a295..6e662383 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_receiver_transfer_handler.dart @@ -24,11 +24,11 @@ class UdpTalkReceiverTransferHandler extends ScpMessageBaseHandle @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } diff --git a/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart index b75805e1..3aab2976 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart @@ -13,7 +13,6 @@ class UdpTalkRejectHandler extends ScpMessageBaseHandle @override void handleReq(ScpMessage scpMessage) { // 收到接听拒绝请求 - print('收到接听拒绝请求'); startChartManage.sendGenericRespSuccessMessage( ToPeerId: scpMessage.FromPeerId!, FromPeerId: scpMessage.ToPeerId!, @@ -23,25 +22,26 @@ class UdpTalkRejectHandler extends ScpMessageBaseHandle startChartManage.stopTalkExpectMessageTimer(); talkStatus.setRejected(); stopRingtone(); + talkStatus.setEnd(); } @override void handleResp(ScpMessage scpMessage) { - print('收到接听拒绝回复'); // 收到接听拒绝回复 talkStatus.setRejected(); startChartManage.stopTalkPingMessageTimer(); startChartManage.stopTalkExpectMessageTimer(); stopRingtone(); + talkStatus.setEnd(); } @override void handleInvalidReq(ScpMessage scpMessage) { - // TODO: implement handleInvalidReq + } @override void handleRealTimeData(ScpMessage scpMessage) { - // TODO: implement handleRealTimeData + } } diff --git a/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart b/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart index a0265cbb..cd6c544c 100644 --- a/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart +++ b/lib/talk/startChart/handle/impl/udp_talk_request_handler.dart @@ -30,15 +30,6 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle // 处理收到接听请求后的事件 _talkRequestEvent(talkObjectName: talkReq.callerName); - // Future.delayed(Duration(seconds: 1), () { - // startChartManage.sendTalkAcceptMessage(); - // // startChartManage.sendTalkRejectMessage(); - // }); - // - // Future.delayed(Duration(seconds: 5), () { - // startChartManage.sendTalkHangupMessage(); - // // startChartManage.sendTalkRejectMessage(); - // }); } @override @@ -46,7 +37,7 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle // 收到对讲请求回复 final GenericResp genericResp = scpMessage.Payload; if (genericResp.code == 0) { - print('发送对讲成功'); + print('发送对讲成功,已经收到对方的回复'); } } diff --git a/lib/talk/startChart/start_chart_talk_status.dart b/lib/talk/startChart/start_chart_talk_status.dart index 013eac85..31cda259 100644 --- a/lib/talk/startChart/start_chart_talk_status.dart +++ b/lib/talk/startChart/start_chart_talk_status.dart @@ -106,6 +106,6 @@ class StartChartTalkStatus { /// 设置状态为结束 void setEnd() { _setStatus(TalkStatus.end); - // 可以在这里添加特定于 "error" 状态的逻辑 + // 可以在这里添加特定于 "end" 状态的逻辑 } }