请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -152,112 +152,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" />
@@ -440,12 +394,11 @@
      <BundleResource Include="Resources\Phone\Navigation\SettingSelected.png" />
      <BundleResource Include="Resources\Phone\SmartSound\PullDown.png" />
      <BundleResource Include="Resources\Phone\SmartSound\Xiaodu.png" />
      <BundleResource Include="Resources\Phone\SmartSound\Sibici.png" />
      <BundleResource Include="Resources\Phone\SmartSound\Xiaoai.png" />
      <BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
      <BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
      <BundleResource Include="Resources\Phone\SmartSound\Tianmao.png" />
      <BundleResource Include="Resources\Phone\SmartSound\CheckBoxDef.png" />
      <BundleResource Include="Resources\Phone\SmartSound\CheckBoxSel.png" />
      <BundleResource Include="Resources\Phone\RollerShade\Stop.png" />
      <BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
      <BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -572,6 +525,7 @@
      <BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
      <BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
      <BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
      <BundleResource Include="Resources\Phone\Item\AdjustSuccessIcon.png" />
      <BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
      <BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
      <BundleResource Include="Resources\Phone\Item\Time.png" />
@@ -608,6 +562,7 @@
      <BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
      <BundleResource Include="Resources\Phone\Item\Remote.png" />
      <BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
      <BundleResource Include="Resources\Phone\Item\TransferOfResidenceIcon.png" />
      <BundleResource Include="Resources\Phone\Item\Safety.png" />
      <BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
      <BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -658,6 +613,7 @@
      <BundleResource Include="Resources\Phone\Item\Floor.png" />
      <BundleResource Include="Resources\Phone\Item\videoIntercom.png" />
      <BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
      <BundleResource Include="Resources\Phone\Item\AdjustFailIcon.png" />
      <BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
      <BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
      <BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
@@ -1159,12 +1115,25 @@
      <BundleResource Include="Resources\Phone\Gateway\WirelessApDirection.png" />
      <BundleResource Include="Resources\Phone\Gateway\GatewayIcon11.png" />
      <BundleResource Include="Resources\Phone\Gateway\GatewayIcon1.png" />
      <BundleResource Include="Resources\Phone\Gateway\GatewayIcon16.png" />
      <BundleResource Include="Resources\Phone\Gateway\WirelessApGatewaySearching.png" />
      <BundleResource Include="Resources\Phone\Gateway\RealGateway11.png" />
      <BundleResource Include="Resources\Phone\Gateway\GatewayIcon6.png" />
      <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\Instruct\AirQualitySensor.png" />
      <BundleResource Include="Resources\Phone\Instruct\Airer.png" />
      <BundleResource Include="Resources\Phone\RealDevice\Airer.png" />
      <BundleResource Include="Resources\Phone\Device\Airer.png" />
      <BundleResource Include="Resources\Phone\Device\AirerSelected.png" />
      <BundleResource Include="Resources\Phone\Device\AirerSelected2.png" />
      <BundleResource Include="Resources\Phone\Device\AirQualitySensor.png" />
      <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected.png" />
      <BundleResource Include="Resources\Phone\Device\AirQualitySensorSelected2.png" />
      <BundleResource Include="Resources\Phone\DoorLock\AddFaceIDTipPic.png" />
      <BundleResource Include="Resources\Phone\DoorLock\faceId.png" />
      <BundleResource Include="Resources\Phone\DoorLock\faceIdOn.png" />
    </ItemGroup>
    <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />