From 2f3a162c3960bedc86081af9823b1683db27bb63 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 29 三月 2021 09:10:43 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
/dev/null | 0
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 281398e..0000000
--- a/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/DLL/.DS_Store b/DLL/.DS_Store
deleted file mode 100644
index 354f176..0000000
--- a/DLL/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/.DS_Store b/HDL-ON_Android/.DS_Store
deleted file mode 100644
index 515e622..0000000
--- a/HDL-ON_Android/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/.DS_Store b/HDL-ON_iOS/.DS_Store
deleted file mode 100644
index 8912fc4..0000000
--- a/HDL-ON_iOS/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
deleted file mode 100644
index eddb677..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
index f5f2ed2..064080f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
@@ -136,8 +136,8 @@
///杩欓噷锛氱洃鍚琈TTP鎺ㄩ�佷笅鏉ヤ富棰�;
if (mqttdate != null)
{
- //浼戠湢500姣锛屼负绛夊緟浜戠鍒涘缓deviceid锛�
- System.Threading.Thread.Sleep(500);
+ //浼戠湢1000姣锛屼负绛夊緟浜戠鍒涘缓deviceid锛�
+ System.Threading.Thread.Sleep(1000);
//璇诲彇娣诲姞閬ユ帶鍣╠eviceID锛屾墠鐭ラ亾鏄惁娣诲姞鎴愬姛锛�
GetControl(frame, control, (device) =>
{
diff --git a/HdlBluWi/.DS_Store b/HdlBluWi/.DS_Store
deleted file mode 100644
index 39659c2..0000000
--- a/HdlBluWi/.DS_Store
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0