Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-09 134811c790a982d505567e2ba69b5de566410367

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -47,14 +47,14 @@
        <ErrorReport>prompt</ErrorReport>
        <WarningLevel>4</WarningLevel>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
        <MtouchDebug>true</MtouchDebug>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchLink>SdkOnly</MtouchLink>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision>
<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -885,7 +885,6 @@
      <BundleResource Include="Resources\Phone\LogicIcon\-.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\+.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\point.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
      <BundleResource Include="Resources\Phone\oRobot.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
@@ -1057,16 +1056,12 @@
      <BundleResource Include="Resources\Phone\PirIcon\online.png" />
      <BundleResource Include="Resources\Phone\PirIcon\adddevice.png" />
      <BundleResource Include="Resources\Phone\PirIcon\next.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\selected+.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
      <ITunesArtwork Include="iTunesArtwork%402x" />
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
        <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
        <Name>Blufi</Name>
      </ProjectReference>
    </ItemGroup>
    <ItemGroup>
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -1102,6 +1097,12 @@
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
        <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
        <Name>Blufi</Name>
      </ProjectReference>
    </ItemGroup>
    <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
    <ProjectExtensions>