From 014abc547ffd1a9f23c58fd7a471dffc5933fdd3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:27:56 +0800
Subject: [PATCH] Merge branch 'master' into NewFilePath
---
HDL_ON/DAL/DriverLayer/Control.cs | 465 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 390 insertions(+), 75 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 7f51627..dcd5410 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;
+using HDL_ON.UI;
+using Shared;
namespace HDL_ON.DriverLayer
{
@@ -46,6 +48,15 @@
return _msg_id++;
}
}
+ /// <summary>
+ /// 鑾峰彇13浣嶆椂闂存埑
+ /// </summary>
+ /// <returns></returns>
+ public string Get_TimeStamp()
+ {
+ long t = DateTime.Now.Ticks / 10000;
+ return t.ToString();
+ }
bool _gatewayOnline = false;
/// <summary>
@@ -58,15 +69,45 @@
}
set
{
- _gatewayOnline = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- UI.HomePage.LoadEvent_CheckLinkStatus();
+ if (_gatewayOnline != value)
+ {
+ _gatewayOnline = value;
+ //淇敼涓婚〉杩炴帴鐘舵��
+ UI.HomePage.LoadEvent_CheckLinkStatus();
+ if (value)
+ {
+ MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(1000);
+ FunctionList.List.ReadAllFunctionStatus();
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+ }
+ }
}
}
/// <summary>
+ /// 缃戝叧閫氳ID
+ /// </summary>
+ public string GatewayId ="";
+
+ bool _isRemote = false;
+ /// <summary>
/// 鏄惁涓鸿繙绋嬭繛鎺�
/// </summary>
- public bool IsRemote = false;
+ public bool IsRemote {
+ get
+ {
+ return _isRemote;
+ }
+ set
+ {
+ _isRemote = value;
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ }
+ }
/// <summary>
/// 閫氳鍦板潃IP
/// </summary>
@@ -82,7 +123,7 @@
/// <summary>
/// 鏈湴udp
/// </summary>
- public Control_Udp myUdp = null;
+ public Control_Udp myUdp1 = null;
/// <summary>
/// 閫氳鏂瑰紡
@@ -103,13 +144,16 @@
/// </summary>
public void OpenUdp(int port)
{
- if (myUdp == null)
- {
- myUdp = new Control_Udp();
- }
-
UdpSocket._BusSocket.Start(port);
}
+ /// <summary>
+ /// 鍏抽棴udp
+ /// </summary>
+ public void CloseUdp()
+ {
+ UdpSocket._BusSocket.Stop();
+ }
+
/// <summary>
/// 鎵撳紑tcp瀹㈡湇绔�
/// </summary>
@@ -135,15 +179,29 @@
/// </summary>
public void SearchLoaclGateway()
{
- OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);
-
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
+ new System.Threading.Thread(() =>
{
- myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
- }
- else if (DB_ResidenceData.residenceData.GatewayType == 1)
+ for (int i = 0; i < 5; i++)
+ {
+ if (GatewayOnline)
+ break;
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
+ }
+ else if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ new Control_Udp().SearchLocalGateway();
+ }
+ System.Threading.Thread.Sleep(500);
+ }
+ })
+ { IsBackground = true }.Start();
+ if (!GatewayOnline)//缃戝叧涓嶅湪绾跨殑鏃跺�欐墠鍙皾璇曡繙绋嬭繛鎺�
{
- myUdp.SearchLocalGateway();
+ Ins.IsRemote = true;
+ DAL.Mqtt.MqttClient.InitState();
}
}
@@ -152,13 +210,16 @@
/// </summary>
public void ControlScene(Scene scene)
{
- if(myUdp!=null)
- {
- myUdp.ControlBusScenes(scene);
- }
- if(myTcpClient!= null)
+ if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
{
ControlAProtocolScene(scene);
+ }
+ else
+ {
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ new Control_Udp().ControlBusScenes(scene);
+ }
}
}
@@ -174,30 +235,48 @@
{
function.usageCount++;
function.refreshTime = DateTime.Now;
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+
+ //杩滅▼閫氳
+ if (Ins.IsRemote)
{
- try
- {
- if(myUdp != null)
- {
- myUdp.WriteBusData(function, commandDictionary);
- }
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
- }
+ DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
+ //ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
+ var apiControlData = function.GetApiControlData(commandDictionary);
+ var actionObjs = new List<ApiAlinkControlActionObj>();
+ actionObjs.Add(apiControlData);
+ var pack = httpServer.ControlDevice(actionObjs);
+ //MainPage.Log($"{pack.Code}:{pack.Data}");
}
+ //鏈湴閫氳
else
{
- if (myTcpClient != null)
+ //Bus鎺у埗
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
- var sendDataObj = function.GetControlSendData(commandDictionary);
- var sendJson = Newtonsoft.Json.JsonConvert.SerializeObject(sendDataObj);
- var sendBytes = System.Text.Encoding.UTF8.GetBytes(sendJson);
- myTcpClient.SendMessage(sendBytes);
+ try
+ {
+ new Control_Udp().WriteBusData(function, commandDictionary);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
+ }
+ }
+ //ALink鎺у埗
+ else
+ {
+ var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
+ var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
+ var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
}
}
+ }
+
+ public void SendApiReadCommand(List<string> functionIds)
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(functionIds);
}
/// <summary>
@@ -207,36 +286,88 @@
public void SendReadCommand(Function function)
{
function.refreshTime = DateTime.Now;
- if (function.bus_Data != null)
+ if (Ins.IsRemote)
{
- try
- {
- //ReadBusData(function);
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
- }
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId});
}
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);
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ try
+ {
+ new Control_Udp().ReadBusData(function);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
+ }
+ }
+ else
+ {
+ var readKey = new Dictionary<string, string>();
+ readKey.Add("sid", function.sid);
+
+ var readDataObj = new AlinkReadFunctionStatusObj()
+ {
+ id = Ins.msg_id.ToString(),
+ objects = new List<Dictionary<string, string>>()
+ {
+ readKey
+ },
+ time_stamp = Utlis.GetTimestamp()
+ };
+ var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
+ var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes,readDataObj.id);
+ }
}
}
+ ///// <summary>
+ ///// 鍙戦�丄鍗忚璇诲彇鍛戒护
+ ///// </summary>
+ //public void SendReadCommand(List<Dictionary<string, string>> keyValuePairs)
+ //{
+ // var readDataObj = new GatewayAlinkReadObj()
+ // {
+ // id = Ins.msg_id.ToString(),
+ // objects = keyValuePairs,
+ // time_stamp = Utlis.GetTimestamp()
+ // };
+ // var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
+ // var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
+ // Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ //}
/// <summary>
- /// 鎺у埗a鍗忚鍦烘櫙
+ /// a鍗忚鎺у埗鍦烘櫙
/// </summary>
/// <param name="scene"></param>
static void ControlAProtocolScene(Scene scene)
{
- var sendSidObj = new AProtocolSendingObject();
- sendSidObj.time_stamp = "";
- sendSidObj.type = "device_sid";
- sendSidObj.command = "get_list_response";
+ if (Ins.IsRemote)
+ {
+ var pm = new HDL_ON.DAL.Server.HttpServerRequest();
+ pm.ExecuteScene(scene.userSceneId);
+ }
+ else
+ {
+ Dictionary<string, string> keys = new Dictionary<string, string>();
+ keys.Add("sid", scene.sid);
+ var aLinkData = new AlinkReadFunctionStatusObj()
+ {
+ id = Ins.msg_id.ToString(),
+ objects = new List<Dictionary<string, string>>()
+ {
+ keys
+ },
+ time_stamp = Utlis.GetTimestamp()
+ };
+ var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
+ var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes,aLinkData.id);
+ }
}
/// <summary>
/// 杞崲閫氳鏁版嵁
@@ -249,6 +380,7 @@
string sendDataString = topicString + lengthString + bodyDataString;
byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
+ MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
return sendDataBytes;
}
@@ -274,7 +406,7 @@
if (res.Length == 2)
{
var topics = res[0].Split("\r\n");
- MainPage.Log(res[1]);
+ //MainPage.Log(res[1]);
foreach (var ts in topics)
{
var key = ts.Split(":");
@@ -288,13 +420,12 @@
break;
}
}
-
//楠岃瘉鏈夋晥鏁版嵁闀垮害
- if (res[1].Length != receiveObj.Length)
- {
- MainPage.Log($"鏀跺埌鏁版嵁鍖呴暱搴︿笉澶�");
- return receiveObj;
- }
+ //if (res[1].Length != receiveObj.Length)
+ //{
+ // MainPage.Log($"鏀跺埌鏁版嵁鍖呴暱搴︿笉澶�");
+ // return receiveObj;
+ //}
receiveObj.BodyDataString = res[1];
var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
@@ -302,27 +433,211 @@
{
return receiveObj;
}
- switch (receiveObj.Topic)
+ if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
{
- case CommunicationTopic.SearchLoaclGateway:
- var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
-#if DEBUG
- if (UserInfo.Current.AccountString == "464027401@qq.com")
+ var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
+ if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
+ {
+ Ins.GatewayOnline = true;
+ if(!string.IsNullOrEmpty( device.gatewayId))
{
- DB_ResidenceData.residenceData.residenceGatewayMAC = "0000000000000000";
+ Ins.GatewayId = device.gatewayId;
}
-#endif
- if (device.device_mac == DB_ResidenceData.residenceData.residenceGatewayMAC)
+ else
{
- Control.Ins.GatewayOnline = true;
+ Ins.GatewayId = device.device_mac;
}
- break;
+ reportIp = "239.0.168.188";// device.ip_address;
+ Ins.IsRemote = false;
+ }
+ }
+ else if(receiveObj.Topic == CommunicationTopic.ct.ReadStatus+"_reply" ||
+ receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
+ {
+ //TODO 鏆傛椂涓嶄紶姝ｇ‘鐨勬暟鎹笂鍘伙紝濡傛灉鍚庨潰瑕佷紭鍖栧墠闈㈣繖浜涗唬鐮�
+ UpdataFunctionStatus(receiveObj.BodyDataString,null);
}
}
return receiveObj;
-
}
+ /// <summary>
+ /// 鏇存柊璁惧鐘舵��
+ /// A鍗忚鏁版嵁
+ /// </summary>
+ /// <param name="updateBytes"></param>
+ public void UpdataFunctionStatus(string revString,byte []usefulBytes)
+ {
+ MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+ if(Control.Ins.myUdp!= null)
+ {
+ //閲嶇疆閲嶅惎udp鍒ゆ柇璋冩暣
+ Ins.myUdp.controlLostCount = 0;
+ }
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
+ if (temp != null)
+ {
+ Control_Udp.ReceiveRepeatManager(temp.id,usefulBytes);
+ var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
+ foreach (var updateTemp in temp.objects)
+ {
+ try
+ {
+ //bool hadChange = false;//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
+ var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
+ if (updataObj != null)
+ {
+ foreach (var attr in updateTemp.status)
+ {
+ foreach (var locatAttr in updataObj.attributes)
+ {
+ if (attr.key == locatAttr.key)
+ {
+ if (locatAttr.curValue.ToString() == attr.value)
+ {
+ continue;
+ }
+ locatAttr.curValue = attr.value;
+ //hadChange = true;
+ }
+ }
+ }
+ //2020-12-13 濡傛灉鎺у埗鏃讹紝绔嬪嵆鏇存柊鐣岄潰鍗崇姸鎬侊紝鏀跺埌鏁版嵁涓嶇敤鍦ㄥ鐞嗭紝鐩墠鍙慨鏀硅澶囩姸鎬侊紝鐣岄潰娌℃湁鏇存柊锛岃繕鏄渶瑕佹帴鏀舵暟鎹洿鏂�
+ //if (!hadChange)//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
+ //{
+ // continue;
+ //}
+ //鏇存柊鐣岄潰鐘舵��
+ switch (updataObj.spk)
+ {
+ case SPK.LightSwitch:
+ RelayPage.UpdataState(updataObj as Light);
+ break;
+ case SPK.LightDimming:
+ var dimming = updataObj as Light;
+ dimming.lastState = Language.StringByID(StringId.Brightness) + " : " + dimming.brightness + "%";
+ DimmerPage.UpdataStates(dimming);
+ break;
+ case SPK.ElectricFan:
+ var fan = updataObj as Fan;
+ fan.lastState = Language.StringByID(StringId.Level) + " : " + fan.openLevel;
+ FanPage.UpdataState(fan);
+ break;
+ case SPK.LightRGB:
+ var rgb = updataObj as Light;
+ rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
+ RGBPage.UpdataStates(rgb);
+ break;
+ case SPK.LightRGBW:
+ case SPK.LightCCT:
+ break;
+ case SPK.CurtainSwitch:
+ var curtain = updataObj as Curtain;
+ curtain.lastState = curtain.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
+ CurtainModulePage.UpdataState(curtain);
+ break;
+ case SPK.CurtainTrietex:
+ var trietex = updataObj as Curtain;
+ trietex.lastState = Language.StringByID(StringId.Open) + trietex.percent + "%";
+ MotorCurtainPage.UpdataState(trietex);
+ break;
+ case SPK.CurtainRoller:
+ var roller = updataObj as Curtain;
+ roller.lastState = Language.StringByID(StringId.Open) + roller.percent + "%";
+ RollingShutterPage.UpdataState(roller);
+ break;
+ case SPK.CurtainShades:
+ break;
+ case SPK.AcStandard:
+ var ac = updataObj as AC;
+ ac.lastState = "";
+ switch (ac.trait_mode.curValue.ToString())
+ {
+ case "cool":
+ ac.lastState = Language.StringByID(StringId.Cool);
+ break;
+ case "heat":
+ ac.lastState = Language.StringByID(StringId.Heat);
+ break;
+ case "dry":
+ ac.lastState = Language.StringByID(StringId.Dry);
+ break;
+ case "auto":
+ ac.lastState = Language.StringByID(StringId.Auto);
+ break;
+ case "fan":
+ ac.lastState = Language.StringByID(StringId.AirSupply);
+ break;
+ }
+ switch (ac.trait_fan.curValue.ToString())
+ {
+ case "high":
+ ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
+ break;
+ case "medium":
+ ac.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
+ break;
+ case "low":
+ ac.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
+ break;
+ case "auto":
+ ac.lastState += " " + Language.StringByID(StringId.Auto);
+ break;
+ }
+ ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
+ ACPage.UpdataStates(ac);
+ break;
+ case SPK.FloorHeatStandard:
+ var fh = updataObj as FloorHeating;
+ switch (fh.trait_mode.curValue)
+ {
+ case "normal":
+ fh.lastState = Language.StringByID(StringId.Normal);
+ break;
+ case "day":
+ fh.lastState = Language.StringByID(StringId.Day);
+ break;
+ case "night":
+ fh.lastState = Language.StringByID(StringId.Night);
+ break;
+ case "timer":
+ fh.lastState = Language.StringByID(StringId.Auto);
+ break;
+ case "away":
+ fh.lastState = Language.StringByID(StringId.Away);
+ break;
+ }
+ fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
+ FloorHeatingPage.UpdataStates(fh);
+ break;
+ case SPK.SensorPm25:
+ case SPK.SensorCO2:
+ case SPK.SensorTVOC:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ var sensor = updataObj as Sensor;
+ EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
+ break;
+ case SPK.ElectricSocket:
+ break;
+ case SPK.ElectricTV:
+ break;
+ default:
+ break;
+ }
+ HomePage.UpdataFunctionStates(updataObj);
+ RoomPage.UpdataStates(updataObj);
+ FunctionPage.UpdataStates(updataObj);
+ ClassificationPage.UpdataInfo(updataObj);
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"A鍗忚鏇存柊鐘舵�佸紓甯�:{ex.Message}");
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0