From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/SmartHome.projitems | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/SmartHome.projitems b/Crabtree/SmartHome/SmartHome.projitems
index 28c02a1..3ed0c6b 100644
--- a/Crabtree/SmartHome/SmartHome.projitems
+++ b/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\" />
--
Gitblit v1.8.0