[modify] 修改灯光控制接口

AutoWeightServer/App.config

@@ -40,6 +40,7 @@
 		<!--指示灯继电器-->
 		<add key="Light_Relay_COM" value="COM4" />
 		<add key="Light_Relay_BaudRate" value="9600" />
+		<add key="Light_Code_Name" value="lightCode3.json" />
 		<add key="Light_Interval" value="8000" />
 		<add key="Light_Blink" value="300" />
 		<!--Led控制-->

AutoWeightServer/AutoWeightServer.csproj

@@ -10,6 +10,7 @@
     <RootNamespace>EC.AutoWeightServer</RootNamespace>
     <AssemblyName>AutoWeightServer</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -192,7 +193,6 @@
     <Compile Include="IfManager\LedZK\LedZKSDK.cs" />
     <Compile Include="IfManager\Light\ILightManager.cs" />
     <Compile Include="IfManager\Light\ILightRelay.cs" />
-    <Compile Include="IfManager\Light\Light2Manager.cs" />
     <Compile Include="IfManager\Light\LightManager.cs" />
     <Compile Include="IfManager\Light\LightRelay.cs" />
     <Compile Include="IfManager\Scales\Scales.cs" />
@@ -328,6 +328,18 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="conf\lightCodeTemplate.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="conf\lightCode3.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="conf\lightCode2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="conf\lightCode.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">

AutoWeightServer/Center/DeviceCenter.cs

@@ -218,7 +218,8 @@ namespace EC.AutoWeightServer.Center
 		{
 			var com = ServerConfig.LightRelayCom;
 			var rate = ServerConfig.LightRelayBaudRate;
-			LightManager = new Light2Manager(com, rate);
+			var name = ServerConfig.LightCodeName;
+			LightManager = new LightManager(com, rate, name);
 			LightManager.StartServer();
 		}
 

AutoWeightServer/IfManager/Light/Light2Manager.cs

@@ -1,178 +0,0 @@
-using System.Collections.Generic;
-
-namespace EC.AutoWeightServer.IfManager.Light
-{
-	public class Light2Manager : ILightManager
-	{
-		private LightRelay _lightRelay;
-		private string _comName;
-		private int _baudRate;
-
-		public Light2Manager()
-		{
-		}
-
-		public Light2Manager(string comName, int baudRate)
-		{
-			_comName = comName;
-			_baudRate = baudRate;
-		}
-
-		#region Start & Stop Server
-
-		/// <summary>
-		/// 开启连接
-		/// </summary>
-		/// <returns></returns>
-		public bool StartServer()
-		{
-			_lightRelay = new LightRelay(_comName, _baudRate);
-			var ret = _lightRelay.StartServer();
-			return ret;
-		}
-
-		/// <summary>
-		/// 关闭连接
-		/// </summary>
-		/// <returns></returns>
-		public bool StopServer()
-		{
-			_lightRelay?.StopServer();
-			_lightRelay = null;
-			return true;
-		}
-
-		public bool IsOpen()
-		{
-			return _lightRelay?.IsOpen() ?? false;
-		}
-
-		#endregion Start & Stop Server
-
-		#region Control Lights Code
-
-		//private int num = 0xFF;
-
-		/// <summary>
-		/// 控制所有灯编码，1 为开启所有灯，2 为关闭所有灯
-		/// </summary>
-		private readonly List<string> _ctrlAllLightCodeList = new List<string>() { "", "01108050000204020F0804A0ED", "011080500002040200080490EE" };
-
-		/// <summary>
-		/// 开启某一路灯编码，不互斥，index 互相对应
-		/// </summary>
-		private readonly List<string> _openLightCodeList = new List<string>() { "", "01050000FF008C3A", "01050001FF00DDFA", "01050002FF002DFA", "01050003FF007C3A" };
-
-		/// <summary>
-		/// 关闭某一路灯编码，不互斥,index 互相对应
-		/// </summary>
-		private readonly List<string> _closeLightCodeList = new List<string>() { "", "010500000000CDCA", "0105000100009C0A", "0105000200006C0A", "0105000300003DCA" };
-
-		/// <summary>
-		/// 互锁编码，控制只有一路灯亮，index 互相对应
-		/// </summary>
-		private readonly List<string> _lockLightOnCodeList = new List<string>() { "", "0110805000020402010804C12E", "0110805000020402020804312E", "0110805000020402040804D12F", "0110805000020402080804112C" };
-
-		/// <summary>
-		/// 互锁编码，控制只有一路灯灭，index 互相对应
-		/// </summary>
-		private readonly List<string> _lockLightOffCodeList = new List<string>() { "", "01108050000204020E0804F12D", "01108050000204020D0804012D", "01108050000204020B0804E12C", "0110805000020402070804212F" };
-
-		#endregion Control Lights Code
-
-		#region Control Lights
-
-		/// <summary>
-		/// 开启所有灯
-		/// </summary>
-		/// <returns></returns>
-		public bool OpenAllLight()
-		{
-			var code = _ctrlAllLightCodeList[1];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 关闭所有灯
-		/// </summary>
-		/// <returns></returns>
-		public bool CloseAllLight()
-		{
-			var code = _ctrlAllLightCodeList[2];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 开启某一路灯
-		/// </summary>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		public bool OpenLight(int index)
-		{
-			var codeList = _openLightCodeList;
-			if (!IsIndexValid(codeList, index))
-				return false;
-			var code = codeList[index];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 关闭某一路灯
-		/// </summary>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		public bool CloseLight(int index)
-		{
-			var codeList = _closeLightCodeList;
-			if (!IsIndexValid(codeList, index))
-				return false;
-			var code = codeList[index];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 互斥开某一路灯
-		/// </summary>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		public bool LockLightOn(int index)
-		{
-			var codeList = _lockLightOnCodeList;
-			if (!IsIndexValid(codeList, index))
-				return false;
-			var code = codeList[index];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 互斥关某一路灯
-		/// </summary>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		public bool LockLightOff(int index)
-		{
-			var codeList = _lockLightOffCodeList;
-			if (!IsIndexValid(codeList, index))
-				return false;
-			var code = codeList[index];
-			return _lightRelay.SendHex(code);
-		}
-
-		/// <summary>
-		/// 判断功能码是否可以使用
-		/// </summary>
-		/// <param name="codeList"></param>
-		/// <param name="index"></param>
-		/// <returns></returns>
-		private bool IsIndexValid(List<string> codeList, int index)
-		{
-			if (codeList == null)
-				return false;
-			if (index < 1 || index > codeList.Count - 1)
-				return false;
-			return true;
-		}
-
-		#endregion Control Lights
-	}
-}

AutoWeightServer/IfManager/Light/LightManager.cs

@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+using EC.Utils;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+using System.IO;
 
 namespace EC.AutoWeightServer.IfManager.Light
 {
@@ -7,15 +10,19 @@ namespace EC.AutoWeightServer.IfManager.Light
 		private LightRelay _lightRelay;
 		private string _comName;
 		private int _baudRate;
+		private string _fileName;
 
 		public LightManager()
 		{
 		}
 
-		public LightManager(string comName, int baudRate)
+		public LightManager(string comName, int baudRate, string fileName)
 		{
 			_comName = comName;
 			_baudRate = baudRate;
+			_fileName = fileName;
+
+			ReadLightCodeJson();
 		}
 
 		#region Start & Stop Server
@@ -54,27 +61,39 @@ namespace EC.AutoWeightServer.IfManager.Light
 		/// <summary>
 		/// 控制所有灯编码，1 为开启所有灯，2 为关闭所有灯
 		/// </summary>
-		private readonly List<string> _ctrlAllLightCodeList = new List<string>() { "", "3301140000000048", "3301130000000047" };
+		private List<string> _ctrlAllLightCodeList;
 
 		/// <summary>
 		/// 开启某一路灯编码，不互斥，index 互相对应
 		/// </summary>
-		private readonly List<string> _openLightCodeList = new List<string>() { "", "3301120000000147", "3301120000000248", "3301120000000349", "330112000000044A" };
+		private List<string> _openLightCodeList;
 
 		/// <summary>
 		/// 关闭某一路灯编码，不互斥,index 互相对应
 		/// </summary>
-		private readonly List<string> _closeLightCodeList = new List<string>() { "", "3301110000000146", "3301110000000247", "3301110000000348", "3301110000000449" };
+		private List<string> _closeLightCodeList;
 
 		/// <summary>
 		/// 互锁编码，控制只有一路灯亮，index 互相对应
 		/// </summary>
-		private readonly List<string> _lockLightOnCodeList = new List<string>() { "", "33011500000E045B", "33011500000D045A", "33011500000B0458", "3301150000070454" };
+		private List<string> _lockLightOnCodeList;
 
 		/// <summary>
 		/// 互锁编码，控制只有一路灯灭，index 互相对应
 		/// </summary>
-		private readonly List<string> _lockLightOffCodeList = new List<string>() { "", "330115000001044E", "330115000002044F", "3301150000040451", "3301150000080455" };
+		private List<string> _lockLightOffCodeList;
+
+		private bool ReadLightCodeJson()
+		{
+			if (!File.Exists(_fileName)) return false;
+			JObject obj = CommonUtil.ReadFileJson(_fileName);
+			_ctrlAllLightCodeList = obj["CtrlAllLightCodeList"].ToObject<List<string>>();
+			_openLightCodeList = obj["OpenLightCodeList"].ToObject<List<string>>();
+			_closeLightCodeList = obj["CloseLightCodeList"].ToObject<List<string>>();
+			_lockLightOnCodeList = obj["LockLightOnCodeList"].ToObject<List<string>>();
+			_lockLightOffCodeList = obj["LockLightOffCodeList"].ToObject<List<string>>();
+			return true;
+		}
 
 		#endregion Control Lights Code
 
@@ -86,7 +105,11 @@ namespace EC.AutoWeightServer.IfManager.Light
 		/// <returns></returns>
 		public bool OpenAllLight()
 		{
-			var code = _ctrlAllLightCodeList[1];
+			var codeList = _ctrlAllLightCodeList;
+			var index = 1;
+			if (!IsIndexValid(codeList, index))
+				return false;
+			var code = codeList[index];
 			return _lightRelay.SendHex(code);
 		}
 
@@ -96,7 +119,11 @@ namespace EC.AutoWeightServer.IfManager.Light
 		/// <returns></returns>
 		public bool CloseAllLight()
 		{
-			var code = _ctrlAllLightCodeList[2];
+			var codeList = _ctrlAllLightCodeList;
+			var index = 2;
+			if (!IsIndexValid(codeList, index))
+				return false;
+			var code = codeList[index];
 			return _lightRelay.SendHex(code);
 		}
 
@@ -156,15 +183,6 @@ namespace EC.AutoWeightServer.IfManager.Light
 			return _lightRelay.SendHex(code);
 		}
 
-		/// <summary>
-		///
-		/// </summary>
-		/// <returns></returns>
-		public bool CombineLight()
-		{
-			return true;
-		}
-
 		/// <summary>
 		/// 判断功能码是否可以使用
 		/// </summary>

AutoWeightServer/Model/Config/ServerConfig.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 
 namespace EC.AutoWeightServer.Model.Config
 {
@@ -13,6 +14,7 @@ namespace EC.AutoWeightServer.Model.Config
 		/// 相机
 		/// </summary>
 		public static string CameraAddress1 { get; } = GetAppConfig("CAMERA_ADDRESS1");
+
 		public static string CameraAddress2 { get; } = GetAppConfig("CAMERA_ADDRESS2");
 		public static string CameraAddress3 { get; } = GetAppConfig("CAMERA_ADDRESS3");
 		public static string CameraAddress4 { get; } = GetAppConfig("CAMERA_ADDRESS4");
@@ -25,6 +27,7 @@ namespace EC.AutoWeightServer.Model.Config
 		/// 称重串口
 		/// </summary>
 		public static string WtCom { get; } = GetAppConfig("WT_COM");
+
 		public static int WtBaudRate { get; } = FormatCom.ToInt(GetAppConfig("WT_BaudRate"));
 		public static int WtDiff { get; } = FormatCom.ToInt(GetAppConfig("WT_Diff"));
 		public static int WtInterval { get; } = FormatCom.ToInt(GetAppConfig("WT_Interval"));
@@ -35,13 +38,13 @@ namespace EC.AutoWeightServer.Model.Config
 		public static int WtTransmitFlag { get; } = FormatCom.ToInt(GetAppConfig("WT_Transmit_Flag"));
 		public static string WtTransmitCom { get; } = GetAppConfig("WT_Transmit_Com");
 
-
 		/// <summary>
 		/// 指示灯继电器串口
 		/// </summary>
 		public static string LightRelayCom { get; } = GetAppConfig("Light_Relay_COM");
 
 		public static int LightRelayBaudRate { get; } = FormatCom.ToInt(GetAppConfig("Light_Relay_BaudRate"));
+		public static string LightCodeName { get; } = Path.Combine(Environment.CurrentDirectory, "conf", GetAppConfig("Light_Code_Name"));
 		public static int LightInterval { get; } = FormatCom.ToInt(GetAppConfig("Light_Interval"));
 		public static int LightBlink { get; } = FormatCom.ToInt(GetAppConfig("Light_Blink"));
 

AutoWeightServer/conf/lightCode.json

@@ -0,0 +1,7 @@
+{
+	"CtrlAllLightCodeList": [ "", "3301140000000048", "3301130000000047" ],
+	"OpenLightCodeList": [ "", "3301120000000147", "3301120000000248", "3301120000000349", "330112000000044A" ],
+	"CloseLightCodeList": [ "", "3301110000000146", "3301110000000247", "3301110000000348", "3301110000000449" ],
+	"LockLightOnCodeList": [ "", "33011500000E045B", "33011500000D045A", "33011500000B0458", "3301150000070454" ],
+	"LockLightOffCodeList": [ "", "330115000001044E", "330115000002044F", "3301150000040451", "3301150000080455" ]
+}

AutoWeightServer/conf/lightCode2.json

@@ -0,0 +1,7 @@
+{
+	"CtrlAllLightCodeList": [ "", "01108050000204020F0804A0ED", "011080500002040200080490EE" ],
+	"OpenLightCodeList": [ "", "01050000FF008C3A", "01050001FF00DDFA", "01050002FF002DFA", "01050003FF007C3A" ],
+	"CloseLightCodeList": [ "", "010500000000CDCA", "0105000100009C0A", "0105000200006C0A", "0105000300003DCA" ],
+	"LockLightOnCodeList": [ "", "0110805000020402010804C12E", "0110805000020402020804312E", "0110805000020402040804D12F", "0110805000020402080804112C" ],
+	"LockLightOffCodeList": [ "", "01108050000204020E0804F12D", "01108050000204020D0804012D", "01108050000204020B0804E12C", "0110805000020402070804212F" ]
+}

AutoWeightServer/conf/lightCode3.json

@@ -0,0 +1,7 @@
+{
+	"CtrlAllLightCodeList": [ "", "010F0500000401003EC3", "010F05000004010F7EC7" ],
+	"OpenLightCodeList": [ "" ],
+	"CloseLightCodeList": [ "" ],
+	"LockLightOnCodeList": [ "", "010F050000040101FF03", "010F050000040102BF02", "010F0500000401043F00", "010F0500000401083F05" ],
+	"LockLightOffCodeList": [ "", "010F05000004010EBF07", "010F05000004010DFF06", "010F05000004010B7F04", "010F0500000401077F01" ]
+}

AutoWeightServer/conf/lightCodeTemplate.json

@@ -0,0 +1,12 @@
+{
+	// 控制所有灯编码，1 为开启所有灯，2 为关闭所有灯
+	"CtrlAllLightCodeList": [ "" ],
+	// 开启某一路灯编码，不互斥，index 互相对应
+	"OpenLightCodeList": [ "" ],
+	// 关闭某一路灯编码，不互斥,index 互相对应
+	"CloseLightCodeList": [ "" ],
+	// 互锁编码，控制只有一路灯亮，index 互相对应
+	"LockLightOnCodeList": [ "" ],
+	// 互锁编码，控制只有一路灯灭，index 互相对应
+	"LockLightOffCodeList": [ "" ]
+}

EC.Utils/CommonUtil.cs

@@ -1,4 +1,7 @@
-using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.IO;
 using System.Text.RegularExpressions;
 
 namespace EC.Utils
@@ -190,5 +193,28 @@ namespace EC.Utils
 			}
 			return s;
 		}
+
+		/// <summary>
+		/// 读取JSON文件
+		/// </summary>
+		public static JObject ReadFileJson(string jsonFile)
+		{
+			try
+			{
+				using (StreamReader file = File.OpenText(jsonFile))
+				{
+					using (JsonTextReader reader = new JsonTextReader(file))
+					{
+						JObject jObject = (JObject)JToken.ReadFrom(reader);
+						return jObject;
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Console.WriteLine(ex.ToString());
+				return null;
+			}
+		}
 	}
 }