Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -60,10 +60,6 @@
    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">

      <HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>

    </Reference>

    <Reference Include="M2Mqtt.Net, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">

      <SpecificVersion>False</SpecificVersion>

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

    </Reference>

    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\Microsoft.AppCenter.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.dll</HintPath>

    </Reference>

@@ -88,9 +84,6 @@
    </Reference>

    <Reference Include="MQTTnet.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">

      <HintPath>..\packages\MQTTnet.2.4.0\lib\netstandard1.3\MQTTnet.Core.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TouchID">

      <HintPath>..\Shared\DLL\Shared.Droid.TouchID.dll</HintPath>

    </Reference>

    <Reference Include="System" />

    <Reference Include="System.Xml" />

@@ -129,44 +122,59 @@
    <Reference Include="Microsoft.AppCenter.Analytics">

      <HintPath>..\packages\Microsoft.AppCenter.Analytics.1.14.0\lib\MonoAndroid403\Microsoft.AppCenter.Analytics.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.HDLWidget">

      <HintPath>..\Shared\DLL\Shared.Droid.HDLWidget.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Annotations">

      <HintPath>..\packages\Xamarin.Android.Support.Annotations.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Annotations.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Compat">

      <HintPath>..\packages\Xamarin.Android.Support.Compat.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Compat.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Core.UI">

      <HintPath>..\packages\Xamarin.Android.Support.Core.UI.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Core.UI.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Core.Utils">

      <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Core.Utils.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Media.Compat">

      <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Media.Compat.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Fragment">

      <HintPath>..\packages\Xamarin.Android.Support.Fragment.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Fragment.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.v4">

      <HintPath>..\packages\Xamarin.Android.Support.v4.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.v4.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Vector.Drawable">

      <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">

      <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\lib\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Shared.Droid.dll</HintPath>

    </Reference>

    <Reference Include="Newtonsoft.Json">

      <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.HDLWidget">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.HDLWidget.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid.TouchID">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.TouchID.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.v7.AppCompat">

      <HintPath>..\..\..\..\Downloads\Shared.Dll-2019-10-29\Shared.Droid\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.v4">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.v4.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Vector.Drawable">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Media.Compat">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Media.Compat.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Fragment">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Core.Utils">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.Utils.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Core.UI">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.UI.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Compat">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Compat.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Annotations">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Annotations.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>

    </Reference>

    <Reference Include="Xamarin.Android.Arch.Core.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.dll</HintPath>

    </Reference>

    <Reference Include="Shared.Droid">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.dll</HintPath>

    </Reference>

    <Reference Include="M2Mqtt.Net">

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

    </Reference>

  </ItemGroup>

  <ItemGroup>

@@ -375,7 +383,6 @@
    <AndroidAsset Include="Assets\Phone\Item\Point.png" />

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

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

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

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

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

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

@@ -412,7 +419,6 @@
    <AndroidAsset Include="Assets\Phone\Item\FixedPosition.png" />

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

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

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

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

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

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

@@ -533,20 +539,15 @@
    <AndroidAsset Include="Assets\Phone\RealDevice\SensorCarbonMonoxide.png" />

    <AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />

    <AndroidAsset Include="Assets\Phone\RealDevice\PanelTwoButton.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1Selected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySelected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewayInstruct.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\SearchGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayImage.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6Selected.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGateway.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewayInstruct.png" />

    <AndroidAsset Include="Assets\Phone\Gateway\WiredGatewaySelected.png" />

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

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

    <AndroidAsset Include="Assets\Phone\Room\Room_IconSelectedBackground.png" />

@@ -574,13 +575,94 @@
    <AndroidAsset Include="Assets\Phone\Light\PlugSelected.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Safeguard\SafetyShortcut.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Safeguard\SafetyShortcutSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDevice.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\QQ.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Account\Wechat.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Safeguard\SafeguardPasswordGround.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\Close.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\CloseSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\Down.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\DownSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\Open.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\OpenSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\Stop.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\StopSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\Up.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RollerShade\UpSelected.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Gateway\AddGatewaySuccess.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\Gateway\WirelessGatewaySearching.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="..\DroidLib\DroidLib.csproj">

      <Project>{47EFF987-3192-4A56-A463-A940F245FF7D}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />

  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />