From 3a43febf276d907186808730e693215a805f8db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Tue, 20 Sep 2022 09:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BD=8D=E6=9C=BA=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmart.ConfigurationSoftware.csproj     |  2 +-
 .../BasicInformation.cs                       | 18 +++++++
 BPASmart.ConfigurationSoftware/Global.cs      | 32 +++++++++++
 .../MainCanvasPageModel.cs                    | 16 ++++++
 .../MainWindow.xaml                           | 12 +++--
 .../MainWindowViewModel.cs                    | 53 +++++++++++++------
 .../NewPageView.xaml                          | 17 ++++--
 .../NewPageView.xaml.cs                       |  7 ++-
 .../NewProjectView.xaml                       |  9 +++-
 .../NewProjectViewModel.cs                    | 39 ++++++++++----
 BPASmart.Server/BPASmart.Server.csproj        |  2 +-
 BeDesignerSCADA/Controls/MainCanvasPanel.xaml |  2 +-
 BeDesignerSCADA/Themes/Styles.xaml            | 28 +++++-----
 ComputerTestDemo/ComputerTestDemo.csproj      |  2 +-
 14 files changed, 189 insertions(+), 50 deletions(-)
 create mode 100644 BPASmart.ConfigurationSoftware/BasicInformation.cs
 create mode 100644 BPASmart.ConfigurationSoftware/Global.cs
 create mode 100644 BPASmart.ConfigurationSoftware/MainCanvasPageModel.cs

diff --git a/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj b/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
index b5565f9c..444235a8 100644
--- a/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
+++ b/BPASmart.ConfigurationSoftware/BPASmart.ConfigurationSoftware.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.7" />
+    <PackageReference Include="BPA.Helper" Version="1.0.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BPASmart.ConfigurationSoftware/BasicInformation.cs b/BPASmart.ConfigurationSoftware/BasicInformation.cs
new file mode 100644
index 00000000..99d2958d
--- /dev/null
+++ b/BPASmart.ConfigurationSoftware/BasicInformation.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.ConfigurationSoftware
+{
+    public class BasicInformation
+    {
+        /// <summary>
+        /// 项目上次保存的目录
+        /// </summary>
+        public string ProjectDefaultPath { get; set; } = string.Empty;
+
+
+    }
+}
diff --git a/BPASmart.ConfigurationSoftware/Global.cs b/BPASmart.ConfigurationSoftware/Global.cs
new file mode 100644
index 00000000..f86d5c5e
--- /dev/null
+++ b/BPASmart.ConfigurationSoftware/Global.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.ConfigurationSoftware
+{
+    public class Global
+    {
+        /// <summary>
+        /// 页面文件夹名称
+        /// </summary>
+        public const string PageDirectoryName = "Layouts";
+
+
+        /// <summary>
+        /// 项目路径
+        /// </summary>
+        public static string ProjectPath { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public static string ProjectName { get; set; }
+
+        /// <summary>
+        /// 变量管理器路径
+        /// </summary>
+        public static string VarManagerPath => $"{AppDomain.CurrentDomain.BaseDirectory}BPASmart.VariableManager.exe";
+    }
+}
diff --git a/BPASmart.ConfigurationSoftware/MainCanvasPageModel.cs b/BPASmart.ConfigurationSoftware/MainCanvasPageModel.cs
new file mode 100644
index 00000000..e0720a0d
--- /dev/null
+++ b/BPASmart.ConfigurationSoftware/MainCanvasPageModel.cs
@@ -0,0 +1,16 @@
+using BeDesignerSCADA.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmart.ConfigurationSoftware
+{
+    public class MainCanvasPageModel
+    {
+        public MainCanvasPanel MainCanvasPanelModel { get; set; }
+        public string PageName { get; set; }
+
+    }
+}
diff --git a/BPASmart.ConfigurationSoftware/MainWindow.xaml b/BPASmart.ConfigurationSoftware/MainWindow.xaml
index df41ee7b..ba4e971b 100644
--- a/BPASmart.ConfigurationSoftware/MainWindow.xaml
+++ b/BPASmart.ConfigurationSoftware/MainWindow.xaml
@@ -121,7 +121,7 @@
             <Button
                 Width="60"
                 Margin="5"
-                Command="{Binding NewCommand}"
+                Command="{Binding SaveCommand}"
                 Content="保存" />
 
             <Button
@@ -195,9 +195,15 @@
                 </ScrollViewer>
             </Grid>
 
-            <Canvas Name="cav" Grid.Column="1" Grid.Row="1">
+            <ContentControl
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="auto"
+                Height="auto"
+                Content="{Binding MainContent}" />
+            <!--<Canvas Name="cav" Grid.Column="1" Grid.Row="1">
 
-            </Canvas>
+            </Canvas>-->
 
         </Grid>
 
diff --git a/BPASmart.ConfigurationSoftware/MainWindowViewModel.cs b/BPASmart.ConfigurationSoftware/MainWindowViewModel.cs
index aeb7a1f5..ac95b7d1 100644
--- a/BPASmart.ConfigurationSoftware/MainWindowViewModel.cs
+++ b/BPASmart.ConfigurationSoftware/MainWindowViewModel.cs
@@ -11,27 +11,26 @@ using System.IO;
 using BPA.Helper;
 using System.Diagnostics;
 using BeDesignerSCADA;
+using BeDesignerSCADA.Controls;
+using System.Windows;
+using System.Reflection;
 
 namespace BPASmart.ConfigurationSoftware
 {
     public class MainWindowViewModel : NoticeBase
     {
-        string LayoutPath
-        {
-            get
-            {
-                Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"AccessFile\\Layouts"));
-                return $"{AppDomain.CurrentDomain.BaseDirectory}AccessFile\\Layouts\\";
-            }
-        }
 
         public MainWindowViewModel()
         {
+
             ActionManage.GetInstance.Register(new Action<object>((o) =>
             {
                 Pages.Add(o.ToString());
-                File.WriteAllText(LayoutPath + o.ToString(), null, Encoding.Unicode);
-            }), "PageName");
+                string path = $"{Global.ProjectPath}\\{Global.PageDirectoryName}";
+                Directory.CreateDirectory(path);
+                File.WriteAllText($"{path}\\{o.ToString()}.lay", null, Encoding.Unicode);
+            }), "AddPage");
+
             NewCommand = new RelayCommand(() =>
             {
                 NewProjectView newProjectView = new NewProjectView();
@@ -40,8 +39,11 @@ namespace BPASmart.ConfigurationSoftware
                 {
                     if (newProjectView.Tag != null && newProjectView.Tag is NewDataModel objModel)
                     {
-                        Directory.CreateDirectory(Path.Combine(objModel.ProjectPath, objModel.ProjectName));
+                        string path = $"{objModel.ProjectPath}\\{objModel.ProjectName}";
+                        Directory.CreateDirectory(path);
+                        Global.ProjectPath = path;
                         Head = objModel.ProjectName;
+                        Global.ProjectName = objModel.ProjectName;
                     }
                 }
             });
@@ -54,20 +56,38 @@ namespace BPASmart.ConfigurationSoftware
 
             OpenVarManagerCommand = new RelayCommand(() =>
             {
-                string path = $"{AppDomain.CurrentDomain.BaseDirectory}BPASmart.VariableManager.exe";
-                if (File.Exists(path))
+                if (File.Exists(Global.VarManagerPath))
                 {
                     Process[] pro = Process.GetProcesses();
                     if (pro?.ToList().FirstOrDefault(p => p.ProcessName.Contains("BPASmart.VariableManager")) == null)
                     {
-                        Process.Start(path);
+                        Process.Start(Global.VarManagerPath);
                     }
                 }
             });
 
             SelectedCommand = new RelayCommand<object>((o) =>
             {
+                string path = $"{Global.ProjectPath}\\{Global.PageDirectoryName}\\{o.ToString()}.lay";
+                mainCanvasPanels.Add(new MainCanvasPageModel()
+                {
+                    MainCanvasPanelModel = new MainCanvasPanel(path),
+                    PageName = o.ToString(),
+                });
+                var res = mainCanvasPanels.FirstOrDefault(p => p.PageName == o.ToString());
+                if (res != null)
+                {
+                    ConstructorInfo cti = res.MainCanvasPanelModel.GetType()?.GetConstructor(System.Type.EmptyTypes);
+                    MainContent = (FrameworkElement)cti?.Invoke(null);
+                }
+            });
 
+            SaveCommand = new RelayCommand(() =>
+            {
+                for (int i = 0; i < mainCanvasPanels.Count; i++)
+                {
+                    mainCanvasPanels.ElementAt(i).MainCanvasPanelModel.FileSave();
+                }
             });
         }
 
@@ -84,7 +104,10 @@ namespace BPASmart.ConfigurationSoftware
         public string Head { get { return _mHead; } set { _mHead = value; OnPropertyChanged(); } }
         private string _mHead;
 
-        //public ObservableCollection<MainCanvasPanel>
+        public FrameworkElement MainContent { get { return _mMainContent; } set { _mMainContent = value; OnPropertyChanged(); } }
+        private FrameworkElement _mMainContent;
+
+        public List<MainCanvasPageModel> mainCanvasPanels { get; set; } = new List<MainCanvasPageModel>();
 
         public ObservableCollection<string> Pages { get; set; } = new ObservableCollection<string>();
 
diff --git a/BPASmart.ConfigurationSoftware/NewPageView.xaml b/BPASmart.ConfigurationSoftware/NewPageView.xaml
index f120779a..a6901cd7 100644
--- a/BPASmart.ConfigurationSoftware/NewPageView.xaml
+++ b/BPASmart.ConfigurationSoftware/NewPageView.xaml
@@ -32,19 +32,30 @@
             Text="{Binding NewData.ProjectName}" />
 
 
-        <Grid Grid.Row="4">
+        <TextBlock
+            Name="ErrorInfo"
+            Grid.Row="2"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Foreground="Red" />
+
+        <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="35*" />
                 <ColumnDefinition Width="32*" />
                 <ColumnDefinition Width="3*" />
             </Grid.ColumnDefinitions>
 
-            <Button Margin="10,2,10,2" Content="创建" Click="Button_Click_1" />
+            <Button
+                Margin="10,2,10,2"
+                Click="Button_Click_1"
+                Content="创建" />
             <Button
                 Grid.Column="1"
                 Grid.ColumnSpan="2"
                 Margin="10,2,10,2"
-                Content="取消" Click="Button_Click" />
+                Click="Button_Click"
+                Content="取消" />
 
         </Grid>
 
diff --git a/BPASmart.ConfigurationSoftware/NewPageView.xaml.cs b/BPASmart.ConfigurationSoftware/NewPageView.xaml.cs
index 617c82bf..6456b83f 100644
--- a/BPASmart.ConfigurationSoftware/NewPageView.xaml.cs
+++ b/BPASmart.ConfigurationSoftware/NewPageView.xaml.cs
@@ -35,10 +35,15 @@ namespace BPASmart.ConfigurationSoftware
         {
             if (this.pageName.Text.Trim().Length > 0)
             {
+
                 this.DialogResult = true;
-                ActionManage.GetInstance.Send("PageName", this.pageName.Text);
+                ActionManage.GetInstance.Send("AddPage", this.pageName.Text);
                 this.Close();
             }
+            else
+            {
+                ErrorInfo.Text = "请输入页面名称";
+            }
 
         }
     }
diff --git a/BPASmart.ConfigurationSoftware/NewProjectView.xaml b/BPASmart.ConfigurationSoftware/NewProjectView.xaml
index bacd6a3a..842e2202 100644
--- a/BPASmart.ConfigurationSoftware/NewProjectView.xaml
+++ b/BPASmart.ConfigurationSoftware/NewProjectView.xaml
@@ -23,6 +23,7 @@
             <RowDefinition />
             <RowDefinition />
             <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
 
         <TextBlock VerticalAlignment="Center" Text="项目名称：" />
@@ -48,7 +49,13 @@
                 Content="..." />
         </Grid>
 
-        <Grid Grid.Row="4">
+        <TextBlock
+            Grid.Row="4"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Text="{Binding ErrorInfo}" Foreground="Red"/>
+
+        <Grid Grid.Row="5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="35*" />
                 <ColumnDefinition Width="32*" />
diff --git a/BPASmart.ConfigurationSoftware/NewProjectViewModel.cs b/BPASmart.ConfigurationSoftware/NewProjectViewModel.cs
index 44e0bf32..ea53afb7 100644
--- a/BPASmart.ConfigurationSoftware/NewProjectViewModel.cs
+++ b/BPASmart.ConfigurationSoftware/NewProjectViewModel.cs
@@ -8,43 +8,64 @@ using Microsoft.Toolkit.Mvvm.Input;
 using System.Windows;
 using BPA.Helper;
 using System.Windows.Forms;
+using System.IO;
+
 namespace BPASmart.ConfigurationSoftware
 {
     public class NewProjectViewModel : NoticeBase
     {
         public NewProjectViewModel()
         {
+            Json<BasicInformation>.Read();
+            NewData.ProjectPath = Json<BasicInformation>.Data.ProjectDefaultPath;
             OpenBrowserDialogCommand = new RelayCommand(() =>
             {
                 FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog();
                 if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
                 {
                     NewData.ProjectPath = folderBrowserDialog.SelectedPath;
+                    Json<BasicInformation>.Data.ProjectDefaultPath = NewData.ProjectPath;
+                    Json<BasicInformation>.Save();
                 }
             });
 
             CreateCommand = new RelayCommand(() =>
             {
-                ActionManage.GetInstance.Send("CreateCommand", NewData);
+                if (NewData.ProjectName == null || NewData.ProjectName?.Length <= 0)
+                {
+                    ErrorInfo = "项目名不能为空";
+                    return;
+                }
+
+                if (NewData.ProjectPath == null || NewData.ProjectPath?.Length <= 0)
+                {
+                    ErrorInfo = "项目路径不合法";
+                    return;
+                }
+                var res = Directory.GetDirectories(NewData.ProjectPath);
+                if (res?.ToList()?.FirstOrDefault(p => p.Contains(NewData.ProjectName)) == null)
+                {
+                    ActionManage.GetInstance.Send("CreateCommand", NewData);
+                }
+                else
+                {
+                    ErrorInfo = "该项目已经存在";
+                    return;
+                }
+
             });
 
             CancelCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("CancelCommand"); });
 
         }
 
-
-
         public NewDataModel NewData { get { return _mNewData; } set { _mNewData = value; OnPropertyChanged(); } }
         private NewDataModel _mNewData = new NewDataModel();
 
 
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo;
 
-        //public string ProjectName { get { return _mProjectName; } set { _mProjectName = value; OnPropertyChanged(); } }
-        //private string _mProjectName;
-
-
-        //public string ProjectPath { get { return _mProjectPath; } set { _mProjectPath = value; OnPropertyChanged(); } }
-        //private string _mProjectPath;
 
         public RelayCommand CreateCommand { get; set; }
 
diff --git a/BPASmart.Server/BPASmart.Server.csproj b/BPASmart.Server/BPASmart.Server.csproj
index e4bed9c3..3815b1c3 100644
--- a/BPASmart.Server/BPASmart.Server.csproj
+++ b/BPASmart.Server/BPASmart.Server.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.13" />
-    <PackageReference Include="BPA.Helper" Version="1.0.7" />
+    <PackageReference Include="BPA.Helper" Version="1.0.8" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
index 9b56aae9..51714989 100644
--- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
+++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
@@ -138,7 +138,7 @@
             <!--中间画布-->
             <Border BorderThickness="1" BorderBrush="{StaticResource AccentBrush}" Margin="4">
                 <Border.Background>
-                    <ImageBrush ImageSource="/Images/bj.png" Stretch="UniformToFill"/>
+                    <ImageBrush ImageSource="../Images/bj.png" Stretch="UniformToFill"/>
                 </Border.Background>
                 <Grid>
                     <Grid.ColumnDefinitions>
diff --git a/BeDesignerSCADA/Themes/Styles.xaml b/BeDesignerSCADA/Themes/Styles.xaml
index 1619a743..7ca408ee 100644
--- a/BeDesignerSCADA/Themes/Styles.xaml
+++ b/BeDesignerSCADA/Themes/Styles.xaml
@@ -300,16 +300,16 @@
                 <Setter TargetName="txt" Property="Text" Value="物料仓" />
             </DataTrigger>
             <DataTrigger Binding="{Binding Name}" Value="NewConveyorBelt">
-                <Setter Property="Kind" TargetName="icon" Value="Attachment"/>
-                <Setter Property="Text" TargetName="txt" Value="滚动线"/>
+                <Setter TargetName="icon" Property="Kind" Value="Attachment" />
+                <Setter TargetName="txt" Property="Text" Value="滚动线" />
             </DataTrigger>
             <DataTrigger Binding="{Binding Name}" Value="TheDataGrid">
-                <Setter Property="Kind" TargetName="icon" Value="BorderAll"/>
-                <Setter Property="Text" TargetName="txt" Value="表格"/>
+                <Setter TargetName="icon" Property="Kind" Value="BorderAll" />
+                <Setter TargetName="txt" Property="Text" Value="表格" />
             </DataTrigger>
             <DataTrigger Binding="{Binding Name}" Value="TheListBox">
-                <Setter Property="Kind" TargetName="icon" Value="ViewHeadline"/>
-                <Setter Property="Text" TargetName="txt" Value="列表控件"/>
+                <Setter TargetName="icon" Property="Kind" Value="ViewHeadline" />
+                <Setter TargetName="txt" Property="Text" Value="列表控件" />
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheRedis">
@@ -323,23 +323,23 @@
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheProgressBar">
-                <Setter Property="Kind" TargetName="icon" Value="Texture"/>
-                <Setter Property="Text" TargetName="txt" Value="进度条正常"/>
+                <Setter TargetName="icon" Property="Kind" Value="Texture" />
+                <Setter TargetName="txt" Property="Text" Value="进度条正常" />
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheRedProgressBar">
-                <Setter Property="Kind" TargetName="icon" Value="CircleSlice5"/>
-                <Setter Property="Text" TargetName="txt" Value="进度条圆形红"/>
+                <Setter TargetName="icon" Property="Kind" Value="CircleSlice5" />
+                <Setter TargetName="txt" Property="Text" Value="进度条圆形红" />
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheBlueProgressBar">
-                <Setter Property="Kind" TargetName="icon" Value="CircleSlice5"/>
-                <Setter Property="Text" TargetName="txt" Value="进度条圆形蓝"/>
+                <Setter TargetName="icon" Property="Kind" Value="CircleSlice5" />
+                <Setter TargetName="txt" Property="Text" Value="进度条圆形蓝" />
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheGreenProgressBar">
-                <Setter Property="Kind" TargetName="icon" Value="CircleSlice5"/>
-                <Setter Property="Text" TargetName="txt" Value="进度条圆形绿"/>
+                <Setter TargetName="icon" Property="Kind" Value="CircleSlice5" />
+                <Setter TargetName="txt" Property="Text" Value="进度条圆形绿" />
             </DataTrigger>
 
             <DataTrigger Binding="{Binding Name}" Value="TheAPI">
diff --git a/ComputerTestDemo/ComputerTestDemo.csproj b/ComputerTestDemo/ComputerTestDemo.csproj
index e0ff7113..47c75072 100644
--- a/ComputerTestDemo/ComputerTestDemo.csproj
+++ b/ComputerTestDemo/ComputerTestDemo.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Communication" Version="1.0.13" />
-    <PackageReference Include="BPA.Helper" Version="1.0.7" />
+    <PackageReference Include="BPA.Helper" Version="1.0.8" />
   </ItemGroup>
 
   <ItemGroup>