From 2a23fbede38fadaf7060510a3cd72a93a8a95ec0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 18 十二月 2020 17:49:46 +0800
Subject: [PATCH] 2020-12-18-3
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 3656aba..e650762 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -89,9 +89,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Newtonsoft.Json">
- <Version>12.0.2</Version>
+ <Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.0.13</Version>
@@ -594,16 +594,13 @@
<BundleResource Include="Resources\Phone\LogicIcon\heatlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\on.png" />
<BundleResource Include="Resources\Phone\LogicIcon\off.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\timecondition.png" />
<BundleResource Include="Resources\Phone\LogicIcon\down.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\timeicon.png" />
<BundleResource Include="Resources\Phone\LogicIcon\lightloguc.png" />
<BundleResource Include="Resources\Phone\LogicIcon\set.png" />
<BundleResource Include="Resources\Phone\LogicIcon\addconditiontarget.png" />
<BundleResource Include="Resources\Phone\LogicIcon\functionicon.png" />
<BundleResource Include="Resources\Phone\LogicIcon\airconditionerlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\bjicon5.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\delayed.png" />
<BundleResource Include="Resources\Phone\LogicIcon\next.png" />
<BundleResource Include="Resources\Phone\LogicIcon\curtainlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\weekoff.png" />
@@ -619,6 +616,17 @@
<BundleResource Include="Resources\Phone\LogicIcon\-.png" />
<BundleResource Include="Resources\Phone\LogicIcon\+.png" />
<BundleResource Include="Resources\Phone\LogicIcon\point.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
+ <BundleResource Include="Resources\Phone\oRobot.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelTip.png" />
+ <BundleResource Include="Resources\Phone\RoomListBg.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\link.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\time.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0