Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi

lib/login/login/starLock_login_page.dart

@@ -243,14 +243,13 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
               },
             ),
             SubmitBtn(
-              btnName: '发送对讲请求',
+              btnName: '发送对讲请求1',
               onClick: () {
                 StartChartManage().sendCallRequestMessage(
-                  ToPeerId: 'GCvA1LeqU1P9bUvxGEEfW41zBqBAiev3enWWuG6k2ekM',
+                  ToPeerId: 'CqKJUADeUZsHrSD4SEVnPBr73fbsHNUXCEq9kyCtE3wp',
                 );
               },
             ),
-
             SizedBox(height: 50.w),
             Row(
               mainAxisAlignment: MainAxisAlignment.center,

lib/talk/startChart/handle/impl/udp_talk_accept_handler.dart

@@ -32,6 +32,8 @@ class UdpTalkAcceptHandler extends ScpMessageBaseHandle
       _handleCheckTalkDataTimer();
       // 启动发送预期数据请求
       _handleStartSendTalkExpectDataRequest();
+      // 停止播放铃声
+      stopRingtone();
       // 设置状态为接听中
       talkStatus.setDuringCall();
       stopRingtone();

lib/talk/startChart/handle/impl/udp_talk_reject_handler.dart

@@ -22,6 +22,7 @@ class UdpTalkRejectHandler extends ScpMessageBaseHandle
     startChartManage.stopTalkPingMessageTimer();
     startChartManage.stopTalkExpectMessageTimer();
     talkStatus.setRejected();
+    stopRingtone();
   }
 
   @override
@@ -31,6 +32,7 @@ class UdpTalkRejectHandler extends ScpMessageBaseHandle
     talkStatus.setRejected();
     startChartManage.stopTalkPingMessageTimer();
     startChartManage.stopTalkExpectMessageTimer();
+    stopRingtone();
   }
 
   @override

lib/talk/startChart/handle/impl/udp_talk_request_handler.dart

@@ -32,6 +32,12 @@ class UdpTalkRequestHandler extends ScpMessageBaseHandle
 
     // Future.delayed(Duration(seconds: 1), () {
     //   startChartManage.sendTalkAcceptMessage();
+    //   // startChartManage.sendTalkRejectMessage();
+    // });
+    //
+    // Future.delayed(Duration(seconds: 5), () {
+    //   startChartManage.sendTalkHangupMessage();
+    //   // startChartManage.sendTalkRejectMessage();
     // });
   }