From f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 19 十二月 2020 17:48:11 +0800
Subject: [PATCH] 完成筛选房间的功能
---
HDL-ON_Android/HDL-ON_Android.csproj | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 093a46e..5fe7cda 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -209,7 +209,7 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -620,16 +620,13 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
- <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
- <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\bjicon5.png" />
- <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
@@ -647,6 +644,25 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheScene.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheTime.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
+ <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
+ <AndroidAsset Include="Assets\Phone\oRobot.png" />
+ <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\PopupDialog.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0