2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL_ON/HDL_ON.projitems

@@ -274,6 +274,10 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\OutdoorEnvironment.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\WeatherCondition.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\1-test-\TestDialog.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\ThirdPartyBrandListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\EmptyClass.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddThirdPartyBrandListpage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Entity\Integratedbrand\IntegratedBrand.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Entity\Function\AirCleaner.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Entity\Function\WeepRobot.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\TuyaAirCleanerPage.cs" />

@@ -323,6 +327,10 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Controls\CompoundControls\SeekBarImageControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Controls\CompoundControls\FanGearSeekBarControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Controls\CompoundControls\ProgressBar.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\TuyaWaterValvePage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Controls\CompoundControls\BatteryPersentControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\TuyaWeepRobotConsumablesMagPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\TuyaWeepRobotHistoryPage.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)UI\" />

@@ -357,5 +365,7 @@
    <Folder Include="$(MSBuildThisFileDirectory)UI\BindingResidence\" />

    <Folder Include="$(MSBuildThisFileDirectory)Common\Utlis\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\1-test-\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\" />

    <Folder Include="$(MSBuildThisFileDirectory)Entity\Integratedbrand\" />

  </ItemGroup>

</Project>