Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-17 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -488,6 +488,8 @@
        <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
        <Folder Include="Base.lproj\" />
        <Folder Include="Resources\Phone\FunctionIcon\CAC\" />
        <Folder Include="Resources\Phone\FunctionIcon\Panel\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1389,6 +1391,22 @@
      <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" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
      <BundleResource Include="Resources\Phone\Public\dialogBg2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhelp.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\screenpanel.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />