Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Home.Ios/Home.IOS.csproj

@@ -728,7 +728,6 @@
      <BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor44.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor541.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\back1.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\selectedpanel.png" />
      <BundleResource Include="Resources\Phone\ZigeeLogic\nofunction.png" />
@@ -1141,7 +1140,8 @@
      <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\Item\SynchronizationSelected.png" />
    </ItemGroup>
    <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
    <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
</Project>