From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10 1.替换最新控件库，增加无网络监听，Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线，发送CheckGateway间隔为10S，收到主题刷新该时间，重置发送次数，发送次数到达3次以上，则判定网关为离线状态。 4.远程重复增加为3次，重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。
---
Crabtree/.vs/SmartHome/xs/UserPrefs.xml | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
index b448b8d..afc5c40 100644
--- a/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
+++ b/Crabtree/.vs/SmartHome/xs/UserPrefs.xml
@@ -1,48 +1,45 @@
锘�<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
- <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.4b65c46595" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/UI/SimpleControl/MqttCommon.cs">
<Files>
- <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="31" Column="21" IsPinned="True" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Guide/GuideSettingGateway.cs" />
- <File FileName="SmartHome/HDL/Operation/MyEnum.cs" />
- <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="269" Column="66" />
- <File FileName="ON/Properties/AssemblyInfo.cs" />
+ <File FileName="SmartHome/HDL/Operation/Control.cs" Line="420" Column="73" />
+ <File FileName="SmartHome/UI/SimpleControl/MqttCommon.cs" Line="557" Column="39" />
+ <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" />
<File FileName="ON/Properties/AndroidManifest.xml" />
- <File FileName="SmartHome/UI/SimpleControl/MainPage.cs" Line="42" Column="58" />
- <File FileName="ON/Application.cs" Line="1" Column="1" />
- <File FileName="ON.Ios/Info.plist" />
- <File FileName="SmartHome/UI/SimpleControl/Phone/Curtain/UserDeviceToCurtains.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToLight.cs" Line="993" Column="44" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Light/UserDeviceToSocket.cs" Line="507" Column="24" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/Room/UserRoom.cs" Line="1880" Column="71" />
+ <File FileName="SmartHome/UI/SimpleControl/EquipmentPublicClass.cs" Line="136" Column="91" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs" Line="508" Column="34" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/AC/UserDeviceToAC.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/FoolHeat/UserDeviceToFH.cs" Line="332" Column="30" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserDeviceView.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="1" Column="1" />
+ <File FileName="SmartHome/HDL/Operation/Utlis.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="SmartHome" expanded="True">
- <Node name="ON.Droid" expanded="True" selected="True">
+ <Node name="ON.Droid" expanded="True">
<Node name="Properties" expanded="True" />
</Node>
<Node name="ON.Ios" expanded="True" />
<Node name="Shared" expanded="True">
<Node name="HDL" expanded="True">
- <Node name="Operation" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
- </Node>
+ <Node name="Operation" expanded="True" />
</Node>
- <Node name="IO" expanded="True" />
<Node name="UI" expanded="True">
<Node name="SimpleControl" expanded="True">
<Node name="Phone" expanded="True">
<Node name="AC" expanded="True" />
- <Node name="Alexa" expanded="True" />
- <Node name="Curtain" expanded="True" />
- <Node name="Fan" expanded="True" />
- <Node name="FresAir" expanded="True" />
- <Node name="Guide" expanded="True" />
+ <Node name="FoolHeat" expanded="True" />
<Node name="Light" expanded="True" />
- <Node name="Register" expanded="True" />
<Node name="Room" expanded="True" />
- <Node name="Scene" expanded="True" />
+ <Node name="System" expanded="True" />
<Node name="User" expanded="True" />
</Node>
+ <Node name="MqttCommon.cs" selected="True" />
</Node>
</Node>
</Node>
--
Gitblit v1.8.0