From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index ef64313..052cf7d 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -591,6 +591,36 @@
<BundleResource Include="Resources\Phone\Classification\Room\Roombg8.png" />
<BundleResource Include="Resources\Phone\Classification\Room\Roombg9.png" />
<BundleResource Include="Resources\Phone\Classification\Room\Roombg10.png" />
+ <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" />
+ <BundleResource Include="Resources\Phone\LogicIcon\weekon.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\outletlogic.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0