From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/DAL/DriverLayer/Control.cs | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index de9a955..981f284 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -336,7 +336,7 @@
}
}
- MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
+ //MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
///绗笁鏂规秱楦﹁澶囩粺涓�浣跨敤杩滅▼鎺у埗
switch(function.spk)
@@ -602,8 +602,7 @@
}
}
- MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic}");
- MainPage.Log($"鍐呭: {res[1]}");
+ MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic} : 鍐呭: {res[1]}");
//楠岃瘉鏈夋晥鏁版嵁闀垮害
@@ -623,7 +622,7 @@
}
var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
- if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
+ if (device.device_mac.ToUpper() == DB_ResidenceData.Instance.HomeGateway.mac.ToUpper())
{
MainPage.Log("鏈湴鎼滅储缃戝叧鎴愬姛");
Ins.IsSearchLocalGatewaySuccessful = true;
@@ -810,36 +809,10 @@
case SPK.SensorTVOC:
case SPK.SensorTemperature:
case SPK.SensorHumidity:
- var sensor = FunctionList.List.GetEnvirSensorsList().Find((obj) => obj.sid == updateTemp.sid);
- if (sensor != null)
- {
- localObj = sensor;
- foreach (var attr in updateTemp.status)
- {
- var localAttr = sensor.attributes.Find((obj) => obj.key == attr.key);
- if (localAttr != null)
- {
- localAttr.curValue = attr.value;
- }
- }
- EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
- }
+ EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.ElectricSocket:
- var es = FunctionList.List.GetElectricSocketList().Find((obj) => obj.sid == updateTemp.sid);
- if (es != null)
- {
- localObj = es;
- foreach (var attr in updateTemp.status)
- {
- var localAttr = es.attributes.Find((obj) => obj.key == attr.key);
- if (localAttr != null)
- {
- localAttr.curValue = attr.value;
- }
- }
- SocketPage.UpdataState(es);
- }
+ SocketPage.UpdataState(localFunction);
break;
case SPK.ElectricTV:
break;
--
Gitblit v1.8.0