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 | 126 +++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 56 deletions(-)
diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index faa9184..a32f7d6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -6,17 +6,19 @@
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{D83486B1-9BE8-4728-A314-3C0B849E1AAB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}"
EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{441E285A-C255-4ACE-970D-28E679F88F57}"
-EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{4930B212-5FF8-40A0-B07C-7E0BF843F461}"
-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
@@ -44,18 +46,6 @@
{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
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhone.Build.0 = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|Any CPU.Build.0 = Release|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhone.ActiveCfg = Release|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhone.Build.0 = Release|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {930FE62C-60E3-4AB6-8645-CAD9E33ADC45}.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
@@ -68,42 +58,6 @@
{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
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhone.Build.0 = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|Any CPU.Build.0 = Release|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.ActiveCfg = Release|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhone.Build.0 = Release|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {65B2FC7C-6B62-4506-BBDD-986C4ACCFF25}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhone.Build.0 = Debug|iPhone
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.ActiveCfg = Release|iPhone
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhone.Build.0 = Release|iPhone
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {441E285A-C255-4ACE-970D-28E679F88F57}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhone.Build.0 = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|Any CPU.Build.0 = Release|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhone.ActiveCfg = Release|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhone.Build.0 = Release|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {4930B212-5FF8-40A0-B07C-7E0BF843F461}.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
@@ -116,6 +70,66 @@
{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
--
Gitblit v1.8.0