From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/GateWay.sln | 61 ++++++++++++++----------------
1 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 734e99a..12dcaa6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -1,77 +1,74 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.87
+VisualStudioVersion = 16.0.29306.81
MinimumVisualStudioVersion = 10.0.40219.1
-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
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}") = "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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{930FE62C-60E3-4AB6-8645-CAD9E33ADC45}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\Shared.projitems*{28ede1ff-20ef-476b-8af8-24a3eeb69f45}*SharedItemsImports = 4
Shared\Shared.projitems*{d83486b1-9be8-4728-a314-3c0b849e1aab}*SharedItemsImports = 13
- Shared\Shared.projitems*{f1296e2c-3777-4385-85b2-da77617e3178}*SharedItemsImports = 4
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
- {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|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|Any CPU.Deploy.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|iPhone.Deploy.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|Any CPU.Deploy.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|iPhone.Deploy.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
- {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|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|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|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
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {2D0E8900-2104-48AF-BDB8-03BF6C558B2F}
+ SolutionGuid = {D4A49B02-C9FD-4987-BA40-527C9F8F61DD}
EndGlobalSection
EndGlobal
--
Gitblit v1.8.0