From 0a8ec482a5ad10bf3cd7010c89630b42ecaca741 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:19:31 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/DAL/DriverLayer/Control.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
old mode 100755
new mode 100644
index 089f706..5d85428
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -310,6 +310,7 @@
MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
+ //useRemote = true;
//杩滅▼閫氳
if (Ins.IsRemote || useRemote == true)
{
@@ -380,6 +381,34 @@
{
var pm = new DAL.Server.HttpServerRequest();
var pack = pm.RefreshDeviceStatus(functionIds);
+ }
+ /// <summary>
+ /// 璇诲彇鍔熻兘璇︾粏鏁版嵁
+ /// </summary>
+ /// <param name="functionIds"></param>
+ public void ReadFunctionsInfo(List<string> functionIds)
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.GetDeviceInfoList(functionIds);
+ if(pack!= null&& pack.Data!=null)
+ {
+ var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(pack.Data.ToString());
+ if(ddd!= null)
+ {
+ foreach(var function in ddd)
+ {
+ 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);
+ }
+ }
+ }
+ }
+ }
}
/// <summary>
@@ -880,8 +909,9 @@
case SPK.ElectricTuyaAirCleaner:
case SPK.ElectricTuyaFan:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWaterValve:
//璁惧鐘舵�佹帹閫�
- var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp);
+ var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
if (myDevice != null)
{
localObj = myDevice;
--
Gitblit v1.8.0