diff --git a/JiLinApp.Docking/FenceAlarm/Entity/UdpAlarmHost.cs b/JiLinApp.Docking/FenceAlarm/Entity/UdpAlarmHost.cs
index 830c114..dff4702 100644
--- a/JiLinApp.Docking/FenceAlarm/Entity/UdpAlarmHost.cs
+++ b/JiLinApp.Docking/FenceAlarm/Entity/UdpAlarmHost.cs
@@ -121,7 +121,7 @@ public class UdpAlarmHost
DeviceId = 0;
GroupId = 0;
UserId = 0;
- DefenceState = -1;
+ DefenceState = 0;
WorkState = 0;
CellState = 0;
ElectricityState = 0;
diff --git a/JiLinApp/Components/CameraRealPlay.xaml b/JiLinApp/Components/CameraRealPlay.xaml
index 97af64f..9180dcf 100644
--- a/JiLinApp/Components/CameraRealPlay.xaml
+++ b/JiLinApp/Components/CameraRealPlay.xaml
@@ -131,12 +131,12 @@
+ Padding="17 0 0 0" FontSize="11" HorizontalContentAlignment="Center" BorderBrush="#90caf9" VerticalContentAlignment="Center">
+ Padding="0" FontSize="11" Foreground="#000000" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
diff --git a/JiLinApp/Pages/PtzManage/Main.xaml.cs b/JiLinApp/Pages/PtzManage/Main.xaml.cs
index 961d985..75a2d19 100644
--- a/JiLinApp/Pages/PtzManage/Main.xaml.cs
+++ b/JiLinApp/Pages/PtzManage/Main.xaml.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.IO.Ports;
using System.Linq;
using System.Text.RegularExpressions;
+using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -326,6 +327,14 @@ public partial class Main : UserControl
if (cameraSdk == null) { LogUnit.Error(this, $"CameraSdk(cameraId:{cameraId}) not found."); return; }
if (realPlay) Dispatcher.Invoke(() => ShowLiveVideo(cameraSdk));
+ // TODO: 设计 PriorityQueue
+ int len = cameraLinkage.PresetIds.Length;
+ for (int i = 0; i < len; i++)
+ {
+ int presetId = cameraLinkage.PresetIds[i];
+ PtzCameraCmd.PtzMove(cameraSdk, PtzCmdType.PresetGoto, new int[] { presetId });
+ if (i != len) Thread.Sleep(5000);
+ }
}
public void ShowLiveVideo(string cameraIp)