From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/GateWay.sln |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/ZigbeeApp20200825/GateWay.sln b/ZigbeeApp/GateWay.sln
similarity index 90%
rename from ZigbeeApp20200825/GateWay.sln
rename to ZigbeeApp/GateWay.sln
index df1f9e5..2da7ab0 100644
--- a/ZigbeeApp20200825/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29911.84
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShardLib", "ShardLib\ShardLib.csproj", "{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}"
@@ -18,7 +16,6 @@
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\Shared.projitems*{28ede1ff-20ef-476b-8af8-24a3eeb69f45}*SharedItemsImports = 4
 		Shared\Shared.projitems*{d83486b1-9be8-4728-a314-3c0b849e1aab}*SharedItemsImports = 13
-		Shared\Shared.projitems*{f1296e2c-3777-4385-85b2-da77617e3178}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|iPhone = Debug|iPhone
@@ -28,16 +25,15 @@
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Release|iPhone.Build.0 = Release|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{FB4A45BC-A09B-48F9-BE46-2CCA96F57749}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.Deploy.0 = Debug|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.ActiveCfg = Release|Any CPU
@@ -45,34 +41,28 @@
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhone.Build.0 = Release|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{47EFF987-3192-4A56-A463-A940F245FF7D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.Build.0 = Release|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6BEBBBB7-D2F8-45E5-9CBC-844DD85DFDE1}
 	EndGlobalSection
 EndGlobal

--
Gitblit v1.8.0