diff --git a/KeyGen/App.xaml b/KeyGen/App.xaml
deleted file mode 100644
index fef1807..0000000
--- a/KeyGen/App.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Application
-    StartupUri="MainWindow.xaml"
-    x:Class="KeyGen.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:local="clr-namespace:KeyGen"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <!--<ms:ThemesDictionary Mode="Dark" Palette="Blue"/>
-                <ms:ControlsDictionary/>-->
-                <ResourceDictionary Source="pack://application:,,,/Melskin;component/Themes/Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/Melskin;component/Themes/Accents/LightBlue.xaml" />
-                <!--<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/DarkBlue.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Dark.xaml" />-->
-                <ResourceDictionary Source="pack://application:,,,/Melskin;component/Themes/Generic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/KeyGen/App.xaml.cs b/KeyGen/App.xaml.cs
deleted file mode 100644
index b6bedf6..0000000
--- a/KeyGen/App.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Configuration;
-using System.Data;
-using System.Windows;
-
-namespace KeyGen;
-
-/// <summary>
-/// Interaction logic for App.xaml
-/// </summary>
-public partial class App : Application
-{
-}
\ No newline at end of file
diff --git a/KeyGen/AssemblyInfo.cs b/KeyGen/AssemblyInfo.cs
deleted file mode 100644
index 4a05c7d..0000000
--- a/KeyGen/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page,
-    // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page,
-    // app, or any theme specific resource dictionaries)
-)]
\ No newline at end of file
diff --git a/KeyGen/KeyGen.csproj b/KeyGen/KeyGen.csproj
deleted file mode 100644
index 5f665df..0000000
--- a/KeyGen/KeyGen.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <TargetFramework>net48</TargetFramework>
-        <LangVersion>preview</LangVersion>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <UseWPF>true</UseWPF>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Melskin\Melskin.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Reference Include="System.Management" />
-    </ItemGroup>
-
-</Project>
diff --git a/Melskin/Controls/MelWindow.xaml b/Melskin/Controls/MelWindow.xaml
index da59529..84b469d 100644
--- a/Melskin/Controls/MelWindow.xaml
+++ b/Melskin/Controls/MelWindow.xaml
@@ -1,21 +1,21 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:assists="clr-namespace:Melskin.Assists"
-    xmlns:controls="clr-namespace:Melskin.Controls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ControlTemplate TargetType="{x:Type Button}" x:Key="WindowNormalButtonTemplate">
+    xmlns:controls="clr-namespace:Melskin.Controls">
+    <ControlTemplate x:Key="WindowNormalButtonTemplate" TargetType="{x:Type Button}">
         <Border
+            x:Name="border"
             Background="{TemplateBinding Background}"
-            SnapsToDevicePixels="True"
-            x:Name="border">
+            SnapsToDevicePixels="True">
             <ContentPresenter
-                Focusable="False"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                x:Name="contentPresenter"
                 Margin="{TemplateBinding Padding}"
-                RecognizesAccessKey="True"
-                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                x:Name="contentPresenter" />
+                Focusable="False"
+                RecognizesAccessKey="True"
+                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Border>
         <ControlTemplate.Triggers>
             <MultiTrigger>
@@ -23,13 +23,13 @@
                     <Condition Property="IsMouseOver" Value="True" />
                     <Condition Property="Background" Value="Transparent" />
                 </MultiTrigger.Conditions>
-                <Setter Property="Background" TargetName="border" Value="{DynamicResource BackgroundLayoutBrush}" />
+                <Setter TargetName="border" Property="Background" Value="{DynamicResource BackgroundLayoutBrush}" />
                 <!--<Setter TargetName="border" Property="Effect">
                     <Setter.Value>
                         <effects:BrightnessContrastEffect Brightness="0.1" />
                     </Setter.Value>
                 </Setter>-->
-                <Setter Property="Background" TargetName="border" Value="#1A000000" />
+                <Setter TargetName="border" Property="Background" Value="#1A000000" />
                 <Setter Property="Opacity" Value="1" />
             </MultiTrigger>
             <Trigger Property="IsPressed" Value="True">
@@ -38,35 +38,35 @@
                         <effects:BrightnessContrastEffect Brightness="0.05" />
                     </Setter.Value>
                 </Setter>-->
-                <Setter Property="Background" TargetName="border" Value="#33000000" />
+                <Setter TargetName="border" Property="Background" Value="#33000000" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Background" Value="{DynamicResource ControlBackgroundDisabledBrush}" />
-                <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Path=(assists:ShadingAssist.DisabledForeground), RelativeSource={RelativeSource TemplatedParent}}" />
+                <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Path=(assists:ShadingAssist.DisabledForeground), RelativeSource={RelativeSource TemplatedParent}}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-    <ControlTemplate TargetType="{x:Type Button}" x:Key="WindowCloseButtonTemplate">
+    <ControlTemplate x:Key="WindowCloseButtonTemplate" TargetType="{x:Type Button}">
         <Border
+            x:Name="border"
             Background="{TemplateBinding Background}"
-            SnapsToDevicePixels="True"
-            x:Name="border">
+            SnapsToDevicePixels="True">
             <ContentPresenter
-                Focusable="False"
-                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                x:Name="contentPresenter"
                 Margin="{TemplateBinding Padding}"
-                RecognizesAccessKey="True"
-                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                x:Name="contentPresenter" />
+                Focusable="False"
+                RecognizesAccessKey="True"
+                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Background" TargetName="border" Value="#E81123" />
+                <Setter TargetName="border" Property="Background" Value="#E81123" />
                 <Setter Property="Foreground" Value="#e0e0e0" />
             </Trigger>
             <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Background" TargetName="border" Value="#F1707A" />
+                <Setter TargetName="border" Property="Background" Value="#F1707A" />
                 <Setter Property="Foreground" Value="#edbebb" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
@@ -76,7 +76,7 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
     <!--  窗口标题按钮  -->
-    <Style TargetType="{x:Type Button}" x:Key="WindowButton">
+    <Style x:Key="WindowButton" TargetType="{x:Type Button}">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="UseLayoutRounding" Value="True" />
@@ -98,7 +98,7 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    <Style TargetType="{x:Type Button}" x:Key="WindowCloseButton">
+    <Style x:Key="WindowCloseButton" TargetType="{x:Type Button}">
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="UseLayoutRounding" Value="True" />
@@ -115,7 +115,7 @@
         <Setter Property="Template" Value="{StaticResource WindowNormalButtonTemplate}" />
     </Style>
 
-    <Style TargetType="{x:Type ResizeGrip}" x:Key="ResizeGripStyle">
+    <Style x:Key="ResizeGripStyle" TargetType="{x:Type ResizeGrip}">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Height" Value="18" />
         <Setter Property="HorizontalAlignment" Value="Right" />
@@ -124,10 +124,10 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ResizeGrip}">
                     <Grid
-                        Background="{TemplateBinding Background}"
+                        Width="18"
                         Height="18"
-                        SnapsToDevicePixels="True"
-                        Width="18">
+                        Background="{TemplateBinding Background}"
+                        SnapsToDevicePixels="True">
                         <Grid.Resources>
                             <Style TargetType="Rectangle">
                                 <!--<Setter Property="Fill" Value="{Binding BorderBackgroundBrush, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" />-->
@@ -163,12 +163,12 @@
         </Style.Triggers>
     </Style>
 
-    <Style TargetType="controls:MelWindow" x:Key="NeoWindowStyle">
+    <Style x:Key="NeoWindowStyle" TargetType="controls:MelWindow">
         <Setter Property="Background" Value="{DynamicResource BackgroundLayoutBrush}" />
         <Setter Property="MinWidth" Value="300" />
         <Setter Property="WindowChrome.WindowChrome">
             <Setter.Value>
-                <WindowChrome UseAeroCaptionButtons="False">
+                <WindowChrome CaptionHeight="32" UseAeroCaptionButtons="True">
                     <!--<WindowChrome.ResizeBorderThickness>6</WindowChrome.ResizeBorderThickness>
                  <WindowChrome.NonClientFrameEdges>Left,Bottom,Right</WindowChrome.NonClientFrameEdges>-->
                 </WindowChrome>
@@ -181,10 +181,10 @@
                         <!--  激活窗口后，窗口内容逐渐清晰，不透明度增加到1  -->
                         <Storyboard x:Key="OpacityInStoryboard">
                             <DoubleAnimation
-                                Duration="0:0:0.2"
-                                From="0.75"
                                 Storyboard.TargetProperty="Opacity"
-                                To="1">
+                                From="0.75"
+                                To="1"
+                                Duration="0:0:0.2">
                                 <DoubleAnimation.EasingFunction>
                                     <SineEase EasingMode="EaseOut" />
                                 </DoubleAnimation.EasingFunction>
@@ -192,10 +192,10 @@
                         </Storyboard>
                         <Storyboard x:Key="OpacityOutStoryboard">
                             <DoubleAnimation
-                                Duration="0:0:0.2"
-                                From="1"
                                 Storyboard.TargetProperty="Opacity"
-                                To="0.75">
+                                From="1"
+                                To="0.75"
+                                Duration="0:0:0.2">
                                 <DoubleAnimation.EasingFunction>
                                     <SineEase EasingMode="EaseOut" />
                                 </DoubleAnimation.EasingFunction>
@@ -215,7 +215,7 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
-                        <Grid Background="{TemplateBinding Background}" x:Name="RootGrid">
+                        <Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="32" />
                                 <RowDefinition Height="*" />
@@ -228,45 +228,45 @@
                             <!--  自定义标题栏  -->
                             <!--  上方背景  -->
                             <Border
-                                Background="{TemplateBinding assists:ColorAssist.TitleBarBackground}"
+                                Grid.Row="0"
                                 Grid.Column="0"
                                 Grid.ColumnSpan="3"
-                                Grid.Row="0" />
+                                Background="{TemplateBinding assists:ColorAssist.TitleBarBackground}" />
                             <StackPanel
-                                Grid.Column="0"
                                 Grid.Row="0"
+                                Grid.Column="0"
                                 Orientation="Horizontal">
                                 <!--  图标容器  -->
                                 <Image
                                     Margin="10,10,4,4"
+                                    VerticalAlignment="Center"
                                     Panel.ZIndex="2048"
                                     RenderOptions.BitmapScalingMode="HighQuality"
                                     Source="{TemplateBinding Icon}"
-                                    Stretch="Uniform"
-                                    VerticalAlignment="Center" />
+                                    Stretch="Uniform" />
 
                                 <!--  左侧标题栏容器  -->
                                 <ContentControl
-                                    Content="{TemplateBinding TitleBarLeftContent}"
+                                    x:Name="LeftContent"
                                     Margin="0,6,8,0"
                                     VerticalAlignment="Center"
                                     VerticalContentAlignment="Center"
-                                    WindowChrome.IsHitTestVisibleInChrome="True"
-                                    x:Name="LeftContent" />
+                                    Content="{TemplateBinding TitleBarLeftContent}"
+                                    WindowChrome.IsHitTestVisibleInChrome="True" />
 
                             </StackPanel>
                             <!--  标题  -->
                             <Label
-                                Grid.Column="1"
                                 Grid.Row="0"
-                                HorizontalAlignment="Left"
+                                Grid.Column="1"
                                 Margin="0,6,0,0"
-                                Padding="12,2">
+                                Padding="12,2"
+                                HorizontalAlignment="Left">
                                 <TextBlock
+                                    x:Name="TitleBlock"
                                     FontSize="14"
                                     Foreground="{DynamicResource TextPrimaryBrush}"
-                                    Text="{TemplateBinding Title}"
-                                    x:Name="TitleBlock">
+                                    Text="{TemplateBinding Title}">
                                     <TextBlock.Style>
                                         <Style TargetType="TextBlock">
                                             <Style.Triggers>
@@ -291,20 +291,20 @@
                                 </TextBlock>
                             </Label>
                             <StackPanel
-                                Grid.Column="2"
                                 Grid.Row="0"
+                                Grid.Column="2"
                                 HorizontalAlignment="Right"
                                 Orientation="Horizontal"
                                 WindowChrome.IsHitTestVisibleInChrome="True">
                                 <!--  右侧内容容器  -->
                                 <ContentControl
-                                    Content="{TemplateBinding TitleBarRightContent}"
+                                    x:Name="RightContent"
                                     VerticalAlignment="Center"
                                     VerticalContentAlignment="Center"
-                                    WindowChrome.IsHitTestVisibleInChrome="True"
-                                    x:Name="RightContent" />
+                                    Content="{TemplateBinding TitleBarRightContent}"
+                                    WindowChrome.IsHitTestVisibleInChrome="True" />
                                 <!--  功能按钮  -->
-                                <Button ToolTip="最小化" x:Name="minimizeButton">
+                                <Button x:Name="minimizeButton" ToolTip="最小化">
                                     <Button.Style>
                                         <Style BasedOn="{StaticResource WindowButton}" TargetType="Button">
                                             <Style.Triggers>
@@ -316,14 +316,14 @@
                                         </Style>
                                     </Button.Style>
                                     <controls:IconElement
+                                        Padding="0,-14,0,0"
                                         FontSize="24"
                                         Foreground="{Binding ElementName=minimizeButton, Path=Foreground}"
-                                        Padding="0,-14,0,0"
                                         SnapsToDevicePixels="True"
                                         Symbol="Minimize"
                                         UseLayoutRounding="True" />
                                 </Button>
-                                <Button WindowChrome.IsHitTestVisibleInChrome="True" x:Name="maximizeRestoreButton">
+                                <Button x:Name="maximizeRestoreButton">
                                     <Button.Style>
                                         <Style BasedOn="{StaticResource WindowButton}" TargetType="Button">
                                             <Style.Triggers>
@@ -335,7 +335,7 @@
                                                         </Setter.Value>
                                                     </Setter>
                                                     <!--  提示  -->
-                                                    <Setter Property="ToolTip" Value="最大化" />
+                                                    <!--<Setter Property="ToolTip" Value="最大化" />-->
                                                 </DataTrigger>
                                                 <DataTrigger Binding="{Binding Path=WindowState, RelativeSource={RelativeSource TemplatedParent}}" Value="Maximized">
                                                     <Setter Property="Content">
@@ -344,7 +344,7 @@
                                                             <controls:IconElement FontSize="20" Symbol="FullscreenExit" />
                                                         </Setter.Value>
                                                     </Setter>
-                                                    <Setter Property="ToolTip" Value="恢复" />
+                                                    <!--<Setter Property="ToolTip" Value="恢复" />-->
                                                 </DataTrigger>
                                                 <!--  切换显示  -->
                                                 <DataTrigger Binding="{Binding Path=ResizeMode, RelativeSource={RelativeSource AncestorType=Window}}" Value="NoResize">
@@ -361,9 +361,9 @@
                                 </Button>
 
                                 <Button
+                                    x:Name="closeButton"
                                     ToolTip="关闭"
-                                    WindowChrome.IsHitTestVisibleInChrome="True"
-                                    x:Name="closeButton">
+                                    WindowChrome.IsHitTestVisibleInChrome="True">
                                     <Button.Style>
                                         <Style BasedOn="{StaticResource WindowButton}" TargetType="Button">
                                             <Setter Property="Tag" Value="Close" />
@@ -389,13 +389,13 @@
                             </StackPanel>
                             <!--  窗体内容  -->
                             <Border
-                                Background="{TemplateBinding Background}"
+                                Grid.Row="1"
                                 Grid.Column="0"
                                 Grid.ColumnSpan="3"
-                                Grid.Row="1"
                                 HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
                                 Panel.ZIndex="1000"
-                                VerticalAlignment="Stretch">
+                                Background="{TemplateBinding Background}">
                                 <AdornerDecorator>
                                     <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}">
                                         <ContentPresenter.Style>
@@ -420,11 +420,11 @@
                                 </AdornerDecorator>
                             </Border>
                             <ResizeGrip
-                                Grid.Column="2"
+                                x:Name="resizeGrip"
                                 Grid.Row="1"
+                                Grid.Column="2"
                                 Panel.ZIndex="2048"
-                                Style="{StaticResource ResizeGripStyle}"
-                                x:Name="resizeGrip" />
+                                Style="{StaticResource ResizeGripStyle}" />
                         </Grid>
                     </Border>
                 </ControlTemplate>
diff --git a/Melskin/Controls/MelWindow.xaml.cs b/Melskin/Controls/MelWindow.xaml.cs
index 567702f..305ad06 100644
--- a/Melskin/Controls/MelWindow.xaml.cs
+++ b/Melskin/Controls/MelWindow.xaml.cs
@@ -1,10 +1,7 @@
-using System.Runtime.InteropServices;
-using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Windows.Input;
 
-using Melskin.Assists;
-
 namespace Melskin.Controls;
 
 /// <summary>
@@ -85,7 +82,10 @@ public class MelWindow : Window
     private const int WM_NCMOUSELEAVE = 0x02A2;
     private const int WM_NCLBUTTONDOWN = 0x00A1;
     private const int WM_NCLBUTTONUP = 0x00A2;
+    private const int WM_SYSCOMMAND = 0x0112;
     private const int HTMAXBUTTON = 9;
+    private const int SC_MAXIMIZE = 0xF030;
+    private const int SC_RESTORE = 0xF120;
     private const uint TME_LEAVE = 0x00000002;
     private const uint TME_NONCLIENT = 0x00000010;
 
@@ -93,6 +93,10 @@ public class MelWindow : Window
 
     private bool isMouseOverMaximizeButton = false;
     private bool isMaximizeButtonPressed = false;
+    /// <summary>
+    /// 记录点击前的窗口状态，用于判断系统是否已通过 Snap Layout 处理了窗口状态变更。
+    /// </summary>
+    private WindowState windowStateBeforeClick;
 
     private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
     {
@@ -101,6 +105,8 @@ public class MelWindow : Window
             case WM_NCHITTEST:
                 if (IsMouseOverMaximizeButton(lParam))
                 {
+                    // 返回 HTMAXBUTTON 让 Windows 11 Shell 知道鼠标在最大化按钮上，
+                    // 从而触发 Snap Layout 弹出菜单。
                     handled = true;
                     return new IntPtr(HTMAXBUTTON);
                 }
@@ -138,6 +144,7 @@ public class MelWindow : Window
                 if (isMouseOverMaximizeButton)
                 {
                     isMaximizeButtonPressed = true;
+                    windowStateBeforeClick = this.WindowState;
                     UpdateMaximizeButtonVisualState();
                     handled = true;
                 }
@@ -147,15 +154,27 @@ public class MelWindow : Window
                 if (isMaximizeButtonPressed)
                 {
                     isMaximizeButtonPressed = false;
+                    isMouseOverMaximizeButton = false;
                     UpdateMaximizeButtonVisualState();
 
-                    if (isMouseOverMaximizeButton)
+                    // 检查系统是否已经通过 Snap Layout 处理了窗口状态变更
+                    // 如果窗口状态未被系统改变，说明用户只是普通点击最大化按钮
+                    if (this.WindowState == windowStateBeforeClick)
                     {
-                        maximizeRestoreButton?.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+                        ToggleWindowState();
                     }
                     handled = true;
                 }
                 break;
+
+            case WM_SYSCOMMAND:
+                var command = wParam.ToInt32() & 0xFFF0;
+                if (command == SC_MAXIMIZE || command == SC_RESTORE)
+                {
+                    // 让系统正常处理 Snap Layout 发出的最大化/还原命令
+                    // 不要阻止这些消息，以确保 Snap Layout 选择的布局能正确应用
+                }
+                break;
         }
 
         return IntPtr.Zero;
@@ -163,8 +182,10 @@ public class MelWindow : Window
 
     private bool IsMouseOverMaximizeButton(IntPtr lParam)
     {
-        var x = (short)(lParam.ToInt32() & 0xFFFF);
-        var y = (short)(lParam.ToInt32() >> 16);
+        // 使用 ToInt64() 确保在 64 位系统和多显示器环境下坐标解析正确
+        var val = lParam.ToInt64();
+        var x = (short)(val & 0xFFFF);
+        var y = (short)((val >> 16) & 0xFFFF);
         var mousePos = new Point(x, y);
 
         var windowPos = this.PointFromScreen(mousePos);
@@ -172,6 +193,7 @@ public class MelWindow : Window
         if (maximizeRestoreButton is Visual maximizeButtonVisual)
         {
             var bounds = VisualTreeHelper.GetDescendantBounds(maximizeButtonVisual);
+            Debug.WriteLine(bounds.ToString());
             var buttonTransform = maximizeButtonVisual.TransformToAncestor(this);
             var buttonRect = buttonTransform.TransformBounds(bounds);
 
@@ -300,43 +322,26 @@ public class MelWindow : Window
     /// <inheritdoc />
     public override void OnApplyTemplate()
     {
-        if (minimizeButton != null)
-        {
-            minimizeButton.Click -= MinimizeButtonClickHandler;
-        }
+        base.OnApplyTemplate();  
+        minimizeButton?.Click -= MinimizeButtonClickHandler;
 
         minimizeButton = GetTemplateChild(VbMinimizeButtonName) as Button;
 
-        if (minimizeButton != null)
-        {
-            minimizeButton.Click += MinimizeButtonClickHandler;
-        }
+        minimizeButton?.Click += MinimizeButtonClickHandler;
 
-        if (maximizeRestoreButton != null)
-        {
-            maximizeRestoreButton.Click -= MaximizeRestoreButtonClickHandler;
-        }
+        maximizeRestoreButton?.Click -= MaximizeRestoreButtonClickHandler;
 
         maximizeRestoreButton = GetTemplateChild(VbMaximizeRestoreButtonName) as Button;
 
-        if (maximizeRestoreButton != null)
-        {
-            maximizeRestoreButton.Click += MaximizeRestoreButtonClickHandler;
-        }
+        maximizeRestoreButton?.Click += MaximizeRestoreButtonClickHandler;
 
-        if (closeButton != null)
-        {
-            closeButton.Click -= CloseButtonClickHandler;
-        }
+        closeButton?.Click -= CloseButtonClickHandler;
 
         closeButton = GetTemplateChild(VbCloseButtonName) as Button;
 
-        if (closeButton != null)
-        {
-            closeButton.Click += CloseButtonClickHandler;
-        }
+        closeButton?.Click += CloseButtonClickHandler;
+
 
-        base.OnApplyTemplate();
     }
 
     private void CloseButtonClickHandler(object sender, RoutedEventArgs args)
diff --git a/MelskinTest/App.xaml b/MelskinTest/App.xaml
index cfa6657..2c1104c 100644
--- a/MelskinTest/App.xaml
+++ b/MelskinTest/App.xaml
@@ -1,6 +1,6 @@
 <Application
     StartupUri="MainWindow.xaml"
-    x:Class="VibeWPFTest.App"
+    x:Class="MelskinTest.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
diff --git a/MelskinTest/App.xaml.cs b/MelskinTest/App.xaml.cs
index 83f0a90..0fe4556 100644
--- a/MelskinTest/App.xaml.cs
+++ b/MelskinTest/App.xaml.cs
@@ -8,7 +8,7 @@ using System.Windows;
 
 using Melskin;
 
-namespace VibeWPFTest
+namespace MelskinTest
 {
     /// <summary>
     /// Interaction logic for App.xaml
@@ -18,7 +18,7 @@ namespace VibeWPFTest
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
-            //Splash.ShowAsync("pack://application:,,,/VibeWPFTest;component/Resources/Images/ImageTest.png");
+            //Splash.ShowAsync("pack://application:,,,/MelskinTest;component/Resources/Images/ImageTest.png");
             //MainWindow = new MainWindow();
             //Splash.CloseOnLoaded(MainWindow);
             //MainWindow.Show();
diff --git a/MelskinTest/ColorPaletteControl.xaml b/MelskinTest/ColorPaletteControl.xaml
index 5281349..f1b35a9 100644
--- a/MelskinTest/ColorPaletteControl.xaml
+++ b/MelskinTest/ColorPaletteControl.xaml
@@ -1,7 +1,7 @@
 <UserControl
-    x:Class="VibeWPFTest.ColorPaletteControl"
+    x:Class="MelskinTest.ColorPaletteControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:local="clr-namespace:VibeWPFTest"
+    xmlns:local="clr-namespace:MelskinTest"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UserControl.Resources>
         <DataTemplate x:Key="ColorItemTemplate">
diff --git a/MelskinTest/ColorPaletteControl.xaml.cs b/MelskinTest/ColorPaletteControl.xaml.cs
index 7aa3a9c..9c93177 100644
--- a/MelskinTest/ColorPaletteControl.xaml.cs
+++ b/MelskinTest/ColorPaletteControl.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace VibeWPFTest
+namespace MelskinTest
 {
     public partial class ColorPaletteControl : UserControl
     {
diff --git a/MelskinTest/ColorPaletteWindow.xaml b/MelskinTest/ColorPaletteWindow.xaml
index 7188ea2..55bb2d0 100644
--- a/MelskinTest/ColorPaletteWindow.xaml
+++ b/MelskinTest/ColorPaletteWindow.xaml
@@ -4,10 +4,10 @@
     Title="配色"
     Width="800"
     mc:Ignorable="d"
-    x:Class="VibeWPFTest.ColorPaletteWindow"
+    x:Class="MelskinTest.ColorPaletteWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:VibeWPFTest"
+    xmlns:local="clr-namespace:MelskinTest"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:n="https://github.com/ShrlAlgo/Melskin"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/MelskinTest/ColorPaletteWindow.xaml.cs b/MelskinTest/ColorPaletteWindow.xaml.cs
index 46400e5..5a569a7 100644
--- a/MelskinTest/ColorPaletteWindow.xaml.cs
+++ b/MelskinTest/ColorPaletteWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace VibeWPFTest
+namespace MelskinTest
 {
     /// <summary>
     /// ColorPaletteWindow.xaml 的交互逻辑
diff --git a/MelskinTest/ControlTestWindow.xaml b/MelskinTest/ControlTestWindow.xaml
index 7b1d1f1..bc9dec7 100644
--- a/MelskinTest/ControlTestWindow.xaml
+++ b/MelskinTest/ControlTestWindow.xaml
@@ -5,10 +5,10 @@
     Width="800"
     d:DesignHeight="800"
     mc:Ignorable="d"
-    x:Class="VibeWPFTest.ControlTestWindow"
+    x:Class="MelskinTest.ControlTestWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:dataModel="clr-namespace:VibeWPFTest.DataModel"
+    xmlns:dataModel="clr-namespace:MelskinTest.DataModel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/MelskinTest/ControlTestWindow.xaml.cs b/MelskinTest/ControlTestWindow.xaml.cs
index ebae52f..e9f01dc 100644
--- a/MelskinTest/ControlTestWindow.xaml.cs
+++ b/MelskinTest/ControlTestWindow.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows;
 using Microsoft.Win32;
 using Melskin.Controls;
 
-namespace VibeWPFTest;
+namespace MelskinTest;
 
 /// <summary>
 /// ControlTestWindow.xaml 的交互逻辑
diff --git a/MelskinTest/DataModel/DataGridItem.cs b/MelskinTest/DataModel/DataGridItem.cs
index 17df513..af7bce0 100644
--- a/MelskinTest/DataModel/DataGridItem.cs
+++ b/MelskinTest/DataModel/DataGridItem.cs
@@ -6,7 +6,7 @@ using System.Windows.Input;
 using CommunityToolkit.Mvvm.Input;
 
 
-namespace VibeWPFTest.DataModel
+namespace MelskinTest.DataModel
 {
     public enum Gender
     {
diff --git a/MelskinTest/DataModel/TreeItemData.cs b/MelskinTest/DataModel/TreeItemData.cs
index ef6cd26..45dbb04 100644
--- a/MelskinTest/DataModel/TreeItemData.cs
+++ b/MelskinTest/DataModel/TreeItemData.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace VibeWPFTest.DataModel
+namespace MelskinTest.DataModel
 {
     public class TreeItemData
     {
diff --git a/MelskinTest/IconsWindow.xaml b/MelskinTest/IconsWindow.xaml
index cfbeb03..5654e75 100644
--- a/MelskinTest/IconsWindow.xaml
+++ b/MelskinTest/IconsWindow.xaml
@@ -4,10 +4,10 @@
     Width="820"
     d:DataContext="{d:DesignInstance Type=local:IconsWindow}"
     mc:Ignorable="d"
-    x:Class="VibeWPFTest.IconsWindow"
+    x:Class="MelskinTest.IconsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:VibeWPFTest"
+    xmlns:local="clr-namespace:MelskinTest"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/MelskinTest/IconsWindow.xaml.cs b/MelskinTest/IconsWindow.xaml.cs
index ae92194..6b4a673 100644
--- a/MelskinTest/IconsWindow.xaml.cs
+++ b/MelskinTest/IconsWindow.xaml.cs
@@ -19,7 +19,7 @@ using Microsoft.Win32;
 
 using Melskin.Assets;
 
-namespace VibeWPFTest;
+namespace MelskinTest;
 /// <summary>
 /// IconsWindow.xaml 的交互逻辑
 /// </summary>
diff --git a/MelskinTest/MainWindow.xaml b/MelskinTest/MainWindow.xaml
index 8c19f55..a9983fd 100644
--- a/MelskinTest/MainWindow.xaml
+++ b/MelskinTest/MainWindow.xaml
@@ -10,15 +10,15 @@
     d:Height="Auto"
     d:SizeToContent="WidthAndHeight"
     mc:Ignorable="d"
-    x:Class="VibeWPFTest.MainWindow"
+    x:Class="MelskinTest.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:dm="clr-namespace:VibeWPFTest.DataModel"
+    xmlns:dm="clr-namespace:MelskinTest.DataModel"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    xmlns:test="clr-namespace:VibeWPFTest"
+    xmlns:test="clr-namespace:MelskinTest"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ms:MelWindow.TitleBarLeftContent>
diff --git a/MelskinTest/MainWindow.xaml.cs b/MelskinTest/MainWindow.xaml.cs
index 6ce6b0c..b62219a 100644
--- a/MelskinTest/MainWindow.xaml.cs
+++ b/MelskinTest/MainWindow.xaml.cs
@@ -18,7 +18,7 @@ using CommunityToolkit.Mvvm.Input;
 using Melskin.Appearance;
 using Melskin.Controls;
 
-namespace VibeWPFTest;
+namespace MelskinTest;
 
 /// <summary>
 /// MainWindow.xaml 的交互逻辑
diff --git a/MelskinTest/NeumorphismWindow.xaml b/MelskinTest/NeumorphismWindow.xaml
index 2863141..64204bf 100644
--- a/MelskinTest/NeumorphismWindow.xaml
+++ b/MelskinTest/NeumorphismWindow.xaml
@@ -5,13 +5,13 @@
     d:DataContext="{d:DesignInstance Type=neoUiTest:MainWindow}"
     d:Height="Auto"
     mc:Ignorable="d"
-    x:Class="VibeWPFTest.NeumorphismWindow"
+    x:Class="MelskinTest.NeumorphismWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:dataModel="clr-namespace:VibeWPFTest.DataModel"
+    xmlns:dataModel="clr-namespace:MelskinTest.DataModel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
-    xmlns:neoUiTest="clr-namespace:VibeWPFTest"
+    xmlns:neoUiTest="clr-namespace:MelskinTest"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ms:MelWindow.Resources>
diff --git a/MelskinTest/NeumorphismWindow.xaml.cs b/MelskinTest/NeumorphismWindow.xaml.cs
index 723d1fb..a80eef4 100644
--- a/MelskinTest/NeumorphismWindow.xaml.cs
+++ b/MelskinTest/NeumorphismWindow.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace VibeWPFTest
+namespace MelskinTest
 {
     /// <summary>
     /// NeumorphismWindow.xaml 的交互逻辑
diff --git a/MelskinTest/ViewModel.cs b/MelskinTest/ViewModel.cs
index 324d8dc..5c7ca19 100644
--- a/MelskinTest/ViewModel.cs
+++ b/MelskinTest/ViewModel.cs
@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace VibeWPFTest
+namespace MelskinTest
 {
     public class MainViewModel : INotifyPropertyChanged
     {
diff --git a/RevitAddins/App.cs b/RevitAddins/App.cs
deleted file mode 100644
index d404d32..0000000
--- a/RevitAddins/App.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-
-using System;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media.Imaging;
-
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Autodesk.Windows;
-
-using Nice3point.Revit.Toolkit.External;
-using Nice3point.Revit.Toolkit.External.Handlers;
-
-using RevitAddins.Properties;
-
-using RibbonButton = Autodesk.Windows.RibbonButton;
-using RibbonPanel = Autodesk.Revit.UI.RibbonPanel;
-
-namespace RevitAddins;
-
-public class App : ExternalApplication
-{
-    public override void OnStartup()
-    {
-        var panel = UiApplication.CreateRibbonPanel("属性表导出");
-
-        PushButtonData export =
-           new(nameof(ExportSheetsCmd), "导出属性表", GlobalVariables.AddInPath, typeof(ExportSheetsCmd).FullName)
-           {
-               LargeImage = ToBitmapSource(Resources.xlsx),
-               ToolTip = "导出属性表"
-           };
-        PushButtonData browser =
-           new(nameof(BrowserFolderCmd), "模板文件夹", GlobalVariables.AddInPath, typeof(BrowserFolderCmd).FullName)
-           {
-               LargeImage = ToBitmapSource(Resources.folder),
-               ToolTip = "模板文件夹"
-           };
-        panel.AddItem(export);
-        panel.AddItem(browser);
-    }
-    public static BitmapSource ToBitmapSource(Bitmap bitmap)
-    {
-        if (bitmap == null)
-        {
-            return null;
-        }
-        return Imaging.CreateBitmapSourceFromHBitmap(bitmap.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
-    }
-    public RibbonControl RibbonControl => ComponentManager.Ribbon;
-
-}
diff --git a/RevitAddins/BrowserFolderCmd.cs b/RevitAddins/BrowserFolderCmd.cs
deleted file mode 100644
index 0843d38..0000000
--- a/RevitAddins/BrowserFolderCmd.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Autodesk.Revit.Attributes;
-using Autodesk.Revit.UI;
-
-using Nice3point.Revit.Toolkit.External;
-
-namespace RevitAddins
-{
-    /// <summary>
-    /// Revit执行命令
-    /// </summary>
-    [Transaction(TransactionMode.Manual)]
-    [Regeneration(RegenerationOption.Manual)]
-    internal class BrowserFolderCmd : ExternalCommand
-    {
-        public override void Execute()
-        {
-            var path = Path.Combine(GlobalVariables.DirAssembly, "Templates");
-            if (Directory.Exists(path))
-            {
-                Process.Start(path);
-            }
-            else
-            {
-                TaskDialog.Show("错误", "指定文件夹不存在！");
-            }
-        }
-    }
-}
diff --git a/RevitAddins/ExportSheetsCmd.cs b/RevitAddins/ExportSheetsCmd.cs
deleted file mode 100644
index 2733a02..0000000
--- a/RevitAddins/ExportSheetsCmd.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-
-using Autodesk.Revit.Attributes;
-
-using Nice3point.Revit.Toolkit.External;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using System.Threading.Tasks;
-
-namespace RevitAddins
-{
-    /// <summary>
-    /// 属性表导出
-    /// </summary>
-    [Transaction(TransactionMode.Manual)]
-    [Regeneration(RegenerationOption.Manual)]
-    public class ExportSheetsCmd : ExternalCommand
-    {
-        public override void Execute()
-        {
-            MainWindow window = new MainWindow() { DataContext = new MainViewModel(Application) };
-            window.ShowDialog();
-        }
-    }
-}
diff --git a/RevitAddins/Extensions.cs b/RevitAddins/Extensions.cs
deleted file mode 100644
index d8f28a2..0000000
--- a/RevitAddins/Extensions.cs
+++ /dev/null
@@ -1,566 +0,0 @@
-
-
-using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Architecture;
-
-using RevitAddins;
-
-using System;
-using System.Collections.Generic;
-
-using System.Linq;
-
-namespace RevitAddins;
-
-public static class Extensions
-{
-    /// <summary>
-    ///     文档的收集器
-    /// </summary>
-    /// <param name="document"></param>
-    public static FilteredElementCollector OfCollector(this Document document) => document == null ? throw new ArgumentNullException(nameof(document), "文档为空") : new(document);
-    public static object GetValue(this Parameter parameter)
-    {
-        object result = null;
-        switch (parameter.StorageType)
-        {
-            case StorageType.None:
-                break;
-
-            case StorageType.Integer:
-                result = parameter.AsInteger();
-                break;
-
-            case StorageType.Double:
-                result = parameter.AsDouble();
-                break;
-
-            case StorageType.String:
-                //Revit数据库存储的值
-                var str = parameter.AsString();
-                if (string.IsNullOrEmpty(str))
-                {
-                    //用户可见的前端显示，如根据单位设置而显示的值
-                    result = parameter.AsValueString();
-                }
-                else
-                {
-                    result = str;
-                }
-                break;
-
-            case StorageType.ElementId:
-                result = parameter.AsElementId();
-                break;
-        }
-
-        return result;
-    }
-    /// <summary>
-    ///     类型的元素集合
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="doc"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryElementsByType<T>(this Document doc)
-        where T : Element
-    {
-        return doc.OfCollector().OfClass(typeof(T));
-    }
-
-    /// <summary>
-    ///     收集特定类别
-    /// </summary>
-    /// <param name="doc"></param>
-    /// <param name="builtInCategory"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryElementsByCategory(this Document doc, BuiltInCategory builtInCategory)
-    {
-        return doc.OfCollector().OfCategory(builtInCategory);
-    }
-
-    /// <summary>
-    ///     收集特定类型
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="doc"></param>
-    /// <param name="builtInCategory"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryElementsByTypeAndCategory<T>(this Document doc, BuiltInCategory builtInCategory)
-        where T : Element
-    {
-        return doc.OfCollector().OfClass(typeof(T)).OfCategory(builtInCategory);
-    }
-
-    public static FilteredElementCollector OfCollector(this View view)
-    {
-        //if (view == null)
-        //{
-        //    throw new ArgumentNullException(nameof(view));
-        //}
-        //if (!view.IsTemplate)
-        //{
-        //    return new FilteredElementCollector(view.doc, view.Id);
-        //}
-        return FilteredElementCollector.IsViewValidForElementIteration(view.Document, view.Id)
-            ? new FilteredElementCollector(view.Document, view.Id)
-            : throw new ArgumentException("当前视图不可应用收集器");
-    }
-
-    /// <summary>
-    ///     收集当前平面视图的某类图元
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="view"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryInstancesByType<T>(this View view)
-        where T : Element
-    {
-        return view.OfCollector().OfClass(typeof(T)).WhereElementIsNotElementType();
-    }
-
-    /// <summary>
-    ///     收集当前平面视图的某类别图元
-    /// </summary>
-    /// <param name="view"></param>
-    /// <param name="builtInCategory"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryElementsByCategoryInView(this View view, BuiltInCategory builtInCategory)
-    {
-        return view.OfCollector().OfCategory(builtInCategory).WhereElementIsNotElementType();
-    }
-
-    /// <summary>
-    ///     收集当前平面视图的某类图元
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="view"></param>
-    /// <param name="builtInCategory"></param>
-    /// <returns></returns>
-    public static FilteredElementCollector QueryElementsByTypeAndCategory<T>(this View view, BuiltInCategory builtInCategory)
-        where T : Element
-    {
-        return view.OfCollector().OfClass(typeof(T)).OfCategory(builtInCategory).WhereElementIsNotElementType();
-    }
-
-
-    /// <summary>
-    /// 过滤项目文件独立模型元素，包含依附在主体上的元素，如楼板边缘、屋顶边缘、墙饰条、封檐板，檐沟等等
-    /// </summary>
-    /// <returns>元素集合</returns>
-    public static FilteredElementCollector OfParentModelCollector(this Document doc)
-    {
-        var col = doc.OfCollector()
-                    .WhereElementIsNotElementType()
-                    .Where(
-                        e => e is TopographySurface ||
-                        e is DirectShape ||
-                            e.CanHaveTypeAssigned()
-                            && e.IsValidObject
-                            && e.HasPhases()
-                            && e.ArePhasesModifiable()
-                            && e.get_BoundingBox(null) != null
-                            && e.Category is { CategoryType: CategoryType.Model }
-                            && (e is HostObject || e.Category.Parent == null)
-                            && e is not Panel
-                            && e is not Mullion
-                            && e is not RevitLinkInstance
-                    ).Select(e => e.Id).ToList();
-        if (col.Count == 0)
-        {
-            return null;
-        }
-        return new FilteredElementCollector(doc, col).WhereElementIsNotElementType();
-    }
-
-    /// <summary>
-    /// 过滤项目文件的所有模型元素
-    /// </summary>
-    /// <returns>元素集合</returns>
-    public static FilteredElementCollector OfAllModelCollector(this Document doc)
-    {
-        if (doc == null)
-        {
-            throw new ArgumentNullException(nameof(doc), "文档为空");
-        }
-        var col = doc.OfCollector()
-            .WhereElementIsNotElementType()
-            .Where(
-                e => e is TopographySurface ||
-                e is DirectShape ||
-                    e.CanHaveTypeAssigned() &&
-                        e.IsValidObject &&
-                        e.HasPhases() &&
-                        e.ViewSpecific == false &&
-                        e.Category is { CategoryType: CategoryType.Model, AllowsBoundParameters: true } &&
-                        e.get_BoundingBox(null) != null &&
-                        e is not RevitLinkInstance).Select(e => e.Id).ToList();
-        if (col.Count == 0)
-        {
-            return null;
-        }
-        return new FilteredElementCollector(doc, col).WhereElementIsNotElementType();
-    }
-    ///// <summary>
-    ///// 获取所有最高层级的模型元素，不包含子模型
-    ///// </summary>
-    ///// <param name="doc"></param>
-    ///// <returns></returns>
-    //public static IEnumerable<Element> OfModelElements(this Document doc)
-    //{
-    //    return doc.OfCollector()
-    //        .WhereElementIsNotElementType()
-    //        .Where(
-    //            e => e is TopographySurface || (
-    //                e.CanHaveTypeAssigned()
-    //                && e.IsValidObject
-    //                && e.get_BoundingBox(null) != null
-    //                && e.HasPhases()
-    //                && e.ViewSpecific == false
-    //                && e.Category is { Parent: null, CategoryType: CategoryType.Model, AllowsBoundParameters: true }
-    //                && e is not Panel
-    //                && e is not Mullion
-    //                && e is not RevitLinkInstance)
-    //        );
-    //}
-    ///// <summary>
-    ///// 所有元素不包括幕墙嵌板，幕墙竖梃、依附图元等等
-    ///// </summary>
-    ///// <param name="doc"></param>
-    ///// <returns></returns>
-    //public static FilteredElementCollector OfModelCollector(this Document doc)
-    //{
-    //    if (doc == null)
-    //    {
-    //        throw new ArgumentNullException(nameof(doc), "文档为空");
-    //    }
-    //    var li = doc.OfCollector().WhereElementIsNotElementType()
-    //        .Where(
-    //            e => e is TopographySurface ||
-    //                (e.CanHaveTypeAssigned() &&
-    //                    e.HasPhases() &&
-    //                    e.Category is { Parent: null, CategoryType: CategoryType.Model } &&
-    //                    e is not Panel &&
-    //                    e is not Mullion &&
-    //                    e is not RevitLinkInstance)).Select(e => e.Id).ToList();
-    //    return new FilteredElementCollector(doc, li).WhereElementIsNotElementType();
-    //}
-    /// <summary>
-    /// 获取对应类型的元素收集器
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="doc"></param>
-    /// <returns></returns>
-    public static IEnumerable<T> OfType<T>(this Document doc)
-        where T : Element => doc.OfCollector().OfClass(typeof(T)).OfType<T>();
-    public static FilteredElementCollector OfClass<T>(this Document doc)
-    where T : Element
-    {
-        return doc.OfCollector().OfClass(typeof(T));
-    }
-    /// <summary>
-    ///     射线法查找所有的Element
-    /// </summary>
-    /// <param name="doc">Dcument</param>
-    /// <param name="filter">例如：ElementClassFilter filter = new ElementClassFilter(typeof(CableTray))</param>
-    /// <param name="targetRef">目标对象</param>
-    /// <param name="center">射源</param>
-    /// <param name="direction">方向</param>
-    /// <returns>返回该射线</returns>
-    public static IList<Element> XRayFindAll(
-        this Document doc,
-        ElementFilter filter,
-        FindReferenceTarget targetRef,
-        XYZ center,
-        XYZ direction
-    )
-    {
-        FilteredElementCollector collector = new(doc);
-        Func<View3D, bool> isNotTemplate = v3 => !v3.IsTemplate;
-        var view3D = collector.OfClass(typeof(View3D)).Cast<View3D>().First(isNotTemplate);
-        ReferenceIntersector refIntersector = new(filter, targetRef, view3D);
-        var refWithContexts = refIntersector.Find(center, direction);
-        if (null == refWithContexts)
-        {
-            return null;
-        }
-
-        IList<Element> resultElements = [];
-        foreach (var rwc in refWithContexts)
-        {
-            var reference = rwc.GetReference();
-            var hitElement = doc.GetElement(reference);
-            if (hitElement != null)
-            {
-                resultElements.Add(hitElement);
-            }
-        }
-
-        return resultElements;
-    }
-    /// <summary>
-    /// 获取标高范围框
-    /// </summary>
-    /// <remarks>最低标高除了包含以上部分，还包含以下部分，最高标高包含以上部分</remarks>
-    /// <param name="doc"></param>
-    /// <returns></returns>
-    public static Dictionary<Level, Outline> GetLevelRanges(this Document doc)
-    {
-        var levels = doc.OfType<Level>().Cast<Level>().OrderBy(l => l.Elevation).ToList();
-        Dictionary<Level, Outline> levelOutlines = [];
-        //获取标高范围
-        for (var i = 0; i < levels.Count; i++)
-        {
-            var baseLevel = levels[i];
-            XYZ min = new(double.MinValue, double.MinValue, baseLevel.Elevation);
-            XYZ max;
-            Outline outline;
-            if (i == 0)
-            {
-                min = new XYZ(double.MinValue, double.MinValue, double.MinValue);
-                var topLevel = levels[i + 1];
-                max = new XYZ(double.MaxValue, double.MaxValue, topLevel.Elevation);
-                outline = new Outline(min, max);
-            }
-            else if (i < levels.Count - 1)
-            {
-                var topLevel = levels[i + 1];
-                max = new XYZ(double.MaxValue, double.MaxValue, topLevel.Elevation);
-                outline = new Outline(min, max);
-            }
-            else//最后一个标高以上
-            {
-                max = new XYZ(double.MaxValue, double.MaxValue, double.MaxValue);
-                outline = new Outline(min, max);
-            }
-
-            levelOutlines.Add(baseLevel, outline);
-        }
-
-        return levelOutlines;
-    }
-
-    /// <summary>
-    ///     射线法查找最近的Element
-    /// </summary>
-    /// <param name="doc">Dcument</param>
-    /// <param name="filter">例如：ElementClassFilter filter = new ElementClassFilter(typeof(CableTray))</param>
-    /// <param name="targetRef">目标对象</param>
-    /// <param name="center">射源</param>
-    /// <param name="direction">方向</param>
-    /// <param name="hitElement">被击中的Element</param>
-    /// <returns>返回该射线</returns>
-    public static Line XRayFindNearest(
-        this Document doc,
-        ElementFilter filter,
-        FindReferenceTarget targetRef,
-        XYZ center,
-        XYZ direction,
-        ref Element hitElement
-    )
-    {
-        FilteredElementCollector collector = new(doc);
-        var view3D = collector.OfClass(typeof(View3D)).Cast<View3D>().First(v3 => !v3.IsTemplate);
-        var rwc = new ReferenceIntersector(filter, targetRef, view3D).FindNearest(center, direction);
-        if (null == rwc)
-        {
-            return null;
-        }
-
-        var reference = rwc.GetReference();
-        var intersection = reference.GlobalPoint;
-        hitElement = doc.GetElement(reference);
-        Line result = null;
-        if (!center.IsAlmostEqualTo(intersection))
-        {
-            result = Line.CreateBound(center, intersection);
-        }
-        else
-        {
-            hitElement = null;
-        }
-
-        return result;
-    }
-
-    public static TResult Invoke<TResult>(this Document doc, Func<Transaction, TResult> func, string name = "default")
-    {
-        using var tr = new Transaction(doc, name);
-        tr.Start();
-
-        var result = func(tr);
-
-        var status = tr.GetStatus();
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                tr.Commit();
-                return result;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                return result;
-
-            case TransactionStatus.Error:
-                tr.RollBack();
-                return result;
-
-            default:
-                return result;
-        }
-    }
-
-    public static TResult InvokeGroup<TResult>(this Document doc, Func<TransactionGroup, TResult> func, string name = "default")
-    {
-        using var tg = new TransactionGroup(doc, name);
-        tg.Start();
-
-        var result = func(tg);
-
-        var status = tg.GetStatus();
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                tg.Assimilate();
-                //tr.Commit();
-                return result;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                return result;
-
-            case TransactionStatus.Error:
-                tg.RollBack();
-                return result;
-
-            default:
-                return result;
-        }
-    }
-
-    public static TResult InvokeSub<TResult>(this Document doc, Func<SubTransaction, TResult> func)
-    {
-        using var st = new SubTransaction(doc);
-        st.Start();
-
-        var result = func(st);
-
-        var status = st.GetStatus();
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                st.Commit();
-                return result;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                return result;
-
-            case TransactionStatus.Error:
-                st.RollBack();
-                return result;
-
-            default:
-                return result;
-        }
-    }
-
-    //private static void UsingThisClass(doc doc)
-    //{
-    //    //无返回值
-    //    doc.Invoke(m => { }, "x");
-    //    //有返回值
-    //    doc.Invoke<Level>(m =>
-    //    {
-    //        return Level.Create(doc, 5);
-    //    }, "x");
-
-    //    doc.InvokeGroup(m => { doc.Invoke(mn => { }, "x"); }, "x");
-    //    doc.InvokeGroup<Level>(m => { doc.Invoke(mn => { }, "x"); doc.Invoke(mn => { }, "Y"); return Level.Create(doc, 5); }, "x");
-    //    doc.InvokeSub(m => { });
-    //    doc.InvokeSub<Level>(m => { return Level.Create(doc, 5); });
-    //}
-
-    public static void Invoke(this Document doc, Action<Transaction> action, string name = "default")
-    {
-        using var tr = new Transaction(doc, name);
-        tr.Start();
-
-        action(tr);
-
-        var status = tr.GetStatus();
-
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                tr.Commit();
-                return;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                return;
-
-            case TransactionStatus.Error:
-                tr.RollBack();
-                return;
-
-            default:
-                return;
-        }
-    }
-
-    public static void InvokeGroup(this Document doc, Action<TransactionGroup> action, string name = "default")
-    {
-        using var tg = new TransactionGroup(doc, name);
-        tg.Start();
-
-        action(tg);
-
-        var status = tg.GetStatus();
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                //tr.Commit();
-                tg.Assimilate();
-                return;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                break;
-
-            case TransactionStatus.Error:
-                tg.RollBack();
-                return;
-
-            default:
-                return;
-        }
-    }
-
-    public static void InvokeSub(this Document doc, Action<SubTransaction> action)
-    {
-        using var st = new SubTransaction(doc);
-        st.Start();
-
-        action(st);
-
-        var status = st.GetStatus();
-        switch (status)
-        {
-            case TransactionStatus.Started:
-                st.Commit();
-                return;
-
-            case TransactionStatus.Committed:
-            case TransactionStatus.RolledBack:
-                break;
-
-            case TransactionStatus.Error:
-                st.RollBack();
-                return;
-
-            default:
-                return;
-        }
-    }
-}
diff --git a/RevitAddins/FolderBrowserDialog.cs b/RevitAddins/FolderBrowserDialog.cs
deleted file mode 100644
index 1a1e195..0000000
--- a/RevitAddins/FolderBrowserDialog.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-
-using Microsoft.Win32;
-
-using System;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-using System.Windows.Interop;
-
-namespace RevitAddins;
-
-/// <summary>
-///     Prompts the user to select a folder with a vista style dialog.
-/// </summary>
-public sealed class FolderBrowserDialog
-{
-    #region Properties
-
-    /// <summary>
-    ///     Gets or sets the path selected by the user.
-    /// </summary>
-    public string SelectedPath { get; set; }
-
-    /// <summary>
-    ///     Gets the name of the element selected by the user.
-    /// </summary>
-    public string SelectedElementName { get; private set; }
-
-    /// <summary>
-    ///     Gets an array of paths selected by the user.
-    /// </summary>
-    public string[] SeletcedPaths { get; private set; }
-
-    /// <summary>
-    ///     Gets an array of element names selected by the user.
-    /// </summary>
-    public string[] SelectedElementNames { get; private set; }
-
-    /// <summary>
-    ///     Gets or sets a valie indicating whether the user is able to select non storage places.
-    /// </summary>
-    public bool AllowNonStoragePlaces { get; set; }
-
-    /// <summary>
-    ///     Gets or sets a valie indicating whether the user can select multiple folders or elements.
-    /// </summary>
-    public bool Multiselect { get; set; }
-
-    #endregion Properties
-
-    #region Public Methods
-
-    /// <summary>
-    ///     Shows the dialog with the default owner.
-    /// </summary>
-    /// <returns><c>true</c> if the user clicks OK in the dialog box; otherwise <c>false</c></returns>
-    public bool ShowDialog()
-    {
-        return ShowDialog(IntPtr.Zero);
-    }
-
-    /// <summary>
-    ///     Shows the dialog with <paramref name="owner" /> as the owner.
-    /// </summary>
-    /// <param name="owner">The owner of the dialog box.</param>
-    /// <returns><c>true</c> if the user clicks OK in the dialog box; otherwise <c>false</c></returns>
-    public bool ShowDialog(Window owner)
-    {
-        return ShowDialog(owner == null ? IntPtr.Zero : new WindowInteropHelper(owner).Handle);
-    }
-
-    /// <summary>
-    ///     Shows the dialog with <paramref name="owner" /> as the owner.
-    /// </summary>
-    /// <param name="owner">The owner of the dialog box.</param>
-    /// <returns><c>true</c> if the user clicks OK in the dialog box; otherwise <c>false</c></returns>
-    public bool ShowDialog(IWin32Window owner)
-    {
-        return ShowDialog(owner == null ? IntPtr.Zero : owner.Handle);
-    }
-
-    /// <summary>
-    ///     Shows the dialog with <paramref name="owner" /> as the owner.
-    /// </summary>
-    /// <param name="owner">The owner of the dialog box.</param>
-    /// <returns><c>true</c> if the user clicks OK in the dialog box; otherwise <c>false</c></returns>
-    public bool ShowDialog(IntPtr owner)
-    {
-        if (Environment.OSVersion.Version.Major < 6)
-        {
-            throw new InvalidOperationException("The dialog need at least Windows Vista to work.");
-        }
-
-        var dialog = CreateNativeDialog();
-        try
-        {
-            SetInitialFolder(dialog);
-            SetOptions(dialog);
-
-            if (dialog.Show(owner) != 0)
-            {
-                return false;
-            }
-
-            SetDialogResults(dialog);
-
-            return true;
-        }
-        finally
-        {
-            Marshal.ReleaseComObject(dialog);
-        }
-    }
-
-    #endregion Public Methods
-
-    #region Helper
-
-    private void GetPathAndElementName(IShellItem item, out string path, out string elementName)
-    {
-        item.GetDisplayName(SIGDN.PARENTRELATIVEFORADDRESSBAR, out elementName);
-        try
-        {
-            item.GetDisplayName(SIGDN.FILESYSPATH, out path);
-        }
-        catch (ArgumentException ex) when (ex.HResult == -2147024809)
-        {
-            path = null;
-        }
-    }
-
-    private IFileOpenDialog CreateNativeDialog()
-    {
-        return new FileOpenDialog() as IFileOpenDialog;
-    }
-
-    private void SetInitialFolder(IFileOpenDialog dialog)
-    {
-        if (!string.IsNullOrEmpty(SelectedPath))
-        {
-            uint atts = 0;
-            if (NativeMethods.SHILCreateFromPath(SelectedPath, out var idl, ref atts) == 0
-                && NativeMethods.SHCreateShellItem(IntPtr.Zero, IntPtr.Zero, idl, out var item) == 0)
-            {
-                dialog.SetFolder(item);
-            }
-        }
-    }
-
-    private void SetOptions(IFileOpenDialog dialog)
-    {
-        dialog.SetOptions(GetDialogOptions());
-    }
-
-    private FOS GetDialogOptions()
-    {
-        var options = FOS.PICKFOLDERS;
-        if (Multiselect)
-        {
-            options |= FOS.ALLOWMULTISELECT;
-        }
-
-        if (!AllowNonStoragePlaces)
-        {
-            options |= FOS.FORCEFILESYSTEM;
-        }
-
-        return options;
-    }
-
-    private void SetDialogResults(IFileOpenDialog dialog)
-    {
-        IShellItem item;
-        if (!Multiselect)
-        {
-            dialog.GetResult(out item);
-            GetPathAndElementName(item, out var path, out var value);
-            SelectedPath = path;
-            SeletcedPaths = new[] { path };
-            SelectedElementName = value;
-            SelectedElementNames = new[] { value };
-        }
-        else
-        {
-            dialog.GetResults(out var items);
-
-            items.GetCount(out var count);
-
-            SeletcedPaths = new string[count];
-            SelectedElementNames = new string[count];
-
-            for (uint i = 0; i < count; ++i)
-            {
-                items.GetItemAt(i, out item);
-                GetPathAndElementName(item, out var path, out var value);
-                SeletcedPaths[i] = path;
-                SelectedElementNames[i] = value;
-            }
-
-            SelectedPath = null;
-            SelectedElementName = null;
-        }
-    }
-
-    #endregion Helper
-
-    #region Types
-
-    private class NativeMethods
-    {
-        [DllImport("shell32.dll")]
-        public static extern int SHCreateShellItem(IntPtr pidlParent, IntPtr psfParent, IntPtr pidl, out IShellItem ppsi);
-
-        [DllImport("shell32.dll")]
-        public static extern int SHILCreateFromPath([MarshalAs(UnmanagedType.LPWStr)] string pszPath, out IntPtr ppIdl, ref uint rgflnOut);
-
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetActiveWindow();
-    }
-
-    [ComImport]
-    [Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    private interface IShellItem
-    {
-        void BindToHandler([In][MarshalAs(UnmanagedType.Interface)] IntPtr pbc, [In] ref Guid bhid, [In] ref Guid riid, out IntPtr ppv);
-
-        void GetParent([MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi);
-
-        void GetDisplayName([In] SIGDN sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
-
-        void GetAttributes([In] uint sfgaoMask, out uint psfgaoAttribs);
-
-        void Compare([In][MarshalAs(UnmanagedType.Interface)] IShellItem psi, [In] uint hint, out int piOrder);
-    }
-
-    [ComImport]
-    [Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    private interface IShellItemArray
-    {
-        void BindToHandler([In][MarshalAs(UnmanagedType.Interface)] IntPtr pbc, [In] ref Guid rbhid, [In] ref Guid riid, out IntPtr ppvOut);
-
-        void GetPropertyStore([In] int Flags, [In] ref Guid riid, out IntPtr ppv);
-
-        void GetPropertyDescriptionList([In][MarshalAs(UnmanagedType.Struct)] ref IntPtr keyType, [In] ref Guid riid, out IntPtr ppv);
-
-        void GetAttributes([In][MarshalAs(UnmanagedType.I4)] IntPtr dwAttribFlags, [In] uint sfgaoMask, out uint psfgaoAttribs);
-
-        void GetCount(out uint pdwNumItems);
-
-        void GetItemAt([In] uint dwIndex, [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi);
-
-        void EnumItems([MarshalAs(UnmanagedType.Interface)] out IntPtr ppenumShellItems);
-    }
-
-    [ComImport]
-    [Guid("d57c7288-d4ad-4768-be02-9d969532d960")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [CoClass(typeof(FileOpenDialog))]
-    private interface IFileOpenDialog //: IFileDialog
-    {
-        [PreserveSig]
-        int Show([In] IntPtr parent);
-
-        void SetFileTypes([In] uint cFileTypes, [In][MarshalAs(UnmanagedType.Struct)] ref IntPtr rgFilterSpec);
-
-        void SetFileTypeIndex([In] uint iFileType);
-
-        void GetFileTypeIndex(out uint piFileType);
-
-        void Advise([In][MarshalAs(UnmanagedType.Interface)] IntPtr pfde, out uint pdwCookie);
-
-        void Unadvise([In] uint dwCookie);
-
-        void SetOptions([In] FOS fos);
-
-        void GetOptions(out FOS pfos);
-
-        void SetDefaultFolder([In][MarshalAs(UnmanagedType.Interface)] IShellItem psi);
-
-        void SetFolder([In][MarshalAs(UnmanagedType.Interface)] IShellItem psi);
-
-        void GetFolder([MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi);
-
-        void GetCurrentSelection([MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi);
-
-        void SetFileName([In][MarshalAs(UnmanagedType.LPWStr)] string pszName);
-
-        void GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName);
-
-        void SetTitle([In][MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
-
-        void SetOkButtonLabel([In][MarshalAs(UnmanagedType.LPWStr)] string pszText);
-
-        void SetFileNameLabel([In][MarshalAs(UnmanagedType.LPWStr)] string pszLabel);
-
-        void GetResult([MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi);
-
-        void AddPlace([In][MarshalAs(UnmanagedType.Interface)] IShellItem psi, FileDialogCustomPlace fdcp);
-
-        void SetDefaultExtension([In][MarshalAs(UnmanagedType.LPWStr)] string pszDefaultExtension);
-
-        void Close([MarshalAs(UnmanagedType.Error)] int hr);
-
-        void SetClientGuid([In] ref Guid guid);
-
-        void ClearClientData();
-
-        void SetFilter([MarshalAs(UnmanagedType.Interface)] IntPtr pFilter);
-
-        void GetResults([MarshalAs(UnmanagedType.Interface)] out IShellItemArray ppenum);
-
-        void GetSelectedItems([MarshalAs(UnmanagedType.Interface)] out IShellItemArray ppSzmedi);
-    }
-
-    [ComImport]
-    [Guid("DC1C5A9C-E88A-4dde-A5A1-60F82A20AEF7")]
-    private class FileOpenDialog
-    {
-    }
-
-    private enum SIGDN : uint
-    {
-        DESKTOPABSOLUTEEDITING = 0x8004c000,
-        DESKTOPABSOLUTEPARSING = 0x80028000,
-        FILESYSPATH = 0x80058000,
-        NORMALDISPLAY = 0,
-        PARENTRELATIVE = 0x80080001,
-        PARENTRELATIVEEDITING = 0x80031001,
-        PARENTRELATIVEFORADDRESSBAR = 0x8007c001,
-        PARENTRELATIVEPARSING = 0x80018001,
-        URL = 0x80068000
-    }
-
-    [Flags]
-    private enum FOS
-    {
-        ALLNONSTORAGEITEMS = 0x80,
-        ALLOWMULTISELECT = 0x200,
-        CREATEPROMPT = 0x2000,
-        DEFAULTNOMINIMODE = 0x20000000,
-        DONTADDTORECENT = 0x2000000,
-        FILEMUSTEXIST = 0x1000,
-        FORCEFILESYSTEM = 0x40,
-        FORCESHOWHIDDEN = 0x10000000,
-        HIDEMRUPLACES = 0x20000,
-        HIDEPINNEDPLACES = 0x40000,
-        NOCHANGEDIR = 8,
-        NODEREFERENCELINKS = 0x100000,
-        NOREADONLYRETURN = 0x8000,
-        NOTESTFILECREATE = 0x10000,
-        NOVALIDATE = 0x100,
-        OVERWRITEPROMPT = 2,
-        PATHMUSTEXIST = 0x800,
-        PICKFOLDERS = 0x20,
-        SHAREAWARE = 0x4000,
-        STRICTFILETYPES = 4
-    }
-
-    #endregion Types
-}
\ No newline at end of file
diff --git a/RevitAddins/GlobalVariables.cs b/RevitAddins/GlobalVariables.cs
deleted file mode 100644
index 8900d64..0000000
--- a/RevitAddins/GlobalVariables.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-
-using Autodesk.Windows;
-
-using OfficeOpenXml;
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using System.Linq;
-
-using System.Timers;
-
-namespace RevitAddins
-{
-    public static class GlobalVariables
-    {
-        public static IntPtr RevitWindowPtr => ComponentManager.ApplicationWindow;
-        public static string AddInPath = typeof(GlobalVariables).Assembly.Location;
-        public static string DirAssembly = Path.GetDirectoryName(AddInPath);
-        public static Timer Timer { get; } = new();
-        public static void TrimLastEmptyRows(this ExcelWorksheet worksheet)
-        {
-            while (worksheet.IsLastRowEmpty())
-            {
-                worksheet.DeleteRow(worksheet.Dimension.End.Row, 1);
-            }
-        }
-        public static bool IsLastRowEmpty(this ExcelWorksheet worksheet)
-        {
-            List<bool> empties = [];
-
-            for (var index = 1; index <= worksheet.Dimension.End.Column; index++)
-            {
-                var value = worksheet.Cells[worksheet.Dimension.End.Row, index].Value;
-                empties.Add(value == null || string.IsNullOrWhiteSpace(value.ToString()));
-            }
-
-            return empties.All(e => e);
-        }
-    }
-}
diff --git a/RevitAddins/License.txt b/RevitAddins/License.txt
deleted file mode 100644
index 80a10a0..0000000
--- a/RevitAddins/License.txt
+++ /dev/null
@@ -1 +0,0 @@
-本插件用于导出Excel属性表二次开发。
\ No newline at end of file
diff --git a/RevitAddins/MainViewModel.cs b/RevitAddins/MainViewModel.cs
deleted file mode 100644
index f8f0c4a..0000000
--- a/RevitAddins/MainViewModel.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Architecture;
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-
-using EPPlus.Core.Extensions;
-
-using OfficeOpenXml;
-using OfficeOpenXml.Style;
-
-namespace RevitAddins
-{
-    public partial class MainViewModel : ObservableObject
-    {
-        private readonly Autodesk.Revit.ApplicationServices.Application application;
-        [ObservableProperty]
-        [NotifyCanExecuteChangedFor(nameof(ExportExcelCommand))]
-        private FileInfo selectedFileInfo;
-        [ObservableProperty]
-        private Dictionary<string, FileInfo> excelTemplates;
-        public MainViewModel(Autodesk.Revit.ApplicationServices.Application application)
-        {
-            this.ExcelTemplates = new Dictionary<string, FileInfo>();
-            if (Directory.Exists(Path.Combine(GlobalVariables.DirAssembly, "Templates")))
-            {
-                DirectoryInfo directoryInfo = new DirectoryInfo(Path.Combine(GlobalVariables.DirAssembly, "Templates"));
-                var files = directoryInfo.GetFiles("*.xlsx");
-                foreach (var item in files)
-                {
-                    ExcelTemplates.Add(item.Name, item);
-                }
-            }
-
-            this.application = application;
-        }
-        private bool CanExport()
-        {
-            if (SelectedFileInfo == null)
-            {
-                return false;
-            }
-            return true;
-        }
-        [RelayCommand(CanExecute = nameof(CanExport))]
-        private void ExportExcel()
-        {
-            StringBuilder sb = new StringBuilder();
-            //选择文件夹，并获取文件夹内的所有*.rvt文件
-            var folderDialog = new FolderBrowserDialog() { Multiselect = false };
-            if (folderDialog.ShowDialog() == false)
-            {
-                return;
-            }
-            var path = folderDialog.SelectedPath;
-            if (Directory.Exists(path))
-            {
-                DirectoryInfo directoryInfo = new DirectoryInfo(path);
-                var files = directoryInfo.GetFiles("*.rvt");
-                foreach (var file in files)
-                {
-                    Document document = null;
-
-                    try
-                    {
-                        document = application.OpenDocumentFile(file.FullName);
-                        var groups = document.OfParentModelCollector().WhereElementIsNotElementType()
-                .GroupBy(e => e.GetParameters("深圳构件标识").FirstOrDefault().AsString());
-
-
-                        var targetExcelPath = Path.Combine(path, Path.GetFileNameWithoutExtension(document.PathName) + ".xlsx");
-                        var fileInfo = SelectedFileInfo.CopyTo(targetExcelPath, true);
-
-                        using var pkg = new ExcelPackage(fileInfo);
-                        var sheetToDel = new List<ExcelWorksheet>();
-                        foreach (var worksheet in pkg.Workbook.Worksheets)
-                        {
-                            var elements = groups.FirstOrDefault(g => g.Key == worksheet.Name)?.ToList();
-                            if (worksheet.Name == "房间")
-                            {
-                                elements = [.. document.OfCollector().OfCategory(BuiltInCategory.OST_Rooms).Cast<Room>().Where(r => r.Area > 0)];
-                            }
-                            if (elements == null || elements.Count == 0)
-                            {
-                                sheetToDel.Add(worksheet);
-                                continue;
-                            }
-                            // 获取到第三行的所有单元格的值，转成列号和值的字典
-                            var range = worksheet.Cells[3, 1, 3, worksheet.Dimension.End.Column];
-                            var values = new Dictionary<int, string>();
-
-                            foreach (var cell in range)
-                            {
-                                if (cell.Value != null)
-                                {
-                                    values[cell.Start.Column] = cell.Text;
-                                }
-                            }
-
-                            for (var i = 0; i < elements.Count; i++)
-                            {
-                                var element = elements[i];
-                                var row = 4 + i;
-                                foreach (var item in values)
-                                {
-                                    var parameter = element.GetParameters(item.Value)?.FirstOrDefault(p => p.HasValue);
-                                    if (parameter != null)
-                                    {
-                                        string value = string.Empty;
-                                        switch (parameter.StorageType)
-                                        {
-                                            case StorageType.None:
-                                                break;
-
-                                            case StorageType.Integer:
-                                                value = parameter.AsInteger().ToString();
-                                                break;
-
-                                            case StorageType.Double:
-                                                value = parameter.AsValueString();
-                                                break;
-
-                                            case StorageType.String:
-                                                //Revit数据库存储的值
-                                                var str = parameter.AsString();
-                                                if (string.IsNullOrEmpty(str))
-                                                {
-                                                    //用户可见的前端显示，如根据单位设置而显示的值
-                                                    value = parameter.AsValueString();
-                                                }
-                                                else
-                                                {
-                                                    value = str;
-                                                }
-                                                break;
-
-                                            case StorageType.ElementId:
-                                                value = parameter.AsElementId().ToString();
-                                                break;
-                                        }
-
-                                        worksheet.Cells[row, item.Key].Value = value;
-                                        //单元格宽度自适应
-                                        worksheet.Cells[row, item.Key].AutoFitColumns();
-                                        //单元格样式，边框线，水平居中
-                                        worksheet.Cells[row, item.Key].Style.Border.BorderAround(ExcelBorderStyle.Thin);
-                                        worksheet.Cells[row, item.Key].Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
-
-
-                                    }
-                                    //else
-                                    //{
-                                    //    MessageBox.Show($"参数{item}不存在！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
-                                    //}
-                                }
-                            }
-                        }
-
-                        foreach (var item in sheetToDel)
-                        {
-                            pkg.Workbook.Worksheets.Delete(item);
-                        }
-                        pkg.Save();
-                        if (document != null)
-                        {
-                            document.Close(false);
-                        }
-
-                        //var package = Items
-                        //    .ToWorksheet("参数表")
-                        //    .WithConfiguration(cfg => cfg.WithColumnConfiguration(c => c.AutoFit()))
-                        //    .ToExcelPackage();
-
-                    }
-                    catch (Exception ex)
-                    {
-                        if (document != null)
-                        {
-                            document.Close(false);
-                        }
-                        sb.AppendLine(ex.Message);
-                        sb.AppendLine(ex.StackTrace);
-                    }
-                }
-                if (sb.Length > 0)
-                {
-                    MessageBox.Show(sb.ToString());
-                }
-                var result = MessageBox.Show(
-                          "是否打开文件夹？",
-                          "提示",
-                          MessageBoxButton.YesNo,
-                          MessageBoxImage.Question);
-                if (result == MessageBoxResult.Yes)
-                {
-                    Process.Start(path);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/RevitAddins/MainWindow.xaml b/RevitAddins/MainWindow.xaml
deleted file mode 100644
index 8846a22..0000000
--- a/RevitAddins/MainWindow.xaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Window
-    x:Class="RevitAddins.MainWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:RevitAddins"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DataContext="{d:DesignInstance Type=local:MainViewModel}"
-    mc:Ignorable="d"
-
-    SizeToContent="WidthAndHeight"
-    Title="属性表导出">
-    <StackPanel Margin="10" Orientation="Horizontal">
-        <TextBlock
-            Margin="5"
-            FontSize="20"
-            FontWeight="Bold"
-            Text="xlsx模板:" />
-        <ComboBox
-            x:Name="cb"
-            Width="100"
-            Margin="5"
-            DisplayMemberPath="Key"
-            ItemsSource="{Binding ExcelTemplates}"
-            SelectedValue="{Binding SelectedFileInfo}"
-            SelectedValuePath="Value" />
-        <Button
-            Margin="5"
-            Command="{Binding ExportExcelCommand}"
-            Content="导出属性表"
-            Padding="5,0,5,0" 
-            ToolTip="选择Revit项目的文件夹批量导出属性表" />
-    </StackPanel>
-</Window>
\ No newline at end of file
diff --git a/RevitAddins/MainWindow.xaml.cs b/RevitAddins/MainWindow.xaml.cs
deleted file mode 100644
index dd5c4a5..0000000
--- a/RevitAddins/MainWindow.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-using Autodesk.Revit.DB;
-
-using EPPlus.Core.Extensions;
-
-using OfficeOpenXml;
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-
-using System.Linq;
-
-using System.Windows;
-
-using System.Windows.Documents;
-
-namespace RevitAddins
-{
-    /// <summary>
-    /// MainWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/RevitAddins/Properties/AssemblyInfo.cs b/RevitAddins/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2292d4c..0000000
--- a/RevitAddins/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
-[assembly: AssemblyTitle("RevitAddins")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RevitAddins")]
-[assembly: AssemblyCopyright("Copyright ©  2025")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
-
-// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
-[assembly: Guid("985886d3-5c16-4b4a-8971-28c635adc035")]
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RevitAddins/Properties/Resources.Designer.cs b/RevitAddins/Properties/Resources.Designer.cs
deleted file mode 100644
index edaf169..0000000
--- a/RevitAddins/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace RevitAddins.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
-    /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RevitAddins.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性，对
-        ///   使用此强类型资源类的所有资源查找执行重写。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap folder {
-            get {
-                object obj = ResourceManager.GetObject("folder", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap xlsx {
-            get {
-                object obj = ResourceManager.GetObject("xlsx", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}
diff --git a/RevitAddins/Properties/Resources.resx b/RevitAddins/Properties/Resources.resx
deleted file mode 100644
index d7c636b..0000000
--- a/RevitAddins/Properties/Resources.resx
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="xlsx" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\xlsx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/RevitAddins/Resources/folder.png b/RevitAddins/Resources/folder.png
deleted file mode 100644
index 99f782e..0000000
Binary files a/RevitAddins/Resources/folder.png and /dev/null differ
diff --git a/RevitAddins/Resources/xlsx.png b/RevitAddins/Resources/xlsx.png
deleted file mode 100644
index 4699791..0000000
Binary files a/RevitAddins/Resources/xlsx.png and /dev/null differ
diff --git a/RevitAddins/RevitAddins.csproj b/RevitAddins/RevitAddins.csproj
deleted file mode 100644
index 1d2154b..0000000
--- a/RevitAddins/RevitAddins.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <OutputType>Library</OutputType>
-    <UseWPF>True</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <LangVersion>13.0</LangVersion>
-    <Configurations>Debug;Release</Configurations>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="Nice3point.Revit.Toolkit" Version="2020.3.0" />
-    <PackageReference Include="EPPlus.Core.Extensions" Version="2.4.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="Revit_All_Main_Versions_API_x64" Version="2020.0.1" PrivateAssets="All" ExcludeAssets="runtime" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="License.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Templates\市政.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Templates\建筑.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Templates\结构.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/RevitAddins/RevitAddins.iss b/RevitAddins/RevitAddins.iss
deleted file mode 100644
index d0b78e6..0000000
--- a/RevitAddins/RevitAddins.iss
+++ /dev/null
@@ -1,60 +0,0 @@
-; 脚本由 Inno Setup 脚本向导生成。
-; 有关创建 Inno Setup 脚本文件的详细信息，请参阅帮助文档！
-
-; 定义应用程序的名称
-#define MyAppName "RevitAddins"
-; 定义应用程序的版本号
-#define MyAppVersion "1.0.0.0"
-; 定义应用程序的发布者
-#define MyAppPublisher "Zhanggg"
-; 定义应用程序的网址
-#define MyAppURL "https://www.shrlalgo.cn/"
-; 定义应用程序的可执行文件名
-#define MyAppExeName "RevitAddins.exe"
-#define MyDllName "RevitAddins"
-
-[Setup]
-; 注意：AppId 的值唯一标识此应用程序。不要在其他应用程序的安装程序中使用相同的 AppId 值。
-; (若要生成新的 GUID，请在 IDE 中单击 "工具|生成 GUID"。)
-AppId={{5DCDD684-EFA0-4CC7-8155-58A84E85A04F}
-; 程序名称
-AppName={#MyAppName}
-; 版本
-AppVersion={#MyAppVersion}
-; AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-;控制面板显示的名称
-UninstallDisplayName={#MyAppName}
-;安装包构建模型
-ArchitecturesInstallIn64BitMode=x64os
-;管理员权限
-PrivilegesRequired=admin
-; 是否创建应用程序目录
-CreateAppDir=no
-; 许可证文件路径
-LicenseFile=.\bin\Debug\License.txt
-InfoBeforeFile=.\bin\Debug\License.txt
-InfoAfterFile=.\bin\Debug\License.txt
-; 取消对以下行的注释以在非管理安装模式下运行(仅针对当前用户进行安装)。
-; PrivilegesRequired=lowest
-; exe输出目录
-OutputDir=.\Setup
-; 输出文件名
-OutputBaseFilename={#MyAppName}
-; 密码
-;Password=SZMEDI
-; 是否加密
-;Encryption=yes
-; 压缩方式
-Compression=lzma
-; 是否使用固体压缩
-SolidCompression=yes
-; 向导样式
-WizardStyle=modern
-
-[Files]
-Source: ".\bin\Debug\*"; DestDir: "C:\ProgramData\Autodesk\Revit\Addins\2020\RevitAddins"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: ".\bin\RevitAddins.addin"; DestDir: "C:\ProgramData\Autodesk\Revit\Addins\2020"; Flags: ignoreversion
\ No newline at end of file
diff --git a/RevitAddins/Setup/RevitAddins.exe b/RevitAddins/Setup/RevitAddins.exe
deleted file mode 100644
index d28b28c..0000000
Binary files a/RevitAddins/Setup/RevitAddins.exe and /dev/null differ
diff --git a/RevitAddins/Templates/市政.xlsx b/RevitAddins/Templates/市政.xlsx
deleted file mode 100644
index 3b5471f..0000000
Binary files a/RevitAddins/Templates/市政.xlsx and /dev/null differ
diff --git a/RevitAddins/Templates/建筑.xlsx b/RevitAddins/Templates/建筑.xlsx
deleted file mode 100644
index 0869c92..0000000
Binary files a/RevitAddins/Templates/建筑.xlsx and /dev/null differ
diff --git a/RevitAddins/Templates/结构.xlsx b/RevitAddins/Templates/结构.xlsx
deleted file mode 100644
index 0c1fb0e..0000000
Binary files a/RevitAddins/Templates/结构.xlsx and /dev/null differ
diff --git a/ShrlAlgoStudio/DrfxFontFixerView.xaml b/ShrlAlgoStudio/DrfxFontFixerView.xaml
index a6a2ffe..158cdbc 100644
--- a/ShrlAlgoStudio/DrfxFontFixerView.xaml
+++ b/ShrlAlgoStudio/DrfxFontFixerView.xaml
@@ -1,14 +1,14 @@
 <ms:MelWindow
-    Height="700"
-    Title="DaVinci Resolve drfx 字体替换"
-    Width="1000"
-    mc:Ignorable="d"
-    x:Class="ShrlAlgoStudio.DrfxFontFixer"
+    x:Class="ShrlAlgoStudio.DrfxFontFixerView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="DaVinci Resolve drfx 字体替换"
+    Width="1000"
+    Height="700"
+    mc:Ignorable="d">
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -22,55 +22,55 @@
             <ColumnDefinition Width="1.5*" />
         </Grid.ColumnDefinitions>
         <GroupBox Grid.Row="0" Header="添加需要处理的 drfx 文件">
-            <ListBox BorderThickness="1" x:Name="FileListBox" />
+            <ListBox x:Name="FileListBox" BorderThickness="1" />
         </GroupBox>
-        <ms:FlexibleRowPanel Grid.Column="0" Grid.Row="1">
+        <ms:FlexibleRowPanel Grid.Row="1" Grid.Column="0">
             <Button
+                x:Name="AddFilesButton"
                 Click="AddFilesButton_Click"
-                Content="添加drfx文件"
-                x:Name="AddFilesButton" />
+                Content="添加drfx文件" />
             <Button
+                x:Name="ClearListButton"
                 Click="ClearListButton_Click"
-                Content="清空处理列表"
-                x:Name="ClearListButton" />
+                Content="清空处理列表" />
         </ms:FlexibleRowPanel>
         <ms:FlexibleRowPanel
+            Grid.Row="2"
             Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Grid.Row="2">
-            <TextBox ms:FlexibleRowPanel.Span="2" x:Name="OutputPath" />
+            Grid.ColumnSpan="2">
+            <TextBox x:Name="OutputPath" ms:FlexibleRowPanel.Span="2" />
             <Button
+                x:Name="BrowserOutputPathButton"
                 Click="BrowserOutputPathButton_Click"
-                Content="选择输出路径"
-                x:Name="BrowserOutputPathButton" />
+                Content="选择输出路径" />
             <Button
+                x:Name="OpenOutputButton"
                 Click="OpenOutputButton_Click"
                 Content="打开输出目录"
-                IsEnabled="False"
-                x:Name="OpenOutputButton" />
+                IsEnabled="False" />
         </ms:FlexibleRowPanel>
         <GroupBox
-            FontWeight="Bold"
+            Grid.Row="3"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Grid.Row="3"
+            FontWeight="Bold"
             Header="处理日志">
-            <ScrollViewer VerticalScrollBarVisibility="Auto" x:Name="LogScrollViewer">
+            <ScrollViewer x:Name="LogScrollViewer" VerticalScrollBarVisibility="Auto">
                 <TextBlock
-                    FontFamily="Consolas"
+                    x:Name="LogTextBlock"
                     Margin="5"
-                    TextWrapping="Wrap"
-                    x:Name="LogTextBlock" />
+                    FontFamily="Consolas"
+                    TextWrapping="Wrap" />
             </ScrollViewer>
         </GroupBox>
         <GroupBox
-            Grid.Column="1"
             Grid.Row="0"
+            Grid.Column="1"
             Header="扫描文件并定义字体/样式替换规则">
             <DataGrid
+                x:Name="MappingDataGrid"
                 AutoGenerateColumns="False"
-                CanUserAddRows="False"
-                x:Name="MappingDataGrid">
+                CanUserAddRows="False">
                 <DataGrid.RowStyle>
                     <Style TargetType="DataGridRow">
                         <Setter Property="ToolTipService.ShowDuration" Value="30000" />
@@ -79,16 +79,16 @@
                 </DataGrid.RowStyle>
                 <DataGrid.Columns>
                     <DataGridTextColumn
+                        Width="*"
                         Binding="{Binding OriginalFont}"
                         Header="原始字体"
-                        IsReadOnly="True"
-                        Width="*" />
+                        IsReadOnly="True" />
                     <DataGridTextColumn
+                        Width="*"
                         Binding="{Binding OriginalStyle}"
                         Header="原始样式"
-                        IsReadOnly="True"
-                        Width="*" />
-                    <DataGridTemplateColumn Header="新字体" Width="*">
+                        IsReadOnly="True" />
+                    <DataGridTemplateColumn Width="*" Header="新字体">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <!--  注意：我们仍然保留LostFocus，因为它能最好地处理“手动输入”文本的场景  -->
@@ -100,7 +100,7 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTemplateColumn Header="新样式" Width="*">
+                    <DataGridTemplateColumn Width="*" Header="新样式">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <ContentControl>
@@ -137,43 +137,43 @@
             </DataGrid>
         </GroupBox>
         <StackPanel
-            Grid.Column="1"
             Grid.Row="1"
+            Grid.Column="1"
             HorizontalAlignment="Right"
-            Orientation="Horizontal"
-            VerticalAlignment="Bottom">
+            VerticalAlignment="Bottom"
+            Orientation="Horizontal">
             <Button
+                x:Name="ScanFilesButton"
                 Click="ScanFilesButton_Click"
-                Content="扫描文件并更新映射表"
-                x:Name="ScanFilesButton" />
+                Content="扫描文件并更新映射表" />
             <Button
+                x:Name="LoadMapButton"
                 Click="LoadMapButton_Click"
-                Content="加载映射表"
-                x:Name="LoadMapButton" />
+                Content="加载映射表" />
             <Button
+                x:Name="SaveMapButton"
                 Click="SaveMapButton_Click"
-                Content="保存映射表"
-                x:Name="SaveMapButton" />
+                Content="保存映射表" />
             <Button
+                x:Name="ClearMapButton"
                 Click="ClearMapButton_Click"
-                Content="清空映射表"
-                x:Name="ClearMapButton" />
+                Content="清空映射表" />
         </StackPanel>
-        <Grid Grid.ColumnSpan="2" Grid.Row="5">
+        <Grid Grid.Row="5" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
             <ProgressBar
+                x:Name="MainProgressBar"
                 Grid.Column="0"
-                Height="35"
-                x:Name="MainProgressBar" />
+                Height="35" />
             <Button
-                Click="StartButton_Click"
-                Content="开始处理"
+                x:Name="StartButton"
                 Grid.Column="1"
-                x:Name="StartButton" />
+                Click="StartButton_Click"
+                Content="开始处理" />
         </Grid>
     </Grid>
 </ms:MelWindow>
\ No newline at end of file
diff --git a/ShrlAlgoStudio/DrfxFontFixerView.xaml.cs b/ShrlAlgoStudio/DrfxFontFixerView.xaml.cs
index 0f851fd..fefbc43 100644
--- a/ShrlAlgoStudio/DrfxFontFixerView.xaml.cs
+++ b/ShrlAlgoStudio/DrfxFontFixerView.xaml.cs
@@ -99,7 +99,7 @@ namespace ShrlAlgoStudio
         protected void OnPropertyChanged(string name) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
     }
 
-    public partial class DrfxFontFixer
+    public partial class DrfxFontFixerView
     {
         public ObservableCollection<FullMapping> FullMappings { get; set; } = new ObservableCollection<FullMapping>();
         public List<string> SystemFonts { get; set; } = new List<string>();
@@ -107,7 +107,7 @@ namespace ShrlAlgoStudio
         private bool isProcessingComplete = false;
         private string lastOutputDirectory = "";
 
-        public DrfxFontFixer()
+        public DrfxFontFixerView()
         {
             InitializeComponent();
             this.DataContext = this;
diff --git a/ShrlAlgoStudio/GuidGeneratorView.xaml b/ShrlAlgoStudio/GuidGeneratorView.xaml
index 810508d..c869408 100644
--- a/ShrlAlgoStudio/GuidGeneratorView.xaml
+++ b/ShrlAlgoStudio/GuidGeneratorView.xaml
@@ -1,10 +1,11 @@
-<Window
+<ms:MelWindow
     x:Class="ShrlAlgoStudio.GuidGeneratorView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoStudio"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     Title="GUID 生成工具"
     Width="800"
     Height="450"
@@ -91,4 +92,4 @@
                 Content="复制到剪贴板" />
         </Grid>
     </Grid>
-</Window>
+</ms:MelWindow>
diff --git a/ShrlAlgoStudio/GuidGeneratorView.xaml.cs b/ShrlAlgoStudio/GuidGeneratorView.xaml.cs
index 0014b8d..3724444 100644
--- a/ShrlAlgoStudio/GuidGeneratorView.xaml.cs
+++ b/ShrlAlgoStudio/GuidGeneratorView.xaml.cs
@@ -17,7 +17,7 @@ namespace ShrlAlgoStudio
     /// <summary>
     /// GuidGeneratorView.xaml 的交互逻辑
     /// </summary>
-    public partial class GuidGeneratorView : Window
+    public partial class GuidGeneratorView
     {
         public GuidGeneratorView()
         {
diff --git a/ShrlAlgoStudio/Iconfont2CSharpView.xaml b/ShrlAlgoStudio/Iconfont2CSharpView.xaml
index b5c026b..69611de 100644
--- a/ShrlAlgoStudio/Iconfont2CSharpView.xaml
+++ b/ShrlAlgoStudio/Iconfont2CSharpView.xaml
@@ -1,10 +1,11 @@
-<Window
+<ms:MelWindow
     x:Class="ShrlAlgoStudio.Iconfont2CSharpView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoStudio"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     Title="字体转C#"
     Width="800"
     Height="450"
@@ -126,4 +127,4 @@
             </Grid>
         </GroupBox>
     </Grid>
-</Window>
+</ms:MelWindow>
diff --git a/ShrlAlgoStudio/Iconfont2CSharpView.xaml.cs b/ShrlAlgoStudio/Iconfont2CSharpView.xaml.cs
index 2aa33da..b3f45e7 100644
--- a/ShrlAlgoStudio/Iconfont2CSharpView.xaml.cs
+++ b/ShrlAlgoStudio/Iconfont2CSharpView.xaml.cs
@@ -23,7 +23,7 @@ namespace ShrlAlgoStudio
     /// <summary>
     /// Iconfont2CSharpView.xaml 的交互逻辑
     /// </summary>
-    public partial class Iconfont2CSharpView : Window
+    public partial class Iconfont2CSharpView
     {
         public ObservableCollection<IconItem> Icons { get; set; } = new ObservableCollection<IconItem>();
 
diff --git a/ShrlAlgoStudio/LicenseGenView.xaml b/ShrlAlgoStudio/LicenseGenView.xaml
index bcc87ba..2f32b59 100644
--- a/ShrlAlgoStudio/LicenseGenView.xaml
+++ b/ShrlAlgoStudio/LicenseGenView.xaml
@@ -1,16 +1,19 @@
 <ms:MelWindow
     Height="450"
-    Title="LicenseGen"
+    Title="许可生成"
     Width="800"
     mc:Ignorable="d"
-    x:Class="ShrlAlgoStudio.LicenseGen"
+    x:Class="ShrlAlgoStudio.LicenseGenView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
-        <ms:StackPanel HorizontalAlignment="Center" Width="600">
+        <ms:StackPanel
+            HorizontalAlignment="Center"
+            Spacing="5"
+            Width="600">
             <UniformGrid Rows="1">
                 <TextBox ms:InputAssist.Prefix="私钥:" x:Name="PrivateKeyTextBox" />
                 <TextBox ms:InputAssist.Prefix="公钥:" x:Name="PublicKeyTextBox" />
diff --git a/ShrlAlgoStudio/LicenseGenView.xaml.cs b/ShrlAlgoStudio/LicenseGenView.xaml.cs
index 2c13604..1e84965 100644
--- a/ShrlAlgoStudio/LicenseGenView.xaml.cs
+++ b/ShrlAlgoStudio/LicenseGenView.xaml.cs
@@ -5,15 +5,17 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Windows;
 
+using Melskin.Controls;
+
 namespace ShrlAlgoStudio;
 
 /// <summary>
-/// Interaction logic for LicenseGen.xaml
+/// Interaction logic for LicenseGenView.xaml
 /// </summary>
-public partial class LicenseGen
+public partial class LicenseGenView
 {
     private static string _privateKey = string.Empty;
-    public LicenseGen()
+    public LicenseGenView()
     {
         InitializeComponent();
     }
diff --git a/ShrlAlgoStudio/LicenseManager.cs b/ShrlAlgoStudio/LicenseManager.cs
index 6605cf4..77cb7e7 100644
--- a/ShrlAlgoStudio/LicenseManager.cs
+++ b/ShrlAlgoStudio/LicenseManager.cs
@@ -1,9 +1,10 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Win32;
 
-namespace KeyGen
+namespace ShrlAlgoStudio
 {
     internal class LicenseManager
     {
diff --git a/ShrlAlgoStudio/MainWindow.xaml b/ShrlAlgoStudio/MainWindow.xaml
index f85e2a7..9b3aefd 100644
--- a/ShrlAlgoStudio/MainWindow.xaml
+++ b/ShrlAlgoStudio/MainWindow.xaml
@@ -1,11 +1,12 @@
-<Window
+<ms:MelWindow
     x:Class="ShrlAlgoStudio.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:ShrlAlgoStudio"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ms="https://github.com/ShrlAlgo/Melskin"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     Title="MainWindow"
     Width="800"
     Height="450"
@@ -16,6 +17,7 @@
             <Button Click="RevitCipher_Click" Content="加解密Revit文件" />
             <Button Click="GuidGenerate_Click" Content="GUID生成" />
             <Button Click="IconFont_Click" Content="图表字体转C#代码" />
+            <Button Click="LicenseGen_Click" Content="许可生成" />
         </ms:StackPanel>
     </Grid>
-</Window>
+</ms:MelWindow>
diff --git a/ShrlAlgoStudio/MainWindow.xaml.cs b/ShrlAlgoStudio/MainWindow.xaml.cs
index cec2533..f720191 100644
--- a/ShrlAlgoStudio/MainWindow.xaml.cs
+++ b/ShrlAlgoStudio/MainWindow.xaml.cs
@@ -1,10 +1,8 @@
 using System.Windows;
 
-using FileProcessor;
-
 namespace ShrlAlgoStudio
 {
-    public partial class MainWindow : Window
+    public partial class MainWindow 
     {
         public MainWindow()
         {
@@ -13,25 +11,30 @@ namespace ShrlAlgoStudio
 
         private void RevitCipher_Click(object sender, RoutedEventArgs e)
         {
-            RevitFileCipher cipher=new RevitFileCipher();
-            cipher.ShowDialog();
+            new RevitFileCipherView().ShowDialog();
         }
 
         private void ReplaceFont_Click(object sender, RoutedEventArgs e)
         {
-            DrfxFontFixer fixer=new DrfxFontFixer();
-            fixer.ShowDialog();
+            DrfxFontFixerView fixerView=new DrfxFontFixerView();
+            fixerView.ShowDialog();
         }
 
         private void GuidGenerate_Click(object sender, RoutedEventArgs e)
         {
-            GuidGeneratorView fixer=new GuidGeneratorView();
-            fixer.ShowDialog();
+            GuidGeneratorView guidView=new GuidGeneratorView();
+            guidView.ShowDialog();
         }
         private void IconFont_Click(object sender, RoutedEventArgs e)
         {
-            Iconfont2CSharpView fixer=new Iconfont2CSharpView();
-            fixer.ShowDialog();
+            Iconfont2CSharpView iconfont2CSharp=new Iconfont2CSharpView();
+            iconfont2CSharp.ShowDialog();
+        }
+
+        private void LicenseGen_Click(object sender, RoutedEventArgs e)
+        {
+            LicenseGenView licenseGen=new LicenseGenView();
+            licenseGen.ShowDialog();
         }
     }
 }
\ No newline at end of file
diff --git a/ShrlAlgoStudio/RevitFileCipherView.xaml b/ShrlAlgoStudio/RevitFileCipherView.xaml
index aecdac2..8e2ab1e 100644
--- a/ShrlAlgoStudio/RevitFileCipherView.xaml
+++ b/ShrlAlgoStudio/RevitFileCipherView.xaml
@@ -1,45 +1,45 @@
 <ms:MelWindow
-    x:Class="FileProcessor.RevitFileCipher"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:FileProcessor"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
+    Height="150"
     Title="解密"
     Width="320"
-    Height="150"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    x:Class="ShrlAlgoStudio.RevitFileCipherView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:ShrlAlgoStudio"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ms="https://github.com/ShrlAlgo/Melskin"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UniformGrid Margin="5" Rows="2">
         <Button
-            Padding="10"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
             Click="IsDecrypt_Click"
-            Content="判断是否加密" />
-        <Button
-            Padding="10"
+            Content="判断是否加密"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
+            Padding="10"
+            VerticalAlignment="Center" />
+        <Button
             Click="DecryptButton_Click"
-            Content="解密文件" />
-        <Button
-            Padding="10"
+            Content="解密文件"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
+            Padding="10"
+            VerticalAlignment="Center" />
+        <Button
             Click="DecryptFolderButton_Click"
-            Content="解密文件夹" />
-        <Button
-            Padding="10"
+            Content="解密文件夹"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
+            Padding="10"
+            VerticalAlignment="Center" />
+        <Button
             Click="EncryptButton_Click"
-            Content="加密文件" />
-        <Button
-            Padding="10"
+            Content="加密文件"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
+            Padding="10"
+            VerticalAlignment="Center" />
+        <Button
             Click="EncryptFolderButton_Click"
-            Content="加密文件夹" />
+            Content="加密文件夹"
+            HorizontalAlignment="Center"
+            Padding="10"
+            VerticalAlignment="Center" />
     </UniformGrid>
 </ms:MelWindow>
diff --git a/ShrlAlgoStudio/RevitFileCipherView.xaml.cs b/ShrlAlgoStudio/RevitFileCipherView.xaml.cs
index 1895fe9..4ecd8a8 100644
--- a/ShrlAlgoStudio/RevitFileCipherView.xaml.cs
+++ b/ShrlAlgoStudio/RevitFileCipherView.xaml.cs
@@ -9,11 +9,11 @@ using Microsoft.Win32;
 namespace ShrlAlgoStudio
 {
     /// <summary>
-    /// RevitFileCipher.xaml 的交互逻辑
+    /// RevitFileCipherView.xaml 的交互逻辑
     /// </summary>
-    public partial class RevitFileCipher
+    public partial class RevitFileCipherView
     {
-        public RevitFileCipher()
+        public RevitFileCipherView()
         {
             InitializeComponent();
         }
diff --git a/ShrlAlgoStudio/ShrlAlgoStudio.csproj b/ShrlAlgoStudio/ShrlAlgoStudio.csproj
index 473b036..639dd94 100644
--- a/ShrlAlgoStudio/ShrlAlgoStudio.csproj
+++ b/ShrlAlgoStudio/ShrlAlgoStudio.csproj
@@ -15,10 +15,6 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.IO.Compression" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="RevitFileCipher.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Reference Include="System.Management" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ShrlAlgoStudio/TimeHelper.cs b/ShrlAlgoStudio/TimeHelper.cs
index 13985ae..269930f 100644
--- a/ShrlAlgoStudio/TimeHelper.cs
+++ b/ShrlAlgoStudio/TimeHelper.cs
@@ -1,8 +1,9 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.IO;
 using System.Net;
 
-namespace KeyGen
+namespace ShrlAlgoStudio
 {
     internal static class TimeHelper
     {
diff --git a/ShrlAlgoToolkit.Core/Assists/ConfigAssist.cs b/ShrlAlgoToolkit.Core/Assists/ConfigAssist.cs
deleted file mode 100644
index fd55de5..0000000
--- a/ShrlAlgoToolkit.Core/Assists/ConfigAssist.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Configuration;
-using System.IO;
-using System.Reflection;
-
-namespace ShrlAlgoToolkit.Core.Assists
-{
-	public class ConfigAssist
-	{
-		/// <summary>
-		///     获取项目文件夹下的配置文件根据Key获取Value
-		/// </summary>
-		/// <param name="key">键</param>
-		/// <returns></returns>
-		public static string GetCfgValue(string key)
-		{
-			var assembly = Assembly.GetCallingAssembly();
-
-			var uri = new Uri(Path.GetDirectoryName(assembly.Location) ?? string.Empty);
-			var map = new ExeConfigurationFileMap { ExeConfigFilename = Path.Combine(uri.LocalPath, assembly.GetName().Name + ".dll.config") };
-			var config = ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None);
-			var loadpath = config.AppSettings.Settings[key].Value; //若路径存在则自动获取该路径
-			return loadpath;
-		}
-
-		/// <summary>
-		///     保存到程序目录下的配置文件
-		/// </summary>
-		/// <param name="key">键</param>
-		/// <param name="value">值</param>
-		public static void SetCfgPairs(string key, string value)
-		{
-			var assembly = Assembly.GetCallingAssembly();
-			var uri = new Uri(Path.GetDirectoryName(assembly.Location) ?? string.Empty);
-			var map = new ExeConfigurationFileMap { ExeConfigFilename = Path.Combine(uri.LocalPath, assembly.GetName().Name + ".dll.config") };
-
-			var config = ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None);
-			config.AppSettings.Settings[key].Value = value; //将用户选取的路径_path赋给app.config中的_path(名称自取)
-			//ConfigurationManager.OpenMappedExeConfiguration(map, 0).AppSettings.Settings["FamilyPath"].Value = SelectedPath;
-			config.AppSettings.SectionInformation.ForceSave = true;
-
-			config.Save(ConfigurationSaveMode.Modified); //将配置保存
-			ConfigurationManager.RefreshSection("appSettings"); //刷新配置文件
-			//if (Directory.Exists(config.AppSettings.Settings["FamilyPath"].Value))//判断配置的路径是否存在
-			//{
-			//    dialog.SelectedPath = config.AppSettings.Settings["FamilyPath"].Value;//若路径存在则自动获取该路径
-			//}
-		}
-	}
-}
diff --git a/ShrlAlgoToolkit.Core/Assists/IOAssist.cs b/ShrlAlgoToolkit.Core/Assists/IOAssist.cs
deleted file mode 100644
index f57aec3..0000000
--- a/ShrlAlgoToolkit.Core/Assists/IOAssist.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Text;
-
-namespace ShrlAlgoToolkit.Core.Assists;
-
-public static class IOAssist
-{
-    public static void GetFilesHierarchy(string path)
-    {
-        var files = Directory.GetFiles($"{path}", "*", SearchOption.AllDirectories); //遍历所有文件夹
-        var list = files.Union(files).OrderBy(s => s);
-    }
-    /// <summary>
-    /// 获取当前文件的副本或备份文件名
-    /// </summary>
-    /// <param name="filePath"></param>
-    /// <returns></returns>
-    /// <exception cref="FileNotFoundException"></exception>
-    public static string GetUniqueFilePath(string filePath)
-    {
-        if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath))
-        {
-            throw new FileNotFoundException($"文件'{filePath}'不存在。");
-        }
-        var dir = Path.GetDirectoryName(filePath);
-        var extension = Path.GetExtension(filePath);
-        var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath);
-        var counter = 1;
-
-        while (true)
-        {
-            var candidateFileName = $"{fileNameWithoutExtension}.{counter:D3}{extension}";
-            var fullPath = Path.Combine(dir, candidateFileName);
-            if (!File.Exists(fullPath))
-            {
-                return fullPath;
-            }
-
-            counter++;
-        }
-    }
-    public static string GetRelativePath(string fromPath, string toPath)
-    {
-        Uri uri = new(fromPath);
-        Uri uri2 = new(toPath);
-        if (uri.Scheme != uri2.Scheme)
-        {
-            return toPath;
-        }
-
-        var uri3 = uri.MakeRelativeUri(uri2);
-        var text = Uri.UnescapeDataString(uri3.ToString());
-        if (uri2.Scheme.Equals("file", StringComparison.InvariantCultureIgnoreCase))
-        {
-            text = text.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-        }
-
-        return text;
-    }
-
-    /// <summary>
-    /// 获取指定系统路径
-    /// </summary>
-    /// <param name="specialFolder"></param>
-    /// <returns></returns>
-    public static string GetSpecialFolderDir(Environment.SpecialFolder specialFolder)
-    {
-        return Environment.GetFolderPath(specialFolder);
-    }
-
-    /// <summary>
-    ///     读文件
-    /// </summary>
-    /// <param name="path">文件路径</param>
-    /// <returns></returns>
-    public static string ReadFile(string path)
-    {
-        string s;
-        if (!File.Exists(path))
-        {
-            s = "不存在相应的目录";
-        }
-        else
-        {
-            using StreamReader f2 = new(path, Encoding.GetEncoding("gb2312"));
-            s = f2.ReadToEnd();
-            f2.Close();
-        }
-
-        return s;
-    }
-
-    /// <summary>
-    /// 在桌面写文件
-    /// </summary>
-    /// <param name="fileName">纯文件名</param>
-    /// <param name="message">写入的内容</param>
-    public static void WriteTxtFile(string fileName, string message)
-    {
-        var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + $"\\{fileName}.txt";
-        File.WriteAllText(filePath, message);
-        Process.Start(filePath);
-    }
-
-    /// <summary>
-    ///     写文件
-    /// </summary>
-    /// <param name="path">文件路径</param>
-    /// <param name="strings">文件内容</param>
-    public static void WriteFile(string path, string strings)
-    {
-        if (!File.Exists(path))
-        {
-            var f = File.Create(path);
-            f.Close();
-            f.Dispose();
-        }
-
-        using StreamWriter f2 = new(path, true, Encoding.UTF8);
-        f2.WriteLine(strings);
-        f2.Close();
-    }
-
-    /// <summary>
-    ///     向文本文件中写入内容
-    /// </summary>
-    /// <param name="filePath">文件的绝对路径</param>
-    /// <param name="text">写入的内容</param>
-    /// <param name="encoding">编码</param>
-    public static void WriteText(string filePath, string text, Encoding encoding)
-    {
-        //向文件写入内容
-        File.WriteAllText(filePath, text, encoding);
-    }
-}
diff --git a/ShrlAlgoToolkit.Core/Assists/IniAssist.cs b/ShrlAlgoToolkit.Core/Assists/IniAssist.cs
deleted file mode 100644
index 8d5b795..0000000
--- a/ShrlAlgoToolkit.Core/Assists/IniAssist.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace ShrlAlgoToolkit.Core.Assists;
-
-public class IniAssist
-{
-	public IniAssist(string iniPath)
-	{
-		path = iniPath;
-	}
-
-	public string path;
-
-	/// <summary>
-	///     删除ini文件下所有段落
-	/// </summary>
-	public void ClearAllSection()
-	{
-		IniWriteValue(null, null, null);
-	}
-
-	/// <summary>
-	///     删除ini文件下personal段落下的所有键
-	/// </summary>
-	/// <param name="section"></param>
-	public void ClearSection(string section)
-	{
-		IniWriteValue(section, null, null);
-	}
-
-	/// <summary>
-	///     读取INI文件
-	/// </summary>
-	/// <param name="section"></param>
-	/// <param name="key"></param>
-	/// <returns></returns>
-	public string IniReadValue(string section, string key)
-	{
-		var temp = new StringBuilder(255);
-		GetPrivateProfileString(section, key, "", temp, 255, path);
-		return temp.ToString();
-	}
-
-	public byte[] IniReadValues(string section, string key)
-	{
-		var temp = new byte[255];
-		var i = GetPrivateProfileString(section, key, "", temp, 255, path);
-		return temp;
-	}
-
-	/// <summary>
-	///     写INI文件
-	/// </summary>
-	/// <param name="section"></param>
-	/// <param name="key"></param>
-	/// <param name="value"></param>
-	public void IniWriteValue(string section, string key, string value)
-	{
-		WritePrivateProfileString(section, key, value, path);
-	}
-
-	[DllImport("kernel32")]
-	private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath);
-
-	[DllImport("kernel32")]
-	private static extern int GetPrivateProfileString(string section, string key, string defVal, byte[] retVal, int size, string filePath);
-
-	[DllImport("kernel32")]
-	private static extern long WritePrivateProfileString(string section, string key, string val, string filePath);
-}
diff --git a/ShrlAlgoToolkit.Core/Assists/LicenseEngine.cs b/ShrlAlgoToolkit.Core/Assists/LicenseEngine.cs
deleted file mode 100644
index 84a728a..0000000
--- a/ShrlAlgoToolkit.Core/Assists/LicenseEngine.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Management;
-using System.Net;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Win32;
-
-namespace ShrlAlgoToolkit.Core.Assists
-{
-    public class LicenseEngine
-    {
-        // 【重要】替换为你生成的公钥
-        private const string PublicKey = @"<RSAKeyValue><Modulus>rd5+EjU6QxaTY/AalU9g6ugAquN0ahJSgeahnf2CrfvUAWFNJ+SH7Qr0RcvOTyAbWfvLWoBDACKaPsg+8nRQcO3EZdFyjJ9oycLNrw38+gSB2+/79Axys/8MHtSXVUw9WN2e9LxeHOQGtcaoSsp+bPGaXswthovQ2CkvBTmCokcAOX6UaR7Av4npaXyEoGCUsZLEiSydMsNbQ+wLsumVg1H2o/cpkO0s4DiJHoF66zUuxA+pYSjSCn5KTUsOemf+gBsob6Sw+7WOToyiOkMdO9Op6esf8yL7DJ1Yd40XaKd5IeLQmEX/b+n1EV2JEkGO0p9q9MQRp6NrEc9LvfMJWQ==</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>";
-
-        private static string RegPath = @$"Software\{Assembly.GetExecutingAssembly().GetName()}\License";
-
-        /// <summary>
-        /// 完整验证逻辑
-        /// </summary>
-        public static (bool isValid, string message) Validate()
-        {
-            string licenseKey = LoadFromRegistry("Key");
-            if (string.IsNullOrEmpty(licenseKey)) return (false, "未找到授权码");
-
-            try
-            {
-                // 1. RSA 解密/验证逻辑
-                // 激活码格式：签名(Base64)|机器码|到期日期
-                var parts = licenseKey.Split('|');
-                if (parts.Length != 3) return (false, "授权格式非法");
-
-                string signature = parts[0];
-                string mCode = parts[1];
-                string expiryStr = parts[2];
-
-                // 2. 验证是否是本机的机器码
-                if (mCode != GetMachineCode()) return (false, "授权码与本机硬件不匹配");
-
-                // 3. 验证 RSA 签名（确保数据没被篡改）
-                if (!VerifySignature($"{mCode}|{expiryStr}", signature)) return (false, "授权签名校验失败");
-
-                // 4. 时间校验
-                DateTime expiryDate = DateTime.ParseExact(expiryStr, "yyyyMMdd", CultureInfo.InvariantCulture);
-                DateTime now = GetRobustDateTime();
-
-                // 防回滚检查
-                DateTime lastRun = GetLastRunTime();
-                if (now < lastRun) return (false, "系统时间异常，请检查时钟");
-                UpdateLastRunTime(now);
-
-                if (now > expiryDate) return (false, $"授权已于 {expiryDate:yyyy-MM-dd} 到期");
-
-                return (true, "授权有效");
-            }
-            catch { return (false, "解析授权出错"); }
-        }
-
-        private static bool VerifySignature(string data, string signature)
-        {
-            using (var rsa = new RSACryptoServiceProvider())
-            {
-                rsa.FromXmlString(PublicKey);
-                var formatter = new RSAPKCS1SignatureDeformatter(rsa);
-                formatter.SetHashAlgorithm("SHA256");
-                byte[] dataBytes = Encoding.UTF8.GetBytes(data);
-                using (var sha = SHA256.Create())
-                {
-                    byte[] hash = sha.ComputeHash(dataBytes);
-                    return formatter.VerifySignature(hash, Convert.FromBase64String(signature));
-                }
-            }
-        }
-
-        public static string GetMachineCode()
-        {
-            // 组合 CPU ID + 硬盘 ID
-            string raw = GetHardwareId("Win32_Processor", "ProcessorId") +
-                         GetHardwareId("Win32_PhysicalMedia", "SerialNumber");
-            using (var sha = SHA256.Create())
-            {
-                byte[] hash = sha.ComputeHash(Encoding.UTF8.GetBytes(raw));
-                return BitConverter.ToString(hash).Replace("-", "").Substring(0, 16);
-            }
-        }
-
-        private static string GetHardwareId(string wmiClass, string property)
-        {
-            try
-            {
-                using (var mc = new ManagementClass(wmiClass))
-                    foreach (var mo in mc.GetInstances()) return mo[property]?.ToString().Trim();
-            }
-            catch { }
-            return "UNKNOWN";
-        }
-
-        // 获取可靠的时间（网络优先，本地其次）
-        private static DateTime GetRobustDateTime()
-        {
-            try
-            {
-                var request = WebRequest.Create("http://www.baidu.com");
-                request.Timeout = 2000;
-                using (var response = request.GetResponse())
-                {
-                    string dateStr = response.Headers["Date"];
-                    return DateTime.ParseExact(dateStr, "ddd, dd MMM yyyy HH:mm:ss 'GMT'", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
-                }
-            }
-            catch { return DateTime.Now; }
-        }
-
-        #region 注册表操作
-        private static DateTime GetLastRunTime()
-        {
-            string val = LoadFromRegistry("T");
-            return string.IsNullOrEmpty(val) ? DateTime.MinValue : new DateTime(long.Parse(val));
-        }
-        private static void UpdateLastRunTime(DateTime now) => SaveToRegistry("T", now.Ticks.ToString());
-
-        public static void SaveToRegistry(string key, string val)
-        {
-            using var r = Registry.CurrentUser.CreateSubKey(RegPath);
-            r.SetValue(key, val);
-        }
-        private static string LoadFromRegistry(string key)
-        {
-            using var r = Registry.CurrentUser.OpenSubKey(RegPath);
-            return r?.GetValue(key)?.ToString();
-        }
-        /// <summary>
-        /// 仅移除当前的激活码（重置授权状态，但保留时间戳防止白嫖）
-        /// </summary>
-        public static void ClearLicenseKey()
-        {
-            try
-            {
-                using (var r = Registry.CurrentUser.OpenSubKey(RegPath, true))
-                {
-                    if (r != null && r.GetValue("Key") != null)
-                    {
-                        r.DeleteValue("Key");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("移除授权码失败: " + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 彻底销毁所有授权痕迹（包括时间戳记录，通常用于卸载）
-        /// </summary>
-        public static void DestroyAllLicenseData()
-        {
-            try
-            {
-                // 第二个参数为 false 表示：如果路径不存在，不抛出异常
-                Registry.CurrentUser.DeleteSubKeyTree(RegPath, false);
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("彻底清理注册表失败: " + ex.Message);
-            }
-        }
-        #endregion
-    }
-}
diff --git a/ShrlAlgoToolkit.Core/Assists/SingletonChildWindowManager.cs b/ShrlAlgoToolkit.Core/Assists/SingletonChildWindowManager.cs
deleted file mode 100644
index 8d881eb..0000000
--- a/ShrlAlgoToolkit.Core/Assists/SingletonChildWindowManager.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Windows;
-using System.Windows.Interop;
-
-namespace ShrlAlgoToolkit.Core.Assists;
-
-public static class SingletonChildWindowManager
-{
-    private static readonly Dictionary<Type, Window> Windows = [];
-    public static void ShowOrActivate<TWindow, TViewModel>(params object[] viewModelParams)
-        where TWindow : Window, new()
-        where TViewModel : class
-    {
-        var windowType = typeof(TWindow);
-        if (Windows.TryGetValue(windowType, out var window) && window != null)
-        {
-            window.Activate();
-        }
-        else
-        {
-            //CloseAllWindowsExcept(windowType);
-            Windows[windowType] = new TWindow();
-            Windows[windowType].Closed += (_, _) => Windows[windowType] = null;
-            if (Windows[windowType].DataContext == null || Windows[windowType].DataContext is not TViewModel)
-            {
-                Windows[windowType].DataContext = viewModelParams.Length == 0
-                    ? Activator.CreateInstance<TViewModel>()
-                    : Activator.CreateInstance(typeof(TViewModel), viewModelParams);
-            }
-            _ = new WindowInteropHelper(Windows[windowType]) { Owner = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle };
-            Windows[windowType].Show();
-        }
-    }
-}
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.Core/Assists/XmlAssist.cs b/ShrlAlgoToolkit.Core/Assists/XmlAssist.cs
deleted file mode 100644
index eae90c1..0000000
--- a/ShrlAlgoToolkit.Core/Assists/XmlAssist.cs
+++ /dev/null
@@ -1,426 +0,0 @@
-using System.IO;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace ShrlAlgoToolkit.Core.Assists;
-
-public class XmlAssist
-{
-	public XmlAssist(string strPath)
-	{
-		XmlPath = strPath;
-	}
-
-	public string XmlPath { get; }
-
-	/// <summary>
-	///     创建配置文件，可在子类中重写此方法
-	/// </summary>
-	public static void CreateFile(string fileName)
-	{
-		var doc = new XmlDocument();
-		var dec = doc.CreateXmlDeclaration("1.0", "UTF-8", null);
-		doc.AppendChild(dec);
-		var root = doc.CreateElement("Root");
-		doc.AppendChild(root);
-		root.AppendChild(doc.CreateElement("Config"));
-		doc.Save(fileName);
-	}
-
-	/// <summary>
-	///     删除节点值
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	public static void Delete(string path, string node)
-	{
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			xn.ParentNode.RemoveChild(xn);
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	/// <summary>
-	///     删除数据
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="attribute">属性名，非空时删除该节点属性值，否则删除节点值</param>
-	public static void Delete(string path, string node, string attribute)
-	{
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			var xe = (XmlElement)xn;
-			if (attribute.Equals(string.Empty))
-			{
-				xn.ParentNode.RemoveChild(xn);
-			}
-			else
-			{
-				xe.RemoveAttribute(attribute);
-			}
-
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	/// <summary>
-	///     插入数据
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="element">元素名，非空时插入新元素，否则在该元素中插入属性</param>
-	/// <param name="attribute">属性名，非空时插入该元素属性值，否则插入元素值</param>
-	/// <param name="value">值</param>
-	public static void Insert(string path, string node, string element, string attribute, string value)
-	{
-		try
-		{
-			var doc = new XmlDocument();
-			doc.Load(AppDomain.CurrentDomain.BaseDirectory + path);
-			var xn = doc.SelectSingleNode(node);
-			if (element.Equals(string.Empty))
-			{
-				if (!attribute.Equals(string.Empty))
-				{
-					var xe = (XmlElement)xn;
-					xe.SetAttribute(attribute, value);
-				}
-			}
-			else
-			{
-				var xe = doc.CreateElement(element);
-				if (attribute.Equals(string.Empty))
-				{
-					xe.InnerText = value;
-				}
-				else
-				{
-					xe.SetAttribute(attribute, value);
-				}
-
-				xn.AppendChild(xe);
-			}
-
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	/// <summary>
-	///     插入数据
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="element">元素名，非空时插入新元素，否则在该元素中插入属性</param>
-	/// <param name="strList">由XML属性名和值组成的二维数组</param>
-	public static void Insert(string path, string node, string element, string[][] strList)
-	{
-		try
-		{
-			var doc = new XmlDocument();
-			doc.Load(AppDomain.CurrentDomain.BaseDirectory + path);
-			var xn = doc.SelectSingleNode(node);
-			var xe = doc.CreateElement(element);
-			var strAttribute = string.Empty;
-			var strValue = string.Empty;
-			for (var i = 0; i < strList.Length; i++)
-			{
-				for (var j = 0; j < strList[i].Length; j++)
-				{
-					if (j == 0)
-					{
-						strAttribute = strList[i][j];
-					}
-					else
-					{
-						strValue = strList[i][j];
-					}
-				}
-
-				if (strAttribute.Equals(string.Empty))
-				{
-					xe.InnerText = strValue;
-				}
-				else
-				{
-					xe.SetAttribute(strAttribute, strValue);
-				}
-			}
-
-			xn.AppendChild(xe);
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	public static void parsexmldoc(string file)
-	{
-		var document = XDocument.Load(file);
-		//获取到XML的根元素进行操作
-		var root = document.Root;
-		if (root.FirstAttribute.Value == "车辆轮廓点")
-		{
-			//获取根元素下的所有子元素
-			var enumerable = root.Elements();
-			foreach (var xe in enumerable)
-			{
-				//IEnumerable<XElement> pts = xe.Elements();
-
-				//KineModel data = new KineModel();
-				//data.StrPosition = xe.Name.LocalName;
-				//data.Name = (string)xe.Attribute("点号");
-				//data.X = (double)xe.Attribute("X");
-				//data.Y = (double)xe.Attribute("Y");
-				//vm.Items.Add(data);
-			}
-		}
-	}
-
-	/// <summary>
-	///     读取指定节点的数据
-	/// </summary>
-	/// <param name="node">节点</param>
-	/// <returns>The <see cref="string" /></returns>
-	public string Read(string node)
-	{
-		var value = string.Empty;
-		try
-		{
-			var doc = XmlLoad();
-			var xn = doc.SelectSingleNode(node);
-			if (xn != null)
-			{
-				value = xn.InnerText;
-			}
-		}
-		catch
-		{
-			// ignored
-		}
-
-		return value;
-	}
-
-	/// <summary>
-	///     读取指定路径和节点的串联值
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <returns>The <see cref="string" /></returns>
-	public static string Read(string path, string node)
-	{
-		var value = string.Empty;
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			value = xn.InnerText;
-		}
-		catch
-		{
-			// ignored
-		}
-
-		return value;
-	}
-
-	/// <summary>
-	///     读取指定路径和节点的属性值
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="attribute">属性名，非空时返回该属性值，否则返回串联值</param>
-	/// <returns>The <see cref="string" /></returns>
-	public static string Read(string path, string node, string attribute)
-	{
-		var value = string.Empty;
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			value = attribute.Equals(string.Empty) ? xn.InnerText : xn.Attributes[attribute].Value;
-		}
-		catch
-		{
-			// ignored
-		}
-
-		return value;
-	}
-
-	/// <summary>
-	///     获取某一节点的所有子节点的值
-	/// </summary>
-	/// <param name="node">要查询的节点</param>
-	/// <returns>The <see cref="XmlNodeList" /></returns>
-	public XmlNodeList ReadAllChild(string node)
-	{
-		var doc = XmlLoad();
-		var xn = doc.SelectSingleNode(node);
-		var nodelist = xn.ChildNodes; //得到该节点的子节点
-		return nodelist;
-	}
-
-	/// <summary>
-	///     获取某一节点的所有孩子节点的值
-	/// </summary>
-	/// <param name="node">要查询的节点</param>
-	public string[] ReadAllChildallValue(string node)
-	{
-		var i = 0;
-		string[] str = { };
-		var doc = XmlLoad();
-		var xn = doc.SelectSingleNode(node);
-		if (xn != null)
-		{
-			var nodelist = xn.ChildNodes; //得到该节点的子节点
-			if (nodelist.Count > 0)
-			{
-				str = new string[nodelist.Count];
-				foreach (XmlElement el in nodelist) //读元素值
-				{
-					str[i] = el.Value;
-					i++;
-				}
-			}
-		}
-
-		return str;
-	}
-
-	/// <summary>
-	///     修改指定节点的数据
-	/// </summary>
-	/// <param name="node">节点</param>
-	/// <param name="value">值</param>
-	public void Update(string node, string value)
-	{
-		try
-		{
-			var doc = XmlLoad();
-			var xn = doc.SelectSingleNode(node);
-			xn.InnerText = value;
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + XmlPath);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	/// <summary>
-	///     修改指定节点的数据
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="value">值</param>
-	public static void Update(string path, string node, string value)
-	{
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			xn.InnerText = value;
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	/// <summary>
-	///     修改指定节点的属性值(静态)
-	/// </summary>
-	/// <param name="path">路径</param>
-	/// <param name="node">节点</param>
-	/// <param name="attribute">属性名，非空时修改该节点属性值，否则修改节点值</param>
-	/// <param name="value">值</param>
-	public static void Update(string path, string node, string attribute, string value)
-	{
-		try
-		{
-			var doc = XmlLoad(path);
-			var xn = doc.SelectSingleNode(node);
-			var xe = (XmlElement)xn;
-			if (attribute.Equals(string.Empty))
-			{
-				xe.InnerText = value;
-			}
-			else
-			{
-				xe.SetAttribute(attribute, value);
-			}
-
-			doc.Save(AppDomain.CurrentDomain.BaseDirectory + path);
-		}
-		catch
-		{
-			// ignored
-		}
-	}
-
-	private XmlDocument XmlLoad()
-	{
-		var XMLFile = XmlPath;
-		var xmldoc = new XmlDocument();
-		try
-		{
-			var filename = AppDomain.CurrentDomain.BaseDirectory + XMLFile;
-			if (File.Exists(filename))
-			{
-				xmldoc.Load(filename);
-			}
-		}
-		catch (Exception)
-		{
-			// ignored
-		}
-
-		return xmldoc;
-	}
-
-	/// <summary>
-	///     导入XML文件
-	/// </summary>
-	/// <param name="strPath">The strPath<see cref="string" /></param>
-	/// <returns>The <see cref="XmlDocument" /></returns>
-	private static XmlDocument XmlLoad(string strPath)
-	{
-		var xmldoc = new XmlDocument();
-		try
-		{
-			var filename = AppDomain.CurrentDomain.BaseDirectory + strPath;
-			if (File.Exists(filename))
-			{
-				xmldoc.Load(filename);
-			}
-		}
-		catch (Exception)
-		{
-			// ignored
-		}
-
-		return xmldoc;
-	}
-}
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
index 6c3aa32..fb1a701 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
@@ -2,6 +2,7 @@
 
 using Nice3point.Revit.Toolkit.External;
 using ShrlAlgoToolkit.Core.Assists;
+using ShrlAlgoToolkit.RevitAddins.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 
@@ -9,5 +10,5 @@ namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 [UsedImplicitly]
 public class ModelCheckCmd : ExternalCommand
 {
-    public override void Execute() => SingletonChildWindowManager.ShowOrActivate<ModelCheckView, ModelCheckViewModel>(UiApplication);//ModelCheckView view = SingletonViewAssist<ModelCheckView>.GetInstance(out var isNewCreate);//if (isNewCreate)//{//    view.DataContext = new ModelCheckViewModel(uiApplication);//    view.ShowAhead();//}//view.Activate();
+    public override void Execute() => WinDialogAssist.ShowOrActivate<ModelCheckView, ModelCheckViewModel>(UiApplication);//ModelCheckView view = SingletonViewAssist<ModelCheckView>.GetInstance(out var isNewCreate);//if (isNewCreate)//{//    view.DataContext = new ModelCheckViewModel(uiApplication);//    view.ShowAhead();//}//view.Activate();
 }
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
index ade76c1..3197d8c 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
@@ -549,7 +549,7 @@ public partial class ModelCheckViewModel : ObservableObject
             {
                 return;
             }
-            SingletonChildWindowManager.ShowOrActivate<MessageWin, MessageViewModel>(uiapp.ActiveUIDocument, errorItems, "未解决错误");
+            WinDialogAssist.ShowOrActivate<MessageWin, MessageViewModel>(uiapp.ActiveUIDocument, errorItems, "未解决错误");
         });
     }
 
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
index 0257e18..cd34ca8 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
@@ -1,6 +1,7 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
 using ShrlAlgoToolkit.Core.Assists;
+using ShrlAlgoToolkit.RevitAddins.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 [Transaction(TransactionMode.Manual)]
@@ -10,6 +11,6 @@ public class SeparateModelCmd : ExternalCommand
     {
         //var win = new SeparateModelWin();
         //win.Show();
-        SingletonChildWindowManager.ShowOrActivate<SeparateModelWin, SeparateModelViewModel>();
+        WinDialogAssist.ShowOrActivate<SeparateModelWin, SeparateModelViewModel>();
     }
 }
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
index c68dde9..0fa291c 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
@@ -1,6 +1,7 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
 using ShrlAlgoToolkit.Core.Assists;
+using ShrlAlgoToolkit.RevitAddins.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
 
@@ -9,10 +10,7 @@ public class CreateOpeningsCmd : ExternalCommand
 {
     public override void Execute()
     {
-        //CreateOpeningsViewModel viewModel = new();
-        //CreateOpeningsView view = new(viewModel);
-        //view.ShowDialog();
-        SingletonChildWindowManager.ShowOrActivate<CreateOpeningsView, CreateOpeningsViewModel>();
+        WinDialogAssist.ShowOrActivate<CreateOpeningsView, CreateOpeningsViewModel>();
     }
 
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
index 6a76bbb..93f3faa 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
@@ -241,7 +241,7 @@ public partial class PipesCreatorViewModel : ObservableObject
                 //var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\问题管线.txt";
                 //File.WriteAllText(filePath, sb.ToString());
                 //WinDialogAssist.OpenFolderAndSelectFile(filePath);
-                IOAssist.WriteTxtFile("问题管线", sb.ToString());
+                LogAssist.WriteTextFile("问题管线", sb.ToString());
             }
 
             //UiDocument.Selection.SetElementIds(ids);
diff --git a/ShrlAlgoToolkit.sln b/ShrlAlgoToolkit.sln
index 38257c8..42521b9 100644
--- a/ShrlAlgoToolkit.sln
+++ b/ShrlAlgoToolkit.sln
@@ -24,10 +24,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShrlAlgoStudio", "ShrlAlgoS
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ShrlAlgoToolkit.Revit", "ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.shproj", "{2CDA289E-5405-4493-B342-57E54EC50A79}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitAddins", "RevitAddins\RevitAddins.csproj", "{9A412F65-33B6-837A-D485-C7501F874B6A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyGen", "KeyGen\KeyGen.csproj", "{C3A385A3-EDE1-C0F9-052D-59C1B0CFDF8D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,14 +57,6 @@ Global
 		{069234FE-56D1-487B-9C25-58F9A80DB88E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{069234FE-56D1-487B-9C25-58F9A80DB88E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{069234FE-56D1-487B-9C25-58F9A80DB88E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A412F65-33B6-837A-D485-C7501F874B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A412F65-33B6-837A-D485-C7501F874B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A412F65-33B6-837A-D485-C7501F874B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A412F65-33B6-837A-D485-C7501F874B6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3A385A3-EDE1-C0F9-052D-59C1B0CFDF8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3A385A3-EDE1-C0F9-052D-59C1B0CFDF8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3A385A3-EDE1-C0F9-052D-59C1B0CFDF8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3A385A3-EDE1-C0F9-052D-59C1B0CFDF8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/VibeWPFTest/VibeWPFTest.csproj b/VibeWPFTest/VibeWPFTest.csproj
deleted file mode 100644
index 5050c3b..0000000
--- a/VibeWPFTest/VibeWPFTest.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net462</TargetFramework>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-    <UseWPF>true</UseWPF>
-    <Platforms>AnyCPU;x64</Platforms>
-<!--	  <Version>1.1.1</Version>-->
-	  <!--<ApplicationIcon>Resources\Images\image.Png</ApplicationIcon>-->
-<!--	  <PackageVersion>1.1.1</PackageVersion>-->
-<!--	  <UseWindowsForms>true</UseWindowsForms>-->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\Images\image.png" />
-    <None Remove="Resources\Images\ImageTest.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Resources\Images\image.png" />
-    <Content Include="Resources\Images\ImageTest.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-      <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Melskin\Melskin.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Management" />
-  </ItemGroup>
-
-</Project>