From 688dbdb4cba154f1dfb60777b0413e0b1258542a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 21 十二月 2020 09:45:33 +0800
Subject: [PATCH] 2020-12-21-1
---
HDL_ON/DAL/DriverLayer/Control.cs | 334 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 277 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 80e292b..33a81c0 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
{
@@ -67,16 +69,23 @@
}
set
{
- _gatewayOnline = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- UI.HomePage.LoadEvent_CheckLinkStatus();
- FunctionList.List.ReadAllFunctionStatus();
+ if (_gatewayOnline != value)
+ {
+ _gatewayOnline = value;
+ //淇敼涓婚〉杩炴帴鐘舵��
+ UI.HomePage.LoadEvent_CheckLinkStatus();
+ if (value)
+ {
+ MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ FunctionList.List.ReadAllFunctionStatus();
+ }
+ }
}
}
/// <summary>
/// 缃戝叧閫氳ID
/// </summary>
- public string GatewayId;
+ public string GatewayId ="";
bool _isRemote = false;
/// <summary>
@@ -90,13 +99,8 @@
set
{
_isRemote = value;
- if(value)
- {
- DAL.Mqtt.MqttClient.InitState();
- }else
- {
- DAL.Mqtt.MqttClient.DisConnectRemote();
- }
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
}
}
/// <summary>
@@ -179,18 +183,18 @@
/// </summary>
public void SearchLoaclGateway()
{
- OpenUdp(DB_ResidenceData.residenceData.GatewayType == 0 ? 6000 : 8585);
+ OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
new System.Threading.Thread(() =>
{
for (int i = 0; i < 5; i++)
{
if (GatewayOnline)
break;
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
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)
+ else if (DB_ResidenceData.Instance.GatewayType == 1)
{
myUdp.SearchLocalGateway();
}
@@ -198,6 +202,11 @@
}
})
{ IsBackground = true }.Start();
+ if (!GatewayOnline)//缃戝叧涓嶅湪绾跨殑鏃跺�欐墠鍙皾璇曡繙绋嬭繛鎺�
+ {
+ Ins.IsRemote = true;
+ DAL.Mqtt.MqttClient.InitState();
+ }
}
/// <summary>
@@ -205,13 +214,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)
+ {
+ myUdp.ControlBusScenes(scene);
+ }
}
}
@@ -229,20 +241,20 @@
function.refreshTime = DateTime.Now;
DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
//杩滅▼閫氳
- if (Ins.IsRemote || true)
+ if (Ins.IsRemote)
{
//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}");
+ //MainPage.Log($"{pack.Code}:{pack.Data}");
}
//鏈湴閫氳
else
{
//Bus鎺у埗
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
try
{
@@ -264,10 +276,16 @@
var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
- myUdp.SendLocalHdlLinkData(sendBytes);
+ Ins.myUdp.SendLocalHdlLinkData(sendBytes);
}
}
}
+ }
+
+ public void SendApiReadCommand(List<string> functionIds)
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(functionIds);
}
/// <summary>
@@ -279,11 +297,12 @@
function.refreshTime = DateTime.Now;
if (Ins.IsRemote)
{
-
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId});
}
else
{
- if (function.bus_Data != null)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
try
{
@@ -299,14 +318,14 @@
var readKey = new Dictionary<string, string>();
readKey.Add("sid", function.sid);
- var readDataObj = new GatewayAlinkReadObj()
+ var readDataObj = new AlinkReadFunctionStatusObj()
{
id = Ins.msg_id.ToString(),
objects = new List<Dictionary<string, string>>()
{
readKey
},
- //time_stamp =
+ time_stamp = Utlis.GetTimestamp()
};
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
@@ -314,32 +333,50 @@
}
}
}
- /// <summary>
- /// 鍙戦�丄鍗忚璇诲彇鍛戒护
- /// </summary>
- public void SendReadCommand(List<Dictionary<string, string>> keyValuePairs)
- {
- var readDataObj = new GatewayAlinkReadObj()
- {
- id = Ins.msg_id.ToString(),
- objects = keyValuePairs,
- //time_stamp =
- };
- var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
- var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
- Ins.myUdp.SendLocalHdlLinkData(sendBytes);
- }
+ ///// <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.userSceneId);
+ 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);
+ Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ }
}
/// <summary>
/// 杞崲閫氳鏁版嵁
@@ -378,7 +415,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(":");
@@ -405,21 +442,204 @@
{
return receiveObj;
}
- switch (receiveObj.Topic)
+ if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
{
- case CommunicationTopic.SearchLoaclGatewayReply:
- var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
- if (device.device_mac == DB_ResidenceData.residenceData.residenceGatewayMAC)
+ 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))
{
- Ins.GatewayOnline = true;
Ins.GatewayId = device.gatewayId;
- reportIp = "239.0.168.188";// device.ip_address;
- Ins.IsRemote = false;
}
- break;
+ else
+ {
+ Ins.GatewayId = device.device_mac;
+ }
+ reportIp = "239.0.168.188";// device.ip_address;
+ Ins.IsRemote = false;
+ }
+ }
+ else if(receiveObj.Topic == CommunicationTopic.ct.ReadStatus+"_reply" ||
+ receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
+ {
+ UpdataFunctionStatus(receiveObj.BodyDataString);
}
}
return receiveObj;
}
+
+ /// <summary>
+ /// 鏇存柊璁惧鐘舵��
+ /// A鍗忚鏁版嵁
+ /// </summary>
+ /// <param name="updateBytes"></param>
+ public void UpdataFunctionStatus(string revString)
+ {
+ MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
+ if (temp != null)
+ {
+ 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