From e18218195caa7fe3af4efa3cd2e53a53a00d98f7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 16 七月 2024 17:01:23 +0800
Subject: [PATCH] 迁移project
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.cs | 4 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.resx | 0
HStation.Xhs.Desktop.sln | 7 ---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.Designer.cs | 4 -
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.Designer.cs | 4 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/LocViewModel.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs | 9 +++-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.cs | 7 ---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 26 +++++++++++++
Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj | 1
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/01-ExtractHelper/ExtractHelper.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.resx | 0
/dev/null | 21 ----------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.resx | 0
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectPropertyGridViewModel.cs | 9 ++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.resx | 0
30 files changed, 53 insertions(+), 61 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj b/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
index f7d1eaa..91e4ce9 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
+++ b/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
@@ -15,7 +15,6 @@
<ItemGroup>
<ProjectReference Include="..\..\Service\HStation.Service.Xhs.Core\HStation.Service.Xhs.Core.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
- <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.PumpProject\HStation.WinFrmUI.Xhs.PumpProject.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Core\HStation.WinFrmUI.Xhs.Core.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Curve\HStation.WinFrmUI.Xhs.Curve.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Project\HStation.WinFrmUI.Xhs.PumpProduct.csproj" />
diff --git a/HStation.Xhs.Desktop.sln b/HStation.Xhs.Desktop.sln
index 07ffd61..41dd3eb 100644
--- a/HStation.Xhs.Desktop.sln
+++ b/HStation.Xhs.Desktop.sln
@@ -37,8 +37,6 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Basic", "WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj", "{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Xhs.PumpProject", "WinFrmUI\HStation.WinFrmUI.PumpProject\HStation.WinFrmUI.Xhs.PumpProject.csproj", "{82FF6E0E-C756-4754-927B-03E144ED0919}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Xhs.Curve", "WinFrmUI\HStation.WinFrmUI.Xhs.Curve\HStation.WinFrmUI.Xhs.Curve.csproj", "{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model", "Model", "{435C0A58-EE2A-4DDD-A8D8-48DD384B5210}"
@@ -105,10 +103,6 @@
{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F}.Release|Any CPU.Build.0 = Release|Any CPU
- {82FF6E0E-C756-4754-927B-03E144ED0919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {82FF6E0E-C756-4754-927B-03E144ED0919}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {82FF6E0E-C756-4754-927B-03E144ED0919}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {82FF6E0E-C756-4754-927B-03E144ED0919}.Release|Any CPU.Build.0 = Release|Any CPU
{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -159,7 +153,6 @@
{84266C68-21C0-4F2D-8569-18B0CB96669D} = {2AE8DD9B-A07B-44C4-B5C4-A9D98C49D633}
{435871C0-4F2F-4D7D-824D-8E7D53C88756} = {D5B088B2-E69E-4B43-838B-080B9F012077}
{2DFEFAC8-58AC-443D-8FCD-EF7EA9DFBB2F} = {D5B088B2-E69E-4B43-838B-080B9F012077}
- {82FF6E0E-C756-4754-927B-03E144ED0919} = {D5B088B2-E69E-4B43-838B-080B9F012077}
{2B355DD2-D6A5-4C64-AB17-64A6AEBB6EEC} = {D5B088B2-E69E-4B43-838B-080B9F012077}
{E5C71A5C-6E4E-4112-8235-DAB973E3A0FB} = {435C0A58-EE2A-4DDD-A8D8-48DD384B5210}
{6046AC77-595C-49B6-90E1-B4DE3877E11C} = {435C0A58-EE2A-4DDD-A8D8-48DD384B5210}
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.Designer.cs
deleted file mode 100644
index 2b768bb..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.Designer.cs
+++ /dev/null
@@ -1,373 +0,0 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject
-{
- partial class XhsProjectUserControl
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- TagName = new DevExpress.XtraEditors.TextEdit();
- CustomerNameTextEdit = new DevExpress.XtraEditors.TextEdit();
- NameTextEdit = new DevExpress.XtraEditors.TextEdit();
- BtnFileChoice = new DevExpress.XtraEditors.ButtonEdit();
- DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- ItemForName = new DevExpress.XtraLayout.LayoutControlItem();
- ItemForConstructionYear = new DevExpress.XtraLayout.LayoutControlItem();
- ItemForTagName = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
- ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)TagName.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)CustomerNameTextEdit.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)BtnFileChoice.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)ItemForName).BeginInit();
- ((System.ComponentModel.ISupportInitialize)ItemForConstructionYear).BeginInit();
- ((System.ComponentModel.ISupportInitialize)ItemForTagName).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
- ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
- SuspendLayout();
- //
- // layoutControl1
- //
- layoutControl1.Controls.Add(TagName);
- layoutControl1.Controls.Add(CustomerNameTextEdit);
- layoutControl1.Controls.Add(NameTextEdit);
- layoutControl1.Controls.Add(BtnFileChoice);
- layoutControl1.Controls.Add(DescriptionTextEdit);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 0);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(967, 0, 650, 400);
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(709, 196);
- layoutControl1.TabIndex = 0;
- layoutControl1.Text = "layoutControl1";
- //
- // TagName
- //
- TagName.Location = new Point(420, 36);
- TagName.Name = "TagName";
- TagName.Size = new Size(277, 20);
- TagName.StyleController = layoutControl1;
- TagName.TabIndex = 5;
- //
- // CustomerNameTextEdit
- //
- CustomerNameTextEdit.Location = new Point(420, 12);
- CustomerNameTextEdit.Margin = new Padding(2);
- CustomerNameTextEdit.Name = "CustomerNameTextEdit";
- CustomerNameTextEdit.Size = new Size(277, 20);
- CustomerNameTextEdit.StyleController = layoutControl1;
- CustomerNameTextEdit.TabIndex = 2;
- //
- // NameTextEdit
- //
- NameTextEdit.Location = new Point(76, 12);
- NameTextEdit.Name = "NameTextEdit";
- NameTextEdit.Size = new Size(276, 20);
- NameTextEdit.StyleController = layoutControl1;
- NameTextEdit.TabIndex = 0;
- //
- // BtnFileChoice
- //
- BtnFileChoice.Location = new Point(76, 36);
- BtnFileChoice.Margin = new Padding(2);
- BtnFileChoice.Name = "BtnFileChoice";
- BtnFileChoice.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
- BtnFileChoice.Properties.ReadOnly = true;
- BtnFileChoice.Size = new Size(276, 20);
- BtnFileChoice.StyleController = layoutControl1;
- BtnFileChoice.TabIndex = 4;
- BtnFileChoice.Click += BtnFileChoice_Click;
- //
- // DescriptionTextEdit
- //
- DescriptionTextEdit.Location = new Point(76, 60);
- DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(621, 124);
- DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 7;
- //
- // Root
- //
- Root.AppearanceItemCaption.Options.UseTextOptions = true;
- Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem13, layoutControlItem11, layoutControlItem12, layoutControlItem16, layoutControlItem14 });
- Root.Name = "Root";
- Root.Size = new Size(709, 196);
- Root.TextVisible = false;
- //
- // layoutControlItem13
- //
- layoutControlItem13.Control = CustomerNameTextEdit;
- layoutControlItem13.Location = new Point(344, 0);
- layoutControlItem13.Name = "layoutControlItem13";
- layoutControlItem13.Size = new Size(345, 24);
- layoutControlItem13.Text = "瀹㈡埛鍚嶇О:";
- layoutControlItem13.TextSize = new Size(52, 14);
- //
- // layoutControlItem11
- //
- layoutControlItem11.AllowHtmlStringInCaption = true;
- layoutControlItem11.Control = NameTextEdit;
- layoutControlItem11.Location = new Point(0, 0);
- layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(344, 24);
- layoutControlItem11.Text = "<color=red>*</color>鍚嶇О:";
- layoutControlItem11.TextSize = new Size(52, 14);
- //
- // layoutControlItem12
- //
- layoutControlItem12.Control = BtnFileChoice;
- layoutControlItem12.Location = new Point(0, 24);
- layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(344, 24);
- layoutControlItem12.Text = "妯″瀷閫夋嫨:";
- layoutControlItem12.TextSize = new Size(52, 14);
- //
- // layoutControlItem16
- //
- layoutControlItem16.Control = DescriptionTextEdit;
- layoutControlItem16.Location = new Point(0, 48);
- layoutControlItem16.Name = "layoutControlItem16";
- layoutControlItem16.Size = new Size(689, 128);
- layoutControlItem16.Text = "璇存槑";
- layoutControlItem16.TextSize = new Size(52, 14);
- //
- // layoutControlItem14
- //
- layoutControlItem14.Control = TagName;
- layoutControlItem14.Location = new Point(344, 24);
- layoutControlItem14.Name = "layoutControlItem14";
- layoutControlItem14.Size = new Size(345, 24);
- layoutControlItem14.Text = "鏍囩:";
- layoutControlItem14.TextSize = new Size(52, 14);
- //
- // ItemForName
- //
- ItemForName.AllowHtmlStringInCaption = true;
- ItemForName.Location = new Point(0, 74);
- ItemForName.Name = "ItemForName";
- ItemForName.Size = new Size(413, 24);
- ItemForName.Text = "<color=red>*</color>鍚嶇О:";
- ItemForName.TextSize = new Size(52, 14);
- //
- // ItemForConstructionYear
- //
- ItemForConstructionYear.Location = new Point(0, 98);
- ItemForConstructionYear.Name = "ItemForConstructionYear";
- ItemForConstructionYear.Size = new Size(413, 24);
- ItemForConstructionYear.Text = "閫夋嫨鏂囦欢:";
- ItemForConstructionYear.TextSize = new Size(52, 14);
- //
- // ItemForTagName
- //
- ItemForTagName.AppearanceItemCaption.Options.UseTextOptions = true;
- ItemForTagName.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- ItemForTagName.Location = new Point(0, 122);
- ItemForTagName.Name = "ItemForTagName";
- ItemForTagName.Size = new Size(827, 24);
- ItemForTagName.Text = "涓夌淮妯″瀷:";
- ItemForTagName.TextSize = new Size(52, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Location = new Point(0, 146);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(827, 24);
- layoutControlItem6.Text = "璇︾粏鍦板潃:";
- layoutControlItem6.TextSize = new Size(52, 14);
- //
- // layoutControlItem4
- //
- layoutControlItem4.Location = new Point(413, 98);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(414, 24);
- layoutControlItem4.Text = "鏍囩:";
- layoutControlItem4.TextSize = new Size(52, 14);
- //
- // layoutControlItem5
- //
- layoutControlItem5.Location = new Point(413, 74);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(414, 24);
- layoutControlItem5.Text = "瀹㈡埛鍚嶇О:";
- layoutControlItem5.TextSize = new Size(52, 14);
- //
- // layoutControlItem1
- //
- layoutControlItem1.Location = new Point(0, 146);
- layoutControlItem1.Name = "layoutControlItem6";
- layoutControlItem1.Size = new Size(827, 24);
- layoutControlItem1.Text = "璇︾粏鍦板潃:";
- layoutControlItem1.TextSize = new Size(52, 14);
- //
- // layoutControlItem2
- //
- layoutControlItem2.AppearanceItemCaption.Options.UseTextOptions = true;
- layoutControlItem2.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
- layoutControlItem2.Location = new Point(0, 122);
- layoutControlItem2.Name = "ItemForTagName";
- layoutControlItem2.Size = new Size(827, 24);
- layoutControlItem2.Text = "涓夌淮妯″瀷:";
- layoutControlItem2.TextSize = new Size(52, 14);
- //
- // layoutControlItem3
- //
- layoutControlItem3.Location = new Point(0, 98);
- layoutControlItem3.Name = "ItemForConstructionYear";
- layoutControlItem3.Size = new Size(413, 24);
- layoutControlItem3.Text = "閫夋嫨鏂囦欢:";
- layoutControlItem3.TextSize = new Size(52, 14);
- //
- // layoutControlItem7
- //
- layoutControlItem7.AllowHtmlStringInCaption = true;
- layoutControlItem7.Location = new Point(0, 74);
- layoutControlItem7.Name = "ItemForName";
- layoutControlItem7.Size = new Size(413, 24);
- layoutControlItem7.Text = "<color=red>*</color>鍚嶇О:";
- layoutControlItem7.TextSize = new Size(52, 14);
- //
- // layoutControlItem8
- //
- layoutControlItem8.Location = new Point(413, 98);
- layoutControlItem8.Name = "layoutControlItem4";
- layoutControlItem8.Size = new Size(414, 24);
- layoutControlItem8.Text = "鏍囩:";
- layoutControlItem8.TextSize = new Size(52, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.Location = new Point(413, 74);
- layoutControlItem9.Name = "layoutControlItem5";
- layoutControlItem9.Size = new Size(414, 24);
- layoutControlItem9.Text = "瀹㈡埛鍚嶇О:";
- layoutControlItem9.TextSize = new Size(52, 14);
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
- //
- // ProjectUserControl
- //
- AutoScaleDimensions = new SizeF(7F, 14F);
- AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(layoutControl1);
- Name = "ProjectUserControl";
- Size = new Size(709, 196);
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)TagName.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)CustomerNameTextEdit.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)BtnFileChoice.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
- ((System.ComponentModel.ISupportInitialize)ItemForName).EndInit();
- ((System.ComponentModel.ISupportInitialize)ItemForConstructionYear).EndInit();
- ((System.ComponentModel.ISupportInitialize)ItemForTagName).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
- ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
-
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem ItemForName;
- private DevExpress.XtraLayout.LayoutControlItem ItemForConstructionYear;
- private DevExpress.XtraLayout.LayoutControlItem ItemForTagName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraEditors.TextEdit TagName;
- private DevExpress.XtraEditors.TextEdit CustomerNameTextEdit;
- private DevExpress.XtraEditors.TextEdit NameTextEdit;
- private DevExpress.XtraEditors.ButtonEdit BtnFileChoice;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
- private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.cs b/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.cs
deleted file mode 100644
index 3f12d2a..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing HStation.Dto;
-
-namespace HStation.WinFrmUI.Xhs.PumpProject
-{
- public partial class XhsProjectUserControl : DevExpress.XtraEditors.XtraUserControl
- {
- public XhsProjectUserControl()
- {
- InitializeComponent();
- }
-
- private AddXhsProjectInput _AddXhsProjectInput = null;
-
- //楠岃瘉
- public bool Valid()
- {
- this.dxErrorProvider1.ClearErrors();
- if (string.IsNullOrEmpty(this.NameTextEdit.Text.Trim()))
- {
- this.dxErrorProvider1.SetError(this.NameTextEdit, "蹇呭～椤�");
- return false;
- }
- return true;
- }
-
- public AddXhsProjectInput GetData(AddXhsProjectInput model)
- {
- model.Name = this.NameTextEdit.Text.Trim();
- model.CustomerName = this.CustomerNameTextEdit.Text.Trim();
- model.CreateTime = DateTime.Now;
- model.TagName = this.TagName.Text.Trim();
- model.GID = Guid.NewGuid().ToString();
- model.Description = this.DescriptionTextEdit.Text.Trim();
- return model;
- }
-
- //閫夋嫨鏂囦欢
- private void BtnFileChoice_Click(object sender, EventArgs e)
- {
- OpenFileDialog openFileDialog = new OpenFileDialog();
- openFileDialog.Filter = "ZIP Files (*.zip)|*.zip";
- openFileDialog.FilterIndex = 1;
- string selectedFilePath = null;
- if (openFileDialog.ShowDialog() == DialogResult.OK)
- {
- selectedFilePath = openFileDialog.FileName;
- string newFileName = selectedFilePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
- ? selectedFilePath.Substring(0, selectedFilePath.Length - 4) + ".hsr"
- : selectedFilePath;
- this.BtnFileChoice.Text = newFileName;
- //瑙ｅ帇鏂囦欢
- // ExtractHelper.ExractFile(selectedFilePath);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.resx b/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.resx
deleted file mode 100644
index d438392..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectUserControl.resx
+++ /dev/null
@@ -1,123 +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>
- <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj b/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj
deleted file mode 100644
index 9ca4b27..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- <TargetFramework>net6.0-windows</TargetFramework>
- <ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
- </ItemGroup>
-
- <ItemGroup>
- <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
- <ProjectReference Include="..\..\Dto\Hstation.Dto.Core\Hstation.Dto.Core.csproj" />
- <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
- </ItemGroup>
-
-</Project>
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj.user b/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj.user
deleted file mode 100644
index 02f47a8..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj.user
+++ /dev/null
@@ -1,30 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
- <ItemGroup>
- <Compile Update="00-PumpProject\AddXhsProjectDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProject\EditXhsProjectDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProject\XhsModelEdit.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProject\XhsProjectUserControl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="00-PumpProject\SetModelEditDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProject\SetUseStatusDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="00-PumpProject\XhsProjectMainPanel.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="MainPanel\XtraUserControl1.cs">
- <SubType>UserControl</SubType>
- </Compile>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.Designer.cs b/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.Designer.cs
deleted file mode 100644
index 9420e4e..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.Designer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject.MainPanel
-{
- partial class XtraUserControl1
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- }
-
- #endregion
- }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.cs b/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.cs
deleted file mode 100644
index fd2c86a..0000000
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/MainPanel/XtraUserControl1.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace HStation.WinFrmUI.Xhs.PumpProject.MainPanel
-{
- public partial class XtraUserControl1 : DevExpress.XtraEditors.XtraUserControl
- {
- public XtraUserControl1()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectPropertyGridViewModel.cs
similarity index 88%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectPropertyGridViewModel.cs
index 0048f25..191932f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectPropertyGridViewModel.cs
@@ -1,12 +1,13 @@
锘縰sing HStation.Dto;
+using HStation.WinFrmUI.Core;
using System.ComponentModel;
-namespace HStation.WinFrmUI.Core
+namespace HStation.WinFrmUI.Xhs.Core
{
- public class XhsProjectViewModel
+ [TypeConverter(typeof(PropertySorter))]
+ public class XhsProjectPropertyGridViewModel
{
- [TypeConverter(typeof(PropertySorter))]
- public XhsProjectViewModel(XhsProjectDto rhs)
+ public XhsProjectPropertyGridViewModel(XhsProjectDto rhs)
{
this.Address = rhs.Address;
this.Name = rhs.Name;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
index 78fdceb..f3e12fd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs
@@ -32,10 +32,13 @@
private async void XhsProjectTreeList1_SelectProjectAsync(string PrjID)
{
await mapViewProjectListContainer1.SelectProject(PrjID);
- var selectchage = await _bll.GetByID(Convert.ToInt64(PrjID));
- if (selectchage != null)
+ if (long.TryParse(PrjID, out long id))
{
- propertyGridControl1.SelectedObject = new XhsProjectViewModel(selectchage);
+ var selectchage = await _bll.GetByID(id);
+ if (selectchage != null)
+ {
+ propertyGridControl1.SelectedObject = new XhsProjectPropertyGridViewModel(selectchage);
+ }
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/LocViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/LocViewModel.cs
similarity index 78%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/LocViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/LocViewModel.cs
index 3506851..048fe8b 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/LocViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/LocViewModel.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
public class LocViewModel
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs
similarity index 93%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs
index 8b01caa..643cc19 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs
@@ -1,6 +1,6 @@
锘縰sing HStation.Dto;
-namespace HStation.WinFrmUI.Xhs.Project
+namespace HStation.WinFrmUI.Xhs.Core
{
public class XhsProjectModelViewModel : XhsProjectItemModelDto
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs
index e61cca6..b083d48 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs
@@ -1,7 +1,7 @@
锘縰sing HStation.Dto;
using Yw.Dto;
-namespace HStation.WinFrmUI.Xhs.Project
+namespace HStation.WinFrmUI.Xhs.Core
{
public class XhsProjectViewModel : XhsProjectDto
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.cs
index 4b7ea67..1d6bafe 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.cs
@@ -4,7 +4,7 @@
using HStation.WinFrmUI.Xhs.PumpProject;
using Newtonsoft.Json;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
public partial class AddXhsProjectDlg : DevExpress.XtraEditors.XtraForm
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.designer.cs
index d3d30e4..30d822e 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.designer.cs
@@ -4,7 +4,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
partial class AddXhsProjectDlg
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.cs
index 625b070..55e9a87 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.cs
@@ -4,7 +4,7 @@
using Newtonsoft.Json;
using Yw.Dto;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
public partial class EditXhsProjectDlg : DevExpress.XtraEditors.XtraForm
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.designer.cs
index e4da153..ff14bfd 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.designer.cs
@@ -4,7 +4,7 @@
using System.Drawing;
using System.Windows.Forms;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
partial class EditXhsProjectDlg
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/EditXhsProjectDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.cs
index 566e369..cd56657 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.cs
@@ -3,7 +3,7 @@
using Mapster;
using Yw.Dto;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
/// <summary>
/// 璁剧疆浣跨敤鐘舵��
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.designer.cs
index 552210b..2f85ea3 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
partial class SetModelEditDlg
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.cs
index 1b3e27f..32d6f39 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.cs
@@ -1,6 +1,6 @@
锘縰sing DevExpress.XtraEditors;
-namespace HStation.WinFrmUI.Xhs.PumpProject
+namespace HStation.WinFrmUI.Xhs.Core
{
/// <summary>
/// 璁剧疆浣跨敤鐘舵��
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.designer.cs
index f58e46f..c5480e2 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
partial class SetUseStatusDlg
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.Designer.cs
index caa9565..ccd40ce 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing HStation.WinFrmUI.Xhs.Project;
-
-namespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
partial class XhsModelEdit
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.cs
similarity index 91%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.cs
index 4824059..82003b0 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.cs
@@ -1,6 +1,4 @@
-锘縰sing HStation.WinFrmUI.Xhs.Project;
-
-namespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
public partial class XhsModelEdit : DevExpress.XtraEditors.XtraForm
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.Designer.cs
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.Designer.cs
index 0fe4e65..8e6fd6e 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
partial class XhsProjectMainPanel
{
@@ -173,7 +173,7 @@
//
// projectViewModelBindingSource
//
- projectViewModelBindingSource.DataSource = typeof(Xhs.Project.XhsProjectViewModel);
+ projectViewModelBindingSource.DataSource = typeof(Xhs.Core.XhsProjectViewModel);
//
// gridView1
//
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.cs
index 9e1439c..332b627 100644
--- a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.cs
@@ -1,9 +1,4 @@
-锘縰sing HStation.Dto;
-using HStation.WinFrmUI.Xhs;
-using HStation.WinFrmUI.Xhs.Project;
-using ISupply.WinFrmUI;
-
-namespace HStation.WinFrmUI.Xhs.PumpProject
+锘縩amespace HStation.WinFrmUI.Xhs.Core
{
public partial class XhsProjectMainPanel : DocumentPage
{
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.resx
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.resx
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.resx
diff --git a/WinFrmUI/HStation.WinFrmUI.PumpProject/01-ExtractHelper/ExtractHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/01-ExtractHelper/ExtractHelper.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.PumpProject/01-ExtractHelper/ExtractHelper.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/01-ExtractHelper/ExtractHelper.cs
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 7a3c282..d361bfa 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -8,6 +8,17 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="05-Project\00-PumpProject\00-ViewModel\AmapLocationViewModel.cs" />
+ <Compile Remove="05-Project\00-PumpProject\00-ViewModel\FixationReceivedViewModel.cs" />
+ <Compile Remove="05-Project\00-PumpProject\AddXhsProjectDlg.cs" />
+ <Compile Remove="05-Project\00-PumpProject\AddXhsProjectDlg.designer.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Remove="05-Project\00-PumpProject\AddXhsProjectDlg.resx" />
+ </ItemGroup>
+
+ <ItemGroup>
<None Remove="map\gaode\html\view_project_list.html" />
<None Remove="map\gaode\img\xhs_project.png" />
<None Remove="map\gaode\js\xhs_base64.js" />
@@ -46,6 +57,21 @@
<Compile Update="04-HomePageMainPanel\HomePageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="05-Project\00-PumpProject\EditXhsProjectDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-Project\00-PumpProject\SetModelEditDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-Project\00-PumpProject\SetUseStatusDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-Project\00-PumpProject\XhsModelEdit.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="05-Project\00-PumpProject\XhsProjectMainPanel.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3