From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 9321179..1b79083 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -108,6 +108,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
+ <Folder Include="Resources\Phone\PM2.5Sensor\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -813,7 +814,6 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelThree.png" />
<BundleResource Include="Resources\Phone\Device\SensorInfraredSelected.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterSelected2.png" />
- <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Device\ConverterSelected.png" />
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
@@ -1030,6 +1030,14 @@
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorPMTwoPointFive.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpoint.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\AirQualitySensorEpointSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFive.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\HumidityPic.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\PmPic.png" />
+ <BundleResource Include="Resources\Phone\PM2.5Sensor\TemperaturePic.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
--
Gitblit v1.8.0