From 7a2b08af309d3b16e380c83063da8211cc97217a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 14:18:42 +0800
Subject: [PATCH] 一个新版本

---
 ZigbeeApp/Home.Ios/Home.IOS.csproj |  199 +++++++++++++++++++------------------------------
 1 files changed, 77 insertions(+), 122 deletions(-)

diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 575a8c7..dbfa276 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -119,6 +119,7 @@
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Resources\" />
+        <Folder Include="Resources\Phone\RoomIcon\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -152,112 +153,66 @@
       </ProjectReference>
     </ItemGroup>
     <ItemGroup>
-      <ImageAsset Include="Assets.xcassets\.DS_Store" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" />
       <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
       <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
       <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" />
       <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688_XS Max.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792_XR.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*2732-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*768.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1004.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2008.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768*1024-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536*2048-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024*748.png" />
-      <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\1242_2688.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-1.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-1.png" />
+      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748.png" />
+      <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.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴828*1792.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2688*1242.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1792*828.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1125*2436.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2436*1125.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2208.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2208*1242.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*2732.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768*1024.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536*2048.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024*768.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*1536.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴750_1334澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴320_480澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1004澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2008澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1024澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2048澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_748澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1496澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_768澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1536澶囦唤.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-2.png" />
-      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180-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\1024*1024-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-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\1024_1024-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\512_512-1.png" />
+      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
     </ItemGroup>
     <ItemGroup>
       <BundleResource Include="Resources\Language.ini" />
@@ -991,28 +946,6 @@
       <BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" />
       <BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" />
       <BundleResource Include="Resources\Phone\Floor\Floor.png" />
-      <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
-      <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
       <BundleResource Include="Resources\Phone\Account\Logo_WhiteHome.png" />
       <BundleResource Include="Resources\Phone\Account\Code.png" />
       <BundleResource Include="Resources\Phone\Account\Cancle.png" />
@@ -1166,6 +1099,28 @@
       <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\RoomIcon\0.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\8.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
+      <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
     </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