Merge branch 'master' into wjc

陈嘉乐

2021-03-02 c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1

 Crabtree/SmartHome/SmartHome.projitems

@@ -280,7 +280,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Music\Tidal.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Music\Usbmusic.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Music\WiFiSet.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaSceneEditPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Guide\GuideSettingInfraredModule.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\TV\ConfigIRCode.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\MqttCommon.cs" />
@@ -289,7 +288,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Operation\ResponseEntity\API.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Light\SendControl.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Room\GenericDialog.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaAddScenePage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Common\Constant.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Common\HttpUtil\ErrorCode.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Common\HttpUtil\HttpServerRequest.cs" />
@@ -303,6 +301,13 @@
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Common\HDLLinkUtlis.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Schedule\Send.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Schedule\Method.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HDL\Common\HDLLinkScene.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\SmartSpeakertListPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\BasePage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaDeviceListPage %28副本%29.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaSettingScenePage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaSettingPage %28副本%29.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\SimpleControl\Phone\Alexa\AlexaSettingDevicePage.cs" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="$(MSBuildThisFileDirectory)DLL\" />