From 559890c482f5973f06aafdfec9550fee5ba3c7f2 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 09 十一月 2026 17:02:15 +0800
Subject: [PATCH] feat: CAN 模拟器 TCP 化 + 多设备并发调试 + 后台生命周期管理
---
HMI.UnitTest/App.xaml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HMI.UnitTest/App.xaml b/HMI.UnitTest/App.xaml
index 293171a..ad0c1c0 100644
--- a/HMI.UnitTest/App.xaml
+++ b/HMI.UnitTest/App.xaml
@@ -13,16 +13,17 @@
<ResourceDictionary Source="/HMI.UI;component/Style/BaseWindow.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/FormStyle.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/PanuonResource.xaml"/>
<ResourceDictionary Source="/HMI.UI;component/Style/MsgBoxStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
- <Style TargetType="{x:Type pu:FormGroup}" BasedOn="{StaticResource InputFormGroupStyle}"></Style>
+ <!--<Style TargetType="{x:Type pu:FormGroup}" BasedOn="{StaticResource InputFormGroupStyle}"></Style>-->
<uic:PathImageConverter x:Key="path2Image"/>
<uic:DataGridRowNumberConverter x:Key="rowNumber"/>
<uic:VisibilityBoolConverter x:Key="vbConverter"/>
<uic:DataGridRowFlagConverter x:Key="rowFlag"/>
<hc:LangConverter x:Key="lc"/>
+ <hc:WidthSizeConverter x:Key="fc"/>
+ <hc:HeightSizeConverter x:Key="hfc"/>
</ResourceDictionary>
</Application.Resources>
</Application>
--
Gitblit v1.9.1