Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-07-16 9fea080c2b3f946ab86369946f7e490f8481073a

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

 BLL/HStation.BLL.Xhs.Core/HStation.BLL.Xhs.Core.csproj

@@ -8,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="Yw.CAL.HttpClient.Core" Version="3.0.6" />
      <PackageReference Include="Yw.CALFactory.Core" Version="3.0.0" />
      <PackageReference Include="Yw.CAL.HttpClient.Core" Version="3.0.9" />
      <PackageReference Include="Yw.CALFactory.Core" Version="3.0.2" />
      <PackageReference Include="Yw.Mapster.Core" Version="3.0.0" />
    </ItemGroup>


 Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs

@@ -4,6 +4,7 @@
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Xhs.Core;
using HStation.WinFrmUI.Xhs.PumpProduct;
using HStation.WinFrmUI.Xhs.PumpProject;
using System;
@@ -492,12 +493,12 @@
        {
            var guid = new SurfaceGuid()
            {
                Function = "项目管理",
                Function = "项目总览",
                Modular = eModular.Basic
            };
            if (!IsExistPage(guid, true))
            {
                var page = new XhsProjectMainPanel();
                var page = new HomePageMainPanel();
                page.PageTitle.Caption = guid.Function;
                page.SurfaceGuid = guid;
                CreatePage(page, guid);

 Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj

@@ -9,14 +9,12 @@

    <ItemGroup>
        <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
        <PackageReference Include="Yw.BLL.Auth.Core" Version="3.0.3" />
        <PackageReference Include="Yw.BLL.Auth.Core" Version="3.0.7" />
    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\..\Service\HStation.Service.Xhs.Core\HStation.Service.Xhs.Project.csproj" />
        <ProjectReference Include="..\..\Setting\HStation.Hxs.Setting\HStation.Setting.Xhs.Core.csproj" />
        <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" />

 HStation.Xhs.Desktop.sln

@@ -31,15 +31,11 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Xhs.Core", "Dto\HStation.Dto.Xhs.Core\HStation.Dto.Xhs.Core.csproj", "{A669AAEF-9242-4B78-A171-BFC98D87CE35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Setting.Xhs.Core", "Setting\Hstation.Hxs.Setting\HStation.Setting.Xhs.Core.csproj", "{32960E3C-F6A0-445F-84C0-3303B93FDD0D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WebApi.Xhs.Core", "WebApi\HStation.WebApi.Xhs.Core\HStation.WebApi.Xhs.Core.csproj", "{84266C68-21C0-4F2D-8569-18B0CB96669D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Core", "WinFrmUI\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj", "{435871C0-4F2F-4D7D-824D-8E7D53C88756}"
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
@@ -56,6 +52,10 @@
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Xhs.PumpProduct", "Service\HStation.Service.Xhs.PumpProduct.Core\HStation.Service.Xhs.PumpProduct.csproj", "{37571FD9-E0AC-4AA3-AD53-9E8A539390D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Xhs.Core", "Service\HStation.Service.Xhs.Core\HStation.Service.Xhs.Core.csproj", "{62C9B772-A274-4E04-A206-50E6505614D3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Map.Core", "WinFrmUI\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj", "{62405CA1-35EB-4DBE-AD07-C16952808C9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Core", "WinFrmUI\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj", "{B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -91,10 +91,6 @@
        {A669AAEF-9242-4B78-A171-BFC98D87CE35}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {A669AAEF-9242-4B78-A171-BFC98D87CE35}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {A669AAEF-9242-4B78-A171-BFC98D87CE35}.Release|Any CPU.Build.0 = Release|Any CPU
        {32960E3C-F6A0-445F-84C0-3303B93FDD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {32960E3C-F6A0-445F-84C0-3303B93FDD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {32960E3C-F6A0-445F-84C0-3303B93FDD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {32960E3C-F6A0-445F-84C0-3303B93FDD0D}.Release|Any CPU.Build.0 = Release|Any CPU
        {84266C68-21C0-4F2D-8569-18B0CB96669D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {84266C68-21C0-4F2D-8569-18B0CB96669D}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {84266C68-21C0-4F2D-8569-18B0CB96669D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,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
@@ -139,6 +131,14 @@
        {62C9B772-A274-4E04-A206-50E6505614D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {62C9B772-A274-4E04-A206-50E6505614D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {62C9B772-A274-4E04-A206-50E6505614D3}.Release|Any CPU.Build.0 = Release|Any CPU
        {62405CA1-35EB-4DBE-AD07-C16952808C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {62405CA1-35EB-4DBE-AD07-C16952808C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {62405CA1-35EB-4DBE-AD07-C16952808C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {62405CA1-35EB-4DBE-AD07-C16952808C9A}.Release|Any CPU.Build.0 = Release|Any CPU
        {B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
    GlobalSection(SolutionProperties) = preSolution
        HideSolutionNode = FALSE
@@ -150,11 +150,9 @@
        {E692C0F6-2627-4E05-89A5-705462B3751B} = {6FA135ED-89EF-474B-B502-FEA300F613A5}
        {AC84FDBE-787C-4B95-82A2-C852A905CEA4} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
        {A669AAEF-9242-4B78-A171-BFC98D87CE35} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
        {32960E3C-F6A0-445F-84C0-3303B93FDD0D} = {00D75422-0508-4383-A558-AF5B7CB4AA7E}
        {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}
@@ -162,6 +160,8 @@
        {DA7418A4-7ABA-48C0-B7D8-4C5642BE53C1} = {67608112-BE07-493C-8240-E084CF461482}
        {37571FD9-E0AC-4AA3-AD53-9E8A539390D6} = {67608112-BE07-493C-8240-E084CF461482}
        {62C9B772-A274-4E04-A206-50E6505614D3} = {67608112-BE07-493C-8240-E084CF461482}
        {62405CA1-35EB-4DBE-AD07-C16952808C9A} = {D5B088B2-E69E-4B43-838B-080B9F012077}
        {B1F602CA-C4A9-4E2B-B9E7-69D582EC1E67} = {D5B088B2-E69E-4B43-838B-080B9F012077}
    EndGlobalSection
    GlobalSection(ExtensibilityGlobals) = postSolution
        SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}

 Setting/Hstation.Hxs.Setting/DbFirstHelper.cs

ÎļþÒÑɾ³ý

 Setting/Hstation.Hxs.Setting/Hstation.Setting.Xhs.Core.csproj

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Bimface.Core/UserControl1.cs

@@ -7,4 +7,4 @@
            InitializeComponent();
        }
    }
}
}

 WinFrmUI/HStation.WinFrmUI.Core/00-UICore/04-Óû§µÇ½Àà/LoginUser.cs

 WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.PumpProject/HStation.WinFrmUI.Xhs.PumpProject.csproj.user

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-_UserControls/XhsProjectUserControl.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/PropertySorter.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,135 @@
using System;
using System.Collections;
using System.ComponentModel;

namespace HStation.WinFrmUI.Core
{
    public class PropertySorter : ExpandableObjectConverter
    {
        #region Methods

        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
        {
            return true;
        }

        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
        {
            //
            // This override returns a list of properties in order
            //
            PropertyDescriptorCollection pdc = TypeDescriptor.GetProperties(value, attributes);
            ArrayList orderedProperties = new ArrayList();
            foreach (PropertyDescriptor pd in pdc)
            {
                Attribute attribute = pd.Attributes[typeof(PropertyOrderAttribute)];
                if (attribute != null)
                {
                    //
                    // If the attribute is found, then create an pair object to hold it
                    //
                    PropertyOrderAttribute poa = (PropertyOrderAttribute)attribute;
                    orderedProperties.Add(new PropertyOrderPair(pd.Name, poa.Order));
                }
                else
                {
                    //
                    // If no order attribute is specifed then given it an order of 0
                    //
                    orderedProperties.Add(new PropertyOrderPair(pd.Name, 0));
                }
            }
            //
            // Perform the actual order using the value PropertyOrderPair classes
            // implementation of IComparable to sort
            //
            orderedProperties.Sort();
            //
            // Build a string list of the ordered names
            //
            ArrayList propertyNames = new ArrayList();
            foreach (PropertyOrderPair pop in orderedProperties)
            {
                propertyNames.Add(pop.Name);
            }
            //
            // Pass in the ordered list for the PropertyDescriptorCollection to sort by
            //
            return pdc.Sort((string[])propertyNames.ToArray(typeof(string)));
        }

        #endregion Methods
    }

    #region Helper Class - PropertyOrderAttribute

    [AttributeUsage(AttributeTargets.Property)]
    public class PropertyOrderAttribute : Attribute
    {
        //
        // Simple attribute to allow the order of a property to be specified
        //
        private int _order;

        public PropertyOrderAttribute(int order)
        {
            _order = order;
        }

        public int Order
        {
            get
            {
                return _order;
            }
        }
    }

    #endregion Helper Class - PropertyOrderAttribute

    #region Helper Class - PropertyOrderPair

    public class PropertyOrderPair : IComparable
    {
        private int _order;
        private string _name;

        public string Name
        {
            get
            {
                return _name;
            }
        }

        public PropertyOrderPair(string name, int order)
        {
            _order = order;
            _name = name;
        }

        public int CompareTo(object obj)
        {
            //
            // Sort the pair objects by ordering by order value
            // Equal values get the same rank
            //
            int otherOrder = ((PropertyOrderPair)obj)._order;
            if (otherOrder == _order)
            {
                //
                // If order not specified, sort by name
                //
                string otherName = ((PropertyOrderPair)obj)._name;
                return string.Compare(_name, otherName);
            }
            else if (otherOrder > _order)
            {
                return -1;
            }
            return 1;
        }
    }

    #endregion Helper Class - PropertyOrderPair
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/AmapLocationViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
namespace HStation.WinFrmUI.Xhs.Core
{
    public class AmapLocationViewModel
    {
        public AmapLocationViewModel()
        {
            location = new Location();
        }

        public string id { get; set; }
        public string name { get; set; }
        public string address { get; set; }
        public Location location { get; set; }

        public long BuildTypeID { get; set; }

        public string NorthEast { get; set; }
        public string SouthWest { get; set; }
    }

    public class Location
    {
        public float lng { get; set; }
        public float lat { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/FixationReceivedViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
namespace HStation.WinFrmUI.Xhs.Core
{
    public class FixationReceivedViewModel
    {
        public string Oper { get; set; }

        public string Json { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-ViewModel/XhsProject/XhsProjectPropertyGridViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
using HStation.Dto;
using HStation.WinFrmUI.Core;
using System.ComponentModel;

namespace HStation.WinFrmUI.Xhs.Core
{
    [TypeConverter(typeof(PropertySorter))]
    public class XhsProjectPropertyGridViewModel
    {
        public XhsProjectPropertyGridViewModel(XhsProjectDto rhs)
        {
            this.Address = rhs.Address;
            this.Name = rhs.Name;
            this.ProjectNumber = rhs.PrjNumber;
            this.CreateTime = rhs.CreateTime;
            this.Description = rhs.Description;
            this.CreateName = rhs.CreateUserDisplayName;
        }

        /// <summary>
        /// åç§°
        /// </summary>
        [DisplayName("名称")]
        [Category("基本信息")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public string Name { get; set; }

        /// <summary>
        /// é¡¹ç›®ç¼–号
        /// </summary>
        [DisplayName("项目编号")]
        [Category("基本信息")]
        [Browsable(true)]
        [PropertyOrder(-9)]
        public string ProjectNumber { get; set; }

        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [DisplayName("创建时间")]
        [Category("基本信息")]
        [PropertyOrder(-10)]
        [Browsable(true)]
        public DateTime CreateTime { get; set; }

        /// <summary>
        /// åˆ›å»ºäºº
        /// </summary>
        [DisplayName("创建人")]
        [Category("基本信息")]
        [PropertyOrder(-11)]
        [Browsable(true)]
        public string CreateName { get; set; }

        /// <summary>
        /// è¯´æ˜Ž
        /// </summary>
        [DisplayName("说明")]
        [Category("基本信息")]
        [PropertyOrder(-12)]
        [Browsable(true)]
        public string Description { get; set; }

        /// <summary>
        /// åœ°å€
        /// </summary>
        [DisplayName("地址")]
        [Category("基本信息")]
        [PropertyOrder(-13)]
        [Browsable(true)]
        public string Address { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.cs

copy from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.cs
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.cs
Îļþ´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.cs ¸´ÖÆ
@@ -1,10 +1,7 @@
using HStation;
using HStation.Dto;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Xhs.PumpProject;
using HStation.Dto;
using Newtonsoft.Json;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class AddXhsProjectDlg : DevExpress.XtraEditors.XtraForm
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs

copy from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.designer.cs
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.designer.cs
Îļþ´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/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
    {
@@ -39,7 +39,7 @@
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            navigationFrame = new DevExpress.XtraBars.Navigation.NavigationFrame();
            navigationPageForm = new DevExpress.XtraBars.Navigation.NavigationPage();
            projectUserControl1 = new HStation.WinFrmUI.Xhs.PumpProject.XhsProjectUserControl();
            projectUserControl1 = new PumpProject.XhsProjectUserControl();
            navigationPageMapSelect = new DevExpress.XtraBars.Navigation.NavigationPage();
            webView21 = new Microsoft.Web.WebView2.WinForms.WebView2();
            stepProgressBar1 = new StepProgressBar();
@@ -312,15 +312,15 @@
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // AddProjectDlg
            // AddXhsProjectDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(742, 400);
            Controls.Add(dataLayoutControl1);
            Name = "AddProjectDlg";
            Name = "AddXhsProjectDlg";
            StartPosition = FormStartPosition.CenterParent;
            Text = "添加";
            Text = "导入项目";
            Load += AddProjectDlg_Load;
            ((ISupportInitialize)dataLayoutControl1).EndInit();
            dataLayoutControl1.ResumeLayout(false);

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.resx

copy from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/AddXhsProjectDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/AddXhsProjectDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,166 @@
namespace HStation.WinFrmUI.Xhs.Core
{
    partial class HomePageMainPanel
    {
        /// <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()
        {
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            xhsProjectTreeList1 = new XhsProjectTreeList();
            panelControl1 = new DevExpress.XtraEditors.PanelControl();
            mapViewProjectListContainer1 = new MapViewProjectListContainer();
            propertyGridControl1 = new DevExpress.XtraVerticalGrid.PropertyGridControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)panelControl1).BeginInit();
            panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)propertyGridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(xhsProjectTreeList1);
            layoutControl1.Controls.Add(panelControl1);
            layoutControl1.Controls.Add(propertyGridControl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(957, 518);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // xhsProjectTreeList1
            // 
            xhsProjectTreeList1.Location = new Point(2, 2);
            xhsProjectTreeList1.Name = "xhsProjectTreeList1";
            xhsProjectTreeList1.Size = new Size(146, 514);
            xhsProjectTreeList1.TabIndex = 6;
            // 
            // panelControl1
            // 
            panelControl1.Controls.Add(mapViewProjectListContainer1);
            panelControl1.Location = new Point(152, 2);
            panelControl1.Name = "panelControl1";
            panelControl1.Size = new Size(633, 514);
            panelControl1.TabIndex = 5;
            // 
            // mapViewProjectListContainer1
            // 
            mapViewProjectListContainer1.Dock = DockStyle.Fill;
            mapViewProjectListContainer1.Location = new Point(2, 2);
            mapViewProjectListContainer1.Margin = new Padding(3, 2, 3, 2);
            mapViewProjectListContainer1.Name = "mapViewProjectListContainer1";
            mapViewProjectListContainer1.Size = new Size(629, 510);
            mapViewProjectListContainer1.TabIndex = 0;
            // 
            // propertyGridControl1
            // 
            propertyGridControl1.Location = new Point(789, 2);
            propertyGridControl1.Name = "propertyGridControl1";
            propertyGridControl1.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.True;
            propertyGridControl1.Size = new Size(166, 514);
            propertyGridControl1.TabIndex = 4;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(957, 518);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = propertyGridControl1;
            layoutControlItem1.Location = new Point(787, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(170, 518);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = panelControl1;
            layoutControlItem2.Location = new Point(150, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(637, 518);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = xhsProjectTreeList1;
            layoutControlItem3.Location = new Point(0, 0);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(150, 518);
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
            // MainPanel
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "MainPanel";
            Size = new Size(957, 518);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)panelControl1).EndInit();
            panelControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)propertyGridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private Core.XhsProjectTreeList xhsProjectTreeList1;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraVerticalGrid.PropertyGridControl propertyGridControl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private MapViewProjectListContainer mapViewProjectListContainer1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
using HStation.WinFrmUI.Core;

namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class HomePageMainPanel : DocumentPage
    {
        public HomePageMainPanel()
        {
            InitializeComponent();
            this.xhsProjectTreeList1.SelectProject += XhsProjectTreeList1_SelectProjectAsync;
        }

        private BLL.XhsProject _bll = null;

        /// <summary>
        /// åˆå§‹åŒ–数据
        /// </summary>
        public override void InitialDataSource()
        {
            _bll = new BLL.XhsProject();
            this.xhsProjectTreeList1.SetBindingData();
            SetBindingData();
        }

        private async void SetBindingData()
        {
            this.mapViewProjectListContainer1.LoadCompletedEvent += MapViewProjectListContainer1_LoadCompletedEvent;
            await this.mapViewProjectListContainer1.InitialContainer();
        }

        //聚焦地图切换事件
        private async void XhsProjectTreeList1_SelectProjectAsync(string PrjID)
        {
            await mapViewProjectListContainer1.SelectProject(PrjID);
            if (long.TryParse(PrjID, out long id))
            {
                var selectchage = await _bll.GetByID(id);
                if (selectchage != null)
                {
                    propertyGridControl1.SelectedObject = new XhsProjectPropertyGridViewModel(selectchage);
                }
            }
        }

        //初始化地图撒点
        private async void MapViewProjectListContainer1_LoadCompletedEvent()
        {
            var list = new List<MapProjectViewModel>();
            var alllist = await _bll.GetAll();
            foreach (var item in alllist)
            {
                var postionchar = item.MapPosition.Split(',');
                list.Add(new MapProjectViewModel() { Id = item.ID.ToString(), Name = item.Name, Description = item.Description, Point = new Yw.Model.Map.Point(Convert.ToDouble(postionchar[0]), Convert.ToDouble(postionchar[1])) });
            }
            await mapViewProjectListContainer1.SetProjectList(list);
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.resx

copy from WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/HomePageMainPanel.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
namespace HStation.WinFrmUI.Xhs.Core
{
    partial class XhsProjectTreeList
    {
        /// <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();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XhsProjectTreeList));
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            treeList1 = new DevExpress.XtraTreeList.TreeList();
            treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            BtnImportProject = new DevExpress.XtraEditors.SimpleButton();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            bindingSource1 = new BindingSource(components);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(treeList1);
            layoutControl1.Controls.Add(BtnImportProject);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(264, 519);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // treeList1
            // 
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
            treeList1.Location = new Point(2, 2);
            treeList1.Name = "treeList1";
            treeList1.OptionsBehavior.Editable = false;
            treeList1.OptionsFind.AlwaysVisible = true;
            treeList1.OptionsFind.FindNullPrompt = "输入搜索关键词：";
            treeList1.Size = new Size(260, 475);
            treeList1.TabIndex = 0;
            treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
            treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
            treeList1.DoubleClick += treeList1_DoubleClick;
            // 
            // treeListColumn1
            // 
            treeListColumn1.Caption = "treeListColumn1";
            treeListColumn1.FieldName = "Name";
            treeListColumn1.Name = "treeListColumn1";
            treeListColumn1.Visible = true;
            treeListColumn1.VisibleIndex = 0;
            // 
            // BtnImportProject
            // 
            BtnImportProject.Appearance.BackColor = Color.MediumTurquoise;
            BtnImportProject.Appearance.Font = new Font("Tahoma", 15F, FontStyle.Bold, GraphicsUnit.Point);
            BtnImportProject.Appearance.Options.UseBackColor = true;
            BtnImportProject.Appearance.Options.UseFont = true;
            BtnImportProject.Appearance.Options.UseTextOptions = true;
            BtnImportProject.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            BtnImportProject.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnImportProject.ImageOptions.SvgImage");
            BtnImportProject.Location = new Point(2, 481);
            BtnImportProject.Name = "BtnImportProject";
            BtnImportProject.Size = new Size(260, 36);
            BtnImportProject.StyleController = layoutControl1;
            BtnImportProject.TabIndex = 2;
            BtnImportProject.Text = "导入项目";
            BtnImportProject.Click += BtnImportProject_Click;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(264, 519);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = treeList1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(264, 479);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = BtnImportProject;
            layoutControlItem2.Location = new Point(0, 479);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(264, 40);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // XhsProjectTreeList
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "XhsProjectTreeList";
            Size = new Size(264, 519);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraTreeList.TreeList treeList1;
        private DevExpress.XtraEditors.SimpleButton BtnImportProject;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private BindingSource bindingSource1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
using HStation.Dto;

namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class XhsProjectTreeList : DevExpress.XtraEditors.XtraUserControl
    {
        public XhsProjectTreeList()
        {
            InitializeComponent();
        }

        private List<XhsProjectDto> _allBindingList = null;

        private BLL.XhsProject _bll;

        public async void SetBindingData()
        {
            _bll = new BLL.XhsProject();
            var alllist = await _bll.GetAll();
            _allBindingList = alllist;
            this.treeList1.DataSource = _allBindingList;
            this.treeList1.RefreshDataSource();
        }

        public event Action<string> SelectProject;

        //双击进入项目详情事件
        private void treeList1_DoubleClick(object sender, EventArgs e)
        {
        }

        //聚焦切换
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
            if (vm != null)
            {
                SelectProject.Invoke(vm.ID.ToString());
            }
        }

        //导入项目
        private void BtnImportProject_Click(object sender, EventArgs e)
        {
            var dlg = new AddXhsProjectDlg();
            dlg.ReloadEvent += async (project, item, model, map) =>
            {
                var id = await _bll.InsertEx(project, item, model, map);
                if (id > 0)
                {
                    var vmmodel = await _bll.GetByID(id);
                    _allBindingList.Add(vmmodel);
                    this.treeList1.RefreshDataSource();
                    return true;
                }
                return false;
            };
            dlg.ShowDialog();
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-HomePageMainPanel/XhsProjectTreeList.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema 

    Version 2.0

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.

    Example:

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>

    There are any number of "resheader" rows that contain simple
    name/value pairs.

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="BtnImportProject.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iSW1wb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxN3Yx
        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
        MTRMMjIsMTd6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
        b24gcG9pbnRzPSIzMCw2IDIyLDYgMjIsMiAxNCw4IDIyLDE0IDIyLDEwIDMwLDEwICAiIGNsYXNzPSJH
        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/AmapLocationViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/FixationReceivedViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/LocViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/LocViewModel.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    public class LocViewModel
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectModelViewModel.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using HStation.Dto;

namespace HStation.WinFrmUI.Xhs.Project
namespace HStation.WinFrmUI.Xhs.Core
{
    public class XhsProjectModelViewModel : XhsProjectItemModelDto
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/00-ViewModel/XhsProjectViewModel.cs ÐÞ¸Ä
@@ -1,7 +1,7 @@
using HStation.Dto;
using Yw.Dto;

namespace HStation.WinFrmUI.Xhs.Project
namespace HStation.WinFrmUI.Xhs.Core
{
    public class XhsProjectViewModel : XhsProjectDto
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/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
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/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
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/AddXhsProjectDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/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
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/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
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/EditXhsProjectDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using Mapster;
using Yw.Dto;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    /// <summary>
    /// è®¾ç½®ä½¿ç”¨çŠ¶æ€

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetModelEditDlg.designer.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    partial class SetModelEditDlg
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetModelEditDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
using DevExpress.XtraEditors;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    /// <summary>
    /// è®¾ç½®ä½¿ç”¨çŠ¶æ€

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/SetUseStatusDlg.designer.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    partial class SetUseStatusDlg
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/SetUseStatusDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,4 @@
using HStation.WinFrmUI.Xhs.Project;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    partial class XhsModelEdit
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsModelEdit.cs ÐÞ¸Ä
@@ -1,6 +1,4 @@
using HStation.WinFrmUI.Xhs.Project;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class XhsModelEdit : DevExpress.XtraEditors.XtraForm
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsModelEdit.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.Designer.cs ÐÞ¸Ä
@@ -1,4 +1,4 @@
namespace HStation.WinFrmUI.Xhs.PumpProject
namespace 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
            // 

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.PumpProject/00-PumpProject/XhsProjectMainPanel.cs ÐÞ¸Ä
@@ -1,9 +1,4 @@
using HStation.Dto;
using HStation.WinFrmUI.Xhs;
using HStation.WinFrmUI.Xhs.Project;
using ISupply.WinFrmUI;

namespace HStation.WinFrmUI.Xhs.PumpProject
namespace HStation.WinFrmUI.Xhs.Core
{
    public partial class XhsProjectMainPanel : DocumentPage
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/00-PumpProject/XhsProjectMainPanel.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/05-Project/01-ExtractHelper/ExtractHelper.cs

 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" />
@@ -30,11 +41,55 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="map\gaode\css\" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="map\gaode\css\" />
    <Compile Update="04-HomePageMainPanel\AddXhsProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <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>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Update="04-HomePageMainPanel\XhsProjectTreeList.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-_UserControls\XhsProjectUserControl.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Update="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>

</Project>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/Resources.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//     è¿è¡Œæ—¶ç‰ˆæœ¬:4.0.30319.42000
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能会导致不正确的行为，并且如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œè¿™äº›æ›´æ”¹å°†ä¼šä¸¢å¤±ã€‚
// </auto-generated>
//------------------------------------------------------------------------------

namespace HStation.WinFrmUI.Xhs.Core.Properties {
    using System;
    
    
    /// <summary>
    ///   ä¸€ä¸ªå¼ºç±»åž‹çš„资源类，用于查找本地化的字符串等。
    /// </summary>
    // æ­¤ç±»æ˜¯ç”± StronglyTypedResourceBuilder
    // ç±»é€šè¿‡ç±»ä¼¼äºŽ ResGen æˆ– Visual Studio çš„工具自动生成的。
    // è‹¥è¦æ·»åŠ æˆ–移除成员，请编辑 .ResX æ–‡ä»¶ï¼Œç„¶åŽé‡æ–°è¿è¡Œ ResGen
    // (以 /str ä½œä¸ºå‘½ä»¤é€‰é¡¹)，或重新生成 VS é¡¹ç›®ã€‚
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
        
        private static global::System.Resources.ResourceManager resourceMan;
        
        private static global::System.Globalization.CultureInfo resourceCulture;
        
        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
        internal Resources() {
        }
        
        /// <summary>
        ///   è¿”回此类使用的缓存的 ResourceManager å®žä¾‹ã€‚
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HStation.WinFrmUI.Xhs.Core.Properties.Resources", typeof(Resources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
            }
        }
        
        /// <summary>
        ///   é‡å†™å½“前线程的 CurrentUICulture å±žæ€§ï¼Œå¯¹
        ///   ä½¿ç”¨æ­¤å¼ºç±»åž‹èµ„源类的所有资源查找执行重写。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
            get {
                return resourceCulture;
            }
            set {
                resourceCulture = value;
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/Resources.resx

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?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>
</root>

 WinFrmUI/HStation.WinFrmUI.Xhs.Curve/HStation.WinFrmUI.Xhs.Curve.csproj

@@ -11,11 +11,13 @@
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\Dto\Hstation.Dto.Core\Hstation.Dto.Core.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
  </ItemGroup>

  <ItemGroup>
    <Compile Update="XhsProjectUserControl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="XhsPumpCurveMainPanel.cs">
      <SubType>UserControl</SubType>
    </Compile>

 WinFrmUI/HStation.WinFrmUI.Xhs.Curve/HStation.WinFrmUI.Xhs.Curve.csproj.user

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup />
  <ItemGroup />
</Project>

 WinFrmUI/HStation.WinFrmUI.Xhs.Curve/XhsPumpCurveMainPanel.cs

@@ -1,6 +1,4 @@
using HStation.Dto;

namespace HStation.WinFrmUI.Xhs
namespace HStation.WinFrmUI.Xhs
{
    public partial class XhsPumpCurveMainPanel : DocumentPage
    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs

@@ -57,10 +57,14 @@
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -88,14 +92,19 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Controls.Add(BtnOk);
            layoutControl1.Controls.Add(simpleButton1);
            layoutControl1.Controls.Add(TextEditName);
@@ -363,17 +372,13 @@
            layoutControlItem13.Text = "选择分类";
            layoutControlItem13.TextSize = new Size(59, 14);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // tabbedControlGroup1
            // 
            tabbedControlGroup1.Location = new Point(0, 144);
            tabbedControlGroup1.Name = "tabbedControlGroup1";
            tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
            tabbedControlGroup1.SelectedTabPage = layoutControlGroup2;
            tabbedControlGroup1.Size = new Size(575, 241);
            tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
            tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2 });
            tabbedControlGroup1.Text = "说明";
            // 
            // layoutControlGroup1
@@ -382,6 +387,7 @@
            layoutControlGroup1.Location = new Point(0, 0);
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Size = new Size(551, 193);
            layoutControlGroup1.Text = "说明";
            // 
            // layoutControlItem5
            // 
@@ -391,6 +397,41 @@
            layoutControlItem5.Size = new Size(551, 193);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextSize = new Size(59, 14);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // layoutControlGroup2
            // 
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem14 });
            layoutControlGroup2.Location = new Point(0, 0);
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Size = new Size(551, 193);
            layoutControlGroup2.Text = "属性";
            // 
            // gridControl1
            // 
            gridControl1.Location = new Point(20, 188);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(547, 189);
            gridControl1.TabIndex = 14;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // gridView1
            // 
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            // 
            // layoutControlItem14
            // 
            layoutControlItem14.Control = gridControl1;
            layoutControlItem14.Location = new Point(0, 0);
            layoutControlItem14.Name = "layoutControlItem14";
            layoutControlItem14.Size = new Size(551, 193);
            layoutControlItem14.TextSize = new Size(0, 0);
            layoutControlItem14.TextVisible = false;
            // 
            // AddPumpProductMainDlg
            // 
@@ -428,10 +469,14 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
            ResumeLayout(false);
        }

@@ -469,5 +514,9 @@
        private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj

@@ -22,7 +22,6 @@
  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
    <ProjectReference Include="..\..\Model\HStation.Model.Xhs.PumpProduct\HStation.Model.Xhs.PumpProduct.csproj" />
    <ProjectReference Include="..\..\Setting\Hstation.Hxs.Setting\Hstation.Setting.Xhs.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
  </ItemGroup>

 WinFrmUI/Hstation.WinFrmUI.Core/Hstation.WinFrmUI.Core.csproj

@@ -13,6 +13,7 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.0.7" />
  </ItemGroup>

  <ItemGroup>