From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 3ff7737..3611ec5 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -197,6 +197,59 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1496.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688_XS Max-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792_XR-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -675,7 +728,6 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor44.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor541.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\back1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedpanel.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nofunction.png" />
@@ -1088,7 +1140,8 @@
<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\Item\SynchronizationSelected.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0