xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:完成重构设备的添加，删除，更新。

Browse Source
This commit is contained in:
David P.G
2025-10-22 14:06:16 +08:00
parent e995ec7207
commit 54d040b45f
76 changed files with 1028 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
DMS.WPF/App.xaml
View File

@@ -2,11 +2,10 @@
x:Class="DMS.WPF.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:DMS.WPF.Converters"
xmlns:localConverters="clr-namespace:DMS.WPF.Converters"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:triggers="clr-namespace:DMS.Core.Models.Triggers;assembly=DMS.Core"
xmlns:converters="clr-namespace:DMS.WPF.Converters"
xmlns:localConverters="clr-namespace:DMS.WPF.Converters"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
<Application.Resources>
<ResourceDictionary>
@@ -19,31 +18,35 @@
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
</ResourceDictionary.MergedDictionaries>
<!-- Converters -->
<converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter"/>
<converters:NullableTimeSpanToSecondsConverter x:Key="NullableTimeSpanToSecondsConverter"/>
<localConverters:BooleanToBrushConverter x:Key="BooleanToBrushConverter"/> <!-- 确保这个转换器也被引用 -->
<!-- 添加缺失的转换器 -->
<localConverters:EnumToVisibilityConverter x:Key="LocalEnumToVisibilityConverter"/>
<localConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
<localConverters:CountToVisibilityConverter x:Key="CountToVisibilityConverter"/>
<localConverters:BoolToStringConverter x:Key="BoolToStringConverter"/>
<localConverters:BoolToColorConverter x:Key="BoolToColorConverter"/>
<!-- System Accent Color as Brush -->
<!-- Converters -->
<converters:EnumToVisibilityConverter x:Key="EnumToVisibilityConverter" />
<converters:NullableTimeSpanToSecondsConverter x:Key="NullableTimeSpanToSecondsConverter" />
<localConverters:BooleanToBrushConverter x:Key="BooleanToBrushConverter" />
<!-- 确保这个转换器也被引用 -->
<!-- 添加缺失的转换器 -->
<localConverters:EnumToVisibilityConverter x:Key="LocalEnumToVisibilityConverter" />
<localConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<localConverters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
<localConverters:BoolToStringConverter x:Key="BoolToStringConverter" />
<localConverters:BoolToColorConverter x:Key="BoolToColorConverter" />
<!-- System Accent Color as Brush -->
<SolidColorBrush x:Key="SystemAccentColorBrush" Color="{DynamicResource SystemAccentColor}" />
<!-- Material Design Icons Font -->
<!-- Material Design Icons Font -->
<FontFamily x:Key="MdFontIcons">/Assets/Fonts/materialdesignicons-webfont.ttf#Material Design Icons</FontFamily>
<!-- Enum Values for ComboBoxes -->
<ObjectDataProvider x:Key="ActionTypeEnum" ObjectType="{x:Type sys:Enum}" MethodName="GetValues">
<!-- Enum Values for ComboBoxes -->
<ObjectDataProvider
x:Key="ActionTypeEnum"
MethodName="GetValues"
ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="triggers:ActionType"/>
<x:Type TypeName="triggers:ActionType" />
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</ResourceDictionary>
</Application.Resources>