Browse Source

[modify] some change

master
fajiao 1 year ago
parent
commit
a987a7cd84
  1. 2
      JiLinApp.Docking/FenceAlarm/Entity/UdpAlarmHost.cs
  2. 4
      JiLinApp/Components/CameraRealPlay.xaml
  3. 9
      JiLinApp/Pages/PtzManage/Main.xaml.cs

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

4
JiLinApp/Components/CameraRealPlay.xaml

@ -131,12 +131,12 @@
<StackPanel Grid.Row="8" Grid.ColumnSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center">
<ComboBox Name="PresetId" materialDesign:HintAssist.Hint="预置点" Width="90" Height="30" SelectedIndex="0" Style="{StaticResource MaterialDesignOutlinedComboBox}"
Padding="17 0 0 0" FontSize="11" Foreground="#90caf9" HorizontalContentAlignment="Center" BorderBrush="#90caf9" VerticalContentAlignment="Center">
Padding="17 0 0 0" FontSize="11" HorizontalContentAlignment="Center" BorderBrush="#90caf9" VerticalContentAlignment="Center">
</ComboBox>
</StackPanel>
<StackPanel Grid.Row="9" Grid.ColumnSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Name="GotoBtn" Content="前往预置点" Width="90" Height="30" Click="GotoBtn_Click" Style="{StaticResource MaterialDesignOutlinedLightButton}"
Padding="0" FontSize="11" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
Padding="0" FontSize="11" Foreground="#000000" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
</Grid>
</StackPanel>

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

Loading…
Cancel
Save