From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp

---
 ZigbeeApp/GateWay.sln |  118 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 68 insertions(+), 50 deletions(-)

diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 505f6f8..683673a 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -8,9 +8,15 @@
 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}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPhoneLib", "SPhoneLib\SPhoneLib.csproj", "{A6CA3387-58A7-4819-992F-C800C8839AFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{91139C9E-B674-417A-B99B-1381705D83F3}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{1AA155B7-E058-493A-B374-CCD32DFE953F}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}"
+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}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{BCCD05A7-CC25-4541-8262-2195E27EEB6B}"
 EndProject
@@ -54,54 +60,66 @@
 		{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
-		{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
-		{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|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.Build.0 = Release|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
-		{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
+		{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
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|iPhone.Build.0 = Release|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{91139C9E-B674-417A-B99B-1381705D83F3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|iPhone.Build.0 = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1AA155B7-E058-493A-B374-CCD32DFE953F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|iPhone.Build.0 = Debug|iPhone
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|iPhone.ActiveCfg = Release|iPhone
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|iPhone.Build.0 = Release|iPhone
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{0E10B7DE-15DA-4F8A-9CD0-798AB174603D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--
Gitblit v1.8.0