maqiao
/
HKC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉录像机相关内容

This commit is contained in:
maqiao 2024-11-26 17:09:37 +08:00
parent 9f918d8aeb
commit 2a495becbd
5 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DM_Weight/App.xaml.cs
View File

@ -103,7 +103,7 @@ namespace DM_Weight
// 组态屏工具 // 组态屏工具
//containerRegistry.RegisterSingleton<ScreenUtil>(); //containerRegistry.RegisterSingleton<ScreenUtil>();
// 录像机 // 录像机
containerRegistry.RegisterSingleton<CHKFunction>(); //containerRegistry.RegisterSingleton<CHKFunction>();
containerRegistry.Register<IDialogService, MaterialDialogService>(); containerRegistry.Register<IDialogService, MaterialDialogService>();

7
DM_Weight/Port/PortUtil.cs
View File

@ -230,7 +230,7 @@ namespace DM_Weight.Port
logger.Info($"进行抽屉操作抽屉号【{DrawerNo}】类型【{BoardType}】库位【{string.Join(",", ColNos)}】窗口【{WindowName}】"); logger.Info($"进行抽屉操作抽屉号【{DrawerNo}】类型【{BoardType}】库位【{string.Join(",", ColNos)}】窗口【{WindowName}】");
Operate = true; Operate = true;
//开始录像 //开始录像
_chkFunction.HIKStartDVRRecord(); //_chkFunction.HIKStartDVRRecord();
logger.Info($"时间:{DateTime.Now}"); logger.Info($"时间:{DateTime.Now}");
try try
{ {
@ -683,8 +683,7 @@ namespace DM_Weight.Port
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private CHKFunction _chkFunction; public PortUtil(IEventAggregator eventAggregator)
public PortUtil(IEventAggregator eventAggregator, CHKFunction chkFunction)
{ {
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
//try //try
@ -761,7 +760,7 @@ namespace DM_Weight.Port
{ {
logger.Error("温湿度串口打开错误" + e.Message); logger.Error("温湿度串口打开错误" + e.Message);
} }
_chkFunction = chkFunction; //_chkFunction = chkFunction;
} }

58
DM_Weight/ViewModels/HomeWindowViewModel.cs
View File

@ -344,16 +344,16 @@ namespace DM_Weight.ViewModels
public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); } public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
public bool KeepAlive => false; public bool KeepAlive => false;
private PortUtil _portUtil; private PortUtil _portUtil;
private CHKFunction _chkFunction; //private CHKFunction _chkFunction;
IEventAggregator _eventAggregator; IEventAggregator _eventAggregator;
public HomeWindowViewModel(IRegionManager iRegionManager, PortUtil portUtil, IDialogService dialogService, IUnityContainer container, IEventAggregator eventAggregator, CHKFunction cHKFunction) public HomeWindowViewModel(IRegionManager iRegionManager, PortUtil portUtil, IDialogService dialogService, IUnityContainer container, IEventAggregator eventAggregator)
{ {
_portUtil = portUtil; _portUtil = portUtil;
_regionManager = iRegionManager; _regionManager = iRegionManager;
_dialogService = dialogService; _dialogService = dialogService;
_container = container; _container = container;
this._eventAggregator = eventAggregator; this._eventAggregator = eventAggregator;
_chkFunction = cHKFunction; //_chkFunction = cHKFunction;
} }
public DelegateCommand<string> OpenFingerDialog public DelegateCommand<string> OpenFingerDialog
@ -453,7 +453,7 @@ namespace DM_Weight.ViewModels
// } // }
//} //}
//保存温湿度信息 //保存温湿度信息
private async void GetWSD(object sender, ElapsedEventArgs e) private void GetWSD(object sender, ElapsedEventArgs e)
{ {
TemperatureHumidityInfo temp = _portUtil.GetWSD(); TemperatureHumidityInfo temp = _portUtil.GetWSD();
if (temp != null) if (temp != null)
@ -546,10 +546,10 @@ namespace DM_Weight.ViewModels
{ {
Operator = null; Operator = null;
Reviewer = null; Reviewer = null;
Application.Current.Dispatcher.Invoke(() => //Application.Current.Dispatcher.Invoke(() =>
{ //{
_regionManager.RequestNavigate("MainRegion", "LoginWindow"); _regionManager.RequestNavigate("MainRegion", "LoginWindow");
}); //});
AlertMsg alertMsg = new AlertMsg AlertMsg alertMsg = new AlertMsg
{ {
Message = $"用户{UserList.Nickname}或还未设置权限，请联系管理员", Message = $"用户{UserList.Nickname}或还未设置权限，请联系管理员",
@ -623,25 +623,25 @@ namespace DM_Weight.ViewModels
//WDTimer.Enabled = true; //WDTimer.Enabled = true;
} }
#endregion #endregion
if (stopRecord > 0) //if (stopRecord > 0)
{ //{
System.Timers.Timer timer = new System.Timers.Timer(); // System.Timers.Timer timer = new System.Timers.Timer();
timer.Interval = 1000; // timer.Interval = 1000;
timer.Elapsed += (sender, e) => // timer.Elapsed += (sender, e) =>
{ // {
//指定时间内无人操作鼠标键盘则停止录像 // //指定时间内无人操作鼠标键盘则停止录像
if (!_portUtil.Operate && CheckComputerFreeState.GetLastInputTime() > stopRecord) // if (!_portUtil.Operate && CheckComputerFreeState.GetLastInputTime() > stopRecord)
{ // {
_chkFunction.HIKStopDVRRecord(); // _chkFunction.HIKStopDVRRecord();
} // }
}; // };
timer.Start(); // timer.Start();
} //}
logger.Info($"当前时间:{DateTime.Now}\r\n获取录像机的时间"); //logger.Info($"当前时间:{DateTime.Now}\r\n获取录像机的时间");
//获取录像机的时间 ////获取录像机的时间
_chkFunction.HIK_DVR_TIME(); //_chkFunction.HIK_DVR_TIME();
_chkFunction.HIKStartDVRRecord(); //_chkFunction.HIKStartDVRRecord();
} }
//每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建 //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
@ -658,13 +658,13 @@ namespace DM_Weight.ViewModels
} }
private void SetLoginOut() private void SetLoginOut()
{ {
_chkFunction.HIKStopDVRRecord(); //_chkFunction.HIKStopDVRRecord();
Operator = null; Operator = null;
Reviewer = null; Reviewer = null;
Application.Current.Dispatcher.Invoke(() => //Application.Current.Dispatcher.Invoke(() =>
{ //{
_regionManager.RequestNavigate("MainRegion", "LoginWindow"); _regionManager.RequestNavigate("MainRegion", "LoginWindow");
}); //});
} }
} }

26
DM_Weight/ViewModels/LoginWindowViewModel.cs
View File

@ -65,7 +65,7 @@ namespace DM_Weight.ViewModels
private FingerprintUtil _fingerprintUtil; private FingerprintUtil _fingerprintUtil;
private PortUtil _portUtil; private PortUtil _portUtil;
private CHKFunction _chkFunction; //private CHKFunction _chkFunction;
public Boolean LoginBtnEnable { get { return _loginBtnEnable; } set { SetProperty(ref _loginBtnEnable, value); } } public Boolean LoginBtnEnable { get { return _loginBtnEnable; } set { SetProperty(ref _loginBtnEnable, value); } }
public string Password { get { return password; } set { SetProperty(ref password, value); } } public string Password { get { return password; } set { SetProperty(ref password, value); } }
@ -115,11 +115,11 @@ namespace DM_Weight.ViewModels
// _regionManager = regionManager; // _regionManager = regionManager;
// _eventAggregator = eventAggregator; // _eventAggregator = eventAggregator;
//} //}
public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil, CHKFunction chcFunction) public LoginWindowViewModel(IRegionManager regionManager, IEventAggregator eventAggregator, PortUtil portUtil)
{ {
//_fingerprintUtil = fingerprintUtil; //_fingerprintUtil = fingerprintUtil;
_portUtil = portUtil; _portUtil = portUtil;
_chkFunction= chcFunction; //_chkFunction= chcFunction;
_regionManager = regionManager; _regionManager = regionManager;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
} }
@ -259,10 +259,10 @@ _exitCommand ??= new DelegateCommand(Exit);
{ {
//添加参数，键值对格式 //添加参数，键值对格式
keys.Add("operator", user); keys.Add("operator", user);
System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() => //System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
{ //{
_regionManager.RequestNavigate("MainRegion", "HomeWindow", keys); _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
})); //}));
} }
// 双人登录模式 // 双人登录模式
else else
@ -275,10 +275,10 @@ _exitCommand ??= new DelegateCommand(Exit);
keys.Add("reviewer", user); keys.Add("reviewer", user);
Reviewer = user; Reviewer = user;
RaisePropertyChanged("Reviewer"); RaisePropertyChanged("Reviewer");
System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() => //System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
{ //{
_regionManager.RequestNavigate("MainRegion", "HomeWindow", keys); _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
})); //}));
} }
else else
@ -299,10 +299,10 @@ _exitCommand ??= new DelegateCommand(Exit);
keys.Add("operator", user); keys.Add("operator", user);
Operator = user; Operator = user;
RaisePropertyChanged("Operator"); RaisePropertyChanged("Operator");
System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() => //System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
{ //{
_regionManager.RequestNavigate("MainRegion", "HomeWindow", keys); _regionManager.RequestNavigate("MainRegion", "HomeWindow", keys);
})); //}));
} }
else else
@ -360,7 +360,7 @@ _exitCommand ??= new DelegateCommand(Exit);
void Exit() void Exit()
{ {
_chkFunction.HIKLoginOut(); //_chkFunction.HIKLoginOut();
Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
Environment.Exit(0); Environment.Exit(0);
} }

14
DM_Weight/ViewModels/MainWindowViewModel.cs
View File

@ -65,9 +65,9 @@ namespace DM_Weight.ViewModels
private FingerprintUtil _fingerprintUtil; private FingerprintUtil _fingerprintUtil;
IRegionManager _regionManager; IRegionManager _regionManager;
IUnityContainer _container; IUnityContainer _container;
private CHKFunction _cHKFunction; //private CHKFunction _cHKFunction;
private readonly ILog logger = LogManager.GetLogger(typeof(PortUtil)); private readonly ILog logger = LogManager.GetLogger(typeof(PortUtil));
public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator, FingerprintUtil fingerprintUtil, CHKFunction cHKFunction) public MainWindowViewModel(IRegionManager regionManager, IUnityContainer container, IEventAggregator eventAggregator, FingerprintUtil fingerprintUtil)
{ {
//_portUtil = portUtil; //_portUtil = portUtil;
this.eventAggregator = eventAggregator; this.eventAggregator = eventAggregator;
@ -75,15 +75,15 @@ namespace DM_Weight.ViewModels
_fingerprintUtil = fingerprintUtil; _fingerprintUtil = fingerprintUtil;
_regionManager = regionManager; _regionManager = regionManager;
_container = container; _container = container;
_cHKFunction = cHKFunction; //_cHKFunction = cHKFunction;
System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() => //System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
{ //{
_container.RegisterType<object, LoginWindow>("LoginWindow"); _container.RegisterType<object, LoginWindow>("LoginWindow");
_regionManager.RequestNavigate("MainRegion", "LoginWindow"); _regionManager.RegisterViewWithRegion("MainRegion", "LoginWindow");
})); //}));
} }