2019.12.5

gxc

2019-12-05 c26d742cef5ac268ca902b6605512b6476a26bc2

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -40,6 +40,7 @@
    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidSupportedAbis />

    <AndroidDexTool>d8</AndroidDexTool>

<AndroidKeyStore></AndroidKeyStore>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

    <DebugSymbols>true</DebugSymbols>

@@ -108,9 +109,6 @@
    </Reference>

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

    <Reference Include="System.Net.Http" />

    <Reference Include="MQTTnet.Core">

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

    </Reference>

    <Reference Include="MQTTnet">

      <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>

    </Reference>

@@ -550,9 +548,6 @@
    <AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />

    <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />

    <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />

    <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />

@@ -567,6 +562,7 @@
    <AndroidAsset Include="Assets\Phone\Room\List.png" />

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

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

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

  </ItemGroup>

  <ItemGroup>

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

@@ -1241,12 +1237,6 @@
    <AndroidAsset Include="Assets\Phone\Account\Back.png" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />

  </ItemGroup>

  <ItemGroup>

@@ -1259,13 +1249,7 @@
    <AndroidAsset Include="Assets\Phone\AC\AC_TIP.png" />

  </ItemGroup>

  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />

  </ItemGroup>

  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />

@@ -1297,6 +1281,9 @@
  <ItemGroup>

    <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />

  </ItemGroup>

  <ItemGroup>

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

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