Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -621,6 +621,10 @@
      <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" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />