From 67ed2f4a0ebe1b265a563bad3f82627ed78c3054 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 15:48:11 +0800
Subject: [PATCH] 2020-11-20 1.修改替换正则检测方法。2.修改请求失败tip方法。3.增加隐私政策功能。
---
HDL_ON/DriverLayer/Control.cs | 276 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 192 insertions(+), 84 deletions(-)
diff --git a/HDL_ON/DriverLayer/Control.cs b/HDL_ON/DriverLayer/Control.cs
index ddc4a95..ea4b55e 100644
--- a/HDL_ON/DriverLayer/Control.cs
+++ b/HDL_ON/DriverLayer/Control.cs
@@ -1,113 +1,221 @@
using System;
using System.Collections.Generic;
using HDL_ON.Entity;
-using Newtonsoft.Json.Linq;
-using Shared;
-namespace HDL_ON
+namespace HDL_ON.DriverLayer
{
- public partial class Control
+
+ /// <summary>
+ /// 閫氳鏂瑰紡
+ /// </summary>
+ public enum CommunicationMode
{
+ /// <summary>
+ /// 鏈湴udp
+ /// </summary>
+ local_BusUdp,
+ /// <summary>
+ /// 鏈湴tcp鏈嶅姟绔�
+ /// </summary>
+ tcp_local_server,
+ /// <summary>
+ /// 鏈湴tcp瀹㈡埛绔�
+ /// </summary>
+ tcp_local_client,
+ }
- public static byte[] Send(string commandString, Function function, int sendCount = 3)
+
+ public class Control
+ {
+ static Control _control;
+ public static Control ins
{
- if (!string.IsNullOrEmpty(function.bus_Data))
+ get
+ {
+ if (_control == null)
+ {
+ _control = new Control();
+ }
+ return _control;
+ }
+ }
+ /// <summary>
+ /// 閫氳鍦板潃IP
+ /// </summary>
+ public string reportIp = "255.255.255.255";
+ /// <summary>
+ /// tcp鏈嶅姟绔�
+ /// </summary>
+ public Control_TcpServer myTcpServer = null;
+ /// <summary>
+ /// tcp瀹㈡湇绔�
+ /// </summary>
+ public Control_TcpClient myTcpClient = null;
+ /// <summary>
+ /// 鏈湴udp
+ /// </summary>
+ public Control_Udp_Bus myUdp = null;
+
+ /// <summary>
+ /// 閫氳鏂瑰紡
+ /// </summary>
+ public CommunicationMode communicationMode;
+
+ /// <summary>
+ /// 鏀瑰彉閫氳鏂瑰紡
+ /// </summary>
+ public void ChangeCommunicationMode(CommunicationMode communicationMode)
+ {
+ this.communicationMode = communicationMode;
+
+
+ switch (this.communicationMode)
+ {
+ case CommunicationMode.local_BusUdp:
+ if (myUdp == null)
+ {
+ myUdp = new Control_Udp_Bus();
+ }
+ UdpSocket._BusSocket.Start();
+ if (myTcpServer != null)
+ {
+ myTcpClient.Close();
+ myTcpClient = null;
+ }
+ if (myTcpClient != null)
+ {
+ myTcpClient.Close();
+ myTcpClient = null;
+ }
+ break;
+ case CommunicationMode.tcp_local_server:
+ if (myTcpServer == null)
+ {
+ myTcpServer = new Control_TcpServer();
+ myTcpServer.OpenServer();
+ }
+ if (myTcpClient != null)
+ {
+ myTcpClient.Close();
+ myTcpClient = null;
+ }
+ if(myUdp != null)
+ {
+ UdpSocket._BusSocket.Stop();
+ myUdp = null;
+ }
+ break;
+ case CommunicationMode.tcp_local_client:
+ if (myTcpClient == null)
+ {
+ myTcpClient = new Control_TcpClient(reportIp);
+ myTcpClient.Connect();
+ }
+ if (myTcpServer != null)
+ {
+ myTcpClient.Close();
+ myTcpClient = null;
+ }
+ if (myUdp != null)
+ {
+ UdpSocket._BusSocket.Stop();
+ myUdp = null;
+ }
+ break;
+ }
+ }
+
+ /// <summary>
+ /// 鍦烘櫙鎺у埗鍏ュ彛
+ /// </summary>
+ public void ControlScene(Scene scene)
+ {
+ if(myUdp!=null)
+ {
+ myUdp.ControlBusScenes(scene);
+ }
+ if(myTcpClient!= null)
+ {
+ ControlAProtocolScene(scene);
+ }
+ }
+
+ /// <summary>
+ /// 鍙戦�佸懡浠�
+ /// 鑷姩鍒ゆ柇鏄惁涓篈鍗忚璁惧锛�
+ /// 涓嶆槸A鍗忚锛岃嚜鍔ㄨ浆鍖朾us鍛戒护鏁版嵁
+ /// </summary>
+ /// <param name="commandString"></param>
+ /// <param name="function"></param>
+ /// <returns></returns>
+ public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
+ {
+ function.usageCount++;
+ function.refreshTime = DateTime.Now;
+ if (DB_ResidenceData.residenceData.GatewayType == 0)
{
try
{
- var ssd = function.GetSendJObject(commandString);
- var revBytes = DataConversion_Bus(ssd, function.bus_Data, function);
- return revBytes;
+ if(myUdp != null)
+ {
+ myUdp.WriteBusData(function, commandDictionary);
+ }
}
catch (Exception ex)
{
- MainPage.Log($"鍙戦�佹暟鎹紓甯革細 {ex.Message}");
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
}
}
else
{
-
- //var jObject = new JObject {
- //{ "DeviceAddr", 11},
- //{ "Epoint", 22},
- // { "Cluster_ID", 8 },
- // { "Command", 33},
- // { "SendMode", 2 }
- //};
- //var data = new JObject {
- // { "Level", 1 },
- // { "TransitionTime", 0 }
- //};
- //jObject.Add("Data", data);
- //return revBytes;
+ if (myTcpClient != null)
+ {
+ var sendDataObj = function.GetControlSendData(commandDictionary);
+ var sendJson = Newtonsoft.Json.JsonConvert.SerializeObject(sendDataObj);
+ var sendBytes = System.Text.Encoding.UTF8.GetBytes(sendJson);
+ myTcpClient.SendMessage(sendBytes);
+ }
}
- return null;
}
+ /// <summary>
+ /// 鍙戦�佽鍙栧懡浠�
+ /// 鑷姩鍒ゆ柇鏄惁涓篈鍗忚璁惧
+ /// </summary>
+ public void SendReadCommand(Function function)
+ {
+ function.refreshTime = DateTime.Now;
+ if (function.bus_Data != null)
+ {
+ try
+ {
+ //ReadBusData(function);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
+ }
+ }
+ else
+ {
+ //var commandObj = function.GetSendJObject(CommandType_A.read);
+ //var commandString = Newtonsoft.Json.JsonConvert.SerializeObject(commandObj);
+ //var commandBytes = System.Text.Encoding.UTF8.GetBytes(commandString);
+ //MqttCommon.MqttRemoteSend(commandBytes);
+ }
+ }
/// <summary>
- /// 灏咥鍗忚鎺у埗鏁版嵁杞崲绋媌us鍗忚鐨勬帶鍒舵暟鎹�
+ /// 鎺у埗a鍗忚鍦烘櫙
/// </summary>
- /// <param name="commandString"></param>
- /// <returns></returns>
- static byte[] DataConversion_Bus(JObject commandString,string bus_Data, Function function)
+ /// <param name="scene"></param>
+ static void ControlAProtocolScene(Scene scene)
{
- //鍙嶉:
- //{
- //"Namespace": "HDL", "Command": "writeRespone",
- //鈥淭ype鈥�:鈥漝evice鈥�, "objects": [{
- //"sid": "0001002019101209000025670100010001鈥�, "statue": "success鈥�
- //}] }
- try
- {
- var sss = JObject.Parse(bus_Data);
- var subnetId = Convert.ToByte(sss.GetValue("SubnetID").ToString());
- var deviceId = Convert.ToByte(sss.GetValue("DeviceID").ToString());
- var loopId = sss.GetValue("LoopID").ToString();
- switch (commandString.GetValue("Command").ToString())
- {
- case "write":
- var jobj = JObject.FromObject(commandString.GetValue("objects"));
- var functionType = jobj.GetValue("sid").ToString().Substring(24, 2);//鎴彇24锛�25瀛楃鑾峰彇鎺у埗鐨勮澶囩殑绫诲瀷
- switch ((FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(functionType)))
- {
- case FunctionType.Light:
- if (jobj.ContainsKey("Switch"))//缁х數鍣�
- {
- var state = jobj.GetValue("Switch").ToString() == "0" ? (byte)0 : (byte)100;
- if (jobj.ContainsKey("Dimmer"))
- { //璋冨厜鍣�
- var brightness = Convert.ToByte(jobj.GetValue("Dimmer").ToString());
- if (brightness > 0)
- {
- (function as Dimmer).brightness = brightness;
- }
- (function as Dimmer).state = state;
- var bytes = new byte[] { Convert.ToByte(loopId), brightness, 0, 0 };
- (function as Dimmer).lastState = Language.StringByID(StringId.Brightness) + " : " + brightness.ToString() + "%";
- return ControlBytesSendHasReturn(Command.SetSingleLight, subnetId, deviceId, bytes);
- }
- else//缁х數鍣�
- {
- var bytes = new byte[] { Convert.ToByte(loopId), state, 0, 0 };
- return ControlBytesSendHasReturn(Command.SetSingleLight, subnetId, deviceId, bytes);
- }
- }
- break;
- }
- break;
- case "read":
-
- break;
- }
-
- }
- catch (Exception ex) {
- MainPage.Log($"DataConversion_Bus Erorr : {ex.Message}");
- }
-
- return null;
+ var sendSidObj = new AProtocolSendingObject();
+ sendSidObj.time_stamp = "";
+ sendSidObj.type = "device_sid";
+ sendSidObj.command = "get_list_response";
}
}
--
Gitblit v1.8.0