From 28b6014b7cbbe6d1667e338743d257b3e98e966d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 14:48:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into dev-tzy
---
HDL_ON/DAL/DriverLayer/Control.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index e8827a2..a2f430d 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}");
//楠岃瘉鏈夋晥鏁版嵁闀垮害
@@ -1029,6 +1029,10 @@
case SPK.ElectricTuyaFan:
case SPK.ElectricTuyaWeepRobot:
case SPK.ElectricTuyaWaterValve:
+ case SPK.SensorPir:
+ case SPK.SensorDoorWindow:
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
//璁惧鐘舵�佹帹閫�
var myDevice = Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid,updateTemp.status);
if (myDevice != null)
--
Gitblit v1.8.0