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 |  110 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 505f6f8..a32f7d6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -8,13 +8,17 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPhoneLib", "SPhoneLib\SPhoneLib.csproj", "{A6CA3387-58A7-4819-992F-C800C8839AFB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.Droid.JPush", "Shared.Droid.JPush\Shared.Droid.JPush.csproj", "{06B9C874-B9B2-4417-8280-B321F966E46B}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{B592195E-7DC2-4745-B53D-AD849835EAF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{85F1AF50-75A6-4011-B811-56B32DA77568}"
+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}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{BCCD05A7-CC25-4541-8262-2195E27EEB6B}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{897BFC2B-5945-4FBB-AC18-64496ADA2C50}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidBluetooth", "AndroidBluetooth\AndroidBluetooth.csproj", "{ECD67F44-FA96-415A-8BC0-27B14A88C68A}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -54,6 +58,54 @@
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.Build.0 = Release|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhone.Build.0 = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A6CA3387-58A7-4819-992F-C800C8839AFB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|iPhone.Build.0 = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{06B9C874-B9B2-4417-8280-B321F966E46B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|iPhone.Build.0 = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B592195E-7DC2-4745-B53D-AD849835EAF5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F1AF50-75A6-4011-B811-56B32DA77568}.Debug|Any CPU.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|Any CPU.ActiveCfg = Release|Any CPU
+		{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|Any CPU.Build.0 = Release|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
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone
@@ -66,42 +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
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.Build.0 = Release|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|iPhone.Build.0 = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BCCD05A7-CC25-4541-8262-2195E27EEB6B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|iPhone.Build.0 = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{897BFC2B-5945-4FBB-AC18-64496ADA2C50}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{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