From 5410998c15467974f637d98636827757be4e613e Mon Sep 17 00:00:00 2001 From: GG Z <903524121@qq.com> Date: Thu, 24 Jun 2021 18:20:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExecuteCmd/CmdUseFamilyPane.cs} | 2 +- .../ExtHandler}/FamilyDockablePaneHandler.cs | 0 .../View}/WpfFamilyDockablePane.xaml | 0 .../View}/WpfFamilyDockablePane.xaml.cs | 0 .../ExecuteCmd}/CmdFloorFinishes.cs | 0 .../ExecuteCmd}/CmdPlaceFloorFinishes.cs | 0 .../ExecuteCmd}/CmdPlaceWallFinishes.cs | 2 +- .../{ => Finishes/View}/WpfFloorFinishes.xaml | 0 .../View}/WpfFloorFinishes.xaml.cs | 0 .../{ => Finishes/View}/WpfWallFinishes.xaml | 0 .../View}/WpfWallFinishes.xaml.cs | 0 .../ExecuteCmd}/CmdLogoExtrusion.cs | 2 +- .../ExecuteCmd}/CmdPlaceReceptionArea.cs | 4 +- .../View}/WpfReceptionArea.xaml | 2 +- .../View}/WpfReceptionArea.xaml.cs | 2 +- .../ExecuteCmd}/CmdArrangeShelfCards.cs | 6 +- .../ExecuteCmd}/CmdPlaceEntranceGate.cs | 4 +- .../ExecuteCmd}/CmdPlaceExitGate.cs | 4 +- .../ExecuteCmd}/CmdPlaceLamps.cs | 4 +- .../ExecuteCmd}/CmdPlaceShelves.cs | 6 +- .../{ => ParcelAreaModule}/Model/Enum.cs | 2 +- .../{ => ParcelAreaModule}/Model/Shelf.cs | 2 +- .../View}/WpfEntranceGate.xaml | 2 +- .../View}/WpfEntranceGate.xaml.cs | 2 +- .../View}/WpfExitGate.xaml | 2 +- .../View}/WpfExitGate.xaml.cs | 2 +- .../View}/WpfLampsLayout.xaml | 2 +- .../View}/WpfLampsLayout.xaml.cs | 2 +- .../View}/WpfShelfCards.xaml | 2 +- .../View}/WpfShelfCards.xaml.cs | 2 +- .../View}/WpfShelvesLayout.xaml | 4 +- .../View}/WpfShelvesLayout.xaml.cs | 6 +- .../ViewModel}/ShelvesPlacementViewModel.cs | 4 +- .../ExcuteCmd}/CmdProjectSettings.cs | 0 .../{ => ProjectConfig}/UserConstant.cs | 2 +- .../View}/WpfProjectSettings.xaml | 0 .../View}/WpfProjectSettings.xaml.cs | 0 RookieStation/RookieStation.csproj | 76 +++---- RookieStation/RsApp.cs | 196 +++++------------- .../ExecuteCmd/CmdExportWorkSchedule.cs} | 0 RookieStation/Utils/CommonUtils.cs | 4 +- 41 files changed, 129 insertions(+), 221 deletions(-) rename RookieStation/{CmdBrowserFamily.cs => CommonTools/ExecuteCmd/CmdUseFamilyPane.cs} (96%) rename RookieStation/{ => CommonTools/ExtHandler}/FamilyDockablePaneHandler.cs (100%) rename RookieStation/{ => CommonTools/View}/WpfFamilyDockablePane.xaml (100%) rename RookieStation/{ => CommonTools/View}/WpfFamilyDockablePane.xaml.cs (100%) rename RookieStation/{ => Finishes/ExecuteCmd}/CmdFloorFinishes.cs (100%) rename RookieStation/{ => Finishes/ExecuteCmd}/CmdPlaceFloorFinishes.cs (100%) rename RookieStation/{ => Finishes/ExecuteCmd}/CmdPlaceWallFinishes.cs (99%) rename RookieStation/{ => Finishes/View}/WpfFloorFinishes.xaml (100%) rename RookieStation/{ => Finishes/View}/WpfFloorFinishes.xaml.cs (100%) rename RookieStation/{ => Finishes/View}/WpfWallFinishes.xaml (100%) rename RookieStation/{ => Finishes/View}/WpfWallFinishes.xaml.cs (100%) rename RookieStation/{ => MailingAreaModule/ExecuteCmd}/CmdLogoExtrusion.cs (99%) rename RookieStation/{ => MailingAreaModule/ExecuteCmd}/CmdPlaceReceptionArea.cs (99%) rename RookieStation/{ => MailingAreaModule/View}/WpfReceptionArea.xaml (98%) rename RookieStation/{ => MailingAreaModule/View}/WpfReceptionArea.xaml.cs (98%) rename RookieStation/{ => ParcelAreaModule/ExecuteCmd}/CmdArrangeShelfCards.cs (95%) rename RookieStation/{ => ParcelAreaModule/ExecuteCmd}/CmdPlaceEntranceGate.cs (98%) rename RookieStation/{ => ParcelAreaModule/ExecuteCmd}/CmdPlaceExitGate.cs (99%) rename RookieStation/{ => ParcelAreaModule/ExecuteCmd}/CmdPlaceLamps.cs (99%) rename RookieStation/{ => ParcelAreaModule/ExecuteCmd}/CmdPlaceShelves.cs (99%) rename RookieStation/{ => ParcelAreaModule}/Model/Enum.cs (94%) rename RookieStation/{ => ParcelAreaModule}/Model/Shelf.cs (95%) rename RookieStation/{ => ParcelAreaModule/View}/WpfEntranceGate.xaml (96%) rename RookieStation/{ => ParcelAreaModule/View}/WpfEntranceGate.xaml.cs (96%) rename RookieStation/{ => ParcelAreaModule/View}/WpfExitGate.xaml (97%) rename RookieStation/{ => ParcelAreaModule/View}/WpfExitGate.xaml.cs (97%) rename RookieStation/{ => ParcelAreaModule/View}/WpfLampsLayout.xaml (97%) rename RookieStation/{ => ParcelAreaModule/View}/WpfLampsLayout.xaml.cs (96%) rename RookieStation/{ => ParcelAreaModule/View}/WpfShelfCards.xaml (97%) rename RookieStation/{ => ParcelAreaModule/View}/WpfShelfCards.xaml.cs (99%) rename RookieStation/{ => ParcelAreaModule/View}/WpfShelvesLayout.xaml (97%) rename RookieStation/{ => ParcelAreaModule/View}/WpfShelvesLayout.xaml.cs (96%) rename RookieStation/{ => ParcelAreaModule/ViewModel}/ShelvesPlacementViewModel.cs (97%) rename RookieStation/{ => ProjectConfig/ExcuteCmd}/CmdProjectSettings.cs (100%) rename RookieStation/{ => ProjectConfig}/UserConstant.cs (97%) rename RookieStation/{ => ProjectConfig/View}/WpfProjectSettings.xaml (100%) rename RookieStation/{ => ProjectConfig/View}/WpfProjectSettings.xaml.cs (100%) rename RookieStation/{cmdExportWorkSchedule.cs => Statistics/ExecuteCmd/CmdExportWorkSchedule.cs} (100%) diff --git a/RookieStation/CmdBrowserFamily.cs b/RookieStation/CommonTools/ExecuteCmd/CmdUseFamilyPane.cs similarity index 96% rename from RookieStation/CmdBrowserFamily.cs rename to RookieStation/CommonTools/ExecuteCmd/CmdUseFamilyPane.cs index 0f07181..b1a6916 100644 --- a/RookieStation/CmdBrowserFamily.cs +++ b/RookieStation/CommonTools/ExecuteCmd/CmdUseFamilyPane.cs @@ -7,7 +7,7 @@ namespace RookieStation.CommonTools.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] - internal class CmdBrowserFamily : IExternalCommand + internal class CmdUseFamilyPane : IExternalCommand { private Guid guid = new Guid("{028001AD-0588-4A9C-AA03-D7E472D85050}"); diff --git a/RookieStation/FamilyDockablePaneHandler.cs b/RookieStation/CommonTools/ExtHandler/FamilyDockablePaneHandler.cs similarity index 100% rename from RookieStation/FamilyDockablePaneHandler.cs rename to RookieStation/CommonTools/ExtHandler/FamilyDockablePaneHandler.cs diff --git a/RookieStation/WpfFamilyDockablePane.xaml b/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml similarity index 100% rename from RookieStation/WpfFamilyDockablePane.xaml rename to RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml diff --git a/RookieStation/WpfFamilyDockablePane.xaml.cs b/RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml.cs similarity index 100% rename from RookieStation/WpfFamilyDockablePane.xaml.cs rename to RookieStation/CommonTools/View/WpfFamilyDockablePane.xaml.cs diff --git a/RookieStation/CmdFloorFinishes.cs b/RookieStation/Finishes/ExecuteCmd/CmdFloorFinishes.cs similarity index 100% rename from RookieStation/CmdFloorFinishes.cs rename to RookieStation/Finishes/ExecuteCmd/CmdFloorFinishes.cs diff --git a/RookieStation/CmdPlaceFloorFinishes.cs b/RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs similarity index 100% rename from RookieStation/CmdPlaceFloorFinishes.cs rename to RookieStation/Finishes/ExecuteCmd/CmdPlaceFloorFinishes.cs diff --git a/RookieStation/CmdPlaceWallFinishes.cs b/RookieStation/Finishes/ExecuteCmd/CmdPlaceWallFinishes.cs similarity index 99% rename from RookieStation/CmdPlaceWallFinishes.cs rename to RookieStation/Finishes/ExecuteCmd/CmdPlaceWallFinishes.cs index c6f68c1..21cefbf 100644 --- a/RookieStation/CmdPlaceWallFinishes.cs +++ b/RookieStation/Finishes/ExecuteCmd/CmdPlaceWallFinishes.cs @@ -4,7 +4,7 @@ using Autodesk.Revit.UI; using Autodesk.Revit.UI.Selection; using RookieStation.Extension; using RookieStation.Finishes.View; -using RookieStation.UserClient; +using RookieStation.RibbonMenu; using RookieStation.Utils; using System; using System.Collections.Generic; diff --git a/RookieStation/WpfFloorFinishes.xaml b/RookieStation/Finishes/View/WpfFloorFinishes.xaml similarity index 100% rename from RookieStation/WpfFloorFinishes.xaml rename to RookieStation/Finishes/View/WpfFloorFinishes.xaml diff --git a/RookieStation/WpfFloorFinishes.xaml.cs b/RookieStation/Finishes/View/WpfFloorFinishes.xaml.cs similarity index 100% rename from RookieStation/WpfFloorFinishes.xaml.cs rename to RookieStation/Finishes/View/WpfFloorFinishes.xaml.cs diff --git a/RookieStation/WpfWallFinishes.xaml b/RookieStation/Finishes/View/WpfWallFinishes.xaml similarity index 100% rename from RookieStation/WpfWallFinishes.xaml rename to RookieStation/Finishes/View/WpfWallFinishes.xaml diff --git a/RookieStation/WpfWallFinishes.xaml.cs b/RookieStation/Finishes/View/WpfWallFinishes.xaml.cs similarity index 100% rename from RookieStation/WpfWallFinishes.xaml.cs rename to RookieStation/Finishes/View/WpfWallFinishes.xaml.cs diff --git a/RookieStation/CmdLogoExtrusion.cs b/RookieStation/MailingAreaModule/ExecuteCmd/CmdLogoExtrusion.cs similarity index 99% rename from RookieStation/CmdLogoExtrusion.cs rename to RookieStation/MailingAreaModule/ExecuteCmd/CmdLogoExtrusion.cs index 05833d2..b4e8dbb 100644 --- a/RookieStation/CmdLogoExtrusion.cs +++ b/RookieStation/MailingAreaModule/ExecuteCmd/CmdLogoExtrusion.cs @@ -7,7 +7,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace RookieStation.ShippingAreaModule.ExecuteCmd +namespace RookieStation.MailingAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/CmdPlaceReceptionArea.cs b/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs similarity index 99% rename from RookieStation/CmdPlaceReceptionArea.cs rename to RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs index efa4261..e1826e4 100644 --- a/RookieStation/CmdPlaceReceptionArea.cs +++ b/RookieStation/MailingAreaModule/ExecuteCmd/CmdPlaceReceptionArea.cs @@ -8,9 +8,9 @@ using RookieStation.Utils; using System; using System.Collections.Generic; using System.Linq; -using RookieStation.ShippingAreaModule.View; +using RookieStation.MailingAreaModule.View; -namespace RookieStation.ShippingAreaModule.ExecuteCmd +namespace RookieStation.MailingAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/WpfReceptionArea.xaml b/RookieStation/MailingAreaModule/View/WpfReceptionArea.xaml similarity index 98% rename from RookieStation/WpfReceptionArea.xaml rename to RookieStation/MailingAreaModule/View/WpfReceptionArea.xaml index b73dbc1..4cbd94d 100644 --- a/RookieStation/WpfReceptionArea.xaml +++ b/RookieStation/MailingAreaModule/View/WpfReceptionArea.xaml @@ -1,5 +1,5 @@  /// WpfReceptionArea.xaml 的交互逻辑 diff --git a/RookieStation/CmdArrangeShelfCards.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdArrangeShelfCards.cs similarity index 95% rename from RookieStation/CmdArrangeShelfCards.cs rename to RookieStation/ParcelAreaModule/ExecuteCmd/CmdArrangeShelfCards.cs index cea14f9..8477a7c 100644 --- a/RookieStation/CmdArrangeShelfCards.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdArrangeShelfCards.cs @@ -1,8 +1,8 @@ using Autodesk.Revit.DB; using Autodesk.Revit.UI; using Autodesk.Revit.UI.Selection; -using RookieStation.PackAreaModule.View; -using RookieStation.UserClient; +using RookieStation.ParcelAreaModule.View; +using RookieStation.RibbonMenu; using RookieStation.Utils; using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Linq; using System.Windows; using System.Windows.Controls; -namespace RookieStation.PackAreaModule.ExecuteCmd +namespace RookieStation.ParcelAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/CmdPlaceEntranceGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs similarity index 98% rename from RookieStation/CmdPlaceEntranceGate.cs rename to RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs index 3f6955f..dd7dd8d 100644 --- a/RookieStation/CmdPlaceEntranceGate.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceEntranceGate.cs @@ -6,9 +6,9 @@ using RookieStation.Utils; using System; using System.Collections.Generic; using System.Linq; -using RookieStation.PackAreaModule.View; +using RookieStation.ParcelAreaModule.View; -namespace RookieStation.PackAreaModule.ExecuteCmd +namespace RookieStation.ParcelAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/CmdPlaceExitGate.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs similarity index 99% rename from RookieStation/CmdPlaceExitGate.cs rename to RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs index 707996a..bf68e73 100644 --- a/RookieStation/CmdPlaceExitGate.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceExitGate.cs @@ -7,9 +7,9 @@ using RookieStation.Utils; using System; using System.Collections.Generic; using System.Linq; -using RookieStation.PackAreaModule.View; +using RookieStation.ParcelAreaModule.View; -namespace RookieStation.PackAreaModule.ExecuteCmd +namespace RookieStation.ParcelAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/CmdPlaceLamps.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs similarity index 99% rename from RookieStation/CmdPlaceLamps.cs rename to RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs index 841a778..1dae8e5 100644 --- a/RookieStation/CmdPlaceLamps.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceLamps.cs @@ -8,9 +8,9 @@ using RookieStation.Utils; using System; using System.Collections.Generic; using System.Linq; -using RookieStation.PackAreaModule.View; +using RookieStation.ParcelAreaModule.View; -namespace RookieStation.PackAreaModule.ExecuteCmd +namespace RookieStation.ParcelAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/CmdPlaceShelves.cs b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs similarity index 99% rename from RookieStation/CmdPlaceShelves.cs rename to RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs index ef890f8..6c156c9 100644 --- a/RookieStation/CmdPlaceShelves.cs +++ b/RookieStation/ParcelAreaModule/ExecuteCmd/CmdPlaceShelves.cs @@ -7,10 +7,10 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using RookieStation.PackAreaModule.Model; -using RookieStation.PackAreaModule.View; +using RookieStation.ParcelAreaModule.Model; +using RookieStation.ParcelAreaModule.View; -namespace RookieStation.PackAreaModule.ExecuteCmd +namespace RookieStation.ParcelAreaModule.ExecuteCmd { [Autodesk.Revit.Attributes.Transaction(Autodesk.Revit.Attributes.TransactionMode.Manual)] [Autodesk.Revit.Attributes.Regeneration(Autodesk.Revit.Attributes.RegenerationOption.Manual)] diff --git a/RookieStation/Model/Enum.cs b/RookieStation/ParcelAreaModule/Model/Enum.cs similarity index 94% rename from RookieStation/Model/Enum.cs rename to RookieStation/ParcelAreaModule/Model/Enum.cs index a403827..f7763b6 100644 --- a/RookieStation/Model/Enum.cs +++ b/RookieStation/ParcelAreaModule/Model/Enum.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RookieStation.PackAreaModule.Model +namespace RookieStation.ParcelAreaModule.Model { public enum NumOfGroup { diff --git a/RookieStation/Model/Shelf.cs b/RookieStation/ParcelAreaModule/Model/Shelf.cs similarity index 95% rename from RookieStation/Model/Shelf.cs rename to RookieStation/ParcelAreaModule/Model/Shelf.cs index 66c7b6e..4bdab2a 100644 --- a/RookieStation/Model/Shelf.cs +++ b/RookieStation/ParcelAreaModule/Model/Shelf.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RookieStation.PackAreaModule.Model +namespace RookieStation.ParcelAreaModule.Model { public class Shelf { diff --git a/RookieStation/WpfEntranceGate.xaml b/RookieStation/ParcelAreaModule/View/WpfEntranceGate.xaml similarity index 96% rename from RookieStation/WpfEntranceGate.xaml rename to RookieStation/ParcelAreaModule/View/WpfEntranceGate.xaml index f075f54..e14c771 100644 --- a/RookieStation/WpfEntranceGate.xaml +++ b/RookieStation/ParcelAreaModule/View/WpfEntranceGate.xaml @@ -1,5 +1,5 @@  /// WpfEntranceGate.xaml 的交互逻辑 diff --git a/RookieStation/WpfExitGate.xaml b/RookieStation/ParcelAreaModule/View/WpfExitGate.xaml similarity index 97% rename from RookieStation/WpfExitGate.xaml rename to RookieStation/ParcelAreaModule/View/WpfExitGate.xaml index bf6379d..a510e5a 100644 --- a/RookieStation/WpfExitGate.xaml +++ b/RookieStation/ParcelAreaModule/View/WpfExitGate.xaml @@ -1,5 +1,5 @@  /// WpfExitGate.xaml 的交互逻辑 diff --git a/RookieStation/WpfLampsLayout.xaml b/RookieStation/ParcelAreaModule/View/WpfLampsLayout.xaml similarity index 97% rename from RookieStation/WpfLampsLayout.xaml rename to RookieStation/ParcelAreaModule/View/WpfLampsLayout.xaml index 3427f05..a2b28e6 100644 --- a/RookieStation/WpfLampsLayout.xaml +++ b/RookieStation/ParcelAreaModule/View/WpfLampsLayout.xaml @@ -1,5 +1,5 @@  /// WpfLampsLayout.xaml 的交互逻辑 diff --git a/RookieStation/WpfShelfCards.xaml b/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml similarity index 97% rename from RookieStation/WpfShelfCards.xaml rename to RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml index 601a200..25dbe51 100644 --- a/RookieStation/WpfShelfCards.xaml +++ b/RookieStation/ParcelAreaModule/View/WpfShelfCards.xaml @@ -1,5 +1,5 @@  /// WpfShelfCards.xaml 的交互逻辑 diff --git a/RookieStation/WpfShelvesLayout.xaml b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml similarity index 97% rename from RookieStation/WpfShelvesLayout.xaml rename to RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml index 4ca6403..7c471ed 100644 --- a/RookieStation/WpfShelvesLayout.xaml +++ b/RookieStation/ParcelAreaModule/View/WpfShelvesLayout.xaml @@ -1,10 +1,10 @@  /// WpfShelvesLayout.xaml 的交互逻辑 diff --git a/RookieStation/ShelvesPlacementViewModel.cs b/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs similarity index 97% rename from RookieStation/ShelvesPlacementViewModel.cs rename to RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs index 0452db7..b8c3847 100644 --- a/RookieStation/ShelvesPlacementViewModel.cs +++ b/RookieStation/ParcelAreaModule/ViewModel/ShelvesPlacementViewModel.cs @@ -1,4 +1,4 @@ -using RookieStation.PackAreaModule.Model; +using RookieStation.ParcelAreaModule.Model; using RookieStation.Utils; using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RookieStation.PackAreaModule +namespace RookieStation.ParcelAreaModule { public class ShelvesPlacementViewModel { diff --git a/RookieStation/CmdProjectSettings.cs b/RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs similarity index 100% rename from RookieStation/CmdProjectSettings.cs rename to RookieStation/ProjectConfig/ExcuteCmd/CmdProjectSettings.cs diff --git a/RookieStation/UserConstant.cs b/RookieStation/ProjectConfig/UserConstant.cs similarity index 97% rename from RookieStation/UserConstant.cs rename to RookieStation/ProjectConfig/UserConstant.cs index 82e5500..23dc609 100644 --- a/RookieStation/UserConstant.cs +++ b/RookieStation/ProjectConfig/UserConstant.cs @@ -1,5 +1,5 @@ using Autodesk.Revit.UI.Selection; -using RookieStation.UserClient; +using RookieStation.RibbonMenu; using RookieStation.Utils; using System; using System.Collections.Generic; diff --git a/RookieStation/WpfProjectSettings.xaml b/RookieStation/ProjectConfig/View/WpfProjectSettings.xaml similarity index 100% rename from RookieStation/WpfProjectSettings.xaml rename to RookieStation/ProjectConfig/View/WpfProjectSettings.xaml diff --git a/RookieStation/WpfProjectSettings.xaml.cs b/RookieStation/ProjectConfig/View/WpfProjectSettings.xaml.cs similarity index 100% rename from RookieStation/WpfProjectSettings.xaml.cs rename to RookieStation/ProjectConfig/View/WpfProjectSettings.xaml.cs diff --git a/RookieStation/RookieStation.csproj b/RookieStation/RookieStation.csproj index 76f7fe0..f9ea2c1 100644 --- a/RookieStation/RookieStation.csproj +++ b/RookieStation/RookieStation.csproj @@ -92,11 +92,11 @@ - - - - - + + + + + True @@ -109,62 +109,62 @@ - - + + - - + + - - - + + + - + True True Resources.resx - + - + - - - + + + - + WpfEntranceGate.xaml - + WpfExitGate.xaml - + WpfFamilyDockablePane.xaml - + WpfFloorFinishes.xaml - + WpfLampsLayout.xaml - + WpfProjectSettings.xaml - + WpfShelfCards.xaml - + WpfReceptionArea.xaml - + WpfShelvesLayout.xaml - + WpfWallFinishes.xaml @@ -284,43 +284,43 @@ - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/RookieStation/RsApp.cs b/RookieStation/RsApp.cs index 6247770..e3e3e9e 100644 --- a/RookieStation/RsApp.cs +++ b/RookieStation/RsApp.cs @@ -2,18 +2,19 @@ using RookieStation.CommonTools.ExecuteCmd; using RookieStation.CommonTools.View; using RookieStation.Finishes.ExecuteCmd; -using RookieStation.PackAreaModule.ExecuteCmd; +using RookieStation.ParcelAreaModule.ExecuteCmd; using RookieStation.ProjectConfig.ExecuteCmd; -using RookieStation.ShippingAreaModule.ExecuteCmd; +using RookieStation.MailingAreaModule.ExecuteCmd; using RookieStation.Statistics.ExecuteCmd; using RookieStation.Utils; using System; +using System.Drawing; using System.IO; using System.Windows; using System.Windows.Interop; using System.Windows.Media.Imaging; -namespace RookieStation.UserClient +namespace RookieStation.RibbonMenu { internal class RsApp : IExternalApplication { @@ -56,172 +57,79 @@ namespace RookieStation.UserClient //项目设置 RibbonPanel projectPanel = application.CreateRibbonPanel(TabName, ProjectSettingsPanelName); - PushButtonData projectPBD = new PushButtonData("项目设置", "项目设置", AddInPath, typeof(CmdProjectSettings).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.cainiao), - Image = ConvertFromBitmap(Properties.Resources.cainiao) - }; - var projectBtn = (PushButton)projectPanel.AddItem(projectPBD); + + CreatePushButton(projectPanel, "项目设置", Properties.Resources.cainiao, null); //前台布置 RibbonPanel receptionAreaPanel = application.CreateRibbonPanel(TabName, ReceptionPanelName); - PushButtonData receptionLayoutPBD = new PushButtonData("寄件区布置", "前台布置", AddInPath, typeof(CmdPlaceReceptionArea).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.Reception), - Image = ConvertFromBitmap(Properties.Resources.Reception) - }; - var receptionBtn = (PushButton)receptionAreaPanel.AddItem(receptionLayoutPBD); - receptionBtn.AvailabilityClassName = ViewPlanCmdEnabled; - PushButtonData logoExtrusionPBD = new PushButtonData("标识挤出", "标识挤出", AddInPath, typeof(CmdLogoExtrusion).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.LogoExtrusion), - Image = ConvertFromBitmap(Properties.Resources.LogoExtrusion) - }; - receptionAreaPanel.AddItem(logoExtrusionPBD); + CreatePushButton(receptionAreaPanel, "前台布置", Properties.Resources.Reception, ViewPlanCmdEnabled); + + CreatePushButton(receptionAreaPanel, "标识挤出", Properties.Resources.LogoExtrusion, ViewPlanCmdEnabled); //出入口布置 RibbonPanel packAreaPanel = application.CreateRibbonPanel(TabName, EntranceAndExitGatePanelName); - PushButtonData entrancegateLayoutPBD = new PushButtonData("入口布置", "入口闸机", AddInPath, typeof(CmdPlaceEntranceGate).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.EntranceGate), - Image = ConvertFromBitmap(Properties.Resources.EntranceGate) - }; - PushButtonData exitGateLayoutPBD = new PushButtonData("出口布置", "出口收检台", AddInPath, typeof(CmdPlaceExitGate).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.ExitGate), - Image = ConvertFromBitmap(Properties.Resources.ExitGate) - }; - //var gateBtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD); + CreatePushButton(packAreaPanel, "入口布置", Properties.Resources.EntranceGate, ViewPlanCmdEnabled); + CreatePushButton(packAreaPanel, "出口布置", Properties.Resources.ExitGate, ViewPlanCmdEnabled); - //IList gateItemsStacked = packAreaPanel.AddStackedItems(entrancegateLayoutPBD, exitGateLayoutPBD); - //var entranceBtn = (PushButton)gateItemsStacked[0]; - //var exitBtn = (PushButton)gateItemsStacked[1]; - var entranceBtn = (PushButton)packAreaPanel.AddItem(entrancegateLayoutPBD); - var exitBtn = (PushButton)packAreaPanel.AddItem(exitGateLayoutPBD); - entranceBtn.AvailabilityClassName = ViewPlanCmdEnabled; - exitBtn.AvailabilityClassName = ViewPlanCmdEnabled; + //PushButtonData exitGateLayoutPBD = new PushButtonData("出口布置", "出口收检台", AddInPath, typeof(CmdPlaceExitGate).FullName) + //{ + // LargeImage = ConvertFromBitmap(Properties.Resources.ExitGate), + // Image = ConvertFromBitmap(Properties.Resources.ExitGate) + //}; + ////var gateBtn = (PushButton)gatePanel.AddItem(exportGateLayoutPBD); - PushButtonData placeShelvesPBD = new PushButtonData("货架布置", "货架布置", AddInPath, typeof(CmdPlaceShelves).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.Shelf), - Image = ConvertFromBitmap(Properties.Resources.Shelf) - }; - var placeShelvesBtn = (PushButton)packAreaPanel.AddItem(placeShelvesPBD); - placeShelvesBtn.AvailabilityClassName = ViewPlanCmdEnabled; + ////IList gateItemsStacked = packAreaPanel.AddStackedItems(entrancegateLayoutPBD, exitGateLayoutPBD); + ////var entranceBtn = (PushButton)gateItemsStacked[0]; + ////var exitBtn = (PushButton)gateItemsStacked[1]; + //寄件区布置 + CreatePushButton(packAreaPanel, "货架布置", Properties.Resources.Shelf, ViewPlanCmdEnabled); - PushButtonData placeShelveCardsPBD = new PushButtonData("货架端牌", "货架端牌", AddInPath, typeof(CmdArrangeShelfCards).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.ShelfCard), - Image = ConvertFromBitmap(Properties.Resources.ShelfCard) - }; - var placeShelveCardsBtn = (PushButton)packAreaPanel.AddItem(placeShelveCardsPBD); + CreatePushButton(packAreaPanel, "货架端牌", Properties.Resources.ShelfCard, ViewPlanCmdEnabled); + CreatePushButton(packAreaPanel, "灯具布置", Properties.Resources.Lamp, ViewPlanCmdEnabled); - PushButtonData placeLampsPBD = new PushButtonData("灯具布置", "灯具布置", AddInPath, typeof(CmdPlaceLamps).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.Lamp), - Image = ConvertFromBitmap(Properties.Resources.Lamp) - }; - var placeLampsBtn = (PushButton)packAreaPanel.AddItem(placeLampsPBD); - placeLampsBtn.AvailabilityClassName = ViewPlanCmdEnabled; //饰面，完成面 RibbonPanel finishesPanel = application.CreateRibbonPanel(TabName, FinishesPanelName); + CreatePushButton(finishesPanel, "板饰面", Properties.Resources.FloorFinishes, ViewPlanCmdEnabled); + CreatePushButton(finishesPanel, "墙饰面", Properties.Resources.WallFinishes, ViewPlanCmdEnabled); - PushButtonData floorfinishesPBD = new PushButtonData("地面铺装", "地面铺装", AddInPath, typeof(CmdPlaceFloorFinishes).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.FloorFinishes), - Image = ConvertFromBitmap(Properties.Resources.FloorFinishes) - }; - var floorcoveringBtn = (PushButton)finishesPanel.AddItem(floorfinishesPBD); - floorcoveringBtn.AvailabilityClassName = ViewPlanCmdEnabled; - - PushButtonData wallcoveringPBD = new PushButtonData("墙饰面", "墙饰面", AddInPath, typeof(CmdPlaceWallFinishes).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.WallFinishes), - Image = ConvertFromBitmap(Properties.Resources.WallFinishes) - }; - - var wallcoveringBtn = (PushButton)finishesPanel.AddItem(wallcoveringPBD); - wallcoveringBtn.AvailabilityClassName = ViewPlanCmdEnabled; //统计面板 RibbonPanel statisticsPanel = application.CreateRibbonPanel(TabName, StatisticsPanelName); + CreatePushButton(statisticsPanel, "工程量导出", Properties.Resources.WorkSchedule, null); - PushButtonData statisticsfamilyPBD = new PushButtonData("输出统计表", "工程量统计", AddInPath, typeof(CmdExportWorkSchedule).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.WorkSchedule), - Image = ConvertFromBitmap(Properties.Resources.WorkSchedule) - }; - statisticsPanel.AddItem(statisticsfamilyPBD); //通用面板 RibbonPanel commonToolsPanel = application.CreateRibbonPanel(TabName, CommonTools); - - PushButtonData browserfamilyPBD = new PushButtonData("浏览族", "浏览族文件", AddInPath, typeof(CmdBrowserFamily).FullName) - { - LargeImage = ConvertFromBitmap(Properties.Resources.FamilyLib), - Image = ConvertFromBitmap(Properties.Resources.FamilyLib) - }; - commonToolsPanel.AddItem(browserfamilyPBD); + CreatePushButton(commonToolsPanel, "族库浏览", Properties.Resources.FamilyLib, null); RegisterDockPane(application); return Result.Succeeded; - - #region MyRegion - - //RibbonPanel familyUtilPanel = application.CreateRibbonPanel(TabName, PanelName1); - - //PushButtonData FamilyTransmitPBData = new PushButtonData("传递标准", "传递标准", AddInPath, "HandyUtils.Common.RExecute.CmdTransmitStandards"); - //PushButtonData FamilyMassSavePBData = new PushButtonData("批量保存", "批量保存", AddInPath, "HandyUtils.Common.RExecute.CmdFamilyPreservation"); - - //IList FtItemsStacked = familyUtilPanel.AddStackedItems(FamilyTransmitPBData, FamilyMassSavePBData); - ////((PushButton)(ribbonItemsStacked[0])).Image = new BitmapImage(new Uri(Path.Combine(ButtonIconsFolder, "Reset.png"), UriKind.Absolute)); - //((PushButton)FtItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.One_Way_Transition_16px); - //((PushButton)FtItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Save_16px); - - //familyUtilPanel.AddSeparator(); - - //PushButtonData ImportFamParaPBD = new PushButtonData("导入族参数", "族参数", AddInPath, "HandyUtils.Common.RExecute.CmdImportParams") - //{ - // ToolTip = "导入族参数到族文件" - //}; - - //PushButtonData ImportSharedParaPBD = new PushButtonData("导入共享参数", "共享参数", AddInPath, "HandyUtils.Common.RExecute.CmdShareParams") - //{ - // ToolTip = "导入参数到共享参数文件" - //}; - //PushButtonData UpdateFamilyFilePBD = new PushButtonData("更新族文件", "更新族", AddInPath, "HandyUtils.Common.RExecute.CmdUpdateFiles") - //{ - // ToolTip = "更新族文件缩略图及升级至当前版本" - //}; - - //IList ParaItemsStacked = familyUtilPanel.AddStackedItems(ImportFamParaPBD, ImportSharedParaPBD, UpdateFamilyFilePBD); - //((PushButton)ParaItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.Add_Property_16px); - //((PushButton)ParaItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Import_16px); - //((PushButton)ParaItemsStacked[2]).Image = ConvertFromBitmap(Properties.Resources.Available_Updates_32px); - - #endregion MyRegion - - #region MyRegion - - //RibbonPanel exportPanel = application.CreateRibbonPanel(TabName, "导出族信息"); - - //PushButtonData pbdSettings = new PushButtonData("设置", "导出选项", AddInPath, "HandyUtils.Common.RExecute.CmdSettings") - //{ - // ToolTip = "设置导出选项" - //}; - - //PushButtonData pbdFamilyInfoExport = new PushButtonData("导出", "信息导出", AddInPath, "HandyUtils.Common.RExecute.CmdFamilyInfo") - //{ - // ToolTip = "将族图片、族参数进行导出" - //}; - //IList ExportItemsStacked = exportPanel.AddStackedItems(pbdSettings, pbdFamilyInfoExport); - //((PushButton)ExportItemsStacked[0]).Image = ConvertFromBitmap(Properties.Resources.Settings_16px); - //((PushButton)ExportItemsStacked[1]).Image = ConvertFromBitmap(Properties.Resources.Export_16px); - - #endregion MyRegion } catch (Exception ex) { Log.WriteLog(ex.Message); - return Result.Cancelled; + return Result.Failed; + } + } + + /// + ///创建按钮 + /// + /// 命令类 + /// 面板 + /// 按钮名 + /// 按钮图片 + /// 控制可用性 + public void CreatePushButton(RibbonPanel panel, string btnContent, Bitmap bitmap, string className) + { + string AddInPath = typeof(T).Assembly.Location; + PushButtonData btnData = new PushButtonData(btnContent, btnContent, AddInPath, typeof(T).FullName) + { + LargeImage = ConvertFromBitmap(bitmap), + Image = ConvertFromBitmap(bitmap) + }; + var placeShelvesBtn = (PushButton)panel.AddItem(btnData); + if (className != null) + { + placeShelvesBtn.AvailabilityClassName = className; } } diff --git a/RookieStation/cmdExportWorkSchedule.cs b/RookieStation/Statistics/ExecuteCmd/CmdExportWorkSchedule.cs similarity index 100% rename from RookieStation/cmdExportWorkSchedule.cs rename to RookieStation/Statistics/ExecuteCmd/CmdExportWorkSchedule.cs diff --git a/RookieStation/Utils/CommonUtils.cs b/RookieStation/Utils/CommonUtils.cs index 252d429..4def643 100644 --- a/RookieStation/Utils/CommonUtils.cs +++ b/RookieStation/Utils/CommonUtils.cs @@ -1,6 +1,6 @@ using Autodesk.Revit.UI; -using RookieStation.PackAreaModule; -using RookieStation.UserClient; +using RookieStation.ParcelAreaModule; +using RookieStation.RibbonMenu; using System; using System.Collections.Generic; using System.ComponentModel;