Merge branch 'wxr6' into temp-wxr

wxr

2021-06-23 197faa202beea7bc6723b24d3bc1de2d5fa48844

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -450,6 +450,7 @@
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
        <Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
        <Folder Include="Resources\Phone\FunctionIcon\Energy\" />
        <Folder Include="Resources\Phone\FunctionIcon\IrFan\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1291,6 +1292,18 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUD.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
      <BundleResource Include="Resources\Phone\Public\ScanGrey.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\FanIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
      <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon2.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />