From 60fea1a35f8bfd2eb1399cae05d853b93b3674f9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 03 一月 2020 13:47:35 +0800
Subject: [PATCH] 2020-01-03 1.增加信mqtt网关设备类型支持。 2.住宅ID改为string类型。
---
Crabtree/SmartHome.sln | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/Crabtree/SmartHome.sln b/Crabtree/SmartHome.sln
index 77cb729..df918d1 100644
--- a/Crabtree/SmartHome.sln
+++ b/Crabtree/SmartHome.sln
@@ -7,15 +7,15 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DroidService", "DroidService\DroidService.csproj", "{CE1A32D2-147D-406D-B194-7820468301D4}"
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}") = "ON.Droid", "ON\ON.Droid.csproj", "{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DroidLib", "DroidLib\DroidLib.csproj", "{47EFF987-3192-4A56-A463-A940F245FF7D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS", "Shared.IOS\Shared.IOS.csproj", "{0048AB87-2130-4437-8F01-8CADAB787004}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Shared.IOS", "Shared.IOS\Shared.IOS.csproj", "{73C54C81-18A3-4299-ACF7-70ACF755FF83}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid", "Shared.Droid\Shared.Droid.csproj", "{B7B2BB29-2DF1-4235-A67B-E09C2EC1EBAF}"
+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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,18 +51,6 @@
{CE1A32D2-147D-406D-B194-7820468301D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE1A32D2-147D-406D-B194-7820468301D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE1A32D2-147D-406D-B194-7820468301D4}.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
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhone.Build.0 = Release|iPhone
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhone.Build.0 = Debug|iPhone
- {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {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
{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}.Release|iPhone.ActiveCfg = Release|Any CPU
@@ -87,30 +75,42 @@
{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
- {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
+ {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
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhone.Build.0 = Release|iPhone
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhone.ActiveCfg = Debug|iPhone
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|iPhone.Build.0 = Debug|iPhone
+ {1D83BF28-BA88-4152-BA41-D7EFE90A5437}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+ {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
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
--
Gitblit v1.8.0