Browse Source

[change] some change.

master
fajiao 1 year ago
parent
commit
9929f65030
  1. 7
      JiLinApp.Docking/VibrateAlarm/Service/TcpManager.cs
  2. 4
      JiLinApp/Pages/Main/MainWindow.xaml.cs
  3. 7
      JiLinApp/Pages/PtzManage/Main.xaml.cs

7
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;

4
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

7
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)

Loading…
Cancel
Save