From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a8e1ced..abaedc6 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>
@@ -602,7 +602,7 @@
<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\bjicon.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" />
@@ -612,6 +612,16 @@
<BundleResource Include="Resources\Phone\LogicIcon\back.png" />
<BundleResource Include="Resources\Phone\LogicIcon\scene.png" />
<BundleResource Include="Resources\Phone\LogicIcon\editname.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\bjicon1.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\bjicon2.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\bjicon3.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\bjicon4.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0