2019.11.28

gxc

2019-11-28 427d1c7ecd04b03419eae157e32fe3367d8dffea

 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj

@@ -34,7 +34,6 @@
    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>

    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

  </PropertyGroup>

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

    <DebugSymbols>true</DebugSymbols>

@@ -48,7 +47,6 @@
    <MandroidI18n>cjk</MandroidI18n>

    <DefineConstants>Android,Release</DefineConstants>

    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>

    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>

    <AndroidDexTool>d8</AndroidDexTool>

    <AndroidUseAapt2>false</AndroidUseAapt2>

  </PropertyGroup>

@@ -186,6 +184,12 @@
    </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>

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

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

    </Reference>

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

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

    </Reference>

  </ItemGroup>

  <ItemGroup>

@@ -538,10 +542,25 @@
    <AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

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

@@ -1200,6 +1219,10 @@
  <ItemGroup>

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

  </ItemGroup>

  <ItemGroup>

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

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

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