Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -176,6 +176,15 @@
    <Reference Include="M2Mqtt.Net">

      <HintPath>..\Shared\DLL\M2Mqtt.Net.dll</HintPath>

    </Reference>

    <Reference Include="ZXing.Net.Mobile.Core, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXing.Net.Mobile.Core.dll</HintPath>

    </Reference>

    <Reference Include="zxing.portable, Version=0.16.2.0, Culture=neutral, PublicKeyToken=830ae994e36ac27d, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\zxing.portable.dll</HintPath>

    </Reference>

    <Reference Include="ZXingNetMobile, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\ZXing.Net.Mobile.2.4.1\lib\MonoAndroid71\ZXingNetMobile.dll</HintPath>

    </Reference>

  </ItemGroup>

  <ItemGroup>

    <Compile Include="Application.cs" />

@@ -573,6 +582,20 @@
    <AndroidAsset Include="Assets\Phone\Light\ONSelected.png" />

    <AndroidAsset Include="Assets\Phone\Light\Plug.png" />

    <AndroidAsset Include="Assets\Phone\Light\PlugSelected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_Auto.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_AutoSelected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_1.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_1Selected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_2.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_2Selected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_3.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_3Selected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_4.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_4Selected.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_5.png" />

    <AndroidAsset Include="Assets\Phone\AC\Swing_5Selected.png" />

    <AndroidAsset Include="Assets\Phone\AC\SwingBackground.png" />

    <AndroidAsset Include="Assets\Phone\Item\List.png" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="Assets\Phone\Scene\" />