From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/GateWay.sln |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 153b144..a32f7d6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -18,6 +18,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidBluetooth", "AndroidBluetooth\AndroidBluetooth.csproj", "{ECD67F44-FA96-415A-8BC0-27B14A88C68A}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\Shared.projitems*{28ede1ff-20ef-476b-8af8-24a3eeb69f45}*SharedItemsImports = 4
@@ -116,6 +118,18 @@
 		{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
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|iPhone.Build.0 = Release|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{ECD67F44-FA96-415A-8BC0-27B14A88C68A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--
Gitblit v1.8.0