From 9a84ad998ea7c0c69b5ce4c3e8cb1e24fac079eb Mon Sep 17 00:00:00 2001 From: rainerosion Date: Tue, 31 Jan 2023 18:02:56 +0800 Subject: [PATCH] refact: mvp --- Tech/Model/Equipment.cs | 59 +++++++++++++++++++++ Tech/Model/Repository/Impl/package-info.cs | 7 +++ Tech/Presenter/package-info.cs | 7 +++ Tech/Tech.csproj | 41 +++++++------- Tech/{ => Util}/ArpUtil.cs | 0 Tech/{ => Util}/GetIPNetTable.cs | 0 Tech/{util => Util}/Thumbnail.cs | 0 Tech/{ => View/Impl}/MainForm.Designer.cs | 0 Tech/{ => View/Impl}/MainForm.cs | 0 Tech/{ => View/Impl}/MainForm.resx | 0 Tech/{ => View/Impl}/PlayerView.Designer.cs | 0 Tech/{ => View/Impl}/PlayerView.cs | 0 Tech/{ => View/Impl}/PlayerView.resx | 0 13 files changed, 95 insertions(+), 19 deletions(-) create mode 100644 Tech/Model/Equipment.cs create mode 100644 Tech/Model/Repository/Impl/package-info.cs create mode 100644 Tech/Presenter/package-info.cs rename Tech/{ => Util}/ArpUtil.cs (100%) rename Tech/{ => Util}/GetIPNetTable.cs (100%) rename Tech/{util => Util}/Thumbnail.cs (100%) rename Tech/{ => View/Impl}/MainForm.Designer.cs (100%) rename Tech/{ => View/Impl}/MainForm.cs (100%) rename Tech/{ => View/Impl}/MainForm.resx (100%) rename Tech/{ => View/Impl}/PlayerView.Designer.cs (100%) rename Tech/{ => View/Impl}/PlayerView.cs (100%) rename Tech/{ => View/Impl}/PlayerView.resx (100%) diff --git a/Tech/Model/Equipment.cs b/Tech/Model/Equipment.cs new file mode 100644 index 0000000..117aa36 --- /dev/null +++ b/Tech/Model/Equipment.cs @@ -0,0 +1,59 @@ +using System; + +namespace Tech_Demo.Model +{ + public class Equipment + { + /** + * 编号 + */ + public int Id { get; set; } + + /** + * 名称 + */ + public string Name { get; set; } + + /** + * ip + */ + public string Ip { get; set; } + + /** + * 地址 + */ + public string Url { get; set; } + + /** + * 设备类型 + */ + public int Type { get; set; } + + public override string ToString() + { + return base.ToString(); + } + + public override bool Equals(object obj) + { + var equipment = obj as Equipment; + return base.Equals(equipment); + } + + public override int GetHashCode() + { + return Id.GetHashCode() ^ Name.GetHashCode() ^ Ip.GetHashCode() ^ Url.GetHashCode() ^ Type.GetHashCode(); + } + + public bool Equals(Equipment equipment) + { + if (equipment == null) + { + return false; + } + + return Id == equipment.Id && Name == equipment.Name && Ip == equipment.Ip && Url == equipment.Url && + Type == equipment.Type; + } + } +} \ No newline at end of file diff --git a/Tech/Model/Repository/Impl/package-info.cs b/Tech/Model/Repository/Impl/package-info.cs new file mode 100644 index 0000000..51399d0 --- /dev/null +++ b/Tech/Model/Repository/Impl/package-info.cs @@ -0,0 +1,7 @@ +namespace Tech_Demo.Model.Repository.Impl +{ + public class package_info + { + + } +} \ No newline at end of file diff --git a/Tech/Presenter/package-info.cs b/Tech/Presenter/package-info.cs new file mode 100644 index 0000000..3b015f8 --- /dev/null +++ b/Tech/Presenter/package-info.cs @@ -0,0 +1,7 @@ +namespace Tech_Demo.Presenter +{ + public class package_info + { + + } +} \ No newline at end of file diff --git a/Tech/Tech.csproj b/Tech/Tech.csproj index 8b1f44b..6370625 100644 --- a/Tech/Tech.csproj +++ b/Tech/Tech.csproj @@ -84,20 +84,9 @@ - - - Form - - - MainForm.cs - - - - UserControl - - - PlayerView.cs - + + + @@ -106,13 +95,21 @@ UCOverview.cs - - + + + + + Form + + MainForm.cs - - + + + UserControl + + PlayerView.cs - + ResXFileCodeGenerator Resources.Designer.cs @@ -126,6 +123,12 @@ UCOverview.cs + + MainForm.cs + + + PlayerView.cs + SettingsSingleFileGenerator diff --git a/Tech/ArpUtil.cs b/Tech/Util/ArpUtil.cs similarity index 100% rename from Tech/ArpUtil.cs rename to Tech/Util/ArpUtil.cs diff --git a/Tech/GetIPNetTable.cs b/Tech/Util/GetIPNetTable.cs similarity index 100% rename from Tech/GetIPNetTable.cs rename to Tech/Util/GetIPNetTable.cs diff --git a/Tech/util/Thumbnail.cs b/Tech/Util/Thumbnail.cs similarity index 100% rename from Tech/util/Thumbnail.cs rename to Tech/Util/Thumbnail.cs diff --git a/Tech/MainForm.Designer.cs b/Tech/View/Impl/MainForm.Designer.cs similarity index 100% rename from Tech/MainForm.Designer.cs rename to Tech/View/Impl/MainForm.Designer.cs diff --git a/Tech/MainForm.cs b/Tech/View/Impl/MainForm.cs similarity index 100% rename from Tech/MainForm.cs rename to Tech/View/Impl/MainForm.cs diff --git a/Tech/MainForm.resx b/Tech/View/Impl/MainForm.resx similarity index 100% rename from Tech/MainForm.resx rename to Tech/View/Impl/MainForm.resx diff --git a/Tech/PlayerView.Designer.cs b/Tech/View/Impl/PlayerView.Designer.cs similarity index 100% rename from Tech/PlayerView.Designer.cs rename to Tech/View/Impl/PlayerView.Designer.cs diff --git a/Tech/PlayerView.cs b/Tech/View/Impl/PlayerView.cs similarity index 100% rename from Tech/PlayerView.cs rename to Tech/View/Impl/PlayerView.cs diff --git a/Tech/PlayerView.resx b/Tech/View/Impl/PlayerView.resx similarity index 100% rename from Tech/PlayerView.resx rename to Tech/View/Impl/PlayerView.resx