From af0266fa5570b6adcdb22f631bf13170e8646ca5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:15:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 880c698..b7b8c09 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -48,6 +48,12 @@
<MandroidI18n>cjk</MandroidI18n>
<DefineConstants>Android,Release</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+ <AotAssemblies>false</AotAssemblies>
+ <EnableLLVM>false</EnableLLVM>
+ <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
+ <BundleAssemblies>false</BundleAssemblies>
+ <AndroidDexTool>d8</AndroidDexTool>
+ <AndroidUseAapt2>false</AndroidUseAapt2>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
@@ -555,12 +561,20 @@
<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" />
+ <AndroidAsset Include="Assets\Phone\Room\Room_IconUnselectedBackground.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\Selected.png" />
+ <AndroidAsset Include="Assets\Phone\Scene\SceneIcon.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" />
@@ -573,4 +587,4 @@
<Import Project="..\packages\Xamarin.Android.Support.v4.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.v4.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
-</Project>
\ No newline at end of file
+</Project>
--
Gitblit v1.8.0