From 108b3cd44e9e2a36748cae8dccd22eff0c8cf989 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:16:58 +0800
Subject: [PATCH] 2019-11-13-1

---
 ZigbeeApp/Shared/Shared.projitems |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index c2852ad..7909d9c 100644
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -413,17 +413,21 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\IO\LocalFileUtils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\LightControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\LightControlForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\OnOffControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\PlugControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddLogicPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddScenePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CustomText.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Cycle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CyclicCycle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DelayTime.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DeviceStateCondition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DeviceTarget.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\EverymonthPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\EveryyearPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\IgnoreTime.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicCommunalPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicDevicePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicIfon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicListAutomation.cs" />
@@ -437,6 +441,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Send.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TemplateDeviceAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TemplateDeviceCondition.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TemplateIgnore.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TemplatePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TimePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TimePoint.cs" />
@@ -447,8 +452,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddScene.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicCommunalPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicList.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicCommunalPage.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicMain.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)Pad\" />
@@ -456,9 +459,17 @@
     <Folder Include="$(MSBuildThisFileDirectory)Phone\Device\Curtain\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Elian.iOS.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\M2Mqtt.Net.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\MQTTnet.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Newtonsoft.Json.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Security.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.xml" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.HDLWidget.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.TouchID.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Core.Common.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.dll" />
@@ -469,18 +480,11 @@
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Core.Utils.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Fragment.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Media.Compat.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.v4.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Elian.iOS.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.TBL.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Xamarin.Essentials.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\M2Mqtt.Net.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\MQTTnet.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Newtonsoft.Json.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Security.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />
   </ItemGroup>
 </Project>

--
Gitblit v1.8.0