Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 ZigbeeApp/GateWay.Ios/GateWay.Ios.csproj

@@ -288,8 +288,6 @@
    <BundleResource Include="Resources\Phone\Item\OpenIcon.png" />

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

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

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

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

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

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

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