From 42fbcd5b70bba77eb14edafa2b7512121a1ce87b Mon Sep 17 00:00:00 2001 From: wenjy Date: Fri, 29 Nov 2024 14:30:57 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=AE=9A=E7=82=B9=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E5=9B=BE=E5=83=8F=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.WPF/Page/IndexControl.xaml.cs | 1 + SlnMesnac.WPF/ViewModel/IndexControlViewModel.cs | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SlnMesnac.WPF/Page/IndexControl.xaml.cs b/SlnMesnac.WPF/Page/IndexControl.xaml.cs index 6e345a0..64ddfdf 100644 --- a/SlnMesnac.WPF/Page/IndexControl.xaml.cs +++ b/SlnMesnac.WPF/Page/IndexControl.xaml.cs @@ -453,6 +453,7 @@ namespace SlnMesnac.WPF.Page fixedPointWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen; fixedPointWindow.Topmost = true; fixedPointWindow.ShowDialog(); + } } diff --git a/SlnMesnac.WPF/ViewModel/IndexControlViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexControlViewModel.cs index a921ab7..fc544a3 100644 --- a/SlnMesnac.WPF/ViewModel/IndexControlViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/IndexControlViewModel.cs @@ -74,6 +74,7 @@ namespace SlnMesnac.WPF.ViewModel autoModeBusiness.CaptureAlarmPictureEvent += CapturePicture; autoModeBusiness.GimbaRotationControlEvent += GimbaRotationControl; + fixedPointBusiness.CaptureAlarmPictureEvent += CapturePicture; fixedPointBusiness.GimbaRotationControlEvent += GimbaRotationControl; RefreshTrackMotorAddress(); @@ -246,12 +247,12 @@ namespace SlnMesnac.WPF.ViewModel if (!CHCNetSDK.NET_DVR_CaptureJPEGPicture(m_lUserID, i, ref lpJpegPara, path)) { - _log.Info("高温报警，图像信息保存失败, error code= " + NET_DVR_GetLastError()); + _log.Info("图像信息保存失败, error code= " + NET_DVR_GetLastError()); return; } else { - _log.Info("高温报警，图像信息保存成功: " + path); + _log.Info("图像信息保存成功: " + path); } } }