From 427a6e93b8946b9d91727166a352b2ee2ef75d19 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:10:08 +0800
Subject: [PATCH] Delete .DS_Store
---
HDL_ON/DAL/DriverLayer/Control.cs | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
old mode 100644
new mode 100755
index 84a426e..089f706
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -279,8 +279,9 @@
/// </summary>
/// <param name="commandString"></param>
/// <param name="function"></param>
+ /// <param name="useRemote">鏄惁鐩存帴浣跨敤杩滅▼鍙戦��</param>
/// <returns></returns>
- public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
+ public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false)
{
function.controlCounter++;
function.refreshTime = DateTime.Now;
@@ -310,7 +311,7 @@
MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
//杩滅▼閫氳
- if (Ins.IsRemote)
+ if (Ins.IsRemote || useRemote == true)
{
DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
//ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
@@ -875,14 +876,27 @@
}
break;
case SPK.ElectricTV:
+ break;
+ case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaWeepRobot:
+ //璁惧鐘舵�佹帹閫�
+ var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp);
+ if (myDevice != null)
+ {
+ localObj = myDevice;
+ }
break;
default:
break;
}
- HomePage.UpdataFunctionStates(localObj);
- RoomPage.UpdataStates(localObj);
- FunctionPage.UpdataStates(localObj);
- ClassificationPage.UpdataInfo(localObj);
+ if (localObj != null)
+ {
+ HomePage.UpdataFunctionStates(localObj);
+ RoomPage.UpdataStates(localObj);
+ FunctionPage.UpdataStates(localObj);
+ ClassificationPage.UpdataInfo(localObj);
+ }
}
}
catch (Exception ex)
--
Gitblit v1.8.0