From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/DAL/DriverLayer/Control.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index e8827a2..58821fd 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -141,7 +141,7 @@
{
//淇敼涓婚〉杩炴帴鐘舵��
HomePage.LoadEvent_CheckLinkStatus();
- MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ MainPage.Log($"缃戝叧灞�鍩熺綉鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
@@ -195,7 +195,7 @@
}
//淇敼涓婚〉杩炴帴鐘舵��
HomePage.LoadEvent_CheckLinkStatus();
- MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
@@ -682,7 +682,7 @@
}
}
- MainPage.Log($"time 1 :{receiveObj.Topic}");
+ MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic}");
//楠岃瘉鏈夋晥鏁版嵁闀垮害
@@ -749,14 +749,6 @@
var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
if (localFunction != null)
{
- //var updateInfoString = $"鏇存柊璁惧:{localFunction.name}";
- //foreach (var attr in updateTemp.status)
- //{
- // updateInfoString += $" key:{attr.key};value:{attr.value}";
- //}
- //MainPage.Log(updateInfoString);
-
-
//鏇存柊鐣岄潰鐘舵��
Function localObj = null;
switch (localFunction.spk)
@@ -1029,6 +1021,11 @@
case SPK.ElectricTuyaFan:
case SPK.ElectricTuyaWeepRobot:
case SPK.ElectricTuyaWaterValve:
+ case SPK.SensorPir:
+ case SPK.SensorDoorWindow:
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
+ case SPK.ClothesHanger:
//璁惧鐘舵�佹帹閫�
var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
if (myDevice != null)
--
Gitblit v1.8.0