From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/DAL/DriverLayer/Control.cs | 112 +++++--------------------------------------------------
1 files changed, 11 insertions(+), 101 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 1d8c208..386bc5a 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -65,63 +65,6 @@
/// </summary>
public bool IsSearchLocalGatewaySuccessful = false;
- ///// <summary>
- /////
- ///// </summary>
- //bool _gatewayOnline1 = false;
- ///// <summary>
- ///// 缃戝叧鏄惁鍦ㄧ嚎
- ///// </summary>
- //public bool GatewayOnline1
- //{
- // get
- // {
- // return _gatewayOnline;
- // }
- // set
- // {
- // if (_gatewayOnline != value)
- // {
- // if(value)
- // {
- // if (IsRemote)//濡傛灉鏄繙绋�
- // {
- // if(DB_ResidenceData.Instance.HomeGateway == null)
- // {
- // return;
- // }
- // if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
- // {
- // new System.Threading.Thread(() => {
- // System.Threading.Thread.Sleep(3000);
- // var pm = new DAL.Server.HttpServerRequest();
- // pm.GetGatewayInfo();
- // }) { IsBackground = true }.Start();
- // return;
- // }
- // }
- // _gatewayOnline = value;
- // //淇敼涓婚〉杩炴帴鐘舵��
- // HomePage.LoadEvent_CheckLinkStatus();
- // MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
- // new System.Threading.Thread(() =>
- // {
- // System.Threading.Thread.Sleep(1000);
- // FunctionList.List.ReadAllFunctionStatus();
- // })
- // { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
- // }
- // else
- // {
- // _gatewayOnline = value;
- // //淇敼涓婚〉杩炴帴鐘舵��
- // HomePage.LoadEvent_CheckLinkStatus();
- // }
- // }
- // }
- //}
-
-
bool _GatewayOnline_Local = false;
/// <summary>
/// 缃戝叧鍦ㄧ嚎-灞�鍩熺綉
@@ -511,7 +454,8 @@
var pack = pm.GetDeviceInfoList(functionIds);
if(pack!= null&& pack.Data!=null)
{
- var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(pack.Data.ToString());
+ //寰呮祴璇�2021-03-04
+ var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());
if(ddd!= null)
{
foreach(var function in ddd)
@@ -519,10 +463,9 @@
var temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
if(temp!= null)
{
- temp = function;
if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(temp.spk))
{
- Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(temp.sid, temp.status);
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(temp.sid, function.status);
}
}
}
@@ -577,21 +520,6 @@
var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
}
}
- ///// <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鍗忚鎺у埗鍦烘櫙
@@ -601,16 +529,8 @@
{
if (!Ins.GatewayOnline_Local)//缃戝叧鏈湴涓嶅湪绾�
{
- //浜戠鍋氬鐞嗗彂閫佷竴绔彛鍦烘櫙
- //if (DB_ResidenceData.Instance.GatewayType == 0)
- //{
- // new Control_Udp().ControlBusScenes(scene);
- //}
- //else
- {
- var pm = new DAL.Server.HttpServerRequest();
- var result = pm.ExecuteScene(scene.userSceneId);
- }
+ var pm = new DAL.Server.HttpServerRequest();
+ var result = pm.ExecuteScene(scene.userSceneId);
}
else
{
@@ -765,11 +685,7 @@
//MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
foreach (var attr in updateTemp.status)
{
- var attrState = localFunction.status.Find((func) => func.key == attr.key);
- if(attrState!= null)
- {
- attrState.value = attr.value;
- }
+ localFunction.SetAttrState(attr.key,attr.value);
}
if (localFunction != null)
@@ -791,7 +707,6 @@
localAttr.curValue = attr.value;
}
}
- //rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
RelayPage.UpdataState(localSwitch);
}
break;
@@ -932,7 +847,7 @@
}
}
ac.lastState = "";
- switch (ac.trait_mode.curValue.ToString())
+ switch (ac.GetAttrState(FunctionAttributeKey.Mode))
{
case "cool":
ac.lastState = Language.StringByID(StringId.Cool);
@@ -950,7 +865,7 @@
ac.lastState = Language.StringByID(StringId.AirSupply);
break;
}
- switch (ac.trait_fan.curValue.ToString())
+ switch (ac.GetAttrState(FunctionAttributeKey.FanSpeed))
{
case "high":
ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
@@ -965,7 +880,7 @@
ac.lastState += " " + Language.StringByID(StringId.Auto);
break;
}
- ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
+ ac.lastState += " " + ac.GetAttrState(FunctionAttributeKey.SetTemp) + ac.tempUnitString;
ACPage.UpdataStates(ac);
}
break;
@@ -1051,14 +966,9 @@
case SPK.SensorSmoke:
case SPK.SensorWater:
case SPK.ClothesHanger:
+ case SPK.IrAC:
//璁惧鐘舵�佹帹閫�
- var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
- if (myDevice != null)
- {
- localObj = myDevice;
- }
- break;
- default:
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
break;
}
if (localObj != null)
--
Gitblit v1.8.0