diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 106848b..ddc7c74 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -16,7 +16,7 @@
-
+
@@ -60,7 +60,16 @@
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DM_Weight/App.xaml.cs b/DM_Weight/App.xaml.cs
index 28a848f..0fa1057 100644
--- a/DM_Weight/App.xaml.cs
+++ b/DM_Weight/App.xaml.cs
@@ -23,6 +23,7 @@ using log4net;
using System.Windows.Interop;
using System.Windows.Threading;
using System.Timers;
+using DM_Weight.HIKVISION;
namespace DM_Weight
{
@@ -92,9 +93,11 @@ namespace DM_Weight
// 串口工具
containerRegistry.RegisterSingleton();
// 指纹机工具
- //containerRegistry.RegisterSingleton();
+ containerRegistry.RegisterSingleton();
// 组态屏工具
containerRegistry.RegisterSingleton();
+ // 录像机
+ containerRegistry.RegisterSingleton();
containerRegistry.Register();
diff --git a/DM_Weight/Converter/TotalCountConverter.cs b/DM_Weight/Converter/TotalCountConverter.cs
new file mode 100644
index 0000000..906aa70
--- /dev/null
+++ b/DM_Weight/Converter/TotalCountConverter.cs
@@ -0,0 +1,35 @@
+using DM_Weight.Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+ public class TotalCountConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ var total = 0;
+ // DataGrid分组后对应的组及组内元素CollectionViewGroup.Items 类型是ReadOnlyObservableCollection