请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -25,6 +25,8 @@
        <MtouchArch>x86_64</MtouchArch>
        <MtouchLink>None</MtouchLink>
        <MtouchDebug>true</MtouchDebug>
        <CodesignProvision>Home_Dev2</CodesignProvision>
        <CodesignKey>iPhone Developer</CodesignKey>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
        <DebugType>none</DebugType>
@@ -51,7 +53,6 @@
        <MtouchDebug>true</MtouchDebug>
        <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
<CodesignProvision>Home_Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -197,6 +198,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" />