From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/DAL/DriverLayer/Control.cs | 109 ++++++++++++++++++++----------------------------------
1 files changed, 40 insertions(+), 69 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index e4f1c1a..981f284 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -283,7 +283,6 @@
/// </summary>
public void ControlScene(Scene scene)
{
- //杩滅▼鎴栬�呮帶鍒秎ink缃戝叧鍦烘櫙
if (!Ins.GatewayOnline_Local || DB_ResidenceData.Instance.GatewayType == 1)
{
new System.Threading.Thread(() =>
@@ -478,55 +477,47 @@
/// 鍙戦�佽鍙栧懡浠�
/// 鑷姩鍒ゆ柇鏄惁涓篈鍗忚璁惧
/// </summary>
- public void SendReadCommand(Function function ,bool forceRemote = false)
+ public void SendReadCommand(Function function)
{
function.refreshTime = DateTime.Now;
- if (forceRemote)
+ if (Ins.GatewayOnline_Local)
{
- var pm = new DAL.Server.HttpServerRequest();
- var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
- }
- else
- {
- if (Ins.GatewayOnline_Local)
+
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
-
- if (DB_ResidenceData.Instance.GatewayType == 0)
+ try
{
- try
- {
- new Control_Udp().ReadBusData(function);
- }
- catch (Exception ex)
- {
- MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
- }
+ new Control_Udp().ReadBusData(function);
}
- else
+ catch (Exception ex)
{
- 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);
- MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
- new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
}
}
else
{
- var pm = new DAL.Server.HttpServerRequest();
- var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
+ 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);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
}
+ }
+ else
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
}
}
@@ -570,7 +561,7 @@
string sendDataString = topicString + lengthString + bodyDataString;
byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
- MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
+ //MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
return sendDataBytes;
}
@@ -644,7 +635,7 @@
{
Ins.GatewayId = device.device_mac;
}
- reportIp = "239.0.168.188";// device.ip_address;//涓绘挱鍦板潃涔熻兘鎺у埗璁惧
+ reportIp = "239.0.168.188";// device.ip_address;
}
}
else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
@@ -670,6 +661,15 @@
/// <param name="updateBytes"></param>
public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
{
+
+ if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
+ {
+ if (FunctionList.List.GetDeviceFunctionList(SPK.BrandType.Tuya).Count == 0)
+ {
+ //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�...");
+ return;
+ }
+ }
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
if (temp != null)
{
@@ -679,22 +679,6 @@
{
try
{
-
- if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
- {
- if (FunctionList.List.OtherBrandFunction.Count != 0)
- {
- if (FunctionList.List.OtherBrandFunction.Find((obj) => obj.sid == updateTemp.sid) == null)
- {
- //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�...");
- return;
- }
- }
- }
-
-
-
-
var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
if (localFunction == null)
{
@@ -719,9 +703,6 @@
Function localObj = null;
switch (localFunction.spk)
{
- case SPK.ElectricEnergy:
- EnergyMainPage.UpdataStatus(localFunction);
- break;
case SPK.LightSwitch:
RelayPage.UpdataState(localFunction);
break;
@@ -828,14 +809,6 @@
case SPK.SensorTVOC:
case SPK.SensorTemperature:
case SPK.SensorHumidity:
- if(localFunction.spk == SPK.SensorTemperature)
- {
- HomePage.LoadEvent_RefreshEnvirIndoorTemp();
- }
- else if (localFunction.spk == SPK.SensorHumidity)
- {
- HomePage.LoadEvent_RefreshEnvirIndoorHumi();
- }
EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.ElectricSocket:
@@ -853,9 +826,7 @@
case SPK.SensorWater:
case SPK.ClothesHanger:
case SPK.AcIr:
- case SPK.SenesorMegahealth:
//璁惧鐘舵�佹帹閫�
- //鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
break;
}
--
Gitblit v1.8.0