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 | 134 ++++++++++++++++++++++++++++++++++----------
1 files changed, 103 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 21d7aa8..a32f7d6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -1,16 +1,24 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Ios", "GateWay.Ios\GateWay.Ios.csproj", "{7D463846-A275-4A2E-930F-B5EA7200CEAA}"
-EndProject
-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}"
-EndProject
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29306.81
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DroidLib", "DroidLib\DroidLib.csproj", "{47EFF987-3192-4A56-A463-A940F245FF7D}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{D83486B1-9BE8-4728-A314-3C0B849E1AAB}"
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}") = "AndroidBluetooth", "AndroidBluetooth\AndroidBluetooth.csproj", "{ECD67F44-FA96-415A-8BC0-27B14A88C68A}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -18,51 +26,115 @@
Shared\Shared.projitems*{d83486b1-9be8-4728-a314-3c0b849e1aab}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
+ Release|Any CPU = Release|Any CPU
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Debug|iPhone.Build.0 = Debug|iPhone
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Release|iPhone.ActiveCfg = Release|iPhone
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Release|iPhone.Build.0 = Release|iPhone
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {7D463846-A275-4A2E-930F-B5EA7200CEAA}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {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
- {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|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
- {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
+ {47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47EFF987-3192-4A56-A463-A940F245FF7D}.Debug|Any CPU.Build.0 = Debug|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|Any CPU.ActiveCfg = Release|Any CPU
+ {47EFF987-3192-4A56-A463-A940F245FF7D}.Release|Any CPU.Build.0 = Release|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
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.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|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|Any CPU.Build.0 = Release|Any CPU
+ {28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {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
+ {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
+ {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
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {D4A49B02-C9FD-4987-BA40-527C9F8F61DD}
EndGlobalSection
EndGlobal
--
Gitblit v1.8.0