代码合并

wxr

2021-09-02 f1532873e3029b2fb17cb84c1b9da1e2f66247c4

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -463,6 +463,9 @@
        <Folder Include="Resources\Phone\FunctionIcon\Energy\" />
        <Folder Include="Resources\Phone\FunctionIcon\IrFan\" />
        <Folder Include="Assets.xcassets\device_bg.imageset\" />
        <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
        <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1321,6 +1324,35 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\AirFreshBgIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingCGS1bg.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingLitebg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckOnIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\SetLightSceneIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\RightIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FaceIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
      <BundleResource Include="Resources\Phone\Collection\DefenseAlarmIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FailIcon.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhcho.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalbreaker.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\security.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />