更新控件集合

BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj

@@ -90,10 +90,6 @@
     <PackageReference Include="StackExchange.Redis" Version="2.6.66" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BPASmart.Model\BPASmart.Model.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Antlr3.Runtime">
       <HintPath>..\BPASmartClient.Compiler\DLL\Antlr3.Runtime.dll</HintPath>

BPASmartClient.SCADAControl/CustomerControls/SwitchButton.cs

@@ -1,25 +1,14 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls
 {

BPASmartClient.SCADAControl/CustomerControls/TheAPI.xaml.cs

@@ -1,27 +1,12 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
-using BPASmartClient.SCADAControl.EnumClass;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using StackExchange.Redis;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 

BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs

@@ -1,23 +1,11 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace BPASmartClient.SCADAControl.CustomerControls
 {

BPASmartClient.SCADAControl/CustomerControls/TheDataGrid.xaml.cs

@@ -1,7 +1,4 @@
 using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl.Converters;
-using BPASmartClient.SCADAControl.EnumClass;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -9,17 +6,8 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls

BPASmartClient.SCADAControl/CustomerControls/TheListBox.xaml.cs

@@ -1,25 +1,14 @@
 using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl.Converters;
-using BPASmartClient.SCADAControl.EnumClass;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 using System.Xml;
 

BPASmartClient.SCADAControl/CustomerControls/TheMQTT.xaml.cs

@@ -1,24 +1,12 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
-using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls

BPASmartClient.SCADAControl/CustomerControls/TheRedis.xaml.cs

@@ -1,24 +1,13 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls

BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs

@@ -1,25 +1,12 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls
 {

BPASmartClient.SCADAControl/CustomerControls/TheToggleButton.xaml.cs

@@ -1,26 +1,11 @@
-using BPASmart.Model;
-using BPASmartClient.Compiler;
-
-using BPASmartClient.SCADAControl;
+using BPASmartClient.Compiler;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace BPASmartClient.SCADAControl.CustomerControls
 {

BPASmartClient.SCADAControl/EnumClass/DataTypeEnum.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.SCADAControl.EnumClass
+namespace BPASmartClient.SCADAControl
 {
     /// <summary>
     /// 数据来源类型
@@ -46,4 +46,65 @@ namespace BPASmartClient.SCADAControl.EnumClass
         GET,
         PUT
     }
+
+    /// <summary>
+    /// 数据类型枚举
+    /// </summary>
+    public enum EDataType
+    {
+        Bool = 1,
+        Byte = 2,
+        Int = 3,
+        Word = 4,
+        Dint = 5,
+        Dword = 6,
+        Float = 7,
+        Double = 8,
+        String = 9,
+    }
+
+    public class ReeisDataModel
+    {
+        public string VarName { get; set; }
+        public string VarVaule { get; set; }
+        public EDataType DataType { get; set; }
+    }
+
+    public class PublishModel
+    {
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string DeviceName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 变量实际地址
+        /// </summary>
+        public string RealAddress { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 变量名称
+        /// </summary>
+        public string VarName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 变量长度
+        /// </summary>
+        public int Length { get; set; } = 1;
+
+        /// <summary>
+        /// 变量当前值
+        /// </summary>
+        public string Value { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 变量数据类型
+        /// </summary>
+        public EDataType DataType { get; set; }
+
+    }
+    public class PublishInfo 
+    {
+        public List<PublishModel> PublishModels { get; set; } = new List<PublishModel>();
+    }
 }