From 0f5a53c7b36c27a0f2bec12e6119207edb6860f8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:29:21 +0800
Subject: [PATCH] 修改主页卡死问题
---
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index e972c74..2f9c150 100755
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -92,12 +92,6 @@
<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>
</Reference>
@@ -142,12 +136,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,8 +471,6 @@
<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" />
@@ -940,6 +926,48 @@
<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')" />
--
Gitblit v1.8.0