From d1bd9606c4d3c9a29087cab05f89f96b4f04afc6 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:08:02 +0800
Subject: [PATCH] 2021-3-29-1
---
/dev/null | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 44 ++++++++++++++++++--------------------------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 4 ++--
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index ee066a2..0000000
--- a/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index fd06db1..018f5f2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,52 +1,44 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Utlis.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="62" Column="44" />
- <File FileName="../HomeApp/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="264" Column="53" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/Send.cs" Line="23" Column="83" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="285" Column="34" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="127" Column="57" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="65" Column="155" />
+ <File FileName="HDL_ON/Common/R.cs" Line="1156" Column="22" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="383" Column="49" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" Line="94" Column="42" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="121" Column="33" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="340" Column="86" />
+ <File FileName="HDL_ON/Common/Utlis.cs" Line="285" Column="24" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
+ <Node name="Common" expanded="True">
+ <Node name="Utlis.cs" selected="True" />
+ </Node>
<Node name="DAL" expanded="True">
<Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
</Node>
<Node name="Entity" expanded="True">
<Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True" />
- </Node>
- </Node>
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="3-Intelligence" expanded="True" />
<Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True">
- <Node name="View" expanded="True" />
- <Node name="Method.cs" selected="True" />
- </Node>
+ <Node name="PirDevice" expanded="True" />
</Node>
<Node name="FuntionControlView" expanded="True">
<Node name="Video" expanded="True" />
</Node>
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
diff --git a/DLL/.DS_Store b/DLL/.DS_Store
deleted file mode 100644
index c8509ed..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 58f9321..0000000
--- a/HDL-ON_Android/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/.DS_Store b/HDL-ON_Android/Assets/Phone/.DS_Store
deleted file mode 100644
index 1875923..0000000
--- a/HDL-ON_Android/Assets/Phone/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/libs/.DS_Store b/HDL-ON_Android/libs/.DS_Store
deleted file mode 100644
index ae45fc3..0000000
--- a/HDL-ON_Android/libs/.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 4e13db4..0000000
--- a/HDL-ON_iOS/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/.DS_Store b/HDL-ON_iOS/Assets.xcassets/.DS_Store
deleted file mode 100644
index aa203c0..0000000
--- a/HDL-ON_iOS/Assets.xcassets/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/.DS_Store b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store b/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store
deleted file mode 100644
index 04233c5..0000000
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/.DS_Store b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/.DS_Store
deleted file mode 100644
index 76483dd..0000000
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/.DS_Store b/HDL_ON/.DS_Store
deleted file mode 100644
index b92307c..0000000
--- a/HDL_ON/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/.DS_Store b/HDL_ON/UI/.DS_Store
deleted file mode 100644
index aa35eb6..0000000
--- a/HDL_ON/UI/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/.DS_Store b/HDL_ON/UI/UI2/.DS_Store
deleted file mode 100644
index 1f6e40e..0000000
--- a/HDL_ON/UI/UI2/.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/3-Intelligence/Automation/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/Automation/.DS_Store
deleted file mode 100644
index b2074c1..0000000
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/.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
diff --git a/ThirdPartyIntegration/.DS_Store b/ThirdPartyIntegration/.DS_Store
deleted file mode 100644
index fce4452..0000000
--- a/ThirdPartyIntegration/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/ys/.DS_Store b/ys/.DS_Store
deleted file mode 100644
index 46585ec..0000000
--- a/ys/.DS_Store
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0