Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj

@@ -267,7 +267,6 @@
    <BundleResource Include="Resources\Phone\Device\ButtonPanelOne.png" />

    <BundleResource Include="Resources\Phone\Device\ButtonPanelThree.png" />

    <BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />

    <BundleResource Include="Resources\Phone\Device\ColorLight.png" />

    <BundleResource Include="Resources\Phone\Device\Converter.png" />

    <BundleResource Include="Resources\Phone\Device\ConverterZb485.png" />

    <BundleResource Include="Resources\Phone\Device\Curtain.png" />

@@ -520,7 +519,6 @@
    <BundleResource Include="Resources\Phone\Item\SwitchSelected.png" />

    <BundleResource Include="Resources\Phone\Item\SwitchSelected1.png" />

    <BundleResource Include="Resources\Phone\Item\ThirdPartyDevice.png" />

    <BundleResource Include="Resources\Phone\Item\Time.png" />

    <BundleResource Include="Resources\Phone\Item\Timer.png" />

    <BundleResource Include="Resources\Phone\Item\Tips.png" />

    <BundleResource Include="Resources\Phone\Item\UnHidenPWD.png" />