Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-04-08 13faa230078dcf13bee96a101849e256c186de6e

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -485,6 +485,7 @@
        <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
        <Folder Include="Base.lproj\" />
        <Folder Include="Resources\Phone\FunctionIcon\CAC\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1386,6 +1387,12 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" />
      <BundleResource Include="Resources\Phone\Collection\FunctionOfflineBg.png" />
      <BundleResource Include="Resources\Phone\Public\MsgIcon\CallIcon.png" />
      <BundleResource Include="Resources\Phone\Public\MsgIcon\AnswerIcon.png" />
      <BundleResource Include="Resources\Phone\Public\MsgIcon\HangUpIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\CAC\DataIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\CAC\JinMaoIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\hvaccac.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />