合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -92,8 +92,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" />

@@ -137,38 +143,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>

@@ -481,7 +493,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" />

@@ -495,7 +506,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" />

@@ -968,6 +978,60 @@
  <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>

  <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')" />