修改命名空间

RookieStation/CmdArrangeShelfCards.cs

@@ -1,6 +1,8 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.PackAreaModule.View;
+using RookieStation.UserClient;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;

RookieStation/CmdBrowserFamily.cs

@@ -1,12 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
 using RookieStation.Utils;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RookieStation.CommonTools
 {

RookieStation/CmdFloorFinishes.cs

@@ -2,12 +2,14 @@
 using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Windows;
+using RookieStation.Finishes.View;
 
 namespace RookieStation.Finishes
 {

RookieStation/CmdLogoExtrusion.cs

@@ -1,14 +1,13 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RookieStation
+namespace RookieStation.ShippingAreaModule
 {
     [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
     [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

RookieStation/CmdNewDimension.cs

@@ -1,14 +1,11 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
 using Autodesk.Revit.UI;
 using RookieStation.Utils;
 
-namespace RookieStation
+namespace RookieStation.Drawing
 {
     [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
     [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

RookieStation/CmdPlaceEntranceGate.cs

@@ -1,14 +1,12 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
+using RookieStation.PackAreaModule.View;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace RookieStation.PackAreaModule
 {

RookieStation/CmdPlaceExitGate.cs

@@ -1,15 +1,13 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Events;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
+using RookieStation.PackAreaModule.View;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace RookieStation.PackAreaModule
 {

RookieStation/CmdPlaceFloorFinishes.cs

@@ -2,13 +2,12 @@
 using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.Extension;
+using RookieStation.Finishes.View;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
 
 namespace RookieStation.Finishes
 {

RookieStation/CmdPlaceLamps.cs

@@ -1,16 +1,14 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
-using Autodesk.Revit.DB.Electrical;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
+using RookieStation.PackAreaModule.View;
-using System.Threading.Tasks;
-using System.Windows;
 
 namespace RookieStation.PackAreaModule
 {

RookieStation/CmdPlaceReceptionArea.cs

@@ -1,22 +1,14 @@
 using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.DB.Events;
 using Autodesk.Revit.DB.Structure;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Net;
+using RookieStation.ShippingAreaModule.View;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media.Media3D;
 
 namespace RookieStation.ShippingAreaModule
 {

RookieStation/CmdPlaceShelves.cs

@@ -1,16 +1,14 @@
 using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.UI;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
+using RookieStation.PackAreaModule.Model;
-using System.Text;
+using RookieStation.PackAreaModule.View;
-using System.Windows;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar;
 
 namespace RookieStation.PackAreaModule
 {

RookieStation/CmdPlaceWallFinishes.cs

@@ -2,14 +2,13 @@
 using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.Extension;
+using RookieStation.Finishes.View;
+using RookieStation.UserClient;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.ConstrainedExecution;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Media.Effects;
 
 namespace RookieStation.Finishes
 {

RookieStation/CmdProjectSettings.cs

@@ -1,15 +1,10 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig.View;
 using RookieStation.Utils;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RookieStation
+namespace RookieStation.ProjectConfig
 {
     [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)]
     [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)]

RookieStation/FamilyDockablePaneHandler.cs

@@ -1,12 +1,10 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
+using RookieStation.CommonTools.Model;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RookieStation.CommonTools
 {

RookieStation/Model/Enum.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.Model
 {
     public enum NumOfGroup
     {

RookieStation/Model/FamilyInfo.cs

@@ -10,7 +10,7 @@ using System.Windows.Media.Imaging;
 using System.Windows;
 using RookieStation.Utils;
 
-namespace RookieStation
+namespace RookieStation.CommonTools.Model
 {
     internal class FamilyInfo
     {

RookieStation/Model/Shelf.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RookieStation.PackAreaModule
+namespace RookieStation.PackAreaModule.Model
 {
     public class Shelf
     {

RookieStation/RookieStation.addin

@@ -4,7 +4,7 @@
 		<Name>菜鸟驿站插件</Name>
 		<Assembly>RsLibrary\RookieStation.dll</Assembly>
 		<ClientId>1aac8233-690c-4dd6-89c0-78221dd65497</ClientId>
-		<FullClassName>RookieStation.RsApp</FullClassName>
+		<FullClassName>RookieStation.UserClient.RsApp</FullClassName>
 		<VendorId>ADSK</VendorId>
 		<VendorDescription>Autodesk, www.autodesk.com</VendorDescription>
 	</AddIn>

RookieStation/RookieStation.csproj

@@ -97,7 +97,7 @@
     <Compile Include="CmdLogoExtrusion.cs" />
     <Compile Include="CmdPlaceWallFinishes.cs" />
     <Compile Include="FamilyDockablePaneHandler.cs" />
-    <Compile Include="Common\FamilyInfo.cs" />
+    <Compile Include="Model\FamilyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -119,7 +119,7 @@
     <Compile Include="Utils\RsRevitUtils.cs" />
     <Compile Include="CmdFloorFinishes.cs" />
     <Compile Include="CmdPlaceLamps.cs" />
-    <Compile Include="Common\Enum.cs" />
+    <Compile Include="Model\Enum.cs" />
     <Compile Include="Utils\ProjectConfigUtil.cs" />
     <Compile Include="CmdProjectSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -133,8 +133,8 @@
     <Compile Include="ShelvesPlacementViewModel.cs" />
     <Compile Include="Utils\SelectFilter.cs" />
     <Compile Include="CmdPlaceReceptionArea.cs" />
-    <Compile Include="Common\Shelf.cs" />
+    <Compile Include="Model\Shelf.cs" />
-    <Compile Include="Common\UserConstant.cs" />
+    <Compile Include="UserConstant.cs" />
     <Compile Include="Utils\WindowsThumbnailProvider.cs" />
     <Compile Include="Utils\WinIntPtr.cs" />
     <Compile Include="WpfEntranceGate.xaml.cs">

RookieStation/RookieStationDebug.addin

@@ -4,7 +4,7 @@
 		<Name>RsApp</Name>
 		<Assembly>C:\Users\Administrator\Desktop\工作内容\菜鸟驿站校企参数化设计开发需求文档v 0.1\RookieStation\RookieStation\bin\Debug\RookieStation.dll</Assembly>
 		<ClientId>1aac8233-690c-4dd6-89c0-78221dd65497</ClientId>
-    <FullClassName>RookieStation.RsApp</FullClassName>
+		<FullClassName>RookieStation.UserClient.RsApp</FullClassName>
 		<VendorId>ADSK</VendorId>
 		<VendorDescription>Autodesk, www.autodesk.com</VendorDescription>
 	</AddIn>

RookieStation/RsApp.cs

@@ -1,21 +1,19 @@
 using Autodesk.Revit.UI;
 using RookieStation.CommonTools;
+using RookieStation.CommonTools.View;
 using RookieStation.Finishes;
 using RookieStation.PackAreaModule;
+using RookieStation.ProjectConfig;
 using RookieStation.ShippingAreaModule;
 using RookieStation.Statistics;
 using RookieStation.Utils;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 
-namespace RookieStation
+namespace RookieStation.UserClient
 {
     internal class RsApp : IExternalApplication
     {

RookieStation/ShelvesPlacementViewModel.cs

@@ -1,4 +1,5 @@
-using RookieStation.Utils;
+using RookieStation.PackAreaModule.Model;
+using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

RookieStation/UserConstant.cs

@@ -1,4 +1,5 @@
 using Autodesk.Revit.UI.Selection;
+using RookieStation.UserClient;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
@@ -6,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RookieStation
+namespace RookieStation.ProjectConfig
 {
     internal static class UserConstant
     {

RookieStation/Utils/AssemblyLoader.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Reflection;
 using System.Threading;
 
-namespace RookieStation
+namespace RookieStation.Utils
 {
     public class AssemblyLoader
     {

RookieStation/Utils/CommonUtils.cs

@@ -1,5 +1,6 @@
 using Autodesk.Revit.UI;
 using RookieStation.PackAreaModule;
+using RookieStation.UserClient;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -49,7 +50,7 @@ namespace RookieStation.Utils
         }
 
         /// <summary>
-        /// 打开窗口，解决引用UI库样式丢失
+        /// 打开窗口，解决引用UI库样式丢失,构造函数不具有参数时
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>

RookieStation/Utils/DocumentExtension.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RookieStation.Utils
+namespace RookieStation.Extension
 {
     public static class DocumentExtension
     {

RookieStation/Utils/EnableCmdInViewPlan.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RookieStation
+namespace RookieStation.Utils
 {
     /// <summary>
     /// 平面视图命令才可用

RookieStation/Utils/EnumItemsSource.cs

@@ -25,7 +25,7 @@ namespace RookieStation.Utils
             set
             {
                 if (!value.IsEnum)
-                    throw new ArgumentException("不是枚举类型", "value");
+                    throw new ArgumentException("不是枚举类型", "值");
                 this.type = value;
                 Initialize();
             }

RookieStation/Utils/Log.cs

@@ -1,4 +1,5 @@
-using System;
+using RookieStation.ProjectConfig;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

RookieStation/Utils/RsRevitUtils.cs

@@ -1,11 +1,11 @@
 using Autodesk.Revit.DB;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Controls;
 
 namespace RookieStation.Utils
 {
@@ -16,7 +16,7 @@ namespace RookieStation.Utils
         /// </summary>
         /// <param name="valueToConvert"></param>
         /// <returns></returns>
-        public static double FtConvertToM(double valueToConvert)
+        public static double ConvertFeetToMetre(double valueToConvert)
         {
             return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_METERS);
         }
@@ -26,7 +26,7 @@ namespace RookieStation.Utils
         /// </summary>
         /// <param name="valueToConvert"></param>
         /// <returns></returns>
-        public static double SFConvertToSM(double valueToConvert)
+        public static double ConvertSquareFeetToSquareMetre(double valueToConvert)
         {
             return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_SQUARE_METERS);
         }
@@ -36,7 +36,7 @@ namespace RookieStation.Utils
         /// </summary>
         /// <param name="valueToConvert"></param>
         /// <returns></returns>
-        public static double FtConvertToMM(double valueToConvert)
+        public static double ConvertFeetToMillimetre(double valueToConvert)
         {
             return UnitUtils.ConvertFromInternalUnits(valueToConvert, DisplayUnitType.DUT_MILLIMETERS);
         }
@@ -431,7 +431,6 @@ namespace RookieStation.Utils
             foreach (var seg in segments)
             {
                 Line tempLine = seg.GetCurve() as Line;
-
                 //判断是否垂直
                 double dotp = Math.Abs(tempLine.Direction.DotProduct(baseLine.Direction));
                 if (dotp < 0.0001)
@@ -442,7 +441,6 @@ namespace RookieStation.Utils
                     }
                 }
             }
-
             return line;
         }
     }

RookieStation/WpfEntranceGate.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfEntranceGate"
+    x:Class="RookieStation.PackAreaModule.View.WpfEntranceGate"
     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"

RookieStation/WpfEntranceGate.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.View
 {
     /// <summary>
     /// WpfEntranceGate.xaml 的交互逻辑

RookieStation/WpfExitGate.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfExitGate"
+    x:Class="RookieStation.PackAreaModule.View.WpfExitGate"
     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"

RookieStation/WpfExitGate.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.View
 {
     /// <summary>
     /// WpfExitGate.xaml 的交互逻辑

RookieStation/WpfFamilyDockablePane.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="RookieStation.CommonTools.WpfFamilyDockablePane"
+    x:Class="RookieStation.CommonTools.View.WpfFamilyDockablePane"
     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"

RookieStation/WpfFamilyDockablePane.xaml.cs

@@ -1,4 +1,5 @@
 using Autodesk.Revit.UI;
+using RookieStation.CommonTools.Model;
 using RookieStation.Properties;
 using RookieStation.Utils;
 using System;
@@ -7,21 +8,11 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Forms;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
-namespace RookieStation.CommonTools
+namespace RookieStation.CommonTools.View
 {
     /// <summary>
     /// WpfFamilyDockablePane.xaml 的交互逻辑

RookieStation/WpfFloorFinishes.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfFloorFinishes"
+    x:Class="RookieStation.Finishes.View.WpfFloorFinishes"
     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"

RookieStation/WpfFloorFinishes.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.Finishes.View
 {
     /// <summary>
     /// WpfFloorFinishes.xaml 的交互逻辑

RookieStation/WpfLampsLayout.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfLampsLayout"
+    x:Class="RookieStation.PackAreaModule.View.WpfLampsLayout"
     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"

RookieStation/WpfLampsLayout.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.View
 {
     /// <summary>
     /// WpfLampsLayout.xaml 的交互逻辑

RookieStation/WpfProjectSettings.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfProjectSettings"
+    x:Class="RookieStation.ProjectConfig.View.WpfProjectSettings"
     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"

RookieStation/WpfProjectSettings.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.ProjectConfig.View
 {
     /// <summary>
     /// WpfProjectSettings.xaml 的交互逻辑

RookieStation/WpfReceptionArea.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.ShippingAreaModule.WpfReceptionArea"
+    x:Class="RookieStation.ShippingAreaModule.View.WpfReceptionArea"
     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"

RookieStation/WpfReceptionArea.xaml.cs

@@ -1,4 +1,5 @@
 using Autodesk.Revit.UI;
+using RookieStation.ProjectConfig;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation.ShippingAreaModule
+namespace RookieStation.ShippingAreaModule.View
 {
     /// <summary>
     /// WpfReceptionArea.xaml 的交互逻辑

RookieStation/WpfShelfCards.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfShelfCards"
+    x:Class="RookieStation.PackAreaModule.View.WpfShelfCards"
     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"
@@ -37,7 +37,11 @@
                 Text="1"
                 TextAlignment="Center" />
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.Column="1" Margin="2" Header="货架组合">
+        <GroupBox
+            Grid.Row="0"
+            Grid.Column="1"
+            Margin="2"
+            Header="货架组合">
             <ComboBox x:Name="cbGroup">
                 <ComboBoxItem Content="单个货架" IsSelected="True" />
                 <ComboBoxItem Content="双联货架" />

RookieStation/WpfShelfCards.xaml.cs

@@ -1,6 +1,8 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
+using RookieStation.ProjectConfig;
+using RookieStation.Extension;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
@@ -8,7 +10,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.View
 {
     /// <summary>
     /// WpfShelfCards.xaml 的交互逻辑

RookieStation/WpfShelvesLayout.xaml

@@ -1,10 +1,10 @@
 <Window
-    x:Class="RookieStation.WpfShelvesLayout"
+    x:Class="RookieStation.PackAreaModule.View.WpfShelvesLayout"
     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:hc="https://handyorg.github.io/handycontrol"
-    xmlns:local="clr-namespace:RookieStation"
+    xmlns:local="clr-namespace:RookieStation.PackAreaModule.Model"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:utils="clr-namespace:RookieStation.Utils"
     Width="81"
@@ -36,7 +36,11 @@
             <RowDefinition Height="5*" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <GroupBox Grid.Row="0" Grid.Column="0" Margin="2" Header="通道宽度">
+        <GroupBox
+            Grid.Row="0"
+            Grid.Column="0"
+            Margin="2"
+            Header="通道宽度">
             <TextBox
                 x:Name="tbPassageWidth"
                 InputMethod.IsInputMethodEnabled="False"
@@ -44,7 +48,11 @@
                 Text="1500"
                 TextAlignment="Center" />
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.Column="1" Margin="2" Header="起点距离">
+        <GroupBox
+            Grid.Row="0"
+            Grid.Column="1"
+            Margin="2"
+            Header="起点距离">
             <TextBox
                 x:Name="tbDistance"
                 InputMethod.IsInputMethodEnabled="False"
@@ -52,7 +60,11 @@
                 Text="0"
                 TextAlignment="Center" />
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.Column="2" Margin="2" Header="起点垂距 ">
+        <GroupBox
+            Grid.Row="0"
+            Grid.Column="2"
+            Margin="2"
+            Header="起点垂距 ">
             <TextBox
                 x:Name="tbOffest"
                 InputMethod.IsInputMethodEnabled="False"
@@ -60,7 +72,11 @@
                 Text="0"
                 TextAlignment="Center" />
         </GroupBox>
-        <GroupBox Grid.Row="0" Grid.Column="3" Margin="2" Header="货架间距 ">
+        <GroupBox
+            Grid.Row="0"
+            Grid.Column="3"
+            Margin="2"
+            Header="货架间距 ">
             <TextBox
                 x:Name="tbSpacing"
                 InputMethod.IsInputMethodEnabled="False"
@@ -78,9 +94,21 @@
             CanUserSortColumns="False"
             ItemsSource="{Binding Data}">
             <DataGrid.Columns>
-                <DataGridComboBoxColumn MinWidth="100" Header="成组" ItemsSource="{Binding Source={StaticResource GroupEnumDescriptionSource}}" SelectedValueBinding="{Binding NumOfGroup, Converter={StaticResource GroupEnumDescriptionSource}, Mode=TwoWay}" />
+                <DataGridComboBoxColumn
-                <DataGridComboBoxColumn MinWidth="100" Header="长度" ItemsSource="{Binding Source={StaticResource LengthTypeEnumDescriptionSource}}" SelectedValueBinding="{Binding ShelfLength, Converter={StaticResource LengthTypeEnumDescriptionSource}, Mode=TwoWay}" />
+                    MinWidth="100"
-                <DataGridComboBoxColumn MinWidth="100" Header="宽度" ItemsSource="{Binding Source={StaticResource WidthTypeEnumDescriptionSource}}" SelectedValueBinding="{Binding ShelfWidth, Converter={StaticResource WidthTypeEnumDescriptionSource}, Mode=TwoWay}" />
+                    Header="成组"
+                    ItemsSource="{Binding Source={StaticResource GroupEnumDescriptionSource}}"
+                    SelectedValueBinding="{Binding NumOfGroup, Converter={StaticResource GroupEnumDescriptionSource}, Mode=TwoWay}" />
+                <DataGridComboBoxColumn
+                    MinWidth="100"
+                    Header="长度"
+                    ItemsSource="{Binding Source={StaticResource LengthTypeEnumDescriptionSource}}"
+                    SelectedValueBinding="{Binding ShelfLength, Converter={StaticResource LengthTypeEnumDescriptionSource}, Mode=TwoWay}" />
+                <DataGridComboBoxColumn
+                    MinWidth="100"
+                    Header="宽度"
+                    ItemsSource="{Binding Source={StaticResource WidthTypeEnumDescriptionSource}}"
+                    SelectedValueBinding="{Binding ShelfWidth, Converter={StaticResource WidthTypeEnumDescriptionSource}, Mode=TwoWay}" />
             </DataGrid.Columns>
         </DataGrid>
         <TextBlock

RookieStation/WpfShelvesLayout.xaml.cs

@@ -1,11 +1,12 @@
 using Autodesk.Revit.UI;
 using RookieStation.PackAreaModule;
+using RookieStation.PackAreaModule.Model;
 using RookieStation.Utils;
 using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Input;
 
-namespace RookieStation
+namespace RookieStation.PackAreaModule.View
 {
     /// <summary>
     /// WpfShelvesLayout.xaml 的交互逻辑
@@ -65,7 +66,7 @@ namespace RookieStation
 
         private void btnAdd_Click(object sender, RoutedEventArgs e)
         {
-            var s = new Shelf()
+            Shelf s = new Shelf()
             {
                 ShelfLength = ShelfLength.x1500,
                 ShelfWidth = ShelfWidth.x400,

RookieStation/WpfWallFinishes.xaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="RookieStation.WpfWallFinishes"
+    x:Class="RookieStation.Finishes.View.WpfWallFinishes"
     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"

RookieStation/WpfWallFinishes.xaml.cs

@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace RookieStation
+namespace RookieStation.Finishes.View
 {
     /// <summary>
     /// WpfWallFinishes.xaml 的交互逻辑

RookieStation/cmdExportWorkSchedule.cs

@@ -5,6 +5,7 @@ using Autodesk.Revit.DB.Electrical;
 using Autodesk.Revit.DB.Plumbing;
 using Autodesk.Revit.UI;
 using OfficeOpenXml;
+using RookieStation.ProjectConfig;
 using RookieStation.Utils;
 using System;
 using System.Collections.Generic;
@@ -388,31 +389,31 @@ namespace RookieStation.Statistics
                 ExcelWorksheet sheet0 = package.Workbook.Worksheets["汇总表"];
                 ExcelWorksheet sheet1 = package.Workbook.Worksheets["基装"];
                 //消防管
-                sheet1.Cells[8, 7].Value = RsRevitUtils.FtConvertToM(pipeLength);
+                sheet1.Cells[8, 7].Value = RsRevitUtils.ConvertFeetToMetre(pipeLength);
                 //桥架
-                sheet1.Cells[9, 7].Value = RsRevitUtils.FtConvertToM(cableTrayLength);
+                sheet1.Cells[9, 7].Value = RsRevitUtils.ConvertFeetToMetre(cableTrayLength);
                 //乳胶漆
-                sheet1.Cells[10, 7].Value = RsRevitUtils.SFConvertToSM(blankEmulsionPaintArea + greyEmulsionPaintArea);
+                sheet1.Cells[10, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(blankEmulsionPaintArea + greyEmulsionPaintArea);
                 //铝塑板
-                sheet1.Cells[11, 7].Value = RsRevitUtils.SFConvertToSM(aluminumPlasticPanelArea);
+                sheet1.Cells[11, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(aluminumPlasticPanelArea);
-                sheet1.Cells[12, 7].Value = RsRevitUtils.FtConvertToM(galvanizeFrame);
+                sheet1.Cells[12, 7].Value = RsRevitUtils.ConvertFeetToMetre(galvanizeFrame);
-                sheet1.Cells[13, 7].Value = RsRevitUtils.SFConvertToSM(cementMortarArea);
+                sheet1.Cells[13, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(cementMortarArea);
                 //轻钢龙骨
-                sheet1.Cells[14, 7].Value = RsRevitUtils.SFConvertToSM(steelWallArea);
+                sheet1.Cells[14, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(steelWallArea);
-                sheet1.Cells[16, 7].Value = RsRevitUtils.SFConvertToSM(floorArea);
+                sheet1.Cells[16, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(floorArea);
-                sheet1.Cells[17, 7].Value = RsRevitUtils.SFConvertToSM(floorArea);
+                sheet1.Cells[17, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(floorArea);
-                sheet1.Cells[18, 7].Value = RsRevitUtils.SFConvertToSM(floorArea);
+                sheet1.Cells[18, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(floorArea);
                 //踢脚线
-                sheet1.Cells[19, 7].Value = RsRevitUtils.FtConvertToM(skirtingWallLength);
+                sheet1.Cells[19, 7].Value = RsRevitUtils.ConvertFeetToMetre(skirtingWallLength);
-                sheet1.Cells[21, 7].Value = RsRevitUtils.SFConvertToSM(stairStoneArea);
+                sheet1.Cells[21, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(stairStoneArea);
-                sheet1.Cells[22, 7].Value = RsRevitUtils.SFConvertToSM(doorStoneArea);
+                sheet1.Cells[22, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(doorStoneArea);
-                sheet1.Cells[24, 7].Value = RsRevitUtils.FtConvertToM(receptionDeskLength);
+                sheet1.Cells[24, 7].Value = RsRevitUtils.ConvertFeetToMetre(receptionDeskLength);
                 sheet1.Cells[25, 7].Value = greenRecyclingBoxCount;
                 sheet1.Cells[26, 7].Value = exitGateDeskCount;
-                sheet1.Cells[27, 7].Value = RsRevitUtils.SFConvertToSM(curtainedDoorArea);
+                sheet1.Cells[27, 7].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(curtainedDoorArea);
                 sheet1.Cells[32, 7].Value = switchingCabinetCount;
                 //为什么和桥架乳胶漆长度不一样
-                sheet1.Cells[33, 7].Value = RsRevitUtils.FtConvertToM(cableTrayLength);
+                sheet1.Cells[33, 7].Value = RsRevitUtils.ConvertFeetToMetre(cableTrayLength);
                 sheet1.Cells[39, 7].Value = socketCount;
                 sheet1.Cells[40, 7].Value = switchCount;
                 sheet1.Cells[41, 7].Value = chandelierCount;
@@ -433,10 +434,10 @@ namespace RookieStation.Statistics
                 sheet3.Cells[9, 6].Value = textCount;
                 sheet3.Cells[10, 6].Value = textCount;
                 sheet3.Cells[11, 6].Value = signageCount;
-                sheet3.Cells[12, 6].Value = RsRevitUtils.SFConvertToSM(cultureWallArea);
+                sheet3.Cells[12, 6].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(cultureWallArea);
                 sheet3.Cells[14, 6].Value = cainiaoDutyCount;
-                sheet3.Cells[15, 6].Value = RsRevitUtils.SFConvertToSM(halfGlassPasteArea);
+                sheet3.Cells[15, 6].Value = RsRevitUtils.ConvertSquareFeetToSquareMetre(halfGlassPasteArea);
-                sheet3.Cells[16, 6].Value = RsRevitUtils.FtConvertToM(containmentLength);
+                sheet3.Cells[16, 6].Value = RsRevitUtils.ConvertFeetToMetre(containmentLength);
                 sheet3.Cells[17, 6].Value = groundSignageCount;
                 sheet3.Cells[18, 6].Value = shelfCardCount;
                 sheet3.Cells[19, 4].Value = shelfSize;