From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Home.Ios/Home.IOS.csproj | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp20200414/Home.Ios/Home.IOS.csproj b/ZigbeeApp20200414/Home.Ios/Home.IOS.csproj
index a4285db..ebef266 100644
--- a/ZigbeeApp20200414/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp20200414/Home.Ios/Home.IOS.csproj
@@ -77,6 +77,9 @@
<Reference Include="Shared.IOS">
<HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -84,9 +87,6 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
- <Reference Include="Shared.IOS.TBL">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
@@ -148,33 +148,6 @@
<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\LaunchImage.launchimage\11 Pro Max.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11.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\11pro.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\AppIcon.appiconset\40*40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
@@ -193,6 +166,33 @@
<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" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -328,6 +328,20 @@
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_5.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_4.png" />
<BundleResource Include="Resources\Phone\MenuGroud\TopRightMenu2_6.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\2.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\3.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\1.png" />
+ <BundleResource Include="Resources\Phone\SceneCardIcon\0.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueTwoButtonTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelTable.png" />
<BundleResource Include="Resources\Phone\DeviceItem\PanelFangyueEightButtonTable.png" />
@@ -449,7 +463,7 @@
<BundleResource Include="Resources\Phone\DoorLock\UnLockSideslipIcon.png" />
<BundleResource Include="Resources\Phone\DoorLock\UndistributeIcon.png" />
<BundleResource Include="Resources\Phone\Logo\Logo.png" />
- <BundleResource Include="Resources\Phone\Logo\2.jpg" />
+ <BundleResource Include="Resources\Phone\Logo\2.png" />
<BundleResource Include="Resources\Phone\Item\Shared.png" />
<BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
<BundleResource Include="Resources\Phone\Item\Add.png" />
@@ -480,6 +494,7 @@
<BundleResource Include="Resources\Phone\Item\ScanQRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Item\LogicMsgIcon.png" />
<BundleResource Include="Resources\Phone\Item\InputAccountIcon.png" />
+ <BundleResource Include="Resources\Phone\Item\NormallyOpen.png" />
<BundleResource Include="Resources\Phone\Item\ItemSelected.png" />
<BundleResource Include="Resources\Phone\Item\UnLockSuccess.png" />
<BundleResource Include="Resources\Phone\Item\GarrisonList.png" />
--
Gitblit v1.8.0