From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期一, 04 十一月 2019 17:58:40 +0800 Subject: [PATCH] 2019-11-04-1 --- ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 66 +------------------------------- 1 files changed, 3 insertions(+), 63 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj index f15e4cb..0515d46 100755 --- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj +++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj @@ -35,10 +35,6 @@ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <AndroidSupportedAbis /> <AndroidDexTool>d8</AndroidDexTool> - <AotAssemblies>false</AotAssemblies> - <EnableLLVM>false</EnableLLVM> - <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot> - <BundleAssemblies>false</BundleAssemblies> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -52,10 +48,6 @@ <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> @@ -91,12 +83,6 @@ </Reference> <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.GDMapKit"> - <HintPath>..\Shared\DLL\Shared.Droid.GDMapKit.dll</HintPath> - </Reference> - <Reference Include="Shared.Droid.PickerView"> - <HintPath>..\Shared\DLL\Shared.Droid.PickerView.dll</HintPath> </Reference> <Reference Include="Shared.Droid.TouchID"> <HintPath>..\Shared\DLL\Shared.Droid.TouchID.dll</HintPath> @@ -142,12 +128,6 @@ </Reference> <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.TBL"> - <HintPath>..\Shared\DLL\Shared.Droid.TBL.dll</HintPath> - </Reference> - <Reference Include="Shared.Droid.TCL"> - <HintPath>..\Shared\DLL\Shared.Droid.TCL.dll</HintPath> </Reference> <Reference Include="Shared.Droid.HDLWidget"> <HintPath>..\Shared\DLL\Shared.Droid.HDLWidget.dll</HintPath> @@ -483,6 +463,8 @@ <AndroidAsset Include="Assets\Phone\Item\OpenIcon.png" /> <AndroidAsset Include="Assets\Phone\Item\PersentIcon.png" /> <AndroidAsset Include="Assets\Phone\Item\PickerColorWheel.png" /> + <AndroidAsset Include="Assets\Phone\Item\PirSensorLightScale.png" /> + <AndroidAsset Include="Assets\Phone\Item\PirSensorLightScaleButton.png" /> <AndroidAsset Include="Assets\Phone\Item\Point.png" /> <AndroidAsset Include="Assets\Phone\Item\ProgressMsg.png" /> <AndroidAsset Include="Assets\Phone\Item\PswSettion.png" /> @@ -938,48 +920,6 @@ <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> <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')" /> @@ -991,4 +931,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