Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

 ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj

@@ -220,7 +220,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\ColorDimmableLight.png" />

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

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

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

@@ -306,7 +305,6 @@
    <BundleResource Include="Resources\Phone\Item\Switch.png" />

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

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

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

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

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

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