diff --git a/JiLinApp.Docking/VibrateAlarm/Service/TcpManager.cs b/JiLinApp.Docking/VibrateAlarm/Service/TcpManager.cs index 314953d..7c61d36 100644 --- a/JiLinApp.Docking/VibrateAlarm/Service/TcpManager.cs +++ b/JiLinApp.Docking/VibrateAlarm/Service/TcpManager.cs @@ -151,7 +151,7 @@ public class TcpManager #region Analysis - private int SendCmdInterval { get; } = 3000; + private int SendCmdInterval { get; } = 6000; private void AnalysisClientMessage(ref ClientMessage clientMsg) { @@ -434,6 +434,7 @@ public class TcpManager Request = msg }; SendRequestTry(ref request); + Thread.Sleep(500); } return true; } @@ -523,6 +524,7 @@ public class TcpManager Request = msg }; SendRequestTry(ref request); + Thread.Sleep(500); } return true; } @@ -563,6 +565,7 @@ public class TcpManager Request = msg }; SendRequestTry(ref request); + Thread.Sleep(500); } return true; } @@ -681,7 +684,7 @@ public class TcpManager private int SendTryTime { get; set; } = 3; - private int SendTryInterval { get; set; } = 300; + private int SendTryInterval { get; set; } = 500; private int ReqWaitTime { get; set; } = 3; diff --git a/JiLinApp/Pages/Main/MainWindow.xaml.cs b/JiLinApp/Pages/Main/MainWindow.xaml.cs index f8c2abf..64ebead 100644 --- a/JiLinApp/Pages/Main/MainWindow.xaml.cs +++ b/JiLinApp/Pages/Main/MainWindow.xaml.cs @@ -1,5 +1,4 @@ -using System; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using System.Windows; using System.Windows.Controls.Primitives; @@ -13,6 +12,7 @@ public partial class MainWindow : Window public MainWindow() { InitializeComponent(); + WindowStartupLocation = WindowStartupLocation.CenterScreen; } #region ElementEvent diff --git a/JiLinApp/Pages/PtzManage/Main.xaml.cs b/JiLinApp/Pages/PtzManage/Main.xaml.cs index 36bbc3e..9b35f5c 100644 --- a/JiLinApp/Pages/PtzManage/Main.xaml.cs +++ b/JiLinApp/Pages/PtzManage/Main.xaml.cs @@ -336,8 +336,9 @@ public partial class Main : UserControl if (item == null) { LogUnit.Error(this, $"CameraLinkageInfo(sensorId:{sensorId}) not found."); return; } string cameraId = item.CameraId; ICameraSDK cameraSdk = GetCameraSdk(cameraId); - if (cameraSdk == null) { LogUnit.Error(this, $"CameraSdk(cameraId:{cameraId}) not found."); return; } - if (cameraSdk.ConnectSuccess()) { MessageBox.Show($"Camera:{cameraSdk.CameraInfo.Ip}, connect failed."); return; } + string cameraIp = cameraSdk.CameraInfo.Ip; + if (cameraSdk == null) { LogUnit.Error(this, $"CameraSdk({cameraId}-{cameraIp}) not found."); return; } + if (!cameraSdk.ConnectSuccess()) { LogUnit.Error(this, $"CameraSdk({cameraId}-{cameraIp}), connect failed."); return; } if (realPlay) Dispatcher.Invoke(() => ShowLiveVideo(cameraSdk)); // TODO: 设计 PriorityQueue @@ -360,7 +361,7 @@ public partial class Main : UserControl public void ShowLiveVideo(ICameraSDK sdk) { if (sdk == null) { LogUnit.Error(this, $"CameraSdk(cameraIp:{sdk.CameraInfo.Ip}) not found."); return; } - if (!sdk.ConnectSuccess()) { LogUnit.Error(this, $"CameraSdk(cameraIp:{sdk.CameraInfo.Ip}) connect failure."); return; } + if (!sdk.ConnectSuccess()) { LogUnit.Error(this, $"CameraSdk({sdk.CameraInfo.Id}-{sdk.CameraInfo.Ip}) connect failed."); return; } string cameraIp = sdk.CameraInfo.Ip; RealPlayDict.TryGetValue(cameraIp, out CameraRealPlay realPlay); if (realPlay == null || realPlay.IsClosed)