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/SmartHome.sln | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Crabtree/SmartHome.sln b/Crabtree/SmartHome.sln
index df918d1..d88eba6 100644
--- a/Crabtree/SmartHome.sln
+++ b/Crabtree/SmartHome.sln
@@ -11,11 +11,11 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DroidLib", "DroidLib\DroidLib.csproj", "{47EFF987-3192-4A56-A463-A940F245FF7D}"
EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Shared.IOS", "Shared.IOS\Shared.IOS.csproj", "{73C54C81-18A3-4299-ACF7-70ACF755FF83}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Shared.Droid", "Shared.Droid\Shared.Droid.csproj", "{B876C313-1818-41B8-9102-104A32AF325E}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ON.Ios", "ON.Ios\ON.Ios.csproj", "{1D83BF28-BA88-4152-BA41-D7EFE90A5437}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS", "Shared.IOS\Shared.IOS.csproj", "{0048AB87-2130-4437-8F01-8CADAB787004}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid", "Shared.Droid\Shared.Droid.csproj", "{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -75,30 +75,6 @@
{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|Any CPU.Build.0 = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|iPhone.ActiveCfg = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|iPhone.Build.0 = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|iPhone.Build.0 = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {73C54C81-18A3-4299-ACF7-70ACF755FF83}.Release|Any CPU.Build.0 = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|iPhone.ActiveCfg = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|iPhone.Build.0 = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|iPhone.Build.0 = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B876C313-1818-41B8-9102-104A32AF325E}.Release|Any CPU.Build.0 = Release|Any CPU
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhone.ActiveCfg = Release|iPhone
@@ -111,6 +87,30 @@
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|Any CPU.ActiveCfg = Release|iPhone
{1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|Any CPU.Build.0 = Release|iPhone
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|iPhone.Build.0 = Release|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0048AB87-2130-4437-8F01-8CADAB787004}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhone.Build.0 = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
--
Gitblit v1.8.0