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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -84,8 +84,14 @@
    <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">

      <HintPath>..\Shared\DLL\Android\Shared.Droid.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\Shared.Droid.TouchID.dll</HintPath>

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

    </Reference>

    <Reference Include="System" />

    <Reference Include="System.IO.Compression" />

@@ -129,38 +135,44 @@
    <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 Include="Xamarin.Android.Arch.Core.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Core.Common.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 Include="Xamarin.Android.Arch.Lifecycle.Common">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.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 Include="Xamarin.Android.Arch.Lifecycle.Runtime">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.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>

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

    </Reference>

    <Reference Include="Shared.Droid">

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

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

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Annotations.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.Core.UI">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Core.UI.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.Fragment">

      <HintPath>..\Shared\DLL\Android\Xamarin.Android.Support.Fragment.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.v4">

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

    </Reference>

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

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

    </Reference>

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

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

    </Reference>

  </ItemGroup>

  <ItemGroup>

@@ -208,12 +220,6 @@
  </ItemGroup>

  <ItemGroup>

    <AndroidResource Include="Resources\xml\file_paths.xml" />

  </ItemGroup>

  <ItemGroup>

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

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

      <Name>DroidLib</Name>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Language.ini" />

@@ -401,19 +407,14 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />

    <AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <AndroidAsset Include="Assets\Phone\Instruct\DeviceSearch.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\DimmableLightOneLoad.png" />

    <AndroidAsset Include="Assets\Phone\Instruct\IntelligentLocksH06C.png" />

@@ -475,7 +476,6 @@
    <AndroidAsset Include="Assets\Phone\Item\RightIcon.png" />

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

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

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

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

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

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

@@ -489,7 +489,6 @@
    <AndroidAsset Include="Assets\Phone\Item\Switch2Selected.png" />

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

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

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

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

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

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

@@ -920,6 +919,135 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\ZigeeLogic\selectedtemperature.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\BindPic\BindRoomColor.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\BindPic\BindRoomColorOn.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

  </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>

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

      <Project>{47eff987-3192-4a56-a463-a940f245ff7d}</Project>

      <Name>DroidLib</Name>

    </ProjectReference>

  </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>

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

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

  <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />