Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -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,15 @@
      <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" />