From 30ce6c4563df5e628c8e8891d666d852bd2203d5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 16 七月 2024 16:42:00 +0800
Subject: [PATCH] 调整程序集
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 8 ++++----
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs | 4 ++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/AmapLocationViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/FixationReceivedViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.Designer.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs | 6 +++---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs | 0
Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/PropertySorter.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.Designer.cs | 2 +-
18 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
index 8c066aa..79a6b8f 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
@@ -498,7 +498,7 @@
};
if (!IsExistPage(guid, true))
{
- var page = new MainPanel();
+ var page = new HomePageMainPanel();
page.PageTitle.Caption = guid.Function;
page.SurfaceGuid = guid;
CreatePage(page, guid);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectUserControl.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/PropertySorter.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/PropertySorter.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/PropertySorter.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/PropertySorter.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/AmapLocationViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/AmapLocationViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/AmapLocationViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/AmapLocationViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/FixationReceivedViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/FixationReceivedViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/FixationReceivedViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/FixationReceivedViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/ViewModelHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs
similarity index 94%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/ViewModelHelper.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs
index 690138c..0048f25 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/ViewModelHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs
@@ -3,10 +3,10 @@
namespace HStation.WinFrmUI.Core
{
- public class ProjectViewModel
+ public class XhsProjectViewModel
{
[TypeConverter(typeof(PropertySorter))]
- public ProjectViewModel(XhsProjectDto rhs)
+ public XhsProjectViewModel(XhsProjectDto rhs)
{
this.Address = rhs.Address;
this.Name = rhs.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/AddXhsProjectDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.Designer.cs
index 4b8add9..d28df69 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace HStation.WinFrmUI.Xhs.Core
{
- partial class MainPanel
+ partial class HomePageMainPanel
{
/// <summary>
/// Required designer variable.
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
similarity index 90%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
index c455786..78fdceb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
@@ -2,9 +2,9 @@
namespace HStation.WinFrmUI.Xhs.Core
{
- public partial class MainPanel : DocumentPage
+ public partial class HomePageMainPanel : DocumentPage
{
- public MainPanel()
+ public HomePageMainPanel()
{
InitializeComponent();
this.xhsProjectTreeList1.SelectProject += XhsProjectTreeList1_SelectProjectAsync;
@@ -35,7 +35,7 @@
var selectchage = await _bll.GetByID(Convert.ToInt64(PrjID));
if (selectchage != null)
{
- propertyGridControl1.SelectedObject = new ProjectViewModel(selectchage);
+ propertyGridControl1.SelectedObject = new XhsProjectViewModel(selectchage);
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/MainPanel.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.Designer.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.Designer.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/XhsProjectTreeList.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 1b03c1c..7a3c282 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -40,10 +40,10 @@
</ItemGroup>
<ItemGroup>
- <Compile Update="AddXhsProjectDlg.cs">
+ <Compile Update="04-HomePageMainPanel\AddXhsProjectDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="MainPanel.cs">
+ <Compile Update="04-HomePageMainPanel\HomePageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="Properties\Resources.Designer.cs">
@@ -51,10 +51,10 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Update="XhsProjectTreeList.cs">
+ <Compile Update="04-HomePageMainPanel\XhsProjectTreeList.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="XhsProjectUserControl.cs">
+ <Compile Update="02-_UserControls\XhsProjectUserControl.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
--
Gitblit v1.9.3