From ed2604abbc7949ebc78e3659fc9f03b2f814a14b Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 14:20:27 +0800
Subject: [PATCH] 2019.10.29-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs                           |  225 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs             |  207 
 ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs                           |   72 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs         |  244 
 ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll                              |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs         | 2102 +++++
 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs                   | 1766 ++-
 ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs                           |  914 +
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs          |  410 +
 ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs                          |  252 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                               |    6 
 ZigbeeApp/Shared/R.cs                                                      |   46 
 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs                        |  398 
 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs             | 1452 +++
 ZigbeeApp/Shared/Phone/Device/Category/Category.cs                         |  691 +
 ZigbeeApp/Shared/Common/Logic.cs                                           |   24 
 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs                                |  309 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs          |  377 
 ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll                                    |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs                      |  422 
 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide                               |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs                            |  281 
 ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll                            |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs                               |  556 +
 ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs                        |  603 
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs                        | 1235 ++-
 ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs                          |  389 +
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml                                     |   33 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 1144 ++
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs              |   63 
 ZigbeeApp/Shared/DLL/Shared.Droid.dll                                      |    0 
 ZigbeeApp/Shared/Shared.projitems                                          |   17 
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs                        |  377 
 /dev/null                                                                  |  681 -
 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs                     | 2033 ++++-
 ZigbeeApp/Shared/Common/ZigbeeColor.cs                                     |   30 
 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs                          |  104 
 ZigbeeApp/.vs/GateWay/xs/project-cache/GateWay.Droid-Debug.json            |    2 
 ZigbeeApp/Shared/DLL/Shared.IOS.dll                                        |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs                | 1384 ++-
 ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs                            |  275 
 ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs                      |   45 
 ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs                | 2102 +++++
 ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs                        | 1739 ++++
 44 files changed, 18,501 insertions(+), 4,509 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 6a5f5e2..3add788 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -4,46 +4,35 @@
   <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
   <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
     <Files>
-      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1105" Column="75" />
+      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1351" Column="26" />
       <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
       <File FileName="Shared/Common/SceneUI.cs" />
+      <File FileName="Shared/Common/ZigbeeColor.cs" />
+      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" />
+      <File FileName="Shared/R.cs" />
+      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs" />
+      <File FileName="Shared/Common/Logic.cs" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="GateWay" expanded="True">
             <Node name="GateWay.Droid" expanded="True">
+              <Node name="References" expanded="True" />
               <Node name="Assets" expanded="True">
-                <Node name="Phone" expanded="True">
-                  <Node name="Scene" expanded="True" />
-                  <Node name="SceneIcon" expanded="True" />
-                </Node>
+                <Node name="Phone" expanded="True" />
               </Node>
             </Node>
             <Node name="Shared" expanded="True">
-              <Node name="Common" expanded="True" />
+              <Node name="DLL" expanded="True" />
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="Category" expanded="True">
                     <Node name="Category.cs" selected="True" />
                   </Node>
-                  <Node name="CommonForm" expanded="True" />
-                  <Node name="Room" expanded="True" />
+                  <Node name="Logic" expanded="True" />
                 </Node>
-                <Node name="UserCenter" expanded="True">
-                  <Node name="CommonBase" expanded="True">
-                    <Node name="Controls" expanded="True">
-                      <Node name="CompoundControls" expanded="True" />
-                    </Node>
-                  </Node>
-                  <Node name="Device" expanded="True">
-                    <Node name="Panel" expanded="True" />
-                  </Node>
-                </Node>
-                <Node name="UserView" expanded="True" />
-                <Node name="ZigBee" expanded="True">
-                  <Node name="Device" expanded="True" />
-                </Node>
+                <Node name="ZigBee" expanded="True" />
               </Node>
             </Node>
           </Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/project-cache/GateWay.Droid-Debug.json b/ZigbeeApp/.vs/GateWay/xs/project-cache/GateWay.Droid-Debug.json
index ced0106..4240aab 100644
--- a/ZigbeeApp/.vs/GateWay/xs/project-cache/GateWay.Droid-Debug.json
+++ b/ZigbeeApp/.vs/GateWay/xs/project-cache/GateWay.Droid-Debug.json
@@ -1 +1 @@
-{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/BouncyCastle.Crypto.dll.1.8.1/lib/BouncyCastle.Crypto.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/DroidLib/bin/Debug/DroidLib.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/M2Mqtt.Net.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Analytics.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Analytics.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Analytics.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Analytics.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Crashes.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Crashes.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Crashes.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Crashes.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/MQTTnet.2.4.0/lib/netstandard1.3/MQTTnet.Core.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/MQTTnet.2.4.0/lib/netstandard1.3/MQTTnet.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Newtonsoft.Json.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Security.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.IO.Compression.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Net.Http.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Web.Services.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Animated.Vector.Drawable.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Annotations.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Annotations.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Compat.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Compat.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.UI.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Core.UI.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.Utils.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Core.Utils.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Fragment.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Fragment.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Media.Compat.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Media.Compat.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.v4.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.v4.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Vector.Drawable.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Vector.Drawable.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Contracts.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.FileVersionInfo.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Security.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.XDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebSockets.Client.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Dynamic.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Xml.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Principal.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.ThreadPool.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Cng.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.EventBasedAsync.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.CompilerServices.VisualC.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.DeriveBytes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/netstandard.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.UnmanagedMemoryStream.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Http.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XmlDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.Xsl.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.Writer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Console.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Cache.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Sockets.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.NetworkInformation.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Utilities.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Principal.Windows.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Claims.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Hashing.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.DriveInfo.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.X509Certificates.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Numerics.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.Watcher.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TraceSource.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.Lightweight.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.CodePages.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Expressions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Timer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.Pipes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.HttpListener.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.RegularExpressions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.Parallel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.NonGeneric.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.Concurrent.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Overlapped.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Pkcs.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Handles.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Data.SqlClient.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ObjectModel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebHeaderCollection.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.RuntimeInformation.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.TypeConverter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Mail.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Parallel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.SecureString.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Registry.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.RSA.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.Annotations.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.Compression.ZipFile.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.WindowsRuntime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Queryable.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.ResourceManager.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.Reader.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.ILGeneration.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Data.Common.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.NameResolution.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceProcess.ServiceController.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Loader.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Security.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.AuthenticationManager.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.ReaderWriter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Tracing.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.AppContext.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Buffers.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.ECDsa.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Csp.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TextWriterTraceListener.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.MemoryMappedFiles.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.OpenSsl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Registry.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.RandomNumberGenerator.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.Specialized.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.ProtectedData.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ValueTuple.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.XmlDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.ServicePoint.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XmlSerializer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.ReaderWriter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encoding.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.IsolatedStorage.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.NetTcp.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.TypeExtensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.Calendars.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Requests.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebSockets.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Json.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Algorithms.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Thread.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Process.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Tools.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Hashing.Algorithms.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Debug.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TraceEvent.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Drawing.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Formatters.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Ping.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Duplex.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.StackTrace.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.DispatchProxy.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.Aes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Memory.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Drawing.Common.dll","Aliases":[]}],"Files":["/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Application.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Properties/AssemblyInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/app.config","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/packages.config","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/AboutResources.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/layout/Main.axml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/values/Strings.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/values/Styles.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/drawable/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/xml/file_paths.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Language.ini","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/RoomCardView.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemUnSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemUnSelected_Black.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/FavoriteRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/NoNameRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_Rectangle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/RoomCardView_Name.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/RelayThreeLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/IntelligentLocksH06C.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/DimmableLightOneLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/DeviceSearch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Add.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Reduce.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_MiddleSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Height.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/OpenOrCloseSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Dry.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Group.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Low.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Heat.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Fan.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Path.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Cool.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Middle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_CoolSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/OpenOrClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_HeightSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_DrySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_AutoSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Auto.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/SelectedFanModeBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_HeatSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_FanSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_LowSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/SelectedModeBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Abount.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/ResidenceManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Backup.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/MenberManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/ImperialCrown.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Opinion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/DeviceManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Admin.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/SafetyManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/CategorySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Category.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/HomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Home.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/SettingSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindEmptyPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindLeft.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindAdd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindDown.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindRight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DistributeUnlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TypeIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddFailedPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SelectedIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Fingerprint207.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockPicClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TempPasswordBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddFingerprintTipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/FavoriteIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RightIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/ShareIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DateIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnlockSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockBlankPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/CancelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TemPasswordVisiable.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/proximityCard.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/EntrySuccessIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/proximityCardOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RemoteUnlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/MemberIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Left.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Fingerprint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DooorLockPicOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Password.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnselectedIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddIcCardTipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockUserPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethod.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RecordIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/FingerprintOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/VisitorIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TempPasswordBackground1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorlockPicture.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnlockFailed.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddPasswordTicPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethodOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SettingIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SideslipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SwitchOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RoomPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/PasswordOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethodIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockSideslipIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UndistributeIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Shared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/RoomIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PickerColorWheel.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Check.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add_GW.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MessageSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PersentIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/WrongIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DateSearchIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Time.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DownLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CloseIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NoBindGW.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/RightIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SwitchSelected1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/QRCode.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ItemSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnLockSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/GarrisonList.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/VirtualFrame.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon2Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionCardView.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ForgotPswList.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Down.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CollectionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Room.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Category_FunctionBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Remote.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScreeningType.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BottomShadow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CancelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Drop_Down.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/HidenPWD.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/House.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NewVersion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Point.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Search.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SwitchSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ThirdPartyDevice.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NextSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Timer.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardMenu.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnLockFail.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ProgressMsg.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Category_FunctionBGSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NoFunction.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch2Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MyHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PswSettionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectFloor_Left.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add_Category.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ResidenceIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Tips.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/HouseSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardRoomSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Floor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Delete.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FixedPositionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Collection1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Collection.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UpperTriangle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SceneCard.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Next.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnHidenPWD.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/OpenIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionCardViewSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PswSettion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CollectionSelected1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Message.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FixedPosition.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/GarrisonListSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Back.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Scene.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionViewBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SceneFunctionBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectHouse.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/CurtainSiphonate.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DimmableLight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelTwo.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorPir.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/RelayThreeLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/CurtainAutoOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Relay.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorInfrared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Curtain.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirSwitchCloudContr.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Socket1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelFour.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ConverterZb485.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Repeater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorHumidity.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/PanelTable.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Sensor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/IntelligentLocks.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirSwitch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Light.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerEpoint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Converter.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ColorLight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanel.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DryContact.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/IntelligentLocksH06C.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorDoorWindow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelOne.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorTemperature.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorFire.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelThree.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorCarbonMonoxide.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DimmableLightOneLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/RelayEpoint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorWater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/DeskLampSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/DeskLamp.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/WithdrawGarrison.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionRemoveHomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionRemoveHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/WithdrawGarrisonSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionAtHomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionAtHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/FloorSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/Floor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Code.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Cancle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/HidePwd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Account.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Cat.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Password.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Logo_White.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/PhoneEmail_White.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/ChangeSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Logo_loginBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/UnhidePwd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/17Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/4Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/16IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/6IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/9IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/19IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/20Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/16Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/1IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/11IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/5Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/7Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/10IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/14Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/6Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/15Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/17IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/7IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/8IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/18IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/20IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/19Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/3Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/10Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/12IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/2IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/5IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/15IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/2Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/11Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/18Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/4IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/14IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/13Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/9Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/8Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/12Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/13IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/3IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/1Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CurtainSiphonate.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorPir.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CurtainAutoOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorInfrared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirSwitchCloudContr.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorEmergencyButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CommonDevice.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorMotion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelFourButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorDoorWindow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorFire.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelFourNotPowerButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelThreeButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorCarbonMonoxide.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorWater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelTwoButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/RealGateway6.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/RealGateway1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewayInstruct.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/SearchGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewayImage.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewayInstruct.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewaySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/More.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectFloor_Right.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_IconSelectedBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_IconUnselectedBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/SceneIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/DroidLib/DroidLib.csproj","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ComparerDeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Device.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/House.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Logic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ApkInfoOBJ.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/FirmwareManaRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GetAppVersionCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResultPack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserLoginLocalRegionRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Pad/MainPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/GesturePswSecirityForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainSiphonateDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RepeaterZigbeeDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorDoorWindowDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorFireDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorWaterDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockListPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockUserMangement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/HistoryRecordPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/RemotelyUnlock.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/SubAccountManagementPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayRebindForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberNotEsixtForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomDeviceListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomDialogSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DateSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/NormalClickButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/DeviceInformationListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/NormalViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/InformationTipView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/TopLayoutTitleControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowMostRightTextView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowNewVersionTipView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputExControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SelectDeviceForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwAddDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwClickButtonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayCoordinatorInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayFirmwareInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayLinuxInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/BackViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DialogInputFrameControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/GatewayFirmwareUpdateControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/MsgControls.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayFirmwareUpdateForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlJiguangMsgPushLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/FirmwareUpdateResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddDeviceAlarmTargetListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddSceneAlarmTargetListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePasswordMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoerceContactSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaListMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CurtainAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/LightAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SwitchAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyPasswordMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordRefreshMsgForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SectorsSettionMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SensorDeviceSettionListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/UserPasswordListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Repeater.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ThirdPartyModuleUpgrade.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Transverter.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/R.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/HomePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/UserPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ZigbeeColor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/CommonPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResultStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/BackupInfoRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/FolderRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GatewayRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GetAreaCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResidenceRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResponsePack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserLoginRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserRegisterReqDto.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SendDataToServer.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Room.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/DeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneRoomUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/BigInteger.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/CloudMqttResponsePack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/CommonInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/EncryptionService.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/IStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/RemoteOperatorConsts.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/SecuritySet.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/SendDataToGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/AirSwitch.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmableLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/CurtainBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/HDLbutton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Logic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/LogicBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/OTADevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/PIRSensor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ThermostatObj.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ToggleLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/IO/LocalFileUtils.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDevieDetailFromAddFunction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDeviceList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDevicesSameTypeList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomShareSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDeviceByRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/Category.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/Line.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectFunctionView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomNoNameMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CompleteButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectedStatuButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CustomAlert.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/LeftIconButtonRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceIconSelectedIMGByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/ACLeftIconButtonRowLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonEnum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutDeleteButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControlForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/PhoneZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountResetPWDSuccess.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetTimeRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SuperGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/CyclicCycle.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Elian.iOS.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/M2Mqtt.Net.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/MQTTnet.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Newtonsoft.Json.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Security.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.TBL.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.TCL.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Xamarin.Essentials.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/ZigBee.Droid.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.IOS.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/ZigBee.Ios.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.UI.26.0.2/proguard/proguard.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Media.Compat.26.0.2/proguard/proguard.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2/proguard/proguard.txt"],"BuildActions":["Compile","Compile","Compile","None","None","None","None","AndroidResource","AndroidResource","AndroidResource","AndroidNativeLibrary","AndroidNativeLibrary","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","ProjectReference","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","None","None","None","None","None","None","None","None","None","None","None","None","None","ProguardConfiguration","ProguardConfiguration","ProguardConfiguration"],"Analyzers":[]}
\ No newline at end of file
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/BouncyCastle.Crypto.dll.1.8.1/lib/BouncyCastle.Crypto.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/DroidLib/bin/Debug/DroidLib.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Java.Interop.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/M2Mqtt.Net.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Analytics.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Analytics.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Analytics.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Analytics.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Crashes.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Crashes.Android.Bindings.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.Crashes.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.Crashes.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Microsoft.AppCenter.1.14.0/lib/MonoAndroid403/Microsoft.AppCenter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v8.0/Mono.Android.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/MQTTnet.2.4.0/lib/netstandard1.3/MQTTnet.Core.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/MQTTnet.2.4.0/lib/netstandard1.3/MQTTnet.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/mscorlib.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Newtonsoft.Json.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Security.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Core.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.IO.Compression.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Net.Http.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Web.Services.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/System.Xml.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Animated.Vector.Drawable.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Annotations.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Annotations.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Compat.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Compat.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.UI.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Core.UI.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.Utils.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Core.Utils.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Fragment.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Fragment.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Media.Compat.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Media.Compat.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.v4.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.v4.dll","Aliases":[]},{"FilePath":"/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Vector.Drawable.26.0.2/lib/MonoAndroid80/Xamarin.Android.Support.Vector.Drawable.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Contracts.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.FileVersionInfo.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Security.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.XDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebSockets.Client.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Dynamic.Runtime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Xml.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Principal.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.ThreadPool.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Cng.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.EventBasedAsync.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.CompilerServices.VisualC.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.DeriveBytes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/netstandard.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.UnmanagedMemoryStream.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Http.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XmlDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.Xsl.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.Writer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Console.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Cache.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Sockets.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.NetworkInformation.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Utilities.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Principal.Windows.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Claims.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Hashing.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.DriveInfo.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.X509Certificates.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Numerics.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.Watcher.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TraceSource.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.Lightweight.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.CodePages.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Expressions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Timer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.Pipes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.HttpListener.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.RegularExpressions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.Parallel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.NonGeneric.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.Concurrent.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Overlapped.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Pkcs.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Handles.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Data.SqlClient.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ObjectModel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebHeaderCollection.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.RuntimeInformation.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.TypeConverter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Mail.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Parallel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.SecureString.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Registry.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.RSA.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.Annotations.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.Compression.ZipFile.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.InteropServices.WindowsRuntime.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.Queryable.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.ResourceManager.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.Reader.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.ILGeneration.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Data.Common.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.NameResolution.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ComponentModel.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceProcess.ServiceController.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Loader.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Security.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.AuthenticationManager.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.ReaderWriter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Tasks.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Tracing.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.AppContext.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Buffers.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.ECDsa.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Csp.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TextWriterTraceListener.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Text.Encoding.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.MemoryMappedFiles.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.OpenSsl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Registry.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.RandomNumberGenerator.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Collections.Specialized.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.ProtectedData.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ValueTuple.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XPath.XmlDocument.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.ServicePoint.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Xml.XmlSerializer.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Extensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Resources.ReaderWriter.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encoding.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.IsolatedStorage.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.NetTcp.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.AccessControl.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.TypeExtensions.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Globalization.Calendars.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Requests.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.WebSockets.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.Emit.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.IO.FileSystem.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Json.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Algorithms.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Threading.Thread.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Linq.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Process.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Tools.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Hashing.Algorithms.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.Debug.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/Microsoft.Win32.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.TraceEvent.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Drawing.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Runtime.Serialization.Formatters.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Ping.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.ServiceModel.Duplex.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Diagnostics.StackTrace.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Reflection.DispatchProxy.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Security.Cryptography.Encryption.Aes.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Memory.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Net.Primitives.dll","Aliases":[]},{"FilePath":"/Library/Frameworks/Xamarin.Android.framework/Versions/9.4.1.0/lib/xamarin.android/xbuild-frameworks/MonoAndroid/v1.0/Facades/System.Drawing.Common.dll","Aliases":[]}],"Files":["/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Application.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Properties/AssemblyInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/app.config","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/packages.config","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/AboutResources.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/layout/Main.axml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/values/Strings.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/values/Styles.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libelianjni.so","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/libs/armeabi-v7a/libjcore127.so","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/drawable/Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Resources/xml/file_paths.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Language.ini","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/RoomCardView.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemUnSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/ItemUnSelected_Black.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/FavoriteRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/NoNameRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_Rectangle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/RoomCardView_Name.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/RelayThreeLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/IntelligentLocksH06C.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/DimmableLightOneLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/DeviceSearch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Add.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Reduce.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_MiddleSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Height.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/OpenOrCloseSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Dry.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Group.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Low.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Heat.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Fan.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Path.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Cool.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_Middle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_CoolSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/OpenOrClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_HeightSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_DrySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_AutoSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_Auto.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/SelectedFanModeBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_HeatSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Mode_FanSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/Fan_LowSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/AC/SelectedModeBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Abount.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/ResidenceManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Backup.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/MenberManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/ImperialCrown.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Opinion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/DeviceManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/Admin.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Center/SafetyManagement.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/CategorySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Category.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/HomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Home.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/Setting.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Navigation/SettingSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindEmptyPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindLeft.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindAdd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindDown.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/BindRight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DistributeUnlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TypeIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddFailedPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SelectedIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Fingerprint207.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockPicClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TempPasswordBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddFingerprintTipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/FavoriteIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RightIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/ShareIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DateIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnlockSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockClose.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockBlankPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/CancelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TemPasswordVisiable.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/proximityCard.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/EntrySuccessIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/proximityCardOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RemoteUnlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/MemberIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Left.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Fingerprint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DooorLockPicOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Password.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnselectedIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddIcCardTipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorLockUserPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethod.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RecordIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/FingerprintOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/VisitorIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/TempPasswordBackground1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorlockPicture.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnlockFailed.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AddPasswordTicPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethodOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SettingIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/DoorlockIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SideslipPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/SwitchOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/RoomPic.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/PasswordOn.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/AllMethodIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UnLockSideslipIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/DoorLock/UndistributeIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Shared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/RoomIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PickerColorWheel.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Check.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add_GW.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MessageSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PersentIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/WrongIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DateSearchIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Time.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DownLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CloseIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NoBindGW.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/RightIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SwitchSelected1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/QRCode.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ItemSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnLockSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/GarrisonList.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardRoom.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/VirtualFrame.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon2Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionCardView.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ForgotPswList.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Down.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CollectionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Room.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Category_FunctionBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Remote.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ScreeningType.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BottomShadow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CancelIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Drop_Down.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/HidenPWD.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/House.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NewVersion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Point.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Search.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SwitchSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ThirdPartyDevice.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NextSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Timer.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardMenu.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnLockFail.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ProgressMsg.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Category_FunctionBGSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/NoFunction.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon2.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch2Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/MyHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PswSettionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectFloor_Left.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Add_Category.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ResidenceIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Tips.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/DeleteIcon1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/HouseSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/ShardRoomSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Floor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Delete.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FixedPositionSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Collection1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Collection.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UpperTriangle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SceneCard.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Next.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/UnHidenPWD.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/OpenIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionCardViewSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/PswSettion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/CollectionSelected1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Message.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FixedPosition.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/GarrisonListSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Back.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Scene.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/FunctionViewBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SceneFunctionBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectHouse.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/CurtainSiphonate.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DimmableLight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelTwo.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorPir.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/RelayThreeLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/CurtainAutoOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Relay.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorInfrared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Curtain.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirSwitchCloudContr.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Socket1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelFour.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ConverterZb485.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Repeater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorHumidity.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/PanelTable.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Sensor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/IntelligentLocks.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorEmergencyButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirSwitch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Light.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorMotion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerEpoint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Converter.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ColorLight.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/Switch.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanel.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DryContact.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/IntelligentLocksH06C.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorDoorWindow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelOne.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorTemperature.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorFire.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/ButtonPanelThree.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorCarbonMonoxide.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/DimmableLightOneLoad.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/RelayEpoint.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorWater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/DeskLampSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Light/DeskLamp.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/WithdrawGarrison.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionRemoveHomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionRemoveHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/WithdrawGarrisonSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionAtHomeSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Safeguard/ProtectionAtHome.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/FloorSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Floor/Floor.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Code.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Cancle.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/HidePwd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Account.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Cat.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Password.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Logo_White.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/PhoneEmail_White.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/ChangeSuccess.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/Logo_loginBG.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Account/UnhidePwd.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/17Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/4Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/16IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/6IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/9IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/19IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/20Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/16Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/1IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/11IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/5Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/7Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/10IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/14Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/6Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/15Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/17IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/7IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/8IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/18IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/20IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/19Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/3Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/10Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/12IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/2IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/5IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/15IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/2Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/11Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/18Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/4IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/14IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/13Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/9Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/8Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/12Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/13IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/3IconSelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/FunctionIcon/1Icon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CurtainSiphonate.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorPir.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CurtainAutoOpen.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorInfrared.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirSwitchCloudContr.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorEmergencyButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/CommonDevice.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorMotion.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelFourButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorDoorWindow.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorFire.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelFourNotPowerButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelThreeButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorCarbonMonoxide.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorWater.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/PanelTwoButton.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/RealGateway6.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/RealGateway1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewaySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewayInstruct.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/SearchGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewayImage.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGateway.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WirelessGatewayInstruct.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/WiredGatewaySelected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/More.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/SelectFloor_Right.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_IconSelectedBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Room/Room_IconUnselectedBackground.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/Selected.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/GateWay.Droid/Assets/Phone/Scene/SceneIcon.png","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/DroidLib/DroidLib.csproj","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ComparerDeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Device.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/House.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Logic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ApkInfoOBJ.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/FirmwareManaRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GetAppVersionCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResultPack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserLoginLocalRegionRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Pad/MainPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/GesturePswSecirityForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodFailedTip.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockListPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockUserMangement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/HistoryRecordPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/RemotelyUnlock.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/SubAccountManagementPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomDeviceListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomDialogSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/DialogCommonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DateSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/NormalClickButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/DeviceInformationListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/PswNumberInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/GatewayRowControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ClickButtonControls/BottomClickButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/DetailTitleControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/NormalViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/ClickButtonCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Common/IconControlCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/InformationTipView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/TopLayoutTitleControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowMostRightTextView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowNewVersionTipView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputExControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/RelayThreeLoadDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFunctionSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorLightPerceptionRegulationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorLightSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/RollerShadeDirectionLimitSettingForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SelectDeviceForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/IntelligentLocksH06cDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwAddDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwClickButtonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGwSelectNetworkForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayCoordinatorInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayFirmwareInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayHistoryFirmwareVersionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayInfoAddForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayLinuxInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayVirtualDriveListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlGatewayListBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlManualBackUpForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/BackViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DialogInputFrameControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/GatewayFirmwareUpdateControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/MsgControls.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/PicViewControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayFirmwareUpdateForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceHardInfoLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceImageInfoLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlJiguangMsgPushLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlPanelLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlPirSensorLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/FirmwareUpdateResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/GatewayResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddDeviceAlarmTargetListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddAlarmTargetTypeListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddSceneAlarmTargetListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePasswordMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoerceContactSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorCoercePasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/EdtiorUserPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaListMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/CurtainAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/LightAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SwitchAlarmSettionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyPasswordMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordRefreshMsgForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SectorsSettionMenuForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SensorDeviceSettionListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/UserPasswordListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/ConfigureNewSharedMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedListRoomForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Repeater.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ThirdPartyModuleUpgrade.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Transverter.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/R.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/HomePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/UserPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ZigbeeColor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterColor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWaySelectForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGwAddDirectionForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/CommonPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResultStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/BackupInfoRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/FolderRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GatewayRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/GetAreaCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResidenceRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/ResponsePack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserLoginRes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/ResponseEntity/UserRegisterReqDto.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SendDataToServer.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/Room.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SearchEditText.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/DeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Common/SceneRoomUI.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/BigInteger.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/CloudMqttResponsePack.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/CommonInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/EncryptionService.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/IStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/OwnCodes.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/RemoteOperatorConsts.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/SecuritySet.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Common/SendDataToGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/AirSwitch.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmableLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/CurtainBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Enum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/HDLbutton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Logic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/LogicBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/OTADevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/PIRSensor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ThermostatObj.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ToggleLight.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/ZigBee/IO/LocalFileUtils.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDevieDetailFromAddFunction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDeviceList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomContent.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/AddDevicesSameTypeList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomShareSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Room/RoomCommon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AC/ACControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDeviceByRoom.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectRoomList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDimmableLightSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/Category.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/Line.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectFunctionView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomNoNameMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CompleteButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectedStatuButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CustomAlert.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/LeftIconButtonRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/BackButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceIconSelectedIMGByLocal.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/ACLeftIconButtonRowLayout.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/ButtonLineForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceDetailInfo.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonEnum.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutDeleteButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomMainView.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/LightControlForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountForgetPWD.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegister.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/PhoneZone.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountRegisterSuccess.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLoginByCode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountResetPWDSuccess.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/PhoneEmailForm.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetTimeRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Category/SelectDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithSeekBarRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectSceneStatuRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicState.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogicStatus.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SuperGateway.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedLogic.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicListAutomation.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/CyclicCycle.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicListPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/MQTTnet.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Security.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Elian.iOS.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.IOS.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/ZigBee.Droid.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Newtonsoft.Json.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/ZigBee.Ios.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/Xamarin.Essentials.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/ZigBee.Droid.xml","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/Shared/DLL/M2Mqtt.Net.dll","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Core.UI.26.0.2/proguard/proguard.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Media.Compat.26.0.2/proguard/proguard.txt","/Users/guoxuecheng/Desktop/HomeApp/ZigbeeApp/packages/Xamarin.Android.Support.Animated.Vector.Drawable.26.0.2/proguard/proguard.txt"],"BuildActions":["Compile","Compile","Compile","None","None","None","None","AndroidResource","AndroidResource","AndroidResource","AndroidNativeLibrary","AndroidNativeLibrary","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidResource","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","AndroidAsset","ProjectReference","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","None","None","None","None","None","None","None","None","None","None","None","None","None","None","ProguardConfiguration","ProguardConfiguration","ProguardConfiguration"],"Analyzers":[]}
\ No newline at end of file
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 53bbb7f..f0a856a 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 022e7a4..9fbefa7 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -91,9 +91,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="Security">
       <HintPath>..\Shared\DLL\Security.dll</HintPath>
@@ -160,6 +157,9 @@
     <Reference Include="Shared.Droid">
       <HintPath>..\Shared\DLL\Shared.Droid.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Application.cs" />
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
old mode 100755
new mode 100644
index 8fed77f..0dad695
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -3,9 +3,11 @@
 
 namespace Shared.Common
 {
+
     public class Logic
     {
         public static List<Logic> LogicList = new List<Logic>();
+        public static List<Logic> LockLogicList = new List<Logic>();
         public static List<ZigBee.Device.CommonDevice> LogicDviceList = new List<ZigBee.Device.CommonDevice>();
         public static Logic CurrentLogic;
         /// <summary>
@@ -14,7 +16,13 @@
         ///<para>浠ヤ笅鎵�鏈夊瓧娈靛彧鏈夊湪Result 涓�1鏃跺瓨鍦�</para>
         /// </summary>
         public int Result;
-
+        /// <summary>
+        /// 0.姝e父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�
+        /// </summary>
+        public int LogicType = 0;
+        /// <summary>
+        /// 閫昏緫ID
+        /// </summary>
         public int LogicId;
         /// <summary>
         ///璇ラ�昏緫鏄惁琚娇鑳姐�� 
@@ -35,9 +43,13 @@
         ///<para>1锛氭弧瓒冲叾涓竴涓潯浠惰Е鍙戝姩浣�</para>
         /// </summary>
         public int Relationship;
+        /// <summary>
+        /// 鎺ㄩ�佸唴瀹�
+        /// </summary>
+        public string LogicCustomPushText;
 
         //public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
-        public TimeAttributeObj TimeAttribute = new TimeAttributeObj(); 
+        public TimeAttributeObj TimeAttribute = new TimeAttributeObj();
         /// <summary>
         /// 閫昏緫鏉′欢鍒楄〃
         /// </summary>
@@ -48,6 +60,10 @@
         /// </summary>
         public List<Dictionary<string, object>> Actions = new List<Dictionary<string, object>>();
 
+        /// <summary>
+        /// 鍏宠仈app璐﹀彿鍒楄〃
+        /// </summary>
+        public List<Dictionary<string, string>> Accounts = new List<Dictionary<string, string>>();
 
     }
 
@@ -58,7 +74,7 @@
     public class TimeAttributeObj
     {
         public int Calendar;
-        public int Repeat=2;
+        public int Repeat = 2;
         public int WeekDay;
         public int SetYear;
         public int MonthDate;
@@ -67,4 +83,4 @@
     }
 
 
-    }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 04dc6e7..8dff9b7 100644
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -298,8 +298,34 @@
         public uint LogicTextBlueColor = 0xFF00AAF0;
         public uint LogicDelBackgroundColor = 0xFFFF0000;
         public uint LogicEditBlackColor = 0xFF00aaf0;
-        public uint LogicTimeViewColor= 0xFFFFFFFF;
-        public uint LogicTimeViewSaveButton = 0xFF121212;
+        public uint LogicTimeViewColor = 0xFFFFFFFF;
+        public uint LogicTimeViewSaveButton = 0xFF121212;
+        //鏈�鏂癠I棰滆壊
+        public uint LogicTopBackgroundColor = 0xFFF9F9F9;
+        public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;
+        public uint LogicBlankBackgroundColor = 0xFFFFFFFF;
+        public uint LogicRowLayoutLineColor = 0x40cccccc;
+        public uint LogicRowLayoutTopLineColor = 0x25000000;
+        public uint LogicBtnCancelColor = 0xFF999999;
+        public uint LogicBtnTypeColor = 0xFF232323;
+        public uint LogicBtnCompleteColor = 0xFFFB744A;
+        public uint LogicBtnSelectedColor = 0xFF333333;
+        public uint LogicBtnNotSelectedColor = 0xFF666666;
+        public uint LogicBtnSaveBackgroundColor = 0xFF232323;
+        public uint LogicBtnSaveTextColor = 0xFFFFFFFF;
+        public uint LogicTranslucentColor = 0x50000000;
+        public uint LogicAddColor = 0xFFFC744B;
+        public uint LogicIconBackgroundColor = 0xFFFEF1ED;
+        public uint LogicProgressColor = 0xFFE8E8E8;
+        public uint LogicProgressColorSelected = 0xffFDB500;
+        public uint LogicEditBlackColor1 = 0xFF4A4A4A;
+        public uint LogicDelBlackColor1 = 0xFFF75858;
+        public uint LogicFunction1Color = 0xFFFFa200;
+        public uint LogicScene1Color = 0xFF4A90E2;
+        public uint LogicSecurity1Color = 0xFF35B87F;
+        public uint LogicDelay1Color = 0xFFBF64FB;
+        public uint LogicListWeekTextColor = 0xFF666666;
+
         #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.GDMapKit.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.GDMapKit.dll
deleted file mode 100755
index be91b1e..0000000
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.GDMapKit.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll
index aea459a..65e9deb 100755
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.PickerView.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.PickerView.dll
deleted file mode 100755
index 12e551e..0000000
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.PickerView.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.TBL.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.TBL.dll
deleted file mode 100755
index 20001b4..0000000
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.TBL.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.TCL.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.TCL.dll
deleted file mode 100755
index 4221046..0000000
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.TCL.dll
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll
index f365695..484bf27 100755
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll
+++ b/ZigbeeApp/Shared/DLL/Shared.Droid.TouchID.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Shared.Droid.dll
index 19b4b2d..92348ee 100755
--- a/ZigbeeApp/Shared/DLL/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll
index 88be6c1..cd3a196 100755
--- a/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/Shared.IOS.dll
index bffafda..163972f 100755
--- a/ZigbeeApp/Shared/DLL/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index b601b50..4405a9a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1279,23 +1279,19 @@
                                 //闃叉鐭椂闂村唴澶氭璇诲彇璁惧鐘舵��
                                 if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
                                 {
-                                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
-                                });
-                            }
-                            else
-                            {
-                                //闃叉鐭椂闂村唴澶氭璇诲彇
-                                if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
-                                {
-                                    rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                    ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+                                    ac.ReadFanMode();
+                                    ac.ReadSystemMode();
+                                    ac.ReadLocalTemperature();
+                                    ac.ReadCoolingSetpoint();
+                                    ac.ReadHeatingSetpoint();
                                 }
                             }
-
 
                             var deviceTypeRowLayout = new RowLayout()
                             {
                                 Height = Application.GetRealHeight(127 + 35),
-                                LineColor = ZigbeeColor.Current.GXCLineColor,
+                                LineColor = ZigbeeColor.Current.GXCBackgroundColor,
                                 Tag = deviceUI
                             };
                             deviceListScrolView.AddChidren(deviceTypeRowLayout);
@@ -1303,43 +1299,25 @@
                             var deviceRow = new FunctionRow(0, 35);
                             deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                             deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
-                            deviceRow.SetStatu(rollerShade.IsOnline == 1);
+                            deviceRow.SetStatu(ac.IsOnline == 1);
                             deviceTypeRowLayout.AddChidren(deviceRow);
 
-                            var editBtn = new CommonForm.RowLayoutEditButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(editBtn);
-                            editBtn.MouseUpEventHandler += deviceDetailHandler;
-
-                            var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
-                            {
-                                Tag = deviceUI,
-                                Radius = 0
-                            };
-                            deviceTypeRowLayout.AddRightView(delBtn);
-                            delBtn.MouseUpEventHandler += delEvent;
-
-
-                            deviceRow.SwitchBtn.MouseUpEventHandler += (sender, e) =>
+                            deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
                             {
                                 zbGateway = deviceUI.CommonDevice.Gateway;
                                 sendedControlCommand = false;
                                 zbGateway.ReportAction += UpdateDeviceControllStatu;
                                 AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
 
-                                (sender as CommonForm.SelectedStatuButton).IsSelected = !(sender as CommonForm.SelectedStatuButton).IsSelected;
-                                if ((sender as CommonForm.SelectedStatuButton).IsSelected)
+                                (send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
+                                if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
                                 {
-                                    rollerShade.CurtainUpDownStopControl(0);
+                                    ac.Open();
                                 }
                                 else
                                 {
-                                    rollerShade.CurtainUpDownStopControl(1);
+                                    ac.Close();
                                 }
-
                                 //鎺у埗寤舵椂鍥炶皟
                                 DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
                                 {
@@ -1867,6 +1845,7 @@
 
         #endregion
 
+
         #region 鈼� 鑷姩鍖朹_________________________
 
         /// <summary>
@@ -1923,22 +1902,16 @@
             bjFrameLayout.AddChidren(recommendswitchBtn);
 
 
-        /// <summary>
-        /// 鏄剧ず娌℃湁鍦烘櫙
-        /// </summary>
-        private void ShowNoSceneTip()
-        {
-            var noFunction = new Button()
+            var scenehorizontalScrol = new HorizontalScrolViewLayout
             {
-                Y = Application.GetRealHeight(320),
-                Width = Application.GetMinRealAverage(757),
-                Height = Application.GetMinRealAverage(435),
-                UnSelectedImagePath = "Item/NoFunction.png",
-                Gravity = Gravity.CenterHorizontal
+                Width = Application.GetRealWidth(1080 - 58),
+                X = Application.GetRealWidth(58),
+                Y = bjFrameLayout.Bottom + Application.GetRealHeight(30),
+                Height = Application.GetRealHeight(0),
             };
-            functionSceneBodyView.AddChidren(noFunction);
+            functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
 
-            var noScenceTip = new Button()
+            var logicScrolView = new VerticalScrolViewLayout
             {
                 Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
@@ -1946,46 +1919,122 @@
                 Radius = (uint)Application.GetRealHeight(50),
                 Y = scenehorizontalScrol.Bottom,
             };
-            functionSceneBodyView.AddChidren(noScenceTip);
-        }
+            functionSceneAutoBodyView.AddChidren(logicScrolView);
 
 
-        #endregion
+            recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                int Yheight = 0;
+                recommendswitchBtn.IsSelected = !recommendswitchBtn.IsSelected;
+                scenehorizontalScrol.RemoveAll();
+                if (recommendswitchBtn.IsSelected)
+                {
+                    scenehorizontalScrol.Height = Application.GetRealHeight(246);
+                    Yheight = 20;
+                    for (int i = 1; i < 4; i++)
+                    {
 
-        #region 鈼� 鑷姩鍖朹_________________________
+                        var frameLayout = new FrameLayout
+                        {
+                            Width = Application.GetMinRealAverage(369 + 46),
+                            Height = Application.GetMinRealAverage(246),
+                        };
+                        scenehorizontalScrol.AddChidren(frameLayout);
+                        var logiciocnBtn = new Button
+                        {
+                            Width = Application.GetMinRealAverage(369),
+                            Height = Application.GetMinRealAverage(246),
+                            UnSelectedImagePath = "ZigeeLogic/" + i + ".png",
+                            Tag = i,
+                        };
+                        frameLayout.AddChidren(logiciocnBtn);
+
+                        var logicnameBtn = new Button
+                        {
+                            Width = Application.GetMinRealAverage(250),
+                            Height = Application.GetMinRealAverage(80),
+                            X = Application.GetRealWidth(23),
+                            Y = Application.GetRealHeight(246 - 23 - 80),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                        };
+                        frameLayout.AddChidren(logicnameBtn);
+
+                        if (i == 1)
+                        {
+                            logicnameBtn.Text = Language.StringByID(MyInternationalizationString.onlight);
+                        }
+                        else if (i == 2)
+                        {
+                            logicnameBtn.Text = Language.StringByID(MyInternationalizationString.offlight);
+                        }
+                        else if (i == 3)
+                        {
+                            logicnameBtn.Text = Language.StringByID(MyInternationalizationString.automation1);
+                        }
+
+
+                        EventHandler<MouseEventArgs> iconclick = (sender1, e1) =>
+                        {
+                            Common.Logic.CurrentLogic = new Common.Logic();
+                            Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+                            if (logiciocnBtn.Tag.ToString() == "3")
+                            {
+                                Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;// Language.StringByID(MyInternationalizationString.automation1);
+                                var addLogicPage = new Logic.AddLogicPage();
+                                HomePage.Instance.AddChidren(addLogicPage);
+                                HomePage.Instance.PageIndex += 1;
+                                addLogicPage.Show();
+                            }
+                            else
+                            {
+                                Common.Logic.LogicDviceList.Clear();
+                                if (Common.Logic.LogicDviceList.Count == 0)
+                                {
+                                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+                                }
+                                Common.Logic.CurrentLogic.LogicType = 2;
+                                Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+                                Logic.TemplatePage templatePage = new Logic.TemplatePage();
+                                Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
+                                HomePage.Instance.AddChidren(templatePage);
+                                HomePage.Instance.PageIndex += 1;
+                                templatePage.Show();
+                            }
+                        };
+                        logiciocnBtn.MouseUpEventHandler += iconclick;
+                        logicnameBtn.MouseUpEventHandler += iconclick;
+                    }
+                }
+                else
+                {
+                    scenehorizontalScrol.Height = Application.GetRealHeight(0);
+                    Yheight = 0;
+                }
+                logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
+                logicScrolView.Height = functionSceneBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
+                Automationview(logicScrolView);
+            };
 
             CommonPage.Loading.Start();
             if (Common.Logic.LogicList.Count == 0)
             {
-                //var Idlist = await Logic.Send.GetLogicId();
-                //if (Idlist.Count != 0)
-                //{
-                //    foreach (var LogicId in Idlist)
-                //    {
-                //        var logic = await Logic.Send.GetLogic(LogicId);
-                //        if (logic != null)
-                //        {
-                //            Common.Logic.LogicList.Add(logic);
-                //        }
-                //    }
-                //}
-                var Idlist = await Logic.Send.GetLogicId();
+                var Idlist = await Logic.Send.GetLogicId(0);
                 if (Idlist.Count != 0)
                 {
-                    var listlogic = await Logic.Send.ReadList(Idlist.Count);
-                    foreach (var LogicId in Idlist)
+                    var listlogic = await Logic.Send.ReadList(Idlist.Count, 0);
+                    //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
+                    for (int j = 0; j < listlogic.Count; j++)
                     {
-                        foreach (var logic in listlogic)
+                        var logic = listlogic[j];
+                        if (logic.LogicType != 0)
                         {
-                            if (logic.LogicId == LogicId)
-                            {
-                                Common.Logic.LogicList.Add(logic);
-                            }
+                            continue;
                         }
+                        Common.Logic.LogicList.Add(logic);
                     }
                 }
             }
-
             //鑷姩鍖�
             Automationview(logicScrolView);
             CommonPage.Loading.Hide();
@@ -1995,73 +2044,92 @@
         /// 鑷姩鍖栧垪琛ㄧ晫闈�
         /// </summary>
         /// <param name="refresview">Refresview.</param>
-        public async void Automationview(VerticalScrolViewLayout refresview)
+        private async void Automationview(VerticalScrolViewLayout refresview)
         {
             refresview.RemoveAll();
             foreach (var logic in Common.Logic.LogicList)
             {
-                var logicrowlayout = new RowLayout
+                var bjRow = new RowLayout
                 {
-                    Height = Application.GetRealHeight(180),
-                    LineColor = ZigbeeColor.Current.LogicLineColor,
-                };
-                refresview.AddChidren(logicrowlayout);
+                    Width = Application.GetRealWidth(1080 - 58),
+                    Height = Application.GetRealHeight(220),
+                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
 
-                var btnname = new Button
+                };
+                refresview.AddChidren(bjRow);
+
+                var logicRowlayout = new RowLayout
                 {
-                    //Text = "閫昏緫涓�",
+                    Y = Application.GetRealHeight(220 - 190),
+                    Height = Application.GetRealHeight(190),
+                    Width = Application.GetRealWidth(1080 - 58 - 46),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    X = Application.GetRealWidth(46),
+                };
+                bjRow.AddChidren(logicRowlayout);
+
+                var logicnameBtn = new Button
+                {
+                    Height = Application.GetRealHeight(58),
+                    Width = Application.GetRealWidth(350),
                     Text = logic.LogicName,
-                    X = Application.GetRealWidth(50),
+                    X = Application.GetRealWidth(12),
                     TextAlignment = TextAlignment.CenterLeft,
-                    Gravity = Gravity.CenterVertical,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 };
-                logicrowlayout.AddChidren(btnname);
+                logicRowlayout.AddChidren(logicnameBtn);
 
-                var btnswitch = new Button
+
+                var logicswitchBtn = new Button
                 {
-                    Width = Application.GetMinRealAverage(183),
-                    Height = Application.GetMinRealAverage(123),
-                    UnSelectedImagePath = "ZigeeLogic/Switch.png",
-                    SelectedImagePath = "ZigeeLogic/SwitchSelected.png",
-                    X = Application.GetRealWidth(1080 - 200),
-                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(104),
+                    Height = Application.GetMinRealAverage(63),
+                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+                    SelectedImagePath = "ZigeeLogic/logicopen.png",
+                    X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
+                    Y = Application.GetRealHeight(58 + 30 + 9),
                 };
-                logicrowlayout.AddChidren(btnswitch);
+                logicRowlayout.AddChidren(logicswitchBtn);
 
-                btnswitch.MouseUpEventHandler += (sender1, e1) =>
+
+
+                logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
                 {
-                    btnswitch.IsSelected = !btnswitch.IsSelected;
-                    if (btnswitch.IsSelected)
+                    logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
+                    if (logicswitchBtn.IsSelected)
                     {
                         //閫昏緫寮�
                         logic.IsEnable = 1;
+                        StatusColor(logic, logicRowlayout, 1);
                     }
                     else
                     {
                         //閫昏緫鍏�
                         logic.IsEnable = 0;
+                        StatusColor(logic, logicRowlayout, 0);
                     }
                     Logic.Send.LogicControlSwitch(logic);
                     //Logic.Send.AddModifyLogic(logic);
                 };
                 if (logic.IsEnable == 1)
                 {
-                    btnswitch.IsSelected = true;
+                    logicswitchBtn.IsSelected = true;
+                    StatusColor(logic, logicRowlayout, 1);
                 }
                 else if (logic.IsEnable == 0)
                 {
-                    btnswitch.IsSelected = false;
+                    logicswitchBtn.IsSelected = false;
+                    StatusColor(logic, logicRowlayout, 0);
                 }
                 ///缂栬緫
                 var edit = new Button
                 {
-                    //TextID = MyInternationalizationString.Musicdel
-                    BackgroundColor = 0xFF00aaf0,
+                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                     Text = Language.StringByID(MyInternationalizationString.edit),
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                 };
-                logicrowlayout.AddRightView(edit);
+                logicRowlayout.AddRightView(edit);
                 edit.MouseUpEventHandler += (sender, e) =>
                 {
                     Common.Logic.LogicDviceList.Clear();
@@ -2071,9 +2139,9 @@
                     }
                     Common.Logic.CurrentLogic = logic;
                     var logicCommunalPage = new Logic.LogicCommunalPage();
-                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                    UserView.HomePage.Instance.PageIndex += 1;
-                    logicCommunalPage.Show(() => { btnname.Text = logic.LogicName; Automationview(refresview); });
+                    HomePage.Instance.AddChidren(logicCommunalPage);
+                    HomePage.Instance.PageIndex += 1;
+                    logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview); });
 
                 };
 
@@ -2081,16 +2149,26 @@
                 ///鍒犻櫎
                 var del = new Button
                 {
-                    //TextID = MyInternationalizationString.Musicdel,
-                    BackgroundColor = 0xFFFF0000,
+                    BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
                     Text = Language.StringByID(MyInternationalizationString.del),
+                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                 };
-                logicrowlayout.AddRightView(del);
+                logicRowlayout.AddRightView(del);
                 del.MouseUpEventHandler += (sender, e) =>
                 {
-                    Common.Logic.LogicList.Remove(logic);
-                    Automationview(refresview);
-                    Logic.Send.DelLogic(logic.LogicId);
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                             Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                    alert.ResultEventHandler += (sender1, e1) =>
+                    {
+                        if (e1)
+                        {
+                            Common.Logic.LogicList.Remove(logic);
+                            Automationview(refresview);
+                            Logic.Send.DelLogic(logic.LogicId);
+                        }
+                    };
+                    alert.Show();
+
                 };
 
             }
@@ -2098,6 +2176,399 @@
 
         }
 
+        private void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
+        {
+
+            var logictimeBtn = new Button
+            {
+                Height = Application.GetRealHeight(58),
+                Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350),
+                X = Application.GetRealWidth(365),
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
+            };
+            logicRowlayout.AddChidren(logictimeBtn);
+
+            ///鏄剧ず鎵ц鍛ㄦ湡
+            switch (logic.TimeAttribute.Repeat)
+            {
+                ///0:鍙墽琛屼竴娆★紝鎵ц鍚嶪sEnable鍊肩疆;1,浠婂勾鍐呮墽琛�;2锛氭瘡澶╂墽琛�;3锛氭瘡鏈堟墽琛�;4锛氭瘡骞存墽琛�;5锛氬懆閲嶅銆�
+                case 0:
+                    {
+                        logictimeBtn.Text = Language.StringByID(MyInternationalizationString.executeonce);
+                    }; break;
+                case 1: { }; break;
+                case 2:
+                    {
+                        logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyday);
+                    }; break;
+                case 3:
+                    {
+
+                        string len = "", value = "";
+                        var stringvalue = Convert.ToString(logic.TimeAttribute.MonthDate, 2);
+                        var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
+                        for (int j = 31; j >= 0; j--)
+                        {
+                            len += str.Substring(j, 1);
+                        }
+                        for (int j = 0; j < len.Length; j++)
+                        {
+                            var strvalue = len.Substring(j, 1);
+                            if (strvalue == "1")
+                            {
+                                value += (j + 1).ToString() + ",";
+                            }
+                        }
+                        logictimeBtn.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
+
+                    }; break;
+                case 4:
+                    {
+
+                        Dictionary<int, int> dictionary = new Dictionary<int, int>();
+                        ///鎵惧嚭鎵ц鐨勬湀浠藉拰澶╂暟
+                        if (logic.TimeAttribute.SelectMonDate.Count != 0)
+                        {
+                            for (int i = 0; i < logic.TimeAttribute.SelectMonDate.Count; i++)
+                            {
+                                var dayvalue = logic.TimeAttribute.SelectMonDate[i];
+                                if (dayvalue != 0)
+                                {
+                                    dictionary.Add(i + 1, dayvalue);
+                                }
+                            }
+                        }
+                        if (dictionary.Count != 0 && dictionary.Count == 1)
+                        {
+                            string len = "", leng = "";
+                            int minvalue = 0, Maximum = 0;
+                            foreach (var value in dictionary)
+                            {
+                                ///鍙栧嚭鏈堜唤
+                                var month = value.Key;
+                                ///鍙栧嚭鏃ユ暟
+                                var day = value.Value;
+                                var maxvalue = Convert.ToString(day, 2);
+                                var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+                                for (int j = 31; j >= 0; j--)
+                                {
+                                    len += str.Substring(j, 1);
+                                }
+
+                                for (int j = 0; j < len.Length; j++)
+                                {
+                                    var strvalue = len.Substring(j, 1);
+                                    if (strvalue == "1")
+                                    {
+                                        minvalue = j + 1;
+                                        break;
+                                    }
+                                }
+                                for (int j = 0; j < len.Length; j++)
+                                {
+                                    var strvalue = len.Substring(j, 1);
+                                    if (strvalue == "1")
+                                    {
+                                        Maximum = j + 1;
+                                    }
+                                }
+
+                                if (month.ToString().Length < 2)
+                                {
+                                    leng = "0" + month.ToString();
+                                }
+                                else
+                                {
+                                    leng = month.ToString();
+                                }
+                                if (minvalue == Maximum)
+                                {
+                                    logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString());
+                                }
+                                else
+                                {
+                                    logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-" + leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+                                }
+                            }
+
+                        }
+                        else
+                        {
+                            int b = 0;
+                            string stringtext = "";
+                            foreach (var value in dictionary)
+                            {
+                                string len = "", leng = "";
+                                int minvalue = 0, Maximum = 0;
+                                ///鍙栧嚭鏈堜唤
+                                var month = value.Key;
+                                ///鍙栧嚭鏃ユ暟
+                                var day = value.Value;
+                                var maxvalue = Convert.ToString(day, 2);
+                                var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+                                for (int j = 31; j >= 0; j--)
+                                {
+                                    len += str.Substring(j, 1);
+                                }
+
+
+                                if (month.ToString().Length < 2)
+                                {
+                                    leng = "0" + month.ToString();
+                                }
+                                else
+                                {
+                                    leng = month.ToString();
+                                }
+
+
+
+                                if (b == 0)
+                                {
+                                    for (int j = 0; j < len.Length; j++)
+                                    {
+                                        var strvalue = len.Substring(j, 1);
+                                        if (strvalue == "1")
+                                        {
+                                            minvalue = j + 1;
+                                            break;
+                                        }
+                                    }
+                                    stringtext += leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-";
+
+                                }
+
+                                if (b == dictionary.Count - 1)
+                                {
+                                    for (int j = 0; j < len.Length; j++)
+                                    {
+                                        var strvalue = len.Substring(j, 1);
+                                        if (strvalue == "1")
+                                        {
+                                            Maximum = j + 1;
+                                        }
+                                    }
+                                    stringtext += leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+
+                                }
+                                b++;
+                            }
+                            logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + stringtext;
+                        }
+
+                    }; break;
+                case 5:
+                    {
+                        string len = "", text = "";
+                        List<int> listvalueInt = new List<int>();
+                        listvalueInt.Clear();
+                        var maxvalue = Convert.ToString(logic.TimeAttribute.WeekDay, 2);
+                        var str = maxvalue.Insert(0, new string('0', 8 - maxvalue.Length));
+                        for (int j = 7; j >= 0; j--)
+                        {
+                            len += str.Substring(j, 1);
+                        }
+
+                        for (int j = 0; j < len.Length; j++)
+                        {
+                            var strvalue = len.Substring(j, 1);
+                            if (strvalue == "1")
+                            {
+                                listvalueInt.Add(j + 1);
+
+
+                                if ((j + 1) == 1)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.mon) + ",";
+                                }
+                                else if ((j + 1) == 2)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.tue) + ",";
+                                }
+                                else if ((j + 1) == 3)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.wed) + ",";
+                                }
+                                else if ((j + 1) == 4)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.thu) + ",";
+                                }
+                                else if ((j + 1) == 5)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.frl) + ",";
+                                }
+                                else if ((j + 1) == 6)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.sat) + ",";
+                                }
+                                else if ((j + 1) == 7)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.sun) + ",";
+                                }
+
+
+                            }
+                        }
+                        //鏆傛椂闅愯棌鎺夛紝闇�瑕佹樉绀哄懆鏈拰宸ヤ綔鏃ュ啀鏀惧紑锛�
+                        //if (listvalueInt.Count == 5 && !listvalueInt.Contains(6) && !listvalueInt.Contains(7))
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.workingday);
+                        //}
+                        //else if (listvalueInt.Count == 2 && listvalueInt.Contains(6) && listvalueInt.Contains(7))
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.weekend);
+                        //}
+                        //else if (listvalueInt.Count == 7)
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyday);
+                        //}
+                        //else
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+                        //}
+                        logictimeBtn.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+                        //btndisplaycycle.Text = text.TrimEnd(',');
+                    }; break;
+            }
+
+            List<string> indexlist = new List<string>();
+            List<string> iconIndexlist = new List<string>();
+            for (int i = 0; i < logic.Actions.Count; i++)
+            {
+                var linkType = logic.Actions[i]["LinkType"].ToString();
+                var d = indexlist.Find((value) => { return value == linkType; });
+                if (d == null)
+                {
+                    indexlist.Add(linkType);
+                }
+            }
+            if (indexlist.Contains("0"))
+            {
+                iconIndexlist.Add("0");
+            }
+            if (indexlist.Contains("2"))
+            {
+                iconIndexlist.Add("2");
+            }
+            if (indexlist.Contains("6"))
+            {
+                iconIndexlist.Add("6");
+            }
+            if (indexlist.Contains("7"))
+            {
+                iconIndexlist.Add("7");
+            }
+            for (int i = 0; i < iconIndexlist.Count; i++)
+            {
+                var iconindex = iconIndexlist[i];
+                var typebjBtn = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    X = Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
+                    Y = Application.GetRealHeight(58 + 30),
+                    Radius = (uint)Application.GetRealHeight(41),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                logicRowlayout.AddChidren(typebjBtn);
+
+                var typeIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
+                    Gravity = Gravity.Center,
+
+                };
+                typebjBtn.AddChidren(typeIconBtn);
+
+                var connectIconBtn = new Button
+                {
+                    Y = typebjBtn.Y + Application.GetRealHeight(35),
+                    X = Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
+                    Width = Application.GetRealWidth(48),
+                    Height = Application.GetRealHeight(15),
+                    UnSelectedImagePath = "ZigeeLogic/connect.png",
+                };
+                logicRowlayout.AddChidren(connectIconBtn);
+                if (iconIndexlist.Count - 1 == i)
+                {
+                    connectIconBtn.Visible = false;
+                }
+                switch (iconindex)
+                {
+                    case "0":
+                        {
+                            if (intvalue == 1)
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/function1.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicFunction1Color;
+                            }
+                            else
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                            }
+                        }
+                        break;
+                    case "2":
+                        {
+
+                            if (intvalue == 1)
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/scene1.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicScene1Color;
+                            }
+                            else
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/noscene.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                            }
+
+                        }
+                        break;
+                    case "6":
+                        {
+                            if (intvalue == 1)
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/security1.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicSecurity1Color;
+
+                            }
+                            else
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nosecurity.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                            }
+
+                        }
+                        break;
+                    case "7":
+                        {
+                            if (intvalue == 1)
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/delay1.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicDelay1Color;
+                            }
+                            else
+                            {
+                                typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nodelay.png";
+                                typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                            }
+
+                        }
+                        break;
+
+                }
+            }
+        }
         #endregion
 
         #region 鈼� 鎺у埗鐘舵�乢________________________
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 2e14c60..df2d07c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -14,106 +14,172 @@
         {
             Tag = "Logic";
         }
-        public void Show ()
+        public void Show()
         {
-            
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new FrameLayout {
-                Height = Application.GetRealHeight (140),
-                Y = Application.GetRealHeight (80),
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor= ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren (topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button {
-                TextID = MyInternationalizationString.selection,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.selection,
             };
-            topFrameLayout.AddChidren (titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var back = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                X = Application.GetRealWidth (20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58+40),
+                Y = Application.GetRealHeight(98-40),
             };
-            topFrameLayout.AddChidren (back);
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren (back);
             back.MouseDownEventHandler += (sender, e) => {
                 RemoveFromParent ();
             };
+            #endregion
 
-            var middle = new FrameLayout ();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight (1920 - 220);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-            this.AddChidren (middle);
-             
-                   
-            #region   ----鏃堕棿鏉′欢----
-            var timerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                //Y=pointtimerowlayout.Bottom,
+            #region  鏈�涓嬮潰鐨勫竷灞�浠g爜
+            var middle = new FrameLayout {
+                Y=topRowLayout.Bottom,
+                Height=Application.GetRealHeight(1920-184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            middle.AddChidren (timerowlayout);
+            this.AddChidren (middle);
+
+            #region   ----鏃堕棿鏉′欢----
+            var timeframelayout= new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(timeframelayout);
+            
+
+            var timeiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/time.png",
+
+            };
+            timeframelayout.AddChidren(timeiconBtn);
+
+            var timerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor= ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timeframelayout.AddChidren(timerow);
             ///鏃堕棿鏉′欢
             var btntime = new Button {
                 Text=Language.StringByID (MyInternationalizationString.timecondition),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            timerowlayout.AddChidren (btntime);
+            timerow.AddChidren (btntime);
 
             var btntimeback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080 - 140),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
             };
-            timerowlayout.AddChidren (btntimeback);
+            timerow.AddChidren (btntimeback);
 
-            EventHandler<MouseEventArgs> timeclick = (sender, e) => {
-                //var timePage = new TimePage ();
-                //UserView.HomePage.Instance.AddChidren (timePage);
-                //UserView.HomePage.Instance.PageIndex += 1;
-                //timePage.Show ();
+            EventHandler<MouseEventArgs> timeclick = (sender, e) =>
+            {
                 TimeView();
             };
             btntime.MouseUpEventHandler += timeclick;
             btntimeback.MouseUpEventHandler += timeclick;
+            timeframelayout.MouseUpEventHandler += timeclick;
+            timeiconBtn.MouseUpEventHandler += timeclick;
+            timerow.MouseUpEventHandler += timeclick;
+
             #endregion
 
             #region   ----璁惧鐘舵�佹潯浠�----
-            var devicerowlayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y=timerowlayout.Bottom,
+            var deviceframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = timeframelayout.Bottom,
             };
-            middle.AddChidren (devicerowlayout);
+            middle.AddChidren (deviceframelayout);
+
+            var deviceiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/function.png",
+
+            };
+            deviceframelayout.AddChidren(deviceiconBtn);
+
+            var devicerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            deviceframelayout.AddChidren(devicerow);
+
+          
             ///璁惧鐘舵�佹潯浠�
             var btndevice = new Button {
                 //Text = "璁惧鐘舵�佹潯浠�",
                 TextID = MyInternationalizationString.device,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (60),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            devicerowlayout.AddChidren (btndevice);
+            devicerow.AddChidren (btndevice);
 
             var btndeviceback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080-140),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+
             };
-            devicerowlayout.AddChidren (btndeviceback);
+            devicerow.AddChidren (btndeviceback);
 
             EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
             {
@@ -127,39 +193,61 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 deviceStateCondition.Show();
             };
-            devicerowlayout.MouseUpEventHandler += devicestateclick;
+            deviceframelayout.MouseUpEventHandler += devicestateclick;
             btndevice.MouseUpEventHandler += devicestateclick;
             btndeviceback.MouseUpEventHandler += devicestateclick;
+            deviceiconBtn.MouseUpEventHandler += devicestateclick;
+            devicerow.MouseUpEventHandler += devicestateclick;
             #endregion
 
             #region   ----瀹夐槻鏉′欢----
-            var securityrowlayout = new RowLayout
+            var securityframelayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
-                Y = devicerowlayout.Bottom,
+                Height = Application.GetRealHeight(160),
+                Y = deviceframelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(securityrowlayout);
+            middle.AddChidren(securityframelayout);
+
+            var securityiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/security.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            securityframelayout.AddChidren(securityiconBtn);
+
+            var securityrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            securityframelayout.AddChidren(securityrow);
+
 
             var btnsecurity = new Button
             {
                 //Text = "瀹夐槻鏉′欢",
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            securityrowlayout.AddChidren(btnsecurity);
+            securityrow.AddChidren(btnsecurity);
 
             var btnsecurityback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity = Gravity.CenterVertical,
+                X = Application.GetRealWidth(789),
+                Gravity=Gravity.CenterVertical,
             };
-            securityrowlayout.AddChidren(btnsecurityback);
+            securityrow.AddChidren(btnsecurityback);
 
             EventHandler<MouseEventArgs> securityclick = (sender, e) =>
             {
@@ -167,15 +255,77 @@
                 this.AddChidren(flMain);
                 SecurityView(flMain, false);
             };
-            securityrowlayout.MouseUpEventHandler += securityclick;
+            securityframelayout.MouseUpEventHandler += securityclick;
             btnsecurity.MouseUpEventHandler += securityclick;
             btnsecurityback.MouseUpEventHandler += securityclick;
+            securityiconBtn.MouseUpEventHandler += securityclick;
+            securityrow.MouseUpEventHandler += securityclick;
+            #endregion
+
+            #region   ----鍦扮悊鍥存爮鏉′欢----
+            var locationframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = securityframelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(locationframelayout);
+
+            var locationiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/position.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            locationframelayout.AddChidren(locationiconBtn);
+
+            var locationrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            locationframelayout.AddChidren(locationrow);
+
+            var btnlocation = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = MyInternationalizationString.location,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            locationrow.AddChidren(btnlocation);
+
+            var btnlocationback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+            };
+            locationrow.AddChidren(btnlocationback);
+
+            EventHandler<MouseEventArgs> locationclick = (sender, e) =>
+            {
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                LocationView(flMain, false);
+            };
+            locationframelayout.MouseUpEventHandler += locationclick;
+            locationiconBtn.MouseUpEventHandler += locationclick;
+            locationrow.MouseUpEventHandler += locationclick;
+            btnlocation.MouseUpEventHandler += locationclick;
+            btnlocationback.MouseUpEventHandler += locationclick;
             #endregion
 
             #region   ----宸叉湁鑷姩鍖栨潯浠�----
             var existencerowlayout = new RowLayout {
                 Height = Application.GetRealHeight (180),
-                Y= securityrowlayout.Bottom,
+                Y= securityframelayout.Bottom,
             };
             //middle.AddChidren (existencerowlayout);
             ///宸叉湁鑷姩鍖栨潯浠�
@@ -210,48 +360,10 @@
             existencerowlayout.MouseUpEventHandler += logicclick;
             #endregion
 
-            #region   ----鍦扮悊鍥存爮鏉′欢----
-            var locationrowlayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = securityrowlayout.Bottom,
-            };
-            //middle.AddChidren(locationrowlayout);
+            
 
-            var btnlocation = new Button
-            {
-                //Text = "鍦扮悊鍥存爮",
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(60),
-                TextID = MyInternationalizationString.location,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            locationrowlayout.AddChidren(btnlocation);
-
-            var btnlocationback = new Button
-            {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity = Gravity.CenterVertical,
-            };
-            locationrowlayout.AddChidren(btnlocationback);
-
-            EventHandler<MouseEventArgs> locationclick = (sender, e) =>
-            {
-                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-                this.AddChidren(flMain);
-                LocationView(flMain, false);
-            };
-            locationrowlayout.MouseUpEventHandler += locationclick;
-            btnlocation.MouseUpEventHandler += locationclick;
-            btnlocationback.MouseUpEventHandler += locationclick;
             #endregion
-         
-          
-           
+
         }
         /// <summary>
         /// 瀹夐槻鏉′欢View
@@ -268,143 +380,217 @@
             {
                 flMain.RemoveFromParent();
             };
-            var devicefra = new FrameLayout
+
+            var securityfra1= new FrameLayout
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
             };
-            flMain.AddChidren(devicefra);
-
-            var devicename = new Button
+            flMain.AddChidren(securityfra1);
+            var securityfra = new FrameLayout
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.securityconditions,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(690),
+                Y = Application.GetRealHeight(1920-690),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
             };
-            devicefra.AddChidren(devicename);
-
-            if (SecurityConditionsInfo.ContainsKey("Type"))
+            flMain.AddChidren(securityfra);
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
             {
-                SecurityConditionsInfo.Remove("Type");
-            }
-            if (SecurityConditionsInfo.ContainsKey("IsValid"))
-            {
-                SecurityConditionsInfo.Remove("IsValid");
-            }
-            if (SecurityConditionsInfo.ContainsKey("ModeId"))
-            {
-                SecurityConditionsInfo.Remove("ModeId"); 
-            }
-          
-            SecurityConditionsInfo.Add("Type", "6");
-            SecurityConditionsInfo.Add("IsValid", "1");
-            SecurityConditionsInfo.Add("ModeId", "0");
-
-            var defenceRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = devicename.Bottom,
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            devicefra.AddChidren(defenceRowLayout);
+            securityfra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
-            var btndefence = new Button
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+
+            #region  ----鍦ㄥ甯冮槻 绂诲甯冮槻  鎾ら槻
+
+            #region  鍦ㄥ甯冮槻
+
+
+            var athomeFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom + Application.GetRealHeight(20),
+            };
+            securityfra.AddChidren(athomeFrameLayout);
+
+            var athomedefenceRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            athomeFrameLayout.AddChidren(athomedefenceRowLayout);
+
+            var btnathomedefence = new Button
             {
                 Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.defence,
+                TextID = MyInternationalizationString.logicathomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="甯冮槻",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
             };
-            defenceRowLayout.AddChidren(btndefence);
-            var defenceSelected = new Button
+            athomedefenceRowLayout.AddChidren(btnathomedefence);
+
+
+            var athomedefenceSelected = new SelectedButton();
+            athomedefenceRowLayout.AddChidren(athomedefenceSelected);
+
+            #endregion
+            #region  绂诲甯冮槻
+
+            var leavehomeFrameLayout = new FrameLayout
             {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
+                Height = Application.GetRealHeight(160),
+                Y = athomeFrameLayout.Bottom,
             };
-            defenceRowLayout.AddChidren(defenceSelected);
+            securityfra.AddChidren(leavehomeFrameLayout);
+
+            var leavehomedefenceRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            leavehomeFrameLayout.AddChidren(leavehomedefenceRowLayout);
+
+            var leavehomebtndefence = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.logicremovehomegarrison,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
+            var leavehomedefenceSelected = new SelectedButton();
+            leavehomedefenceRowLayout.AddChidren(leavehomedefenceSelected);
+            #endregion
+            #region  鎾ら槻
+            var withdrawalFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = leavehomeFrameLayout.Bottom,
+            };
+            securityfra.AddChidren(withdrawalFrameLayout);
+
 
             var withdrawalRowLayout = new RowLayout
             {
-                Y = defenceRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            devicefra.AddChidren(withdrawalRowLayout);
+            withdrawalFrameLayout.AddChidren(withdrawalRowLayout);
 
             var btnwithdrawal = new Button
             {
+
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.withdrawal,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鎾ら槻",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
             };
             withdrawalRowLayout.AddChidren(btnwithdrawal);
-            var withdrawalSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
+            var withdrawalSelected = new SelectedButton();
             withdrawalRowLayout.AddChidren(withdrawalSelected);
+            #endregion
 
-            ///甯冮槻鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> copenclick = (sedner14, e14) =>
+            #region  ----鍦ㄥ甯冮槻 绂诲甯冮槻  鎾ら槻鐐瑰嚮浜嬩欢
+            ///鍦ㄥ甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> athomeclick = (sedner14, e14) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.Visible = true;
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomedefenceSelected.Visible = true;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = false;
-                if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
-                {
-                    SecurityConditionsInfo.Remove("EnOrWithdrawMode");
-                }
-                SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
-
-                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
             };
-            btndefence.MouseUpEventHandler += copenclick;
-            defenceRowLayout.MouseUpEventHandler += copenclick;
-            defenceSelected.MouseUpEventHandler += copenclick;
+            athomedefenceRowLayout.MouseUpEventHandler += athomeclick;
+            btnathomedefence.MouseUpEventHandler += athomeclick;
+            athomedefenceSelected.MouseUpEventHandler += athomeclick;
+            athomeFrameLayout.MouseUpEventHandler += athomeclick;
 
-
+            ///绂诲甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            {
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = true;
+                withdrawalSelected.Visible = false;
+            };
+            leavehomedefenceRowLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomebtndefence.MouseUpEventHandler += leavehomeclick;
+            leavehomedefenceSelected.MouseUpEventHandler += leavehomeclick;
+            leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
             ///鎾ら槻鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> disableclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                defenceSelected.Visible = false;
+                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = true;
-                if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
-                {
-                    SecurityConditionsInfo.Remove("EnOrWithdrawMode");
-                }
-                SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
-                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
             };
             withdrawalRowLayout.MouseUpEventHandler += disableclick;
             btnwithdrawal.MouseUpEventHandler += disableclick;
             withdrawalSelected.MouseUpEventHandler += disableclick;
+            withdrawalFrameLayout.MouseUpEventHandler += disableclick;
+            #endregion
+            #endregion
+
 
             if (edit)
             {
@@ -415,36 +601,107 @@
                     {
                         if (securityifon["EnOrWithdrawMode"] == "0")
                         {
-                            defenceSelected.Visible = true;
-                            withdrawalSelected.Visible = false;
+                            if (securityifon["ModeId"] == "1")
+                            {
+                                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomedefenceSelected.Visible = true;
+                                leavehomedefenceSelected.Visible = false;
+                                withdrawalSelected.Visible = false;
+                            }
+                            else
+                            {
+                                btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                athomedefenceSelected.Visible = false;
+                                leavehomedefenceSelected.Visible = true;
+                                withdrawalSelected.Visible = false;
+                            }
+
 
                         }
                         else
                         {
-                            defenceSelected.Visible = false;
+                            btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            athomedefenceSelected.Visible = false;
+                            leavehomedefenceSelected.Visible = false;
                             withdrawalSelected.Visible = true;
                         }
                         break;
                     }
                 }
             }
-            var cancel = new Button
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = devicefra.Height - Application.GetRealHeight(160),
-
-            };
-            devicefra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
-            {
-                flMain.RemoveFromParent();
+                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible)
+                {
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                if (SecurityConditionsInfo.ContainsKey("Type"))
+                {
+                    SecurityConditionsInfo.Remove("Type");
+                }
+                if (SecurityConditionsInfo.ContainsKey("IsValid"))
+                {
+                    SecurityConditionsInfo.Remove("IsValid");
+                }
+                if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                {
+                    SecurityConditionsInfo.Remove("ModeId");
+                }
 
+                SecurityConditionsInfo.Add("Type", "6");
+                SecurityConditionsInfo.Add("IsValid", "1");
+                SecurityConditionsInfo.Add("ModeId", "0");
+                //鍦ㄥ甯冮槻
+                if (athomedefenceSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                    {
+                        SecurityConditionsInfo.Remove("ModeId");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "1");
+                }
+                //绂诲甯冮槻
+                if (leavehomedefenceSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    if (SecurityConditionsInfo.ContainsKey("ModeId"))
+                    {
+                        SecurityConditionsInfo.Remove("ModeId");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
+                    SecurityConditionsInfo.Add("ModeId", "2");
+                }
+                //鎾ら槻
+                if (withdrawalSelected.Visible)
+                {
+                    if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+                    {
+                        SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+                    }
+                    SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
+                }
+                LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+            };
+           
         }
         /// <summary>
         /// 鍦扮悊鍥存爮View
@@ -461,139 +718,168 @@
             {
                 flMain.RemoveFromParent();
             };
+
+            var Locationfra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(Locationfra1);
             var Locationfra = new FrameLayout
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(Locationfra);
 
-            var locationviewname = new Button
+
+            #region  -------鍙栨秷   瀹屾垚
+            var typeRow = new RowLayout
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.locationmode,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
-                //Text="浣嶇疆妯″紡",
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            Locationfra.AddChidren(locationviewname);
-
-            if (LocationConditionsInfo.ContainsKey("Type"))
+            Locationfra.AddChidren(typeRow);
+            var Btncancel = new Button
             {
-                LocationConditionsInfo.Remove("Type");
-            }
-            if (LocationConditionsInfo.ContainsKey("IsValid"))
-            {
-                LocationConditionsInfo.Remove("IsValid");
-            }
-           
-            LocationConditionsInfo.Add("Type", "7");
-            LocationConditionsInfo.Add("IsValid", "1");
-
-            var leavehomeRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = locationviewname.Bottom,
-            };
-            Locationfra.AddChidren(leavehomeRowLayout);
-
-            var btnleavehome = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.leavehome,
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="绂诲",
             };
-            leavehomeRowLayout.AddChidren(btnleavehome);
-            var leavehomeSelected = new Button
+            typeRow.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
             {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
             };
-            leavehomeRowLayout.AddChidren(leavehomeSelected);
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.location,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            typeRow.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            typeRow.AddChidren(Btncomplete);
+            #endregion
+
+            #region  ------鍦ㄥ   绂诲  
+            #region ------鍦ㄥ
+
+            var athomeFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = typeRow.Bottom + Application.GetRealHeight(20),
+            };
+            Locationfra.AddChidren(athomeFrameLayout);
 
             var athomeRowLayout = new RowLayout
             {
-                Y = leavehomeRowLayout.Bottom,
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            Locationfra.AddChidren(athomeRowLayout);
+            athomeFrameLayout.AddChidren(athomeRowLayout);
 
             var btnathome = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.athome,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鍦ㄥ",
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+
+
             };
             athomeRowLayout.AddChidren(btnathome);
-            var athomeSelected = new Button
-            {
-                X = Application.GetRealWidth(1000 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
+            var athomeSelected = new SelectedButton();
             athomeRowLayout.AddChidren(athomeSelected);
+            #endregion
 
-            ///绂诲鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            #region -------绂诲 
+            var leavehomeFrameLayout = new FrameLayout
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                leavehomeSelected.Visible = true;
-                athomeSelected.Visible = false;
-                if (LocationConditionsInfo.ContainsKey("AtHome"))
-                {
-                    LocationConditionsInfo.Remove("AtHome");
-                }
-                LocationConditionsInfo.Add("AtHome", "0");
-
-                LogicIfon.AddLocationconditions(LocationConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
+                Height = Application.GetRealHeight(160),
+                Y = athomeFrameLayout.Bottom,
             };
-            btnleavehome.MouseUpEventHandler += leavehomeclick;
-            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
-            leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
-           
+            Locationfra.AddChidren(leavehomeFrameLayout);
 
+            var leavehomeRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            leavehomeFrameLayout.AddChidren(leavehomeRowLayout);
+
+            var btnleavehome = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.leavehome,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            leavehomeRowLayout.AddChidren(btnleavehome);
+            var leavehomeSelected = new SelectedButton();
+            leavehomeRowLayout.AddChidren(leavehomeSelected);
+            #endregion
+
+            #endregion
+            string strname = "";
             ///鍦ㄥ鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> athomeclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
+                strname = btnathome.Text;
+                btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                 leavehomeSelected.Visible = false;
                 athomeSelected.Visible = true;
-                if (LocationConditionsInfo.ContainsKey("AtHome"))
-                {
-                    LocationConditionsInfo.Remove("AtHome");
-                }
-                LocationConditionsInfo.Add("AtHome", "1");
-                LogicIfon.AddLocationconditions(LocationConditionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
+
+
             };
             btnathome.MouseUpEventHandler += athomeclick;
             athomeSelected.MouseUpEventHandler += athomeclick;
             athomeRowLayout.MouseUpEventHandler += athomeclick;
+            athomeFrameLayout.MouseUpEventHandler += athomeclick;
+
+            ///绂诲鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            {
+                strname = btnleavehome.Text;
+                btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnathome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                leavehomeSelected.Visible = true;
+                athomeSelected.Visible = false;
+            };
+            btnleavehome.MouseUpEventHandler += leavehomeclick;
+            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
+            leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
 
             if (edit)
             {
@@ -604,36 +890,102 @@
                     {
                         if (Locationifon["AtHome"] == "0")
                         {
+                            strname = btnleavehome.Text;
                             leavehomeSelected.Visible = true;
                             athomeSelected.Visible = false;
-
+                            btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnathome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                         }
                         else
                         {
+                            strname = btnathome.Text;
                             leavehomeSelected.Visible = false;
                             athomeSelected.Visible = true;
+                            btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                         }
                         break;
                     }
                 }
             }
-            var cancel = new Button
-            {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = Locationfra.Height - Application.GetRealHeight(160),
 
-            };
-            Locationfra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                flMain.RemoveFromParent();
+
+                if (!leavehomeSelected.Visible && !athomeSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                if (LocationConditionsInfo.ContainsKey("Type"))
+                {
+                    LocationConditionsInfo.Remove("Type");
+                }
+                if (LocationConditionsInfo.ContainsKey("IsValid"))
+                {
+                    LocationConditionsInfo.Remove("IsValid");
+                }
+                LocationConditionsInfo.Add("Type", "7");
+                LocationConditionsInfo.Add("IsValid", "1");
+                if (leavehomeSelected.Visible)
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "0");
+                }
+                else
+                {
+                    if (LocationConditionsInfo.ContainsKey("AtHome"))
+                    {
+                        LocationConditionsInfo.Remove("AtHome");
+                    }
+                    LocationConditionsInfo.Add("AtHome", "1");
+                }
+                double a1 = 23.134421, a2 = 113.267189;
+                //璋冪敤鏂规硶锛岃烦杞〉闈�
+                GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
+                {
 
+                    //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
+                    var latitud = (int)Math.Truncate(mLatitude * 1000000);
+                    var longitude = (int)Math.Truncate(mLongitude * 1000000);
+                    Dictionary<string, string> accounts = new Dictionary<string, string>();
+                    if (accounts.ContainsKey("Account"))
+                    {
+                        accounts.Remove("Account");
+                    }
+                    if (accounts.ContainsKey("Type"))
+                    {
+                        accounts.Remove("Type");
+                    }
+                    if (accounts.ContainsKey("Latitude"))
+                    {
+                        accounts.Remove("latitude");
+                    }
+                    if (accounts.ContainsKey("Longitude"))
+                    {
+                        accounts.Remove("Longitude");
+                    }
+                    if (accounts.ContainsKey("Radius"))
+                    {
+                        accounts.Remove("radius");
+                    }
+                    accounts.Add("Account", Config.Instance.Guid);
+                    accounts.Add("Type", "7");
+                    accounts.Add("Latitude", latitud.ToString());
+                    accounts.Add("Longitude", longitude.ToString());
+                    accounts.Add("Radius", mRadius.ToString());
+                    LogicIfon.Addaccounts(accounts);
+                    LogicIfon.AddLocationconditions(LocationConditionsInfo);
+                    var logicCommunalPage = new LogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    logicCommunalPage.Show(() => { });
+                }, strname, true, a1, a2, 500);
+            };
         }
 
         /// <summary>
@@ -643,126 +995,213 @@
         {
             UserView.HomePage.Instance.ScrollEnabled = false;
             Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
-            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
             this.AddChidren(flMain);
             flMain.MouseUpEventHandler += (sender12, e12) =>
             {
                 flMain.RemoveFromParent();
             };
+
+            var timetypeframelayout1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(timetypeframelayout1);
+
             var timetypeframelayout = new FrameLayout
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(720),
-                Y = Application.GetRealHeight(1920 - 30 - 720),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(timetypeframelayout);
 
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timetypeframelayout.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X=Application.GetRealWidth(80),
+                TextAlignment=TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
             var Btntitle= new Button
             {
-                Y = Application.GetRealHeight(20),
-                TextID = MyInternationalizationString.Selectedtimetype,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
-                //Text="鏃堕棿绫诲瀷",
+                TextID = MyInternationalizationString.type,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X= Btncancel.Right+Application.GetRealWidth(100),
+                TextSize = 16,
             };
-            timetypeframelayout.AddChidren(Btntitle);
-
-          
-
-            var timepointrow= new RowLayout
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
             {
-                Height = Application.GetRealHeight(180),
-                Y = Btntitle.Bottom,
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+                
             };
-            timetypeframelayout.AddChidren(timepointrow);
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+            #region  -------绔嬪嵆鎵ц   鏃堕棿鑼冨洿
+
+            #region  -------绔嬪嵆鎵ц 
+            var timepointFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom+Application.GetRealHeight(20),
+            };
+            timetypeframelayout.AddChidren(timepointFrameLayout);
+
+            var timerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            timepointFrameLayout.AddChidren(timerow);
+
 
             var Btntimepoint = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.immediateexecution,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text="绔嬪嵆鎵ц",
             };
-            timepointrow.AddChidren(Btntimepoint);
+            timerow.AddChidren(Btntimepoint);
 
-            var timerow = new RowLayout
+            var timepointSelected = new SelectedButton();
+            timerow.AddChidren(timepointSelected);
+            #endregion
+
+
+            #region  -------鏃堕棿鑼冨洿
+            var timeFrameLayout = new FrameLayout
             {
-                Y = timepointrow.Bottom,
-                Height = Application.GetRealHeight(180),
+                Height = Application.GetRealHeight(160),
+                Y =timepointFrameLayout.Bottom,
             };
-            timetypeframelayout.AddChidren(timerow);
+            timetypeframelayout.AddChidren(timeFrameLayout);
+
+            var time1row = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            timeFrameLayout.AddChidren(time1row);
 
             var Btntime = new Button
             {
                 Width = Application.GetRealWidth(600),
                 TextID = MyInternationalizationString.timeframe,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text = "鏃堕棿鑼冨洿",
             };
-            timerow.AddChidren(Btntime);
+            time1row.AddChidren(Btntime);
 
+            var timeSelected = new SelectedButton();
+            time1row.AddChidren(timeSelected);
+            #endregion
+
+        
             ///绔嬪嵆鎵ц鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
             {
-                Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
-                timeConditionsInfo.Add("Type", "0");
-                timeConditionsInfo.Add("IsValid", "1");
-                timeConditionsInfo.Add("DateType", "1");
-                timeConditionsInfo.Add("RemindTime", "0");
-                timeConditionsInfo.Add("EnDelay", "0");
-                timeConditionsInfo.Add("DelayTime", "0");
-                timeConditionsInfo.Add("AdjustTime", "0");
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-                var timePoint = new TimePoint();
-                UserView.HomePage.Instance.AddChidren(timePoint);
-                UserView.HomePage.Instance.PageIndex += 1;
-                timePoint.Show(timeConditionsInfo);
+                Btntimepoint.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                Btntime.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                timepointSelected.Visible = true;
+                timeSelected.Visible = false;
             };
+            timepointFrameLayout.MouseUpEventHandler += timepointclick;
+            timerow.MouseUpEventHandler += timepointclick;
             Btntimepoint.MouseUpEventHandler += timepointclick;
-            timepointrow.MouseUpEventHandler += timepointclick;
+            timepointSelected.MouseUpEventHandler += timepointclick;
 
 
             ///鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> timeclick = (sedner15, e15) =>
             {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-                var timePage = new TimePage();
-                UserView.HomePage.Instance.AddChidren (timePage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                timePage.Show ();
-               
+                Btntimepoint.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                Btntime.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                timepointSelected.Visible = false;
+                timeSelected.Visible = true;
             };
             Btntime.MouseUpEventHandler += timeclick;
-            timerow.MouseUpEventHandler += timeclick;
+            time1row.MouseUpEventHandler += timeclick;
+            timeSelected.MouseUpEventHandler += timeclick;
+            timeFrameLayout.MouseUpEventHandler += timeclick;
+            #endregion
 
 
-            var cancel = new Button
+
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = timetypeframelayout.Height - Application.GetRealHeight(160),
-
-            };
-            timetypeframelayout.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender16, e16) =>
-            {
-                flMain.RemoveFromParent();
+                if (!timepointSelected.Visible && !timeSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
                 UserView.HomePage.Instance.ScrollEnabled = true;
-            };
+                flMain.RemoveFromParent();
+                if (timepointSelected.Visible)
+                {
 
+                    Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
+                    timeConditionsInfo.Add("Type", "0");
+                    timeConditionsInfo.Add("IsValid", "1");
+                    timeConditionsInfo.Add("DateType", "1");
+                    timeConditionsInfo.Add("RemindTime", "0");
+                    timeConditionsInfo.Add("EnDelay", "0");
+                    timeConditionsInfo.Add("DelayTime", "0");
+                    timeConditionsInfo.Add("AdjustTime", "0");
+
+                    var timePoint = new TimePoint();
+                    UserView.HomePage.Instance.AddChidren(timePoint);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    timePoint.Show(timeConditionsInfo);
+                }
+                else
+                {
+                    var timePage = new TimePage();
+                    UserView.HomePage.Instance.AddChidren(timePage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    timePage.Show();
+
+                }
+            };
         }
 
     }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 5009ebd..5f7b17b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -12,68 +12,165 @@
     public class AddScenePage : FrameLayout
     {
 
-        Button roomname;
         public AddScenePage()
         {
             Tag = "Logic";
         }
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button clickbutton = new Button();
+        HorizontalScrolViewLayout roomhorizontalScrol;
+        VerticalScrolViewLayout middle;
+        public string clickTag = "no";
+        public SceneUI tempScene = null;
+        Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
         public void Show()
         {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-
-            var topFrameLayout = new FrameLayout
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(220),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                //Text = "娣诲姞鍦烘櫙",
-                TextID = MyInternationalizationString.addscene,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addscene,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
-            {
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
                 RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
             };
 
-            roomname = new Button
+            var foolrname = new Button
             {
-                Width = Application.GetMinRealAverage(300 + 300),
-                Height = Application.GetMinRealAverage(80),
-                X = Application.GetRealWidth(1080 - 300 - 30 - 300),
-                Y = Application.GetRealHeight(120),
-                TextAlignment = TextAlignment.CenterRight,
-                //Text = "鑷畾涔夋埧闂�",
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID=MyInternationalizationString.customroom,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
             };
-            topFrameLayout.AddChidren(roomname);
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+        
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+             roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
 
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 300);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = roomhorizontalScrol.Bottom;
+            middle.Height = Application.GetRealHeight(1920 - 260 - 200 - 184);
+            middle.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
             this.AddChidren(middle);
 
-            roomname.MouseUpEventHandler += (sender, e) =>
+            var saveframeLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveframeLayout);
+
+          var  btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveframeLayout.AddChidren(btnsave);
+
+            btnsave.MouseUpEventHandler += (sender2, e2) =>
+            {
+                if (clickTag == "no" || tempScene == null)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                              Language.StringByID(MyInternationalizationString.complete));
+                    alert.Show();
+                    return;
+                }
+                if (actionsInfo.ContainsKey("LinkType"))
+                {
+                    actionsInfo.Remove("LinkType");
+                }
+                actionsInfo.Add("LinkType", 2);
+                LogicIfon.AddSceneactions(tempScene, actionsInfo);
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+
+            };
+
+            ///閫変腑妤煎眰
+            foolrname.MouseUpEventHandler += (sender, e) =>
             {
                 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                 this.AddChidren(flMain);
@@ -81,117 +178,228 @@
                 {
                     flMain.RemoveFromParent();
                 };
-                var roombj = new VerticalScrolViewLayout
+                var foolrbj = new VerticalScrolViewLayout
                 {
 
                     Width = Application.GetRealWidth(400),
                     Height = Application.GetRealHeight(600),
                     X = Application.GetRealWidth(1080 - 400 - 60),
-                    Y = Application.GetRealHeight(220 + 30 + 80),
+                    Y = Application.GetRealHeight(184 + 50),
                     BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                     Radius = (uint)Application.GetRealHeight(30),
                 };
-                flMain.AddChidren(roombj);
-                List<Common.Room> roomlist = new List<Common.Room>();
-                roomlist.Clear();
-                Common.Room customroom = new Common.Room();
-                //铏氭嫙涓�涓埧闂村姞杞芥湰鍦版墍鏈夊満鏅紱
-                customroom.SceneUIList.AddRange(Common.Room.AllRoomSceneUIList);
-                customroom.Name =Language.StringByID(MyInternationalizationString.customroom);
-                roomlist.Add(customroom);
-                roomlist.AddRange(Common.Room.Lists);
-                foreach (var room in roomlist)
+                flMain.AddChidren(foolrbj);
+                ///榛樿璋冭瘯
+
+                foreach (var foolr in Config.Instance.Home.FloorDics)
                 {
-                    var rowLayout = new RowLayout
+                    var foolrRowLayout = new FrameLayout
                     {
                         Height = Application.GetRealHeight(150),
                     };
-                    roombj.AddChidren(rowLayout);
+                    foolrbj.AddChidren(foolrRowLayout);
 
-                    var btnroomname = new Button
+                    var btnfoolrname = new Button
                     {
-                        Width = Application.GetRealWidth(300),
-                        Text = room.Name,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        X = Application.GetRealWidth(30),
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
                         TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        Tag = foolr.Key,
                     };
-                    rowLayout.AddChidren(btnroomname);
+                    foolrRowLayout.AddChidren(btnfoolrname);
 
-                    EventHandler<MouseEventArgs> roomclick = (sender1, e1) =>
+
+                    EventHandler<MouseEventArgs> foolrclick = (sender13, e13) =>
                     {
-
+                        roomhorizontalScrol.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
+                        middle.RemoveAll();
                         flMain.RemoveFromParent();
-                        roomname.Text = room.Name;
-                        SceneView(middle, room.SceneUIList);
-
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list);
                     };
-                    rowLayout.MouseUpEventHandler += roomclick;
-                    btnroomname.MouseUpEventHandler += roomclick;
+                    foolrRowLayout.MouseUpEventHandler += foolrclick;
+                    btnfoolrname.MouseUpEventHandler += foolrclick;
+
 
                 }
-               
             };
 
-            SceneView(middle,Common.Room.AllRoomSceneUIList);
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
+            {
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
+                {
+                    roomlists.AddRange(Common.Room.Lists);
+                }
+                else
+                {
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+                }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+
+            }
+
+
+            ///绗竴娆¤繘鏉�
+            AllRoomView(roomlists);
 
         }
+        /// <summary>
+        /// 鏄剧ず鎵�鏈夋埧闂寸殑鏂规硶
+        /// </summary>
+        /// <param name="RoomList"></param>
+        void AllRoomView(List<Common.Room> RoomList ) {
+            for (int i = 0; i < RoomList.Count; i++)
+            {
+                var room = RoomList[i];
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
 
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
 
-        void SceneView(VerticalScrolViewLayout middle,List<SceneUI>scenelist)
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+
+                if (i == 0)
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    SceneView(room.SceneUIList);
+
+                }
+                
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    SceneView(room.SceneUIList);
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
+        }
+        /// <summary>
+        /// 鏄剧ず鎵�鏈夌殑鍦烘櫙鐨勬柟娉�
+        /// </summary>
+        /// <param name="scenelist"></param>
+        void SceneView(List<SceneUI>scenelist)
         {
             middle.RemoveAll();
-            foreach (var tempScene in scenelist)
+            foreach (var scene in scenelist)
             {
-                var deviceRowLayout = new RowLayout
+                var sceneFramelayout = new FrameLayout
                 {
-                    Height = Application.GetRealHeight(180),
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                 };
-                middle.AddChidren(deviceRowLayout);
+                middle.AddChidren(sceneFramelayout);
 
-                var btn = new Button
+
+                var sceneIconBtn = new Button
                 {
-                    Height = Application.GetRealHeight(180),
-                    Width = LayoutParams.MatchParent,
+                    Width = Application.GetRealWidth(81),
+                    Height = Application.GetRealHeight(81),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(55),
+                    UnSelectedImagePath = "ZigeeLogic/scene.png",
 
                 };
-                deviceRowLayout.AddChidren(btn);
+                sceneFramelayout.AddChidren(sceneIconBtn);
 
-                var devicetypename = new Button
+                var sceneRow = new RowLayout
                 {
-                    Width = Application.GetRealWidth(600),
-                    Text = tempScene.Name,
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                sceneFramelayout.AddChidren(sceneRow);
+
+                var scenename = new Button
+                {
+                    Text = scene.Name,
                     TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealWidth(40),
-                    //SelectedBackgroundColor = 0xfffe5e00,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                 };
-                deviceRowLayout.AddChidren(devicetypename);
+                sceneRow.AddChidren(scenename);
+
+                var selectedBtn = new Button
+                {
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(789),
+                    UnSelectedImagePath = "ZigeeLogic/selected.png",
+                    Visible = false,
+                    Gravity = Gravity.CenterVertical,
+                };
+                sceneRow.AddChidren(selectedBtn);
 
                 EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
                 {
-                    Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
-                    if (actionsInfo.ContainsKey("LinkType"))
-                    {
-                        actionsInfo.Remove("LinkType");
-                    }
+                    tempScene = scene;
+                    clickTag = "yes";
+                    clickbutton.Visible = false;
+                    clickbutton = selectedBtn;
+                    selectedBtn.Visible = true;
                     if (actionsInfo.ContainsKey("DeviceAddr"))
                     {
                         actionsInfo.Remove("DeviceAddr");
                     }
-                    actionsInfo.Add("LinkType", 2);
-                    actionsInfo.Add("DeviceAddr", tempScene.Id);
-
-                    LogicIfon.AddSceneactions(tempScene,actionsInfo);
-                    var logicCommunalPage = new LogicCommunalPage();
-                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                    UserView.HomePage.Instance.PageIndex += 1;
-                    logicCommunalPage.Show(() => { });
+                    actionsInfo.Add("DeviceAddr", scene.Id);
                 };
 
-                deviceRowLayout.MouseUpEventHandler += sceneclick;
-                btn.MouseUpEventHandler += sceneclick;
-                devicetypename.MouseUpEventHandler += sceneclick;
+                sceneFramelayout.MouseUpEventHandler += sceneclick;
+                sceneIconBtn.MouseUpEventHandler += sceneclick;
+                sceneRow.MouseUpEventHandler += sceneclick;
+                scenename.MouseUpEventHandler += sceneclick;
+                selectedBtn.MouseUpEventHandler += sceneclick;
 
             }
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index a3530a9..2d8c58c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -10,75 +10,103 @@
 
         public void Show()
         {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new FrameLayout
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                //TextID = MyInternationalizationString.selection,
-                Text = "鑷畾涔夋帹閫�",
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.custompush,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var back = new Button
+            var clickBtn = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) => {
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
                 RemoveFromParent();
             };
 
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            #endregion
 
-            var middle = new FrameLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
             var textBox = new EditText
             {
-                Width = Application.GetRealWidth(900),
+                Width = Application.GetRealWidth(1080),
                 Height = Application.GetRealHeight(600),
-                X = Application.GetRealWidth(90),
-                Y = Application.GetRealHeight(90),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Radius = (uint)Application.GetRealHeight(40),
-                BorderColor = ZigbeeColor.Current.LogicLineColor,
-                BorderWidth = 2,
-                //Text = Common.Logic.CurrentLogic.LogicName,
-                //TextID=MyInternationalizationString.automation1,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Text = Common.Logic.CurrentLogic.LogicCustomPushText,
             };
             middle.AddChidren(textBox);
 
-            var btnsave = new Button
+             var btnsave = new Button
             {
-                Height = Application.GetRealHeight(150),
-                Y = textBox.Bottom + Application.GetRealHeight(300),
-                //Text = "淇濆瓨",
-                Width = Application.GetRealWidth(500),
-                Radius = (uint)Application.GetRealHeight(50),
-                BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
-                X = Application.GetRealWidth(290),
-                TextID = MyInternationalizationString.Save,
+                Y= middle.Height-Application.GetRealHeight(260),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.confrim,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
             };
+            middle.AddChidren(btnsave);
+
+                     
             middle.AddChidren(btnsave);
             btnsave.MouseUpEventHandler += (sender, e) =>
              {
+                 if (Common.Logic.CurrentLogic.LogicId != 0)
+                 {
+                     Send.LogicControlSwitch(Common.Logic.CurrentLogic);
+                 }
+                 else {
+                     Send.AddModifyLogic(Common.Logic.CurrentLogic);
+                 }
                  RemoveFromParent();
+
              };
         }
     }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
index 159b1eb..f257172 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -9,213 +9,441 @@
 {
     public class Cycle : FrameLayout
     {
+       
         Action action;
         public Cycle(Action action)
         {
             this.action = action;
         }
-        public Cycle()
-        {
-            Tag = "Logic";
-        }
-        /// <summary>
-        /// 閫変腑
-        /// </summary>
-        Button beforeClickButton = new Button();
-       
+     
         public void Show()
         {
-
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            var topFrameLayout = new FrameLayout
+            Tag = "Logic";
+            
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.cycle,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.cycle,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var hdl = new Button
+            var clickBtn = new Button
             {
-                Width = Application.GetRealWidth(154),
-                Height = Application.GetRealHeight(90),
-                X = Application.GetRealWidth(1080 - 170),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "Logo/Logo.png",
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            //topFrameLayout.AddChidren(hdl);
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                //if (action != null)
+                //    action();
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
-            {
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                //if (action != null)
+                //    action();
                 RemoveFromParent();
-                if (action != null)
-                    action();
+
             };
-            var titlerl = new RowLayout
+            #endregion
+
+
+
+
+            var middle = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
-               // BackgroundColor = 0xff0f0f0f,
-                Y = Application.GetRealHeight(220),
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            AddChidren(titlerl);
-
-            titlerl.AddChidren(
-                new Button
-                {
-                    X = Application.GetRealWidth(40),
-                    //Text = "璇烽�夋嫨閲嶅鎵ц鍛ㄦ湡",
-                    TextID = MyInternationalizationString.repeat,
-                    TextSize = 17,
-                    TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                }
-            );
-
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = titlerl.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220 - 180 - 174);
-            middle.BackgroundColor =ZigbeeColor.Current.LogicBackgroundColor;
             this.AddChidren(middle);
+            
 
-
-
-
-            var cyclelist = new List<string>();
-            cyclelist.AddRange(new string[] {
-                Language.StringByID(MyInternationalizationString.executeonce),
-                Language.StringByID(MyInternationalizationString.everyday),
-                //"浠婂勾",
-                //Language.StringByID(MyInternationalizationString.workingday),
-                //Language.StringByID(MyInternationalizationString.weekend),
-                Language.StringByID(MyInternationalizationString.monthly),
-                Language.StringByID(MyInternationalizationString.everyyear),
-                Language.StringByID(MyInternationalizationString.logicminute),
-            });
-
-            foreach (var name in cyclelist)
+            var btnsave = new Button
             {
-                var cyclerwLayout = new RowLayout
-                {
-                    Height = Application.GetRealHeight(180),
-                };
-                middle.AddChidren(cyclerwLayout);
+                Y= middle.Height-Application.GetRealHeight(260),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            middle.AddChidren(btnsave);
 
-                var btn = new Button
-                {
-                    Height = Application.GetRealHeight(180),
-                    Width = LayoutParams.MatchParent,
-                    SelectedBackgroundColor = 0xfffe5e00,
-                };
-                cyclerwLayout.AddChidren(btn);
 
-                var btnName = new Button
-                {
-                    Gravity = Gravity.CenterVertical,
-                    Text = name,
-                    Width = Application.GetRealWidth(400),
-                    Height = Application.GetRealHeight(100),
-                    X = Application.GetRealWidth(30),
-                    TextSize = 16,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                };
-                cyclerwLayout.AddChidren(btnName);
 
-                var btntimeback = new Button
-                {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
-                    //UnSelectedImagePath = "MusicIcon/Next.png",
-                    SelectedImagePath = "ZigeeLogic/next.png",
-                    X = Application.GetRealWidth(1080 - 140),
-                };
-                if (name == Language.StringByID(MyInternationalizationString.monthly) || name == Language.StringByID(MyInternationalizationString.everyyear) || name == Language.StringByID(MyInternationalizationString.logiccustom))
-                {
-                    cyclerwLayout.AddChidren(btntimeback);
-                }
+            #region   ----鎵ц涓�娆�----
+            var onceFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(onceFramelayout);
 
-                //if (timename == name) {
-                //    beforeClickButton.IsSelected = false;
-                //    beforeClickButton = btn;
-                //    btn.IsSelected = true;
-                //}
 
-                EventHandler<MouseEventArgs> timeclick = (sender, e) =>
-                {
-                    if (btnName.Text == Language.StringByID(MyInternationalizationString.logiccustom))
-                    {
-                        var weekPage = new WeekPage();
-                        UserView.HomePage.Instance.AddChidren(weekPage);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        weekPage.Show();
-                    }
-                    else if (btnName.Text == Language.StringByID(MyInternationalizationString.monthly))
-                    {
-                        var everymonthPage = new EverymonthPage();
-                        UserView.HomePage.Instance.AddChidren(everymonthPage);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        everymonthPage.Show();
-                    }
-                    else if (btnName.Text == Language.StringByID(MyInternationalizationString.everyyear))
-                    {
-                        var everyyearPage = new EveryyearPage();
-                        UserView.HomePage.Instance.AddChidren(everyyearPage);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        everyyearPage.Show();
-                    }
-                    else
-                    {
-                        beforeClickButton.IsSelected = false;
-                        beforeClickButton = btn;
-                        btn.IsSelected = true;
-                        if (btnName.Text == Language.StringByID(MyInternationalizationString.everyday))
-                        {
-                            Common.Logic.CurrentLogic.TimeAttribute.Repeat = 2;
-                        }
-                        else if (btnName.Text == Language.StringByID(MyInternationalizationString.executeonce))
-                        {
-                            Common.Logic.CurrentLogic.TimeAttribute.Repeat = 0;
-                        }
-                    }
-                };
-                cyclerwLayout.MouseUpEventHandler += timeclick;
-                btn.MouseUpEventHandler += timeclick;
-                btnName.MouseUpEventHandler += timeclick;
-                btntimeback.MouseUpEventHandler += timeclick;
+            var onceIconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/point.png",
 
             };
+            onceFramelayout.AddChidren(onceIconBtn);
 
-            var btncomplete = new Button
+            var onceRow = new RowLayout
             {
-                Y = middle.Bottom,
-                Height = Application.GetRealHeight(174),
-                TextID = MyInternationalizationString.complete,
-                //BackgroundColor = 0xff1f1f1f,
-                TextSize = 16,
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            onceFramelayout.AddChidren(onceRow);
+            var onceTextBtn = new Button
+            {
+                Text = Language.StringByID(MyInternationalizationString.executeonce),
+                TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            AddChidren(btncomplete);
+            onceRow.AddChidren(onceTextBtn);
 
-            btncomplete.MouseUpEventHandler += (sedder, e) =>
+            var onceBackBtn = new SelectedButton(789);
+            onceRow.AddChidren(onceBackBtn);
+
+
+
+            #endregion
+
+            #region   ----姣忓ぉ----
+            var everydayFramelayout = new FrameLayout
             {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = onceFramelayout.Bottom,
+            };
+            middle.AddChidren(everydayFramelayout);
+
+            var everydayIconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/point.png",
+
+            };
+            everydayFramelayout.AddChidren(everydayIconBtn);
+
+            var everydayRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            everydayFramelayout.AddChidren(everydayRow);
+
+
+            var everydayTxetBtn = new Button
+            {
+                TextID = MyInternationalizationString.everyday,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            everydayRow.AddChidren(everydayTxetBtn);
+
+            var everydayBack = new SelectedButton(789);
+            everydayRow.AddChidren(everydayBack);
+
+           
+            #endregion
+
+            #region   ----姣忓懆----
+            var weekFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = everydayFramelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(weekFramelayout);
+
+            var weekIconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/point.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            weekFramelayout.AddChidren(weekIconBtn);
+
+            var weekRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            weekFramelayout.AddChidren(weekRow);
+
+
+            var weekTextBtn = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = MyInternationalizationString.weekly,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            weekRow.AddChidren(weekTextBtn);
+
+            var weekBack = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+            };
+            weekRow.AddChidren(weekBack);
+
+            #endregion
+
+            #region   ----姣忔湀----
+            var monthlyFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = weekFramelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(monthlyFramelayout);
+
+            var monthlyIconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/point.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            monthlyFramelayout.AddChidren(monthlyIconBtn);
+
+            var monthlyRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            monthlyFramelayout.AddChidren(monthlyRow);
+
+            var monthlyTextBtn = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = MyInternationalizationString.monthly,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            monthlyRow.AddChidren(monthlyTextBtn);
+
+            var monthlyBack = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+            };
+            monthlyRow.AddChidren(monthlyBack);
+            #endregion
+
+            #region   ----姣忓勾----
+            var yearFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = monthlyFramelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            //middle.AddChidren(yearFramelayout);
+
+            var yearIconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/point.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            yearFramelayout.AddChidren(yearIconBtn);
+
+            var yearRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            yearFramelayout.AddChidren(yearRow);
+
+
+            var yearTextBtn = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = MyInternationalizationString.everyyear,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            yearRow.AddChidren(yearTextBtn);
+
+            var yearBack = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+            };
+            yearRow.AddChidren(yearBack);
+
+            EventHandler<MouseEventArgs> yearclick = (sender, e) =>
+            {
+                var everyyearPage = new EveryyearPage();
+                UserView.HomePage.Instance.AddChidren(everyyearPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                everyyearPage.Show();
+
+            };
+            yearFramelayout.MouseUpEventHandler += yearclick;
+            yearTextBtn.MouseUpEventHandler += yearclick;
+            yearBack.MouseUpEventHandler += yearclick;
+            yearIconBtn.MouseUpEventHandler += yearclick;
+            yearRow.MouseUpEventHandler += yearclick;
+
+            #endregion
+            EventHandler<MouseEventArgs> onceclick = (sender, e) =>
+            {
+                onceBackBtn.Visible = true;
+                everydayBack.Visible = false;
+            };
+            onceTextBtn.MouseUpEventHandler += onceclick;
+            onceBackBtn.MouseUpEventHandler += onceclick;
+            onceFramelayout.MouseUpEventHandler += onceclick;
+            onceIconBtn.MouseUpEventHandler += onceclick;
+            onceRow.MouseUpEventHandler += onceclick;
+
+            EventHandler<MouseEventArgs> everydayclick = (sender, e) =>
+            {
+                onceBackBtn.Visible = false;
+                everydayBack.Visible = true;
+
+            };
+            everydayFramelayout.MouseUpEventHandler += everydayclick;
+            everydayTxetBtn.MouseUpEventHandler += everydayclick;
+            everydayBack.MouseUpEventHandler += everydayclick;
+            everydayIconBtn.MouseUpEventHandler += everydayclick;
+            everydayRow.MouseUpEventHandler += everydayclick;
+
+            EventHandler<MouseEventArgs> weekclick = (sender, e) =>
+            {
+                onceBackBtn.Visible = false;
+                everydayBack.Visible = false;
+                var weekPage = new WeekPage();
+                UserView.HomePage.Instance.AddChidren(weekPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                weekPage.Show(weekTextBtn.Text);
+
+            };
+            weekFramelayout.MouseUpEventHandler += weekclick;
+            weekTextBtn.MouseUpEventHandler += weekclick;
+            weekBack.MouseUpEventHandler += weekclick;
+            weekIconBtn.MouseUpEventHandler += weekclick;
+            weekRow.MouseUpEventHandler += weekclick;
+
+            EventHandler<MouseEventArgs> monthlyclick = (sender, e) =>
+            {
+                onceBackBtn.Visible = false;
+                everydayBack.Visible = false;
+                var everymonthPage = new EverymonthPage();
+                UserView.HomePage.Instance.AddChidren(everymonthPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                everymonthPage.Show(monthlyTextBtn.Text);
+
+            };
+            monthlyFramelayout.MouseUpEventHandler += monthlyclick;
+            monthlyIconBtn.MouseUpEventHandler += monthlyclick;
+            monthlyRow.MouseUpEventHandler += monthlyclick;
+            monthlyTextBtn.MouseUpEventHandler += monthlyclick;
+            monthlyBack.MouseUpEventHandler += monthlyclick;
+            if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 0)
+            {
+                onceBackBtn.Visible = true;
+                everydayBack.Visible = false;
+            }
+            else if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 2)
+            {
+                onceBackBtn.Visible = false;
+                everydayBack.Visible = true;
+            }
+            else
+            {
+                onceBackBtn.Visible = false;
+                everydayBack.Visible = false;
+            }
+
+            btnsave.MouseUpEventHandler += (sedder, e) =>
+            {
+                if (!onceBackBtn.Visible && !everydayBack.Visible)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                                     Language.StringByID(MyInternationalizationString.selectweek),
+                                                 Language.StringByID(MyInternationalizationString.complete));
+
+                    alert.Show();
+                    return;
+                }
+                if (onceBackBtn.Visible)
+                {
+                    Common.Logic.CurrentLogic.TimeAttribute.Repeat = 0;
+
+                }
+                if (everydayBack.Visible)
+                {
+                    Common.Logic.CurrentLogic.TimeAttribute.Repeat = 2;
+                }
                 RemoveFromParent();
                 action();
+
             };
 
         }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 2788f4b..26cc142 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -16,77 +16,214 @@
         {
             Tag = "Logic";
         }
-        Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
-      
-        public void Show()
+
+        public void Show(int isInt=0, bool edit=false)
         {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            var topFrameLayout = new FrameLayout
+            
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                Text = "娣诲姞寤舵椂",
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.adddelay,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
-         
-            var back = new Button
+            var clickBtn = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
             };
 
-            var middle = new FrameLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220 - 174);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            #endregion
+
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
 
-
-
-            var timeview = new TimeView
+            var blancolor = new FrameLayout
             {
-                Y = Application.GetRealHeight(400),
-                Height = Application.GetRealHeight(600),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Width = Application.GetRealWidth(1080),
+                Width = Application.GetMinRealAverage(200),
+                Height = Application.GetMinRealAverage(200),
+                Y = Application.GetRealHeight(130),
+                BackgroundColor = 0xFFFFFFFF,
+                Radius = (uint)Application.GetMinRealAverage(100),
+                X = Application.GetRealWidth(440),
             };
-           middle.AddChidren(timeview);
-
-            var btnComplete = new Button
+            middle.AddChidren(blancolor);
+            var color = new FrameLayout
             {
-                Y = middle.Bottom,
-                Height = Application.GetRealHeight(174),
-                TextID = MyInternationalizationString.complete,
+                Width = blancolor.Width - Application.GetMinRealAverage(24),
+                Height = blancolor.Height - Application.GetMinRealAverage(24),
+                Y = Application.GetRealHeight(12),
+                BackgroundColor = 0xFFFEF1ED,
+                Radius = (uint)Application.GetMinRealAverage(86),
+                X = Application.GetRealWidth(12),
+            };
+            blancolor.AddChidren(color);
+            var btnicon = new Button
+            {
+                X = Application.GetRealWidth(48),
+                Width = Application.GetRealWidth(80),
+                Height = Application.GetRealHeight(80),
+                Y = Application.GetRealHeight(48),
+                UnSelectedImagePath = "ZigeeLogic/delay.png",
+            };
+            color.AddChidren(btnicon);
+            var titleText = new Button
+            {
+                Width = Application.GetMinRealAverage(480),
+                Height = Application.GetMinRealAverage(60),
+                X = Application.GetRealWidth(300),
+                Y = blancolor.Bottom + Application.GetRealHeight(50),
+                TextID =MyInternationalizationString.createtimetext,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
             };
-            AddChidren(btnComplete);
+            middle.AddChidren(titleText);
 
+            var PickerViewfra = new FrameLayout
+            {
+                Y = titleText.Bottom + Application.GetRealHeight(250),
+                Height = Application.GetRealHeight(1046),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(PickerViewfra);
+
+
+
+            var mUIPickerView = new UIPickerView
+            {
+                Y = Application.GetRealHeight(50),
+                Height = Application.GetRealHeight(600),
+            };
+            PickerViewfra.AddChidren(mUIPickerView);
+
+            var mList1 = new List<string>();
+            var mList2 = new List<string>();
+            for (int i = 0; i < 61; i++)
+            {
+                if (i < 10)
+                {
+                    var a = "0" + i.ToString();
+                    mList1.Add(a + " " + Language.StringByID(MyInternationalizationString.minute));
+                    mList2.Add(a + " " + Language.StringByID(MyInternationalizationString.second));
+                }
+                else
+                {
+                    mList1.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.minute));
+                    mList2.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.second));
+                }
+
+            }
+            mUIPickerView.setNPicker(mList1, mList2, new List<string>());
+            ///榛樿鐘舵��
+            mUIPickerView.setCurrentItems(0, 5, 0);
+            int timevalue = 5;
+            int value = 0;
+            if (edit)
+            {
+                
+                timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
+                var minutevalue1 = timevalue / 60;
+                var secondvalue1 = timevalue % 60;
+                //鏇存柊鏈�鏂扮姸鎬�
+                mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+                value = timevalue;
+            }
+            string selectde = "";
+            mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+            {
+                var minutevalue = int.Parse(mList1[s1].Split(' ')[0]);
+                var secondvalue = int.Parse(mList2[s2].Split(' ')[0]);
+                timevalue = minutevalue * 60 + secondvalue;
+                selectde = "yes";
+
+            };
+
+
+            var btnsave = new Button
+            {
+                Y = PickerViewfra.Height - Application.GetRealHeight(260),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            PickerViewfra.AddChidren(btnsave);
 
             ///瀹屾垚鐐瑰嚮浜嬩欢
-            btnComplete.MouseUpEventHandler += (sender, e) =>
+            btnsave.MouseUpEventHandler += (sender, e) =>
             {
-                Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
-                actionsInfo.Add("LinkType", 10);
-                actionsInfo.Add("DelayTime", 5);
-                Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
+                
+                if (selectde != ""|| timevalue==5)
+                {
+                    Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+                    actionsInfo.Add("LinkType", 7);
+                    actionsInfo.Add("DelayTime", timevalue);
+                    if (edit)
+                    {
+                        Common.Logic.CurrentLogic.Actions.RemoveAt(isInt);
+                        Common.Logic.CurrentLogic.Actions.Insert(isInt, actionsInfo);
+                    }
+                    else
+                    {
+                        Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
+
+                    }
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                              Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+                }
                 var logicCommunalPage = new LogicCommunalPage { };
                 UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                 UserView.HomePage.Instance.PageIndex += 1;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 13af081..59e67bb 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -9,104 +9,159 @@
 
 namespace Shared.Phone.Device.Logic
 {
-    public class DeviceStateCondition :FrameLayout
+    public class DeviceStateCondition : FrameLayout
     {
         public DeviceStateCondition()
         {
             Tag = "Logic";
 
         }
-        Button SelectedButton = new Button();
-        HorizontalScrolViewLayout horizontalScrol;
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button devicetypeButton = new Button();
         VerticalScrolViewLayout middle;
+        FrameLayout clickframeLayout = new FrameLayout();
+        Button clickbutton = new Button();
+        Button clicktextcolcrbutton = new Button();
+
         public void Show()
         {
-           
-            UserView.HomePage.Instance.ScrollEnabled = false;
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new RowLayout
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(220),
-                Y = Application.GetRealHeight(80),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
-            
+            this.AddChidren(topRowLayout);
+
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.devicestate,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.devicestate,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
+            topRowLayout.AddChidren(back);
             back.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
                 UserView.HomePage.Instance.ScrollEnabled = true;
             };
 
-            var roomname = new Button
+            var foolrname = new Button
             {
-                Width = Application.GetMinRealAverage(300 + 300-30),
-                Height = Application.GetMinRealAverage(80),
-                X = Application.GetRealWidth(1080 - 300 - 30 - 300),
-                Y = Application.GetRealHeight(120),
-                TextAlignment = TextAlignment.CenterRight,
-                //Text = "鑷畾涔夋埧闂�",
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID=MyInternationalizationString.customroom,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
             };
-            topFrameLayout.AddChidren(roomname);
-
-            var horizontalScrolfl = new FrameLayout
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
             {
-                Height = Application.GetRealHeight(220 + 30),
-                Y = topFrameLayout.Bottom,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+
+            #endregion
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            var roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58 - 200),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58 + 200),
             };
-            AddChidren(horizontalScrolfl);
-                      
-
-             horizontalScrol = new HorizontalScrolViewLayout()
+            this.AddChidren(devicetypehorizontalScrol1);
+            ///璁惧绫诲瀷婊戝姩鎺т欢
+            var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
             {
-                Width = Application.GetRealWidth(1080 - 40),
-                Height = Application.GetRealHeight(180 + 30),
-                Y = Application.GetRealHeight(40),
-                X = Application.GetRealWidth(40),
-                Radius = (uint)Application.GetRealHeight(30),
-            };
-            horizontalScrolfl.AddChidren(horizontalScrol);
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                Radius = (uint)Application.GetRealHeight(50),
 
-             middle = new VerticalScrolViewLayout();
-            middle.Y = horizontalScrolfl.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 300 - 250);
+            };
+            this.AddChidren(devicetypehorizontalScrol);
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
+            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
             middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            middle.X = Application.GetRealWidth(58);
+            middle.Radius = (uint)Application.GetRealHeight(50);
             this.AddChidren(middle);
 
             ///鐩墠鏀寔鐨勮澶�
-            List<DeviceType> deviceTypeList = new List<DeviceType> {
+            var deviceTypeList = new List<DeviceType> {
                 DeviceType.IASZone,
                 DeviceType.OnOffSwitch,
-                //DeviceType.ColorDimmableLight,
-                // DeviceType.OnOffOutput,
-                //  DeviceType.WindowCoveringDevice,
-                //   DeviceType.AirSwitch,
+                DeviceType.OnOffOutput,//妤兼鐏�
+                DeviceType.DoorLock,
+                DeviceType.TemperatureSensor,
             };
-            ///鎴块棿鐐瑰嚮浜嬩欢
-            roomname.MouseUpEventHandler += (sender, e) =>
+
+            ///妤煎眰鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
             {
 
                 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -115,95 +170,187 @@
                 {
                     flMain.RemoveFromParent();
                 };
-                var roombj = new VerticalScrolViewLayout
+                var foolrbj = new VerticalScrolViewLayout
                 {
 
                     Width = Application.GetRealWidth(400),
                     Height = Application.GetRealHeight(600),
                     X = Application.GetRealWidth(1080 - 400 - 60),
-                    Y = Application.GetRealHeight(220 + 30 + 80),
+                    Y = Application.GetRealHeight(184 + 50),
                     BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                     Radius = (uint)Application.GetRealHeight(30),
                 };
-                flMain.AddChidren(roombj);
-                List<Common.Room> roomlist = new List<Common.Room>();
-                roomlist.Clear();
-                Common.Room customroom = new Common.Room();
-                customroom.Name =Language.StringByID(MyInternationalizationString.customroom);
-                foreach (var device in Common.Logic.LogicDviceList)
+                flMain.AddChidren(foolrbj);
+                foreach (var foolr in Config.Instance.Home.FloorDics)
                 {
-                   
-                    var deviceui = customroom.GetDeviceUI(device);
-                    if (deviceui != null)
-                    {
-                        customroom.DeviceUIList.Add(deviceui);
-                    }
 
-                }
-                roomlist.Add(customroom);
-                roomlist.AddRange(Common.Room.Lists);
-                foreach (var room in roomlist)
-                {
-                    var rowLayout = new RowLayout
+                    var foolrRowLayout = new FrameLayout
                     {
                         Height = Application.GetRealHeight(150),
                     };
-                    roombj.AddChidren(rowLayout);
+                    foolrbj.AddChidren(foolrRowLayout);
 
-                    var btnroomname = new Button
+                    var btnfoolrname = new Button
                     {
-                        Width = Application.GetRealWidth(300),
-                        Text = room.Name,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        X = Application.GetRealWidth(30),
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
                         TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        //SelectedTextColor=0xfffc744b,
+                        Tag = foolr.Key,
                     };
-                    rowLayout.AddChidren(btnroomname);
+                    foolrRowLayout.AddChidren(btnfoolrname);
 
-                    EventHandler<MouseEventArgs> roomclick = (sender1, e1) =>
+
+                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                     {
-
+                        roomhorizontalScrol.RemoveAll();
+                        devicetypehorizontalScrol.RemoveAll();
+                        middle.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
                         flMain.RemoveFromParent();
-                        roomname.Text = room.Name;
-                        var list = new List<DeviceUI>();
-                        foreach (var device in room.DeviceUIList)
-                        {
-                            if (!deviceTypeList.Contains(device.CommonDevice.Type))
-                            {
-                                continue;
-                            }
-                            list.Add(device);
-                        }
-                        AllDeviceTypeView(list);
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
                     };
-                    rowLayout.MouseUpEventHandler += roomclick;
-                    btnroomname.MouseUpEventHandler += roomclick;
+                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
+                    btnfoolrname.MouseUpEventHandler += foolrnameclick;
+
 
                 }
+
             };
-    
-            Common.Room room1= new Common.Room();
-            foreach (var device in Common.Logic.LogicDviceList)
+            foolrname.MouseUpEventHandler += foorlclick;
+            dropdown.MouseUpEventHandler += foorlclick;
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
             {
-                               
-                if (!deviceTypeList.Contains(device.Type))
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
                 {
-                    continue;
+                    roomlists.AddRange(Common.Room.Lists);
                 }
-                var deviceui = room1.GetDeviceUI(device);
-                if (deviceui != null)
+                else
                 {
-                    room1.DeviceUIList.Add(deviceui);
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
                 }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
 
             }
-            AllDeviceTypeView(room1.DeviceUIList);
+
+            AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+        }
+        /// <summary>
+        /// 鍔犺浇鎵�鏈夋埧闂寸殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            for (int i = 0; i < roomlist.Count; i++)
+            {
+                var room = roomlist[i];
+
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y=Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn= new Button
+                {
+
+                    Height = Application.GetRealHeight(152-26-20),
+                    Width = Application.GetRealWidth(255-20-50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y=Application.GetRealHeight(21 +13+10),
+                    X=Application.GetRealWidth(10+25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+
+                if (i == 0)//
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice==null) {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+                }
+
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+
+
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice==null) {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
         }
         /// <summary>
         /// 鍔犺浇璇ュ尯鍩熸墍鏈夎澶囪鍥炬柟娉�
         /// </summary>0
         /// <param name="devicelist">Devicelist.</param>
-        void AllDeviceTypeView(List<DeviceUI> devicelist)
+        void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
         {
             List<string> devicetypelist = new List<string>();
             devicetypelist.Clear();
@@ -220,7 +367,7 @@
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
             }
 
-            var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone);
+            var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone|| device.CommonDevice.Type == DeviceType.TemperatureSensor);
             if (iASZonejosn != null)
             {
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
@@ -230,65 +377,100 @@
             {
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.OnOffSwitch));
             }
-            #endregion
-       
-            horizontalScrol.RemoveAll();
-            foreach (var devicetype in devicetypelist)
+            var doorLock = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DoorLock);
+            if (doorLock != null)
             {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.doorLock));
+            }
+            #endregion
+
+            devicetypehorizontalScrol.RemoveAll();
+            for (int i = 0; i < devicetypelist.Count; i++)
+            {
+
+                var devicetype = devicetypelist[i];
+
+                var spaceRowLayout = new FrameLayout();
+                devicetypehorizontalScrol.AddChidren(spaceRowLayout);
+                if (i == 0)
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(37);
+                }
+                else
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(80);
+                }
 
                 var deviceRowLayout = new FrameLayout
                 {
-                    Height = Application.GetRealHeight(180 + 30),
-                    Width = Application.GetRealWidth(250),
+                    Width = Application.GetRealWidth(156 + 20),
+                    Height = Application.GetRealHeight(280 - 30),
+                    Y = Application.GetRealHeight(30),
                 };
-                horizontalScrol.AddChidren(deviceRowLayout);
+                devicetypehorizontalScrol.AddChidren(deviceRowLayout);
+
+                var backgroundColor = new Button
+                {
+                    Width = Application.GetRealWidth(156),
+                    Height = Application.GetRealHeight(180),
+                    X = Application.GetRealWidth(10),
+                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
+                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
+                };
+                deviceRowLayout.AddChidren(backgroundColor);
+
 
                 var devicetypeicon = new Button
                 {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
-                    X = Application.GetRealWidth(70),
+                    Width = Application.GetRealWidth(84),
+                    Height = Application.GetRealHeight(84),
+                    X = Application.GetRealWidth(46),
+                    Y = Application.GetRealHeight(30),
                 };
                 deviceRowLayout.AddChidren(devicetypeicon);
-                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/Light.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/LightSelected.png";
-                }
-                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/Curtain.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/CurtainSelected.png";
-                }
-                else if (devicetype == Language.StringByID(MyInternationalizationString.OnOffSwitch))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/OnOffSwitch.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/OnOffSwitchSelected.png";
-                }
-                else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/Sensor.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/SensorSelected.png";
-                }
 
                 var devicetypename = new Button
                 {
-                    Width = Application.GetRealWidth(250),
-                    Height = Application.GetRealHeight(50),
+                    Width = Application.GetRealWidth(176),
+                    Height = Application.GetRealHeight(40),
                     Text = devicetype,
                     TextAlignment = TextAlignment.Center,
-                    Y = devicetypeicon.Bottom + Application.GetRealHeight(20),
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Y = backgroundColor.Bottom,
+                    TextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 10,
                 };
                 deviceRowLayout.AddChidren(devicetypename);
-
+                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedlight.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/LightSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                    //devicetypeicon.SelectedImagePath = "ZigeeLogic/CurtainSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.OnOffSwitch))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedpanel.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/OnOffSwitchSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedsenor.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/SensorSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selecteddoorlock.png";
+                }
                 EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
                 {
                     List<DeviceType> list = new List<DeviceType>();
                     list.Clear();
-                    SelectedButton.IsSelected = false;
-                    SelectedButton = devicetypeicon;
-                    SelectedButton.IsSelected = true;
+                    devicetypeButton.IsSelected = false;
+                    devicetypeButton = backgroundColor;
+                    backgroundColor.IsSelected = true;
                     ///鍒嗙被鏄剧ず锛堜緥濡傜伅鍏夛細{鐏厜1锛岀伅鍏�2...}锛�
                     if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
                     {
@@ -305,6 +487,11 @@
                     else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
                     {
                         list.Add(DeviceType.IASZone);
+                        list.Add(DeviceType.TemperatureSensor);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
+                    {
+                        list.Add(DeviceType.DoorLock);
                     }
 
                     ConditionDeviceView(list, devicelist);
@@ -313,6 +500,7 @@
                 deviceRowLayout.MouseUpEventHandler += devicetypeclick;
                 devicetypename.MouseUpEventHandler += devicetypeclick;
                 devicetypeicon.MouseUpEventHandler += devicetypeclick;
+                backgroundColor.MouseUpEventHandler += devicetypeclick;
 
             }
             ///鏄剧ず鎴块棿鎵�鏈夎澶�
@@ -336,44 +524,123 @@
                     continue;
                 }
 
-                var row = new RowLayout
+
+                var deviceFramelayout = new FrameLayout
                 {
-                    Height = Application.GetRealHeight(180),
+                    Height = Application.GetRealHeight(160),
+                };
+                middle.AddChidren(deviceFramelayout);
+
+                var bjFramelayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(112),
+                    Height = Application.GetRealHeight(112),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(30 + 9),
+                    Radius = (uint)Application.GetRealHeight(56),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                deviceFramelayout.AddChidren(bjFramelayout);
+
+                var deviceIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    Gravity = Gravity.Center,
 
                 };
-                middle.AddChidren(row);
+                bjFramelayout.AddChidren(deviceIconBtn);
+
+                var deviceRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                deviceFramelayout.AddChidren(deviceRow);
 
                 var devicename = new Button
                 {
-                    Gravity = Gravity.CenterVertical,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealWidth(40),
-                    Width = Application.GetRealWidth(600),
-                    //SelectedBackgroundColor = 0xFFE9652D,
                     Text = common.CommonDevice.DeviceEpointName,
+                    TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                 };
-                row.AddChidren(devicename);
-
-                var btndeviceback = new Button
+                deviceRow.AddChidren(devicename);
+                switch (common.CommonDevice.Type)
                 {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
-                    UnSelectedImagePath = "ZigeeLogic/Next.png",
-                    X = Application.GetRealWidth(1080 - 140),
-                    Gravity = Gravity.CenterVertical,
-                };
-                row.AddChidren(btndeviceback);
+                    case DeviceType.OnOffOutput:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/light.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedlight.png";
+                        }
+                        break;
+                    case DeviceType.IASZone:
+                        {
+                            var iASZonedevice = common.CommonDevice as IASZone;
+                            if (iASZonedevice.DeviceID != 1026)
+                            {
+                                break;
+                            }
+                            deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+                            deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
+
+
+                        }
+                        break;
+                    case DeviceType.TemperatureSensor:
+                        {
+                            var temperatureSensor = common.CommonDevice as TemperatureSensor;
+                            if (temperatureSensor.SensorDiv == 1)
+                            {
+                                deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/temperature.png";
+                                deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedtemperature.png";
+                            }
+                            else
+                            {
+                                deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+                                deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedhumidity.png";
+                            }
+                        }
+                        break;
+                    case DeviceType.OnOffSwitch:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/panel.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedpanel.png";
+                        }
+                        break;
+                    case DeviceType.DoorLock:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selecteddoorlock.png";
+                        }
+                        break;
+                }
 
                 EventHandler<MouseEventArgs> devicclick = (sen, e) =>
                 {
+                    clickbutton.IsSelected = false;
+                    clickbutton = deviceIconBtn;
+                    deviceIconBtn.IsSelected = true;
+                    clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                    clickframeLayout = bjFramelayout;
+                    bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+                    clicktextcolcrbutton.IsSelected = false;
+                    clicktextcolcrbutton = devicename;
+                    devicename.IsSelected = true;
                     var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                     this.AddChidren(flMain);
                     CurrentDeviceView(flMain, common.CommonDevice, false);
                 };
-                row.MouseUpEventHandler += devicclick;
+                deviceFramelayout.MouseUpEventHandler += devicclick;
+                bjFramelayout.MouseUpEventHandler += devicclick;
+                deviceIconBtn.MouseUpEventHandler += devicclick;
+                deviceRow.MouseUpEventHandler += devicclick;
                 devicename.MouseUpEventHandler += devicclick;
-                btndeviceback.MouseUpEventHandler += devicclick;
+
 
             }
         }
@@ -381,59 +648,95 @@
         /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
         /// </summary>
         /// <param name="common">Common.</param>
-        public static  void CurrentDeviceView(FrameLayout flMain,CommonDevice common,bool edit)
+        public async static  void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
         {
             //涓嶈褰撳墠鐣岄潰婊戝姩
             UserView.HomePage.Instance.ScrollEnabled = false;
+            List<Dictionary<string, string>> doorlockConditionsInfo= new List<Dictionary<string, string>>();
             Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
+            dictionary(deviceConditionsInfo, "Type", "1");
+            dictionary(deviceConditionsInfo, "IsValid", "1");
+            dictionary(deviceConditionsInfo, "MacAddr", common.DeviceAddr);
+            dictionary(deviceConditionsInfo, "Epoint", common.DeviceEpoint.ToString());
             //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
             //this.AddChidren(flMain);
             flMain.MouseUpEventHandler += (sender, e) =>
             {
                 flMain.RemoveFromParent();
+
+
             };
+
+            var devicefra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(devicefra1);
+
             var devicefra = new FrameLayout
             {
 
-                Width = Application.GetRealWidth(1080 - 80),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(devicefra);
 
-            var devicename = new Button
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
             {
-                Y = Application.GetRealHeight(20),
-                Text = common.DeviceEpointName,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            devicefra.AddChidren(devicename);
+            devicefra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
-            string SelectedDeviceStatuscondition = "no";
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text = common.DeviceEpointName,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
 
-            if (deviceConditionsInfo.ContainsKey("Type"))
-            {
-                deviceConditionsInfo.Remove("Type");
-            }
-            if (deviceConditionsInfo.ContainsKey("IsValid"))
-            {
-                deviceConditionsInfo.Remove("IsValid");
-            }
-            if (deviceConditionsInfo.ContainsKey("MacAddr"))
-            {
-                deviceConditionsInfo.Remove("MacAddr");
-            }
-            if (deviceConditionsInfo.ContainsKey("Epoint"))
-            {
-                deviceConditionsInfo.Remove("Epoint");
-            }
-            deviceConditionsInfo.Add("Type", "1");
-            deviceConditionsInfo.Add("IsValid", "1");
-            deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
-            deviceConditionsInfo.Add("Epoint",common.DeviceEpoint.ToString());
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+            string SelectedDeviceStatuscondition = "";
+
             Dictionary<string, string> devices = null;
             if (edit)
             {
@@ -455,101 +758,72 @@
                 ///鐏厜
                 case DeviceType.OnOffOutput:
                     {
-
-                        if (deviceConditionsInfo.ContainsKey("Cluster_ID"))
-                        {
-                            deviceConditionsInfo.Remove("Cluster_ID");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeId"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeId");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("Range"))
-                        {
-                            deviceConditionsInfo.Remove("Range");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeData2");
-                        }
-                        deviceConditionsInfo.Add("Cluster_ID", "6");
-                        deviceConditionsInfo.Add("AttriButeId", "0");
-                        deviceConditionsInfo.Add("Range", "1");
-                        deviceConditionsInfo.Add("AttriButeData2", "0");
-
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "6");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                        dictionary(deviceConditionsInfo, "Range", "1");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
 
                         #region  鐏厜View
 
 
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
-                        devicefra.Height = Application.GetRealHeight(720);
-                        var OnOffOutputfra = new FrameLayout
+
+                        var openframelayout = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 2 + 30),
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
-                        devicefra.AddChidren(OnOffOutputfra);
+                        devicefra.AddChidren(openframelayout);
 
                         var openrowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-                        OnOffOutputfra.AddChidren(openrowlayout);
+                        openframelayout.AddChidren(openrowlayout);
 
                         var btnopen = new Button
                         {
-                            //Text = "寮�",
+                            Width = Application.GetRealWidth(600),
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         openrowlayout.AddChidren(btnopen);
 
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var openBtnSelected = new SelectedButton();
                         openrowlayout.AddChidren(openBtnSelected);
 
 
-
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
                         var closerowlayout = new RowLayout
                         {
-                            Y = openrowlayout.Bottom,
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                         };
-                        OnOffOutputfra.AddChidren(closerowlayout);
+                        closeframelayout.AddChidren(closerowlayout);
 
                         var btnclose = new Button
                         {
                             //Text = "鍏�",
                             TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         closerowlayout.AddChidren(btnclose);
 
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical,
-                        };
+                        var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
                         #endregion
 
@@ -558,44 +832,47 @@
                         {
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
-                            SelectedDeviceStatuscondition = "yes";
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "1");//榛樿鍊�
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            SelectedDeviceStatuscondition = "OnOffOutput";
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");//榛樿鍊�
+
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
                         btnopen.MouseUpEventHandler += openclick;
                         openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
                         ///鐐瑰嚮鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
-                            SelectedDeviceStatuscondition = "yes";
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "0");//榛樿鍊�
+                            SelectedDeviceStatuscondition = "OnOffOutput";
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//榛樿鍊�
 
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
                         btnclose.MouseUpEventHandler += closeclick;
-                        closeBtnSelected.MouseUpEventHandler += openclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
                         if (edit && devices != null)
                         {
                             if (devices["AttriButeId"] == "0")
                             {
                                 if (devices["AttriButeData1"] == "1")
                                 {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                     openBtnSelected.Visible = true;
                                     closeBtnSelected.Visible = false;
                                 }
                                 else
                                 {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                                     openBtnSelected.Visible = false;
                                     closeBtnSelected.Visible = true;
 
@@ -607,29 +884,10 @@
                 case DeviceType.WindowCoveringDevice:
                     {
 
-
-                        if (deviceConditionsInfo.ContainsKey("Cluster_ID"))
-                        {
-                            deviceConditionsInfo.Remove("Cluster_ID");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeId"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeId");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("Range"))
-                        {
-                            deviceConditionsInfo.Remove("Range");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeData2");
-                        }
-                        deviceConditionsInfo.Add("Cluster_ID", "258");
-                        deviceConditionsInfo.Add("AttriButeId", "8");
-                        deviceConditionsInfo.Add("Range", "0");
-                        deviceConditionsInfo.Add("AttriButeData2", "0");
-
-
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "258");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "8");
+                        dictionary(deviceConditionsInfo, "Range", "0");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
 
                         #region 绐楀笜View
                         devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
@@ -652,7 +910,7 @@
                             //Text = "寮�",
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
+                            X = Application.GetRealWidth(50),
                             Width = Application.GetRealWidth(300),
                             Height = Application.GetRealHeight(180),
                             //SelectedBackgroundColor = 0xfffe5e00,
@@ -683,7 +941,7 @@
                             //Text = "鍏�",
                             TextID = MyInternationalizationString.close,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
+                            X = Application.GetRealWidth(50),
                             Width = Application.GetRealWidth(300),
                             Height = Application.GetRealHeight(180),
                             TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -705,15 +963,10 @@
                         ///鐐瑰嚮纭浜嬩欢
                         EventHandler<MouseEventArgs> openclick = (sender, e) =>
                         {
-                            SelectedDeviceStatuscondition = "yes";
+                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "95");//榛樿鍊�
-
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "95");//榛樿鍊�
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
@@ -722,14 +975,10 @@
                         ///鐐瑰嚮鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
-                            SelectedDeviceStatuscondition = "yes";
+                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "5");//榛樿鍊�
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "5");//榛樿鍊�
 
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
@@ -762,141 +1011,126 @@
                         {
                             break;
                         }
-                        if (deviceConditionsInfo.ContainsKey("Cluster_ID"))
-                        {
-                            deviceConditionsInfo.Remove("Cluster_ID");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeId"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeId");
-                        }
 
-                        if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeData2");
-                        }
-                        deviceConditionsInfo.Add("Cluster_ID", "1280");
-                        deviceConditionsInfo.Add("AttriButeId", "1281");
-
-                        deviceConditionsInfo.Add("AttriButeData2", "0");
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "1280");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "1281");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
 
                         #region  瀹夐槻璁惧View
 
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
-                        devicefra.Height = Application.GetRealHeight(720);
-                        var iASZonedevicefra = new FrameLayout
+                        var openframelayout = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 2 + 30),
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
-                        devicefra.AddChidren(iASZonedevicefra);
+                        devicefra.AddChidren(openframelayout);
 
                         var openrowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-
+                        openframelayout.AddChidren(openrowlayout);
 
                         var btnopen = new Button
                         {
-
-                            //TextID = MyInternationalizationString.open,
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         openrowlayout.AddChidren(btnopen);
 
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var openBtnSelected = new SelectedButton();
                         openrowlayout.AddChidren(openBtnSelected);
 
 
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
                         var closerowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
-                            Y = openrowlayout.Bottom,
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                         };
-                        ///
+                        closeframelayout.AddChidren(closerowlayout);
 
                         var btnclose = new Button
                         {
-
-                            //TextID = MyInternationalizationString.close,
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         closerowlayout.AddChidren(btnclose);
 
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
 
 
                         #endregion
+
+                        int timevalue = 0;
                         ///鐐瑰嚮纭浜嬩欢
                         EventHandler<MouseEventArgs> openclick = (sender, e) =>
                         {
-                            SelectedDeviceStatuscondition = "yes";
+                            SelectedDeviceStatuscondition = "IASZone";
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
-                            if (deviceConditionsInfo.ContainsKey("Range"))
+                            if (iASZonedevice.IasDeviceType == 13)
                             {
-                                deviceConditionsInfo.Remove("Range");
+                                closeBtnSelected.Visible = true;
                             }
-                            deviceConditionsInfo.Add("Range", "5");
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "1");//榛樿鍊�
+                            dictionary(deviceConditionsInfo, "Range", "5");
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");
 
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
                         btnopen.MouseUpEventHandler += openclick;
                         openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
                         ///鐐瑰嚮鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
-                            SelectedDeviceStatuscondition = "yes";
+                            SelectedDeviceStatuscondition = "IASZone";
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
-                            if (deviceConditionsInfo.ContainsKey("Range"))
+                            dictionary(deviceConditionsInfo, "Range", "1");
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+                            if (iASZonedevice.IasDeviceType == 13)
                             {
-                                deviceConditionsInfo.Remove("Range");
+                                SelectedDeviceStatuscondition = "no";
+                                btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = true;
+                                var ignoreTime = new IgnoreTime();
+                                UserView.HomePage.Instance.AddChidren(ignoreTime);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                ignoreTime.Show(common, btnclose.Text, edit, timevalue);
                             }
-                            deviceConditionsInfo.Add("Range", "1");
-                            if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                            {
-                                deviceConditionsInfo.Remove("AttriButeData1");
-                            }
-                            deviceConditionsInfo.Add("AttriButeData1", "0");//榛樿鍊�
+
 
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
                         btnclose.MouseUpEventHandler += closeclick;
                         closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
 
 
 
@@ -905,69 +1139,140 @@
                             case 13:
                                 {
                                     btnopen.TextID = MyInternationalizationString.someone;
-                                    //btnclose.TextID = MyInternationalizationString.unmanned;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
-                                    //iASZonedevicefra.AddChidren(closerowlayout);
+                                    btnclose.TextID = MyInternationalizationString.unattendedtime1;
+                                    closeBtnSelected.UnSelectedImagePath = "ZigeeLogic/next.png";
+                                    closeBtnSelected.Visible = true;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
                                 }
                                 break;
                             case 21:
-                                {
-                                    btnopen.TextID = MyInternationalizationString.logicopen;
-                                    btnclose.TextID = MyInternationalizationString.logicclose;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
-                                    iASZonedevicefra.AddChidren(closerowlayout);
-                                }
-                                break;
                             case 22:
                                 {
+                                    #region
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 3 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 * 3 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.logicopen;
                                     btnclose.TextID = MyInternationalizationString.logicclose;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
-                                    iASZonedevicefra.AddChidren(closerowlayout);
+                                    closerowlayout.LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
+
+
+
+                                    var timeoutframelayout = new FrameLayout
+                                    {
+                                        Height = Application.GetRealHeight(160),
+                                        Y = closeframelayout.Bottom,
+                                    };
+                                    devicefra.AddChidren(timeoutframelayout);
+                                    var timeoutrowlayout = new RowLayout
+                                    {
+                                        Y = Application.GetRealHeight(30),
+                                        Width = Application.GetRealWidth(920),
+                                        Height = Application.GetRealHeight(130),
+                                        X = Application.GetRealWidth(80),
+                                        LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                                    };
+                                    timeoutframelayout.AddChidren(timeoutrowlayout);
+
+                                    var btntimeout = new Button
+                                    {
+                                        TextID = MyInternationalizationString.closetimeout,
+                                        Width = Application.GetRealWidth(600),
+                                        TextAlignment = TextAlignment.CenterLeft,
+                                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                    };
+                                    timeoutrowlayout.AddChidren(btntimeout);
+
+                                    var timeoutBtnSelected = new Button
+                                    {
+                                        X = Application.GetRealWidth(860),
+                                        Width = Application.GetMinRealAverage(60),
+                                        Height = Application.GetMinRealAverage(60),
+                                        UnSelectedImagePath = "ZigeeLogic/next.png",
+                                        Gravity = Gravity.CenterVertical,
+                                    };
+                                    timeoutrowlayout.AddChidren(timeoutBtnSelected);
+                                    EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
+                                    {
+                                        SelectedDeviceStatuscondition = "no";
+                                        btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        var ignoreTime = new IgnoreTime();
+                                        UserView.HomePage.Instance.AddChidren(ignoreTime);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        ignoreTime.Show(common, btntimeout.Text, edit, timevalue);
+
+                                    };
+                                    timeoutframelayout.MouseUpEventHandler += timeoutclick;
+                                    timeoutrowlayout.MouseUpEventHandler += timeoutclick;
+                                    btntimeout.MouseUpEventHandler += timeoutclick;
+                                    timeoutBtnSelected.MouseUpEventHandler += timeoutclick;
+
+                                    #endregion
                                 }
                                 break;
 
                             case 40:
                                 {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.smokescreen;
                                     //btnclose.TextID = MyInternationalizationString.nosmokescreen;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
                             case 42:
                                 {
                                     btnopen.TextID = MyInternationalizationString.waterleakage;
                                     btnclose.TextID = MyInternationalizationString.noleakage;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
-                                    iASZonedevicefra.AddChidren(closerowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
+
                                 }
                                 break;
                             case 43:
                                 {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.gas;
                                     //btnclose.TextID = MyInternationalizationString.nogas;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
                             case 44:
                                 {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.emergencybutton;
                                     //btnclose.TextID = MyInternationalizationString.nosmokescreen;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
 
                             case 277:
                                 {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.callthepolice;
                                     //btnclose.TextID = MyInternationalizationString.nosmokescreen;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
                             default:
                                 {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                                     btnopen.TextID = MyInternationalizationString.callthepolice;
-                                    iASZonedevicefra.AddChidren(openrowlayout);
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
                         }
@@ -977,138 +1282,229 @@
                             {
                                 if (devices["AttriButeData1"] == "1")
                                 {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                     openBtnSelected.Visible = true;
                                     closeBtnSelected.Visible = false;
                                 }
                                 else
                                 {
-                                    openBtnSelected.Visible = false;
-                                    closeBtnSelected.Visible = true;
+                                    if (devices.ContainsKey("IgnoreTime"))
+                                    {
+                                        timevalue = int.Parse(devices["IgnoreTime"]);
+                                    }
+                                    else
+                                    {
+                                        btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                    }
                                 }
                             }
+
+
                         }
 
                     }
                     break;
                 case DeviceType.OnOffSwitch:
                     {
-                        if (deviceConditionsInfo.ContainsKey("Cluster_ID"))
-                        {
-                            deviceConditionsInfo.Remove("Cluster_ID");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeId"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeId");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("Range"))
-                        {
-                            deviceConditionsInfo.Remove("Range");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeData1"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeData1");
-                        }
-                        if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
-                        {
-                            deviceConditionsInfo.Remove("AttriButeData2");
-                        }
-                        deviceConditionsInfo.Add("Cluster_ID", "1282");
-                        deviceConditionsInfo.Add("AttriButeId", "1283");
-                        deviceConditionsInfo.Add("Range", "0");//鎸夐敭鐗规畩
-                        deviceConditionsInfo.Add("AttriButeData1", "0");
-                        deviceConditionsInfo.Add("AttriButeData2", "0");
 
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
-                        devicefra.Height = Application.GetRealHeight(720);
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "1283");
+                        dictionary(deviceConditionsInfo, "Range", "0");//鎸夐敭鐗规畩
+                        dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                        devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
                         var OnOffOutputfra = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 2 + 30),
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
                         devicefra.AddChidren(OnOffOutputfra);
 
                         var buttonRow = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                         };
                         OnOffOutputfra.AddChidren(buttonRow);
 
                         var button = new Button
                         {
-                            //TextID = MyInternationalizationString.button1,
+                            Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            Text=Language.StringByID(MyInternationalizationString.OnOffSwitch)+common.DeviceEpoint.ToString(),
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
                             //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                         };
                         buttonRow.AddChidren(button);
 
-                        var buttonSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var buttonSelected = new SelectedButton();
                         buttonRow.AddChidren(buttonSelected);
-                      EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
+                        EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
                        {
                            buttonSelected.Visible = true;
-                           SelectedDeviceStatuscondition = "yes";
+                           SelectedDeviceStatuscondition = "OnOffSwitch";
+                           button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
 
                        };
                         buttonRow.MouseUpEventHandler += buttonclick;
                         button.MouseUpEventHandler += buttonclick;
                         buttonSelected.MouseUpEventHandler += buttonclick;
+                        OnOffOutputfra.MouseUpEventHandler += buttonclick;
 
                         if (edit && devices != null)
                         {
                             buttonSelected.Visible = true;
+                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
                         }
-                                            
+
+                    }
+                    break;
+                case DeviceType.DoorLock:
+                    {
+                        #region  ------
+                        var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
+                        //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
+                        var pra = new UserCenter.MemberListInfoPra();
+                        string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+                        var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+                        Send.UserList.Clear();
+                        for (int i = 0; i < listInfo.Count; i++)
+                        {
+                            var membership = new Send.MembershipIfon();
+                            var membershipifon = listInfo[i];
+                            for (int j = 0; j < doorlockifonlist.Count; j++)
+                            {
+                                ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
+                                if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
+                                {
+                                    membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
+                                    membership.MembershipName = membershipifon.UserName;
+                                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
+
+                                }
+
+                            }
+                            if (membership.UserIdMode.Count != 0)
+                            {
+                                ///杩囨护鎺夐噸澶嶆暟鎹紱
+                                var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
+                                if (str == null)
+                                {
+                                    Send.UserList.Add(membership);
+                                }
+                            }
+
+                        }
+                        #endregion
+
+                        var memberList = new MemberList();
+                        UserView.HomePage.Instance.AddChidren(memberList);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        MemberList.action += () => { flMain.RemoveFromParent(); };
+                        memberList.Show(common);
                     }
                     break;
 
+                case DeviceType.TemperatureSensor:
+                    {
+                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 2 - 20 - 50);
+                        devicefra.Height = Application.GetRealHeight(140 + 160 * 2 + 20 + 50);
+                        var temperatureSensor = common as TemperatureSensor;
+                        var Btntemperaturevalue = new Button
+                        {
+                            TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                            Height = Application.GetRealHeight(60),
+                            Width = Application.GetRealWidth(400),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            X = Application.GetRealWidth(80),
+                            Y = timetype.Bottom + Application.GetRealHeight(70),
+                        };
+                        devicefra.AddChidren(Btntemperaturevalue);
+
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70),
+                            X = Application.GetRealWidth(80),
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                        };
+                        devicefra.AddChidren(horizontalSeekBarVol);
+                        horizontalSeekBarVol.MouseUpEventHandler += (sender, e) =>
+                        {
+                            SelectedDeviceStatuscondition = "TemperatureSensor";
+                            if (temperatureSensor.SensorDiv == 1)
+                            {
+                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());
+
+                                Btntemperaturevalue.Text = "褰撳墠>" + horizontalSeekBarVol.Progress.ToString() + "鈩�";
+
+                            }
+                            else
+                            {
+                                Btntemperaturevalue.Text = "褰撳墠<" + horizontalSeekBarVol.Progress.ToString() + "%";
+                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊�
+                            }
+                        };
+
+
+
+                        if (temperatureSensor.SensorDiv == 1)
+                        {
+                            dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
+                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                            dictionary(deviceConditionsInfo, "Range", "0");//0澶т簬AttriButeData1鏃惰Е鍙戝姩浣�
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+                            Btntemperaturevalue.Text = "褰撳墠>0鈩�";
+
+                        }
+                        else
+                        {
+                            Btntemperaturevalue.Text = "褰撳墠<0%";
+                            dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
+                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                            dictionary(deviceConditionsInfo, "Range", "2");//2灏忎簬AttriButeData1鏃惰Е鍙戝姩浣�
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//娓╁害鍊�
+                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+                        }
+
+                        if (edit && devices != null)
+                        {
+                            horizontalSeekBarVol.Progress = int.Parse(devices["AttriButeData1"]);
+                            if (temperatureSensor.SensorDiv == 1)
+                            {
+
+                                Btntemperaturevalue.Text = "褰撳墠>" + devices["AttriButeData1"] + "鈩�";
+
+                            }
+                            else
+                            {
+                                Btntemperaturevalue.Text = "褰撳墠<" + devices["AttriButeData1"] + "%";
+                            }
+                        }
+
+                    }
+                    break;
             }
 
-
-            var cancel = new Button
-            {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = devicefra.Height - Application.GetRealHeight(160),
-
-            };
-            devicefra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender, e) =>
-            {
-                flMain.RemoveFromParent();
-                UserView.HomePage.Instance.ScrollEnabled = true;
-            };
-
-
-            var btnSave = new Button
-            {
-                Y = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(150),
-                Text = Language.StringByID(MyInternationalizationString.complete),
-                TextColor = ZigbeeColor.Current.LogicTextBlueColor,
-                X = Application.GetRealWidth(1000 - 200),
-            };
-            devicefra.AddChidren(btnSave);
-            btnSave.MouseUpEventHandler += (sender2, e2) =>
+            Btncomplete.MouseUpEventHandler += (sender2, e2) =>
             {
                 //UserView.HomePage.Instance.ScrollEnabled = true;
-                if (SelectedDeviceStatuscondition == "yes")
+                if (SelectedDeviceStatuscondition != "")
                 {
                     LogicIfon.AddDeviceconditions(common, deviceConditionsInfo);
                 }
@@ -1135,6 +1531,16 @@
 
         }
 
+        public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
+        {
+            if (deviceConditionsInfo.ContainsKey(Key))
+            {
+                deviceConditionsInfo.Remove(Key);
+            }
+            deviceConditionsInfo.Add(Key, Value);
+        }
+
+        
 
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
index d40a92b..6d8fc64 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs
@@ -17,75 +17,116 @@
         }
         public void Show ()
         {
-            
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new FrameLayout
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
-
-            var titleName = new Button {
-                TextID = MyInternationalizationString.addaction,
-                TextSize = 17,
+            var titleName = new Button
+            {
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addaction,
             };
-            topFrameLayout.AddChidren (titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var back = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                X = Application.GetRealWidth (20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            topFrameLayout.AddChidren (back);
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
             back.MouseDownEventHandler += (sender, e) => {
-                RemoveFromParent ();
+                RemoveFromParent();
             };
+            #endregion
 
-          
-            var middle = new VerticalScrolViewLayout ();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
             #region ----- 璁惧------    
-            var deviceRowLayout = new RowLayout
+            var deviceframelayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
-                //BackgroundColor = 0xff323232,
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren (deviceRowLayout);
+            middle.AddChidren(deviceframelayout);
 
-            var device = new Button {
-                Width = Application.GetRealWidth (400),
+            var deviceiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/function.png",
+
+            };
+            deviceframelayout.AddChidren(deviceiconBtn);
+
+            var devicerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            deviceframelayout.AddChidren(devicerow);
+
+
+            var btndevice = new Button
+            {
                 TextID = MyInternationalizationString.device,
-                //Text = "璁惧",
-                TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            deviceRowLayout.AddChidren (device);
+            devicerow.AddChidren(btndevice);
 
-            var btndeviceback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080-140),//550
+            var btndeviceback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
-            };
-            deviceRowLayout.AddChidren (btndeviceback);
+                UnSelectedImagePath = "ZigeeLogic/next.png",
 
-            EventHandler<MouseEventArgs> deviceclick = (sender, e) => {
+            };
+            devicerow.AddChidren(btndeviceback);
+
+            EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
+            {
                 Common.Logic.LogicDviceList.Clear();
                 if (Common.Logic.LogicDviceList.Count == 0)
                 {
@@ -97,90 +138,122 @@
                 logicDevicePage.Show();
 
             };
-             deviceRowLayout.MouseUpEventHandler += deviceclick;
-             device.MouseUpEventHandler += deviceclick;
-             btndeviceback.MouseUpEventHandler += deviceclick;
-#endregion
+            deviceframelayout.MouseUpEventHandler += devicestateclick;
+            btndevice.MouseUpEventHandler += devicestateclick;
+            btndeviceback.MouseUpEventHandler += devicestateclick;
+            deviceiconBtn.MouseUpEventHandler += devicestateclick;
+            devicerow.MouseUpEventHandler += devicestateclick;
+            #endregion
 
-            #region ----- 鍦烘櫙------        
-            var sceneRowLayout = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                //BackgroundColor = 0xff323232,
-                Y=deviceRowLayout.Bottom,
+            #region ----- 鍦烘櫙------
+
+
+            var sceneframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y= deviceframelayout.Bottom,
             };
-            middle.AddChidren (sceneRowLayout);
+            middle.AddChidren(sceneframelayout);
+
+            var sceneiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/scene.png",
+
+            };
+            sceneframelayout.AddChidren(sceneiconBtn);
+
+
+            var sceneRowLayout = new RowLayout {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            sceneframelayout.AddChidren (sceneRowLayout);
 
             var scene = new Button {
-                Width = Application.GetRealWidth (400),
                 TextID = MyInternationalizationString.scene,
-                //Text = "鍦烘櫙",
-                TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth (40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
             sceneRowLayout.AddChidren (scene);
 
             var btnsceneback = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth (1080-140),//550
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "ZigeeLogic/next.png",
             };
             sceneRowLayout.AddChidren (btnsceneback);
 
-            EventHandler<MouseEventArgs> sceneclick = (sender, e) => {
-                CommonPage.Loading.Start ();
-                System.Threading.Tasks.Task.Run (() => {
-                    Application.RunOnMainThread (() => {
-                        CommonPage.Loading.Hide ();
-                        var addScenePage = new AddScenePage ();
-                        UserView.HomePage.Instance.AddChidren (addScenePage);
-                        UserView.HomePage.Instance.PageIndex += 1;
-                        addScenePage.Show ();
-
-                    });
-                });
+            EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
+            {
+                var addScenePage = new AddScenePage();
+                UserView.HomePage.Instance.AddChidren(addScenePage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                addScenePage.Show();
             };
              sceneRowLayout.MouseUpEventHandler += sceneclick;
              scene.MouseUpEventHandler += sceneclick;
              btnsceneback.MouseUpEventHandler += sceneclick;
-#endregion
+            sceneframelayout.MouseUpEventHandler += sceneclick;
+            sceneiconBtn.MouseUpEventHandler += sceneclick;
+            #endregion
 
             #region ----- 瀹夐槻妯″紡------        
-            ///瀹夐槻妯″紡
-            var securityRowLayout = new RowLayout
+            var securityframelayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
-                //BackgroundColor = 0xff323232,
-                Y = sceneRowLayout.Bottom,
+                Height = Application.GetRealHeight(160),
+                Y = sceneframelayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(securityRowLayout);
+            middle.AddChidren(securityframelayout);
 
-            var security = new Button
+            var securityiconBtn = new Button
             {
-                Width = Application.GetRealWidth(400),
-                TextID = MyInternationalizationString.securitymode,
-                //Text = "瀹夐槻妯″紡",
-                TextSize = 16,
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                UnSelectedImagePath = "ZigeeLogic/security.png",
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+            };
+            securityframelayout.AddChidren(securityiconBtn);
+
+            var securityrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            securityframelayout.AddChidren(securityrow);
+
+
+            var btnsecurity = new Button
+            {
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
+                TextID = MyInternationalizationString.securitymode,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
-            securityRowLayout.AddChidren(security);
+            securityrow.AddChidren(btnsecurity);
 
             var btnsecurityback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),//550
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
             };
-            securityRowLayout.AddChidren(btnsecurityback);
+            securityrow.AddChidren(btnsecurityback);
 
             EventHandler<MouseEventArgs> securityclick = (sender, e) => {
                 var securityMode = new SecurityMode();
@@ -189,9 +262,11 @@
                 securityMode.Show();
             };
 
-            securityRowLayout.MouseUpEventHandler += securityclick;
-            security.MouseUpEventHandler += securityclick;
+            securityframelayout.MouseUpEventHandler += securityclick;
+            btnsecurity.MouseUpEventHandler += securityclick;
             btnsecurityback.MouseUpEventHandler += securityclick;
+            securityiconBtn.MouseUpEventHandler += securityclick;
+            securityrow.MouseUpEventHandler += securityclick;
             #endregion
 
             #region ----- 宸叉湁鑷姩鍖�------      
@@ -201,7 +276,7 @@
             {
                 Height = Application.GetRealHeight(180),
                 //BackgroundColor = 0xff323232,
-                Y = securityRowLayout.Bottom,
+                Y = securityframelayout.Bottom,
             };
             //middle.AddChidren(existenceRowLayout);
 
@@ -240,101 +315,71 @@
             btnexistenceback.MouseUpEventHandler += existenceclick;
             #endregion
 
-            #region ----- 寤舵椂------        
+            #region ----- 寤舵椂------
+
+            var delayedframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = securityframelayout.Bottom,
+            };
+            middle.AddChidren(delayedframelayout);
+
+            var delayediconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/delay.png",
+
+            };
+            delayedframelayout.AddChidren(delayediconBtn);
+
             var delayedRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(180),
-                //BackgroundColor = 0xff323232,
-                Y=securityRowLayout.Bottom,
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-           //middle.AddChidren(delayedRowLayout);
+            delayedframelayout.AddChidren(delayedRowLayout);
 
             var delayed = new Button
             {
-                Width = Application.GetRealWidth(400),
-                TextID = MyInternationalizationString.delayed,
-                //Text = "寤舵椂",
-                TextSize = 16,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
+                TextID = MyInternationalizationString.delayed,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
             delayedRowLayout.AddChidren(delayed);
 
             var btndelayedback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),//550
+                X = Application.GetRealWidth(789),
                 Gravity = Gravity.CenterVertical,
             };
             delayedRowLayout.AddChidren(btndelayedback);
 
             EventHandler<MouseEventArgs> delayedclick = (sender, e) =>
             {
-                //var delayTime = new DelayTime();
-                //UserView.HomePage.Instance.AddChidren(delayTime);
-                //UserView.HomePage.Instance.PageIndex += 1;
-                //delayTime.Show();
-                DelayTimeView();
+                var delayTime = new DelayTime();
+                UserView.HomePage.Instance.AddChidren(delayTime);
+                UserView.HomePage.Instance.PageIndex += 1;
+                delayTime.Show();
             };
 
             delayedRowLayout.MouseUpEventHandler += delayedclick;
             delayed.MouseUpEventHandler += delayedclick;
             btndelayedback.MouseUpEventHandler += delayedclick;
-#endregion
+            delayedframelayout.MouseUpEventHandler += delayedclick;
+            delayediconBtn.MouseUpEventHandler += delayedclick;
+            #endregion
         }
 
-        public static  void DelayTimeView(Dictionary<string, object> delayactionsInfo=null)
-        {
-            var listValues = new List<string>();
-            for (int i = 0; i < 60; i++)
-            {
-                listValues.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.second));
-            }
-            var list = new List<KeyValuePair<string, string[]>> { };
-            for (int i = 0; i <= 60; i++)
-            {
-                list.Add(new KeyValuePair<string, string[]>(i.ToString() + " " + Language.StringByID(MyInternationalizationString.minute), listValues.ToArray()));
-            }
-
-            /*
-            PickerView.Show(list, (obj) =>
-            {
-                var minute = obj.Split(',')[0].Split(' ')[0];
-                var second = obj.Split(',')[1].Split(' ')[0];
-                int value = int.Parse(minute) * 60 + int.Parse(second);
-                if (value == 0)
-                {
-                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                                                   "鏃堕棿涓嶈兘涓�0",
-                                                  Language.StringByID(MyInternationalizationString.complete));
-                    alert.Show();
-                    return;
-                }
-                if (delayactionsInfo == null)
-                {
-                    Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
-                    actionsInfo.Add("LinkType", 10);
-                    actionsInfo.Add("DelayTime", value);
-                    Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
-                }
-                else
-                {
-                    if (delayactionsInfo.ContainsKey("DelayTime"))
-                    {
-                        delayactionsInfo.Remove("DelayTime");
-                    }
-                    delayactionsInfo.Add("DelayTime", value);
-                }
-                var logicCommunalPage = new LogicCommunalPage { };
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
-            }, Language.StringByID(MyInternationalizationString.complete), "");
-            */
-        }
+        
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
new file mode 100755
index 0000000..139489c
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddAction.cs
@@ -0,0 +1,207 @@
+锘縰sing System;
+using Shared;
+using Shared.Common;
+using Shared.R;
+
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class AddAction : FrameLayout
+    {
+
+        public AddAction()
+        {
+            Tag = "LockLogic";
+        }
+        public void Show()
+        {
+
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addaction,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                RemoveFromParent();
+            };
+            #endregion
+
+
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            #region ----- 璁惧------    
+            var deviceframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(deviceframelayout);
+
+            var deviceiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/function.png",
+
+            };
+            deviceframelayout.AddChidren(deviceiconBtn);
+
+            var devicerow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            deviceframelayout.AddChidren(devicerow);
+
+
+            var btndevice = new Button
+            {
+                TextID = MyInternationalizationString.device,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            devicerow.AddChidren(btndevice);
+
+            var btndeviceback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+
+            };
+            devicerow.AddChidren(btndeviceback);
+
+            EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
+            {
+                var lockAddDevice = new LockAddDevice();
+                UserView.HomePage.Instance.AddChidren(lockAddDevice);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockAddDevice.Show();
+            };
+            deviceframelayout.MouseUpEventHandler += devicestateclick;
+            btndevice.MouseUpEventHandler += devicestateclick;
+            btndeviceback.MouseUpEventHandler += devicestateclick;
+            deviceiconBtn.MouseUpEventHandler += devicestateclick;
+            devicerow.MouseUpEventHandler += devicestateclick;
+            #endregion
+
+            #region ----- 鍦烘櫙------
+
+
+            var sceneframelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = deviceframelayout.Bottom,
+            };
+            middle.AddChidren(sceneframelayout);
+
+            var sceneiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/scene.png",
+
+            };
+            sceneframelayout.AddChidren(sceneiconBtn);
+
+
+            var sceneRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            sceneframelayout.AddChidren(sceneRowLayout);
+
+            var scene = new Button
+            {
+                TextID = MyInternationalizationString.scene,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            sceneRowLayout.AddChidren(scene);
+
+            var btnsceneback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(789),
+                Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+            };
+            sceneRowLayout.AddChidren(btnsceneback);
+
+            EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
+            {
+                var lockAddScene = new LockAddScene();
+                UserView.HomePage.Instance.AddChidren(lockAddScene);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockAddScene.Show();
+            };
+            sceneRowLayout.MouseUpEventHandler += sceneclick;
+            scene.MouseUpEventHandler += sceneclick;
+            btnsceneback.MouseUpEventHandler += sceneclick;
+            sceneframelayout.MouseUpEventHandler += sceneclick;
+            sceneiconBtn.MouseUpEventHandler += sceneclick;
+            #endregion
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
new file mode 100755
index 0000000..577d841
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -0,0 +1,377 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared;
+using Shared.Common;
+using Shared.R;
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class AddCondition : FrameLayout
+    {
+        public AddCondition()
+        {
+            Tag = "LockLogic";
+        }
+        Button selectedIcon = new Button();
+       
+        public int conditionsIndex = -1;
+        public void Show()
+        {
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.selection,
+                Text = "閫夋嫨鐢ㄦ埛",
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            #endregion
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+
+            var userlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
+            userlist.Clear();
+            ///鍒ゆ柇APP鐧诲綍杩涙潵鐢ㄦ埛韬唤(涓讳汉锛岀鐞嗗憳锛屾垚鍛�)
+            if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
+            {
+                var list = LockIfon.GetUserIfon(LockIfon.UserMemberInfoRes.SubAccountDistributedMark);
+                foreach (var o in list)
+                {
+                    if (userlist.Count != 0)
+                    {
+                        continue;
+                    }
+                    userlist.Add(o);
+                }
+            }
+            else
+            {
+                userlist = LockIfon.GetUserList();
+            }
+            for (int i = 0; i < userlist.Count; i++)
+            {
+                var user = userlist[i];
+                var userFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                };
+                middle.AddChidren(userFramelayout);
+
+                var userRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(1080 - 58 - 58),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(58),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                };
+                userFramelayout.AddChidren(userRow);
+
+                var usernameBtn = new Button
+                {
+                    Text = user.UserName,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Width = Application.GetRealWidth(600),
+                    Height = Application.GetRealHeight(130),
+                    Tag = userlist[i].ConnectedAccount
+                };
+                userRow.AddChidren(usernameBtn);
+
+                var btntimeback = new Button
+                {
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
+                    UnSelectedImagePath = "ZigeeLogic/next.png",
+                    X = userRow.Width - Application.GetRealWidth(58),
+                    Gravity = Gravity.CenterVertical,
+                };
+                userRow.AddChidren(btntimeback);
+
+
+                EventHandler<MouseEventArgs> userclick = (sender, e) =>
+                {
+                    var uesrifonlist = LockIfon.GetUserIfon(usernameBtn.Tag.ToString());
+                    SelectedUserID(uesrifonlist, usernameBtn.Text);
+                };
+                usernameBtn.MouseUpEventHandler += userclick;
+                btntimeback.MouseUpEventHandler += userclick;
+                userFramelayout.MouseUpEventHandler += userclick;
+                userRow.MouseUpEventHandler += userclick;
+
+
+            }
+        }
+        
+        /// <summary>
+        /// 閫夋嫨鏌愪釜鐢ㄦ埛
+        /// </summary>
+        /// <param name="uesrifonlist">瑙﹀彂婧愬垪琛�</param>
+        /// <param name="userName">鐢ㄦ埛鍚嶅瓧</param>
+         void SelectedUserID(List<ZigBee.Device.DoorLock.LocaDoorLockObj> uesrifonlist,string userName) {
+
+           var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            this.AddChidren(flMain);
+
+            flMain.MouseUpEventHandler += (sender1, e1) =>
+            {
+                flMain.RemoveFromParent();
+            };
+
+            var lockcolorfra = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(lockcolorfra);
+
+            var lockcolorfra1 = new FrameLayout
+            {
+
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(lockcolorfra1);
+
+            #region  -------鍙栨秷   瀹屾垚
+            var lockRow = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            lockcolorfra1.AddChidren(lockRow);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            lockRow.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text =userName,
+            };
+            lockRow.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            lockRow.AddChidren(Btncomplete);
+            #endregion
+
+            string SelectedLockStatus = "";
+            lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * uesrifonlist.Count) - 20 - 50);
+            lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * uesrifonlist.Count) + 20 + 50);
+            ///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
+            int attriButeId = 0, attriButeData2 = 0;
+            for (int j = 0; j < uesrifonlist.Count; j++)
+            {
+                var userid = uesrifonlist[j];
+                var doorlockfra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j),
+                };
+                lockcolorfra1.AddChidren(doorlockfra);
+
+                var doorlockRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(920),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(80),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                };
+                doorlockfra.AddChidren(doorlockRow);
+
+                var doorlockBtn = new Button
+                {
+                    Width = Application.GetRealWidth(600),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                };
+                doorlockRow.AddChidren(doorlockBtn);
+                //(0鎸夐敭/3鍗�/15鎸囩汗)
+                switch (userid.UnlockType)
+                {
+                    case 0:
+                        {
+                            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
+                        }
+                        break;
+                    case 3:
+                        {
+                            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
+                        }
+                        break;
+                    case 15:
+                        {
+                            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
+                        }
+                        break;
+
+                }
+
+
+                var doorlockSelected = new Button
+                {
+                    X = Application.GetRealWidth(860),
+                    Width = Application.GetMinRealAverage(60),
+                    Height = Application.GetMinRealAverage(60),
+                    UnSelectedImagePath = "ZigeeLogic/selected.png",
+                    Visible = false,
+                    Gravity = Gravity.CenterVertical,
+
+                };
+                doorlockRow.AddChidren(doorlockSelected);
+                if ((uesrifonlist.Count - 1) == j)
+                {
+                    doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                }
+                EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
+                {
+                    SelectedLockStatus = "DoorLock";
+                    selectedIcon.Visible = false;
+                    selectedIcon = doorlockSelected;
+                    doorlockSelected.Visible = true;
+                    //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                    attriButeId = userid.UnlockType;
+                    attriButeData2 = userid.UserID;
+                };
+                doorlockRow.MouseUpEventHandler += doorlockclick;
+                doorlockBtn.MouseUpEventHandler += doorlockclick;
+                doorlockSelected.MouseUpEventHandler += doorlockclick;
+                doorlockfra.MouseUpEventHandler += doorlockclick;
+                ///鏄剧ず涔嬪墠鐨勭姸鎬�
+                if (conditionsIndex != -1)
+                {
+                    var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
+                    if (s["AttriButeId"] == userid.UnlockType.ToString() && s["AttriButeData2"] == userid.UserID.ToString())
+                    {
+                        selectedIcon.Visible = false;
+                        selectedIcon = doorlockSelected;
+                        doorlockSelected.Visible = true;
+                    }
+                }
+            }
+           
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+                var lockConditionsInfo = new Dictionary<string, string>();
+                lockConditionsInfo.Add("Type", "1");
+                lockConditionsInfo.Add("IsValid", "1");
+                lockConditionsInfo.Add("MacAddr", LockIfon.DoorLock.DeviceAddr);
+                lockConditionsInfo.Add("Epoint", LockIfon.DoorLock.DeviceEpoint.ToString());
+                lockConditionsInfo.Add("Cluster_ID", "64529");
+                lockConditionsInfo.Add("AttriButeId", attriButeId.ToString());
+                lockConditionsInfo.Add("AttriButeData2", attriButeData2.ToString());
+                lockConditionsInfo.Add("AttriButeData1", "2");
+                lockConditionsInfo.Add("Range", "0");
+                if (SelectedLockStatus != "")
+                {
+                    if (conditionsIndex == -1)
+                    {
+                        Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
+                    }
+                    else
+                    {
+                        Common.Logic.CurrentLogic.Conditions.RemoveAt(conditionsIndex);
+                        Common.Logic.CurrentLogic.Conditions.Insert(conditionsIndex, lockConditionsInfo);
+                    }
+
+                }
+                else
+                {
+                    if (conditionsIndex == -1)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                               Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+                }
+                var lockLogicCommunalPage = new LockLogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockLogicCommunalPage.Show(() => { });
+            };
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
new file mode 100755
index 0000000..7998d32
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -0,0 +1,2102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class LockAddDevice:FrameLayout
+    {
+        public LockAddDevice()
+        {
+            Tag = "LockLogic";
+        }
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button devicetypeButton = new Button();
+        VerticalScrolViewLayout middle;
+        FrameLayout clickframeLayout = new FrameLayout();
+        Button clickbutton = new Button();
+        Button clicktextcolcrbutton = new Button();
+        public void Show()
+        {
+
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.devicestate,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var foolrname = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
+            };
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            var roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+
+            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58 - 200),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58 + 200),
+            };
+            this.AddChidren(devicetypehorizontalScrol1);
+            ///璁惧绫诲瀷婊戝姩鎺т欢
+            var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                Radius = (uint)Application.GetRealHeight(50),
+
+            };
+            this.AddChidren(devicetypehorizontalScrol);
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
+            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            middle.X = Application.GetRealWidth(58);
+            middle.Radius = (uint)Application.GetRealHeight(50);
+            this.AddChidren(middle);
+
+            ///鐩墠鏀寔鐨勮澶�
+            List<DeviceType> deviceTypeList = new List<DeviceType> {
+                DeviceType.OnOffOutput,
+                DeviceType.DimmableLight,
+                DeviceType.WindowCoveringDevice,
+                DeviceType.Thermostat,
+                DeviceType.AirSwitch,
+            };
+
+
+
+            ///妤煎眰鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
+            {
+
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                flMain.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    flMain.RemoveFromParent();
+                };
+                var foolrbj = new VerticalScrolViewLayout
+                {
+
+                    Width = Application.GetRealWidth(400),
+                    Height = Application.GetRealHeight(600),
+                    X = Application.GetRealWidth(1080 - 400 - 60),
+                    Y = Application.GetRealHeight(184 + 50),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    Radius = (uint)Application.GetRealHeight(30),
+                };
+                flMain.AddChidren(foolrbj);
+                foreach (var foolr in Config.Instance.Home.FloorDics)
+                {
+
+                    var foolrRowLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(150),
+                    };
+                    foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolrname = new Button
+                    {
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        //SelectedTextColor=0xfffc744b,
+                        Tag = foolr.Key,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolrname);
+
+
+                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
+                    {
+                        roomhorizontalScrol.RemoveAll();
+                        devicetypehorizontalScrol.RemoveAll();
+                        middle.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
+                        flMain.RemoveFromParent();
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+                    };
+                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
+                    btnfoolrname.MouseUpEventHandler += foolrnameclick;
+
+
+                }
+
+            };
+            foolrname.MouseUpEventHandler += foorlclick;
+            dropdown.MouseUpEventHandler += foorlclick;
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
+            {
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
+                {
+                    roomlists.AddRange(Common.Room.Lists);
+                }
+                else
+                {
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+                }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+
+            }
+
+
+            AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+
+
+        }
+        /// <summary>
+        /// 鍔犺浇鎵�鏈夋埧闂寸殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            for (int i = 0; i < roomlist.Count; i++)
+            {
+                var room = roomlist[i];
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+                if (i == 0)
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+                }
+
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
+        }
+
+        /// <summary>
+        ///鍔犺浇璇ュ尯鍩熸墍鏈夎澶囩殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+
+            List<string> devicetypelist = new List<string>();
+            devicetypelist.Clear();
+
+            #region  ------鎺掑垪璁惧绫诲瀷------
+            var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+            if (lightjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
+            }
+            var curtainjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.WindowCoveringDevice);
+            if (curtainjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
+            }
+            var ac = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.Thermostat);
+            if (ac != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.AC));
+            }
+            var airSwitch = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.AirSwitch);
+            if (airSwitch != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Airswitch));
+            }
+
+            #endregion
+
+            devicetypehorizontalScrol.RemoveAll();
+            for (int i = 0; i < devicetypelist.Count; i++)
+            {
+
+                var devicetype = devicetypelist[i];
+
+                var spaceRowLayout = new FrameLayout();
+                devicetypehorizontalScrol.AddChidren(spaceRowLayout);
+                if (i == 0)
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(37);
+                }
+                else
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(80);
+                }
+
+                var deviceRowLayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(156 + 20),
+                    Height = Application.GetRealHeight(280 - 30),
+                    Y = Application.GetRealHeight(30),
+                };
+                devicetypehorizontalScrol.AddChidren(deviceRowLayout);
+
+                var backgroundColor = new Button
+                {
+                    Width = Application.GetRealWidth(156),
+                    Height = Application.GetRealHeight(180),
+                    X = Application.GetRealWidth(10),
+                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
+                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
+                };
+                deviceRowLayout.AddChidren(backgroundColor);
+
+
+                var devicetypeicon = new Button
+                {
+                    Width = Application.GetRealWidth(84),
+                    Height = Application.GetRealHeight(84),
+                    X = Application.GetRealWidth(46),
+                    Y = Application.GetRealHeight(30),
+                };
+                deviceRowLayout.AddChidren(devicetypeicon);
+
+                var devicetypename = new Button
+                {
+                    Width = Application.GetRealWidth(176),
+                    Height = Application.GetRealHeight(40),
+                    Text = devicetype,
+                    TextAlignment = TextAlignment.Center,
+                    Y = backgroundColor.Bottom,
+                    TextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 10,
+                };
+                deviceRowLayout.AddChidren(devicetypename);
+                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedlight.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedac.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                }
+                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
+                {
+
+                    devicetypeButton.IsSelected = false;
+                    devicetypeButton = backgroundColor;
+                    backgroundColor.IsSelected = true;
+                    List<DeviceType> list = new List<DeviceType>();
+                    list.Clear();
+                    ///鍒嗙被鏄剧ず锛堜緥濡傜伅鍏夛細{鐏厜1锛岀伅鍏�2...}锛�
+                    if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                    {
+                        list.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
+                        list.Add(DeviceType.DimmableLight);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                    {
+                        list.Add(DeviceType.WindowCoveringDevice);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                    {
+                        list.Add(DeviceType.Thermostat);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                    {
+                        list.Add(DeviceType.AirSwitch);
+                    }
+
+                    ActionDeviceView(list, devicelist);
+
+                };
+                deviceRowLayout.MouseUpEventHandler += devicetypeclick;
+                devicetypename.MouseUpEventHandler += devicetypeclick;
+                devicetypeicon.MouseUpEventHandler += devicetypeclick;
+                backgroundColor.MouseUpEventHandler += devicetypeclick;
+
+            }
+            ///鏄剧ず鎴块棿鎵�鏈夎澶�
+            ActionDeviceView(new List<DeviceType>(), devicelist);
+        }
+        /// <summary>
+        /// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
+        /// </summary>
+        /// <param name="devicelist">璁惧鍒楄〃</param>
+        void ActionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+        {
+            middle.RemoveAll();
+            foreach (var common in devicelist)
+            {
+
+                if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.CommonDevice.Type))
+                {
+                    continue;
+                }
+
+                var deviceFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                };
+                middle.AddChidren(deviceFramelayout);
+
+                var bjFramelayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(112),
+                    Height = Application.GetRealHeight(112),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(30 + 9),
+                    Radius = (uint)Application.GetRealHeight(56),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                deviceFramelayout.AddChidren(bjFramelayout);
+
+                var deviceIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    Gravity = Gravity.Center,
+
+                };
+                bjFramelayout.AddChidren(deviceIconBtn);
+
+                var deviceRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                deviceFramelayout.AddChidren(deviceRow);
+
+                var devicename = new Button
+                {
+                    Text = common.CommonDevice.DeviceEpointName,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                };
+                deviceRow.AddChidren(devicename);
+                switch (common.CommonDevice.Type)
+                {
+
+                    case DeviceType.OnOffOutput:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/light.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedlight.png";
+                        }
+                        break;
+                    case DeviceType.DimmableLight:
+                        {
+
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selecteddimmableLight.png";
+                        }
+                        break;
+                    case DeviceType.WindowCoveringDevice:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/curtain.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                        }
+                        break;
+                    case DeviceType.Thermostat:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/ac.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedac.png";
+                        }
+                        break;
+                    case DeviceType.AirSwitch:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                        }
+                        break;
+                }
+
+                EventHandler<MouseEventArgs> devicclick = (sen, e) =>
+                {
+                    clickbutton.IsSelected = false;
+                    clickbutton = deviceIconBtn;
+                    deviceIconBtn.IsSelected = true;
+                    clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                    clickframeLayout = bjFramelayout;
+                    bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+                    clicktextcolcrbutton.IsSelected = false;
+                    clicktextcolcrbutton = devicename;
+                    devicename.IsSelected = true;
+
+                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                    this.AddChidren(flMain);
+                    CurrentDeviceStateView(flMain, common.CommonDevice, false);
+                };
+                deviceFramelayout.MouseUpEventHandler += devicclick;
+                bjFramelayout.MouseUpEventHandler += devicclick;
+                deviceIconBtn.MouseUpEventHandler += devicclick;
+                deviceRow.MouseUpEventHandler += devicclick;
+                devicename.MouseUpEventHandler += devicclick;
+
+            }
+        }
+        /// <summary>
+        /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
+        /// </summary>
+        /// <param name="common">Common.</param>
+        public static void CurrentDeviceStateView(FrameLayout flMain, CommonDevice common, bool edit)
+        {
+            //涓嶈褰撳墠鐣岄潰婊戝姩
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+            List<Dictionary<string, string>> taskListInfo = new List<Dictionary<string, string>>();
+            flMain.MouseUpEventHandler += (sender, e) =>
+            {
+                flMain.RemoveFromParent();
+            };
+            var devicefra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(devicefra1);
+
+            var devicefra = new FrameLayout
+            {
+
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530 + 160),
+                Y = Application.GetRealHeight(1920 - 530 - 160),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(devicefra);
+
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            devicefra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text = common.DeviceEpointName,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+
+            string SelectedDeviceStatusaction = "no";
+            actionsInfo.Add("LinkType", 0);
+            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+            actionsInfo.Add("Epoint", common.DeviceEpoint);
+            actionsInfo.Add("Time", 0);
+            actionsInfo.Add("TaskList", taskListInfo);
+
+            List<Dictionary<string, string>> TaskList = null;
+            if (edit)
+            {
+                foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+                {
+                    if (deviceinfo["LinkType"].ToString() == "0")
+                    {
+
+                        if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+                        {
+                            TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
+                            break;
+                        }
+                    }
+                }
+            }
+            switch (common.Type)
+            {
+
+                ///鐏厜
+                case DeviceType.OnOffOutput:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("TaskType"))
+                        {
+                            switchdictionary.Remove("TaskType");
+                        }
+                        if (switchdictionary.ContainsKey("Data1"))
+                        {
+                            switchdictionary.Remove("Data1");
+                        }
+                        if (switchdictionary.ContainsKey("Data2"))
+                        {
+                            switchdictionary.Remove("Data2");
+                        }
+                        switchdictionary.Add("TaskType", "1");
+                        switchdictionary.Add("Data1", "0");
+                        switchdictionary.Add("Data2", "0");
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+
+                        #region  鐏厜View
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+                        #endregion
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
+
+                        #endregion
+
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                        };
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    if (switchdictionary.ContainsKey("Data1"))
+                                    {
+                                        switchdictionary.Remove("Data1");
+                                    }
+                                    if (value["Data1"] == "1")
+                                    {
+                                        switchdictionary.Add("Data1", "1");
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = false;
+                                    }
+                                    else if (value["Data1"] == "0")
+                                    {
+                                        switchdictionary.Add("Data1", "0");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                    }
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
+                                    }
+                                    break;
+                                }
+
+                            }
+                        }
+
+                    }
+                    break;
+                ///璋冨厜鐏厜
+                case DeviceType.DimmableLight:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("Data2"))
+                        {
+                            switchdictionary.Remove("Data2");
+                        }
+                        switchdictionary.Add("Data2", "0");
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+
+                        #region  鐏厜View
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 3 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 3 + 210 + 160);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+                        var horizontalSeekBarRow = new RowLayout
+                        {
+                            Y = openrowlayout.Bottom,
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
+
+                        #endregion
+
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                        };
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
+
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                if (switchdictionary.ContainsKey("TaskType"))
+                                {
+                                    switchdictionary.Remove("TaskType");
+                                }
+                                if (value["TaskType"] == "1")
+                                {
+                                    switchdictionary.Add("TaskType", "1");
+                                    if (value["Data1"] == "0")
+                                    {
+                                        switchdictionary.Add("Data1", "0");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+
+                                }
+                                else if (value["TaskType"] == "3")
+                                {
+                                    switchdictionary.Add("TaskType", "3");
+                                    switchdictionary.Add("Data1", value["Data1"]);
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                    takebackBtnSelected.Visible = false;
+                                    horizontalSeekBarVol.IsCanMove = true;
+                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                    horizontalSeekBarVol.Progress = int.Parse(value["Data1"]) * 100 / 254;
+                                    Progressvalue = horizontalSeekBarVol.Progress;
+
+                                }
+                                break;
+
+                            }
+                        }
+
+                    }
+                    break;
+                ///绐楀笜
+                case DeviceType.WindowCoveringDevice:
+                    {
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("TaskType"))
+                        {
+                            switchdictionary.Remove("TaskType");
+                        }
+                        switchdictionary.Add("TaskType", "6");
+
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 2 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 2 + 210 + 160);
+                        #region 绐楀笜View
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+
+                        var horizontalSeekBarRow = new RowLayout
+                        {
+                            Y = openrowlayout.Bottom,
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+
+
+                        #endregion
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
+
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data2", "0");
+                            switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+
+
+
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "6")
+                                {
+                                    if (value["Data1"] == "5")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        if (switchdictionary.ContainsKey("Data2"))
+                                        {
+                                            switchdictionary.Remove("Data2");
+                                        }
+                                        switchdictionary.Add("Data1", "5");
+                                        switchdictionary.Add("Data2", value["Data2"]);
+                                        horizontalSeekBarVol.IsCanMove = true;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
+                                        Progressvalue = horizontalSeekBarVol.Progress;
+                                    }
+                                    else if (value["Data1"] == "1")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        switchdictionary.Add("Data1", "1");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+                ///绌烘皵寮�鍏�
+                case DeviceType.AirSwitch:
+                    {
+                        {
+
+                            #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                            Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "0");
+                            switchdictionary.Add("Data2", "0");
+                            taskListInfo.Add(switchdictionary);
+
+                            #endregion
+
+                            #region  绌烘皵鐏厜View
+
+                            #region 寮�
+
+                            var openframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = timetype.Bottom + Application.GetRealHeight(20),
+                            };
+                            devicefra.AddChidren(openframelayout);
+
+                            var openrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            openframelayout.AddChidren(openrowlayout);
+
+                            var btnopen = new Button
+                            {
+                                Width = Application.GetRealWidth(600),
+                                TextID = MyInternationalizationString.open,
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            openrowlayout.AddChidren(btnopen);
+
+                            var openBtnSelected = new SelectedButton();
+                            openrowlayout.AddChidren(openBtnSelected);
+                            #endregion
+                            #region  鍏�
+                            var closeframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = openframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(closeframelayout);
+                            var closerowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            closeframelayout.AddChidren(closerowlayout);
+
+                            var btnclose = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.close,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            closerowlayout.AddChidren(btnclose);
+
+                            var closeBtnSelected = new SelectedButton();
+                            closerowlayout.AddChidren(closeBtnSelected);
+                            #endregion
+                            #region   鍙栧弽
+                            var takebackframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = closeframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(takebackframelayout);
+                            var takebackrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                            };
+                            takebackframelayout.AddChidren(takebackrowlayout);
+
+                            var btntakeback = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.onoff,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            takebackrowlayout.AddChidren(btntakeback);
+
+                            var takebackBtnSelected = new SelectedButton();
+                            takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                            #endregion
+
+
+                            #endregion
+
+                            ///纭浜嬩欢
+                            EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = true;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+
+                            };
+                            openrowlayout.MouseUpEventHandler += openclick;
+                            btnopen.MouseUpEventHandler += openclick;
+                            openBtnSelected.MouseUpEventHandler += openclick;
+                            openframelayout.MouseUpEventHandler += openclick;
+                            ///鍙栨秷浜嬩欢
+                            EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = true;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                            };
+                            closerowlayout.MouseUpEventHandler += closeclick;
+                            btnclose.MouseUpEventHandler += closeclick;
+                            closeBtnSelected.MouseUpEventHandler += closeclick;
+                            closeframelayout.MouseUpEventHandler += closeclick;
+                            //鍙栧弽
+                            EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = true;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                            };
+                            takebackrowlayout.MouseUpEventHandler += takebackclick;
+                            btntakeback.MouseUpEventHandler += takebackclick;
+                            takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                            takebackframelayout.MouseUpEventHandler += takebackclick;
+                            if (edit && TaskList != null)
+                            {
+                                foreach (var value in TaskList)
+                                {
+                                    if (value["TaskType"] == "1")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        if (value["Data1"] == "1")
+                                        {
+                                            switchdictionary.Add("Data1", "1");
+                                            openBtnSelected.Visible = true;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "0")
+                                        {
+                                            switchdictionary.Add("Data1", "0");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = true;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "2")
+                                        {
+                                            switchdictionary.Add("Data1", "2");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = true;
+                                        }
+                                        break;
+                                    }
+
+                                }
+                            }
+
+                        }
+                    }
+                    break;
+
+                case DeviceType.Thermostat:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> modedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
+                        taskListInfo.Add(switchdictionary);
+                        taskListInfo.Add(temperaturedictionary);
+                        taskListInfo.Add(modedictionary);
+                        taskListInfo.Add(speeddictionary);
+                        dictionary(switchdictionary, "TaskType", "1");
+                        dictionary(switchdictionary, "Data2", "0");
+                        dictionary(temperaturedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "Data1", "3");
+                        dictionary(speeddictionary, "TaskType", "5");
+                        dictionary(speeddictionary, "Data1", "6");
+
+                        #endregion
+
+                        #region  绌鸿皟View
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160 * 2);
+                        devicefra.Height = Application.GetRealHeight(600 + 210 + 160 * 2);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+                        #endregion
+
+                        #region  绌鸿皟鐘舵�乂iew
+                        var PickerViewfra = new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(PickerViewfra);
+
+
+                        var pausePickerViewfra = new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(pausePickerViewfra);
+
+
+
+                        var mUIPickerView = new UIPickerView
+                        {
+                            Height = Application.GetRealHeight(600 - 5),
+                        };
+                        PickerViewfra.AddChidren(mUIPickerView);
+                        var line = new Button
+                        {
+                            Y = Application.GetRealHeight(600 - 5),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(5),
+                            X = Application.GetRealWidth(80),
+                            BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        PickerViewfra.AddChidren(line);
+
+                        var mList1 = new List<string>();
+                        var mList2 = new List<string> {
+                         Language.StringByID(MyInternationalizationString.logiccool),
+                         Language.StringByID(MyInternationalizationString.logicheat),
+                         Language.StringByID(MyInternationalizationString.logicauto),
+                         Language.StringByID(MyInternationalizationString.logicdry),
+                         Language.StringByID(MyInternationalizationString.logicfanonly),
+                        };
+                        var mList3 = new List<string>{
+                         Language.StringByID(MyInternationalizationString.logiclow),
+                         Language.StringByID(MyInternationalizationString.logicmedium),
+                         Language.StringByID(MyInternationalizationString.logichigh),
+                          };
+                        for (int i = 16; i < 33; i++)
+                        {
+                            mList1.Add(i.ToString() + " " + "鈩�");
+                        }
+                        mUIPickerView.setNPicker(mList1, mList2, mList3);
+                        ///榛樿鐘舵��
+
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = PickerViewfra.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+
+
+                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+                        {
+                            if (openBtnSelected.Visible)
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                var temperature = mList1[s1].Split(' ')[0];
+                                var modestring = mList2[s2].Split(' ')[0];
+                                var speedstring = mList3[s3].Split(' ')[0];
+                                ModeState(modestring, temperaturedictionary, modedictionary);
+                                var a = int.Parse(temperature) * 100;
+                                dictionary(temperaturedictionary, "Data2", a.ToString());
+
+                                SpeedState(speedstring, speeddictionary);
+
+
+                            }
+                        };
+
+                        #endregion
+                        //榛樿26,鑷姩,涓
+                        int indextemperature = 10, indexmode = 2, indexspeed = 1;
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    dictionary(switchdictionary, "Data1", value["Data1"]);
+                                    if (value["Data1"] == "1")
+                                    {
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(0);
+                                    }
+                                    else if (value["Data1"] == "0")
+                                    {
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(600);
+                                    }
+
+                                }
+                                else if (value["TaskType"] == "5")
+                                {
+                                    if (value["Data1"] == "3")
+                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                        dictionary(modedictionary, "Data2", value["Data2"]);
+                                        string modetext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "3":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                    //indexmode = 0;
+                                                }
+                                                break;
+                                            case "4":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                    //  indexmode = 1;
+                                                }
+                                                break;
+                                            case "1":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                    //   indexmode = 2;
+                                                }
+                                                break;
+                                            case "8":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                    //  indexmode = 3;
+                                                }
+                                                break;
+                                            case "7":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                    //indexmode = 4;
+                                                }
+                                                break;
+                                        }
+                                        indexmode = mList2.IndexOf(modetext);
+                                    }
+                                    else if (value["Data1"] == "6")
+                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                        dictionary(speeddictionary, "Data2", value["Data2"]);
+                                        string speedtext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "1":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                    //indexspeed = 0;
+                                                }
+                                                break;
+
+                                            case "2":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                    // indexspeed = 1;
+                                                }
+                                                break;
+                                            case "3":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                    // indexspeed = 2;
+                                                }
+                                                break;
+
+                                        }
+                                        indexspeed = mList3.IndexOf(speedtext);
+                                    }
+                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                    else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")
+                                    {
+                                        var s = int.Parse(value["Data2"]) / 100;
+                                        indextemperature = mList1.IndexOf(s.ToString() + " " + "鈩�");
+                                        dictionary(temperaturedictionary, "Data1", value["Data1"]);
+                                        dictionary(temperaturedictionary, "Data2", value["Data2"]);
+                                    }
+
+                                }
+                            }
+                        }
+                        ///鏇存柊鏈�鏂扮┖璋冪姸鎬侊紱
+                        mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
+
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(0);
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            dictionary(switchdictionary, "Data1", "1");
+                            var temperature = mList1[indextemperature].Split(' ')[0];
+                            var modestring = mList2[indexmode].Split(' ')[0];
+                            var speedstring = mList3[indexspeed].Split(' ')[0];
+
+                            ModeState(modestring, temperaturedictionary, modedictionary);
+                            var a = int.Parse(temperature) * 100;
+                            dictionary(temperaturedictionary, "Data2", a.ToString());
+                            SpeedState(speedstring, speeddictionary);
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(600);
+
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            dictionary(switchdictionary, "Data1", "0");
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                    }
+                    break;
+
+
+            }
+
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+
+                if (SelectedDeviceStatusaction == "yes")
+                {
+                    LogicIfon.AddDeviceactions(common, actionsInfo);
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                               Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+
+                }
+                flMain.RemoveFromParent();
+                var lockLogicCommunalPage = new LockLogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockLogicCommunalPage.Show(() => { });
+
+            };
+
+        }
+
+        public static void dictionary(Dictionary<string, string> deviceactionsInfo, string Key, string Value)
+        {
+            if (deviceactionsInfo.ContainsKey(Key))
+            {
+                deviceactionsInfo.Remove(Key);
+            }
+            deviceactionsInfo.Add(Key, Value);
+        }
+        /// <summary>
+        /// 绌鸿皟妯″紡鐨勭姸鎬�
+        /// </summary>
+        /// <param name="modestring"></param>
+        /// <param name="temperaturedictionary"></param>
+        /// <param name="modedictionary"></param>
+        public static void ModeState(string modestring, Dictionary<string, string> temperaturedictionary, Dictionary<string, string> modedictionary)
+        {
+
+            if (modestring == Language.StringByID(MyInternationalizationString.logiccool))
+            {
+                dictionary(modedictionary, "Data2", "3");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicheat))
+            {
+
+                dictionary(modedictionary, "Data2", "4");
+                dictionary(temperaturedictionary, "Data1", "4");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicauto))
+            {
+
+                dictionary(modedictionary, "Data2", "1");
+                dictionary(temperaturedictionary, "Data1", "7");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicdry))
+            {
+
+                dictionary(modedictionary, "Data2", "8");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicfanonly))
+            {
+                dictionary(temperaturedictionary, "Data1", "20");
+                dictionary(modedictionary, "Data2", "7");
+            }
+
+        }
+        /// <summary>
+        /// 椋庨�熺殑妯″紡
+        /// </summary>
+        /// <param name="speedstring"></param>
+        /// <param name="speeddictionary"></param>
+        public static void SpeedState(string speedstring, Dictionary<string, string> speeddictionary)
+        {
+
+            if (speedstring == Language.StringByID(MyInternationalizationString.logiclow))
+            {
+
+                dictionary(speeddictionary, "Data2", "1");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logicmedium))
+            {
+
+                dictionary(speeddictionary, "Data2", "2");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logichigh))
+            {
+
+                dictionary(speeddictionary, "Data2", "3");
+            }
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
new file mode 100755
index 0000000..fb4ffce
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
@@ -0,0 +1,410 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.R;
+using ZigBee.Device;
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class LockAddScene:FrameLayout
+    {
+        public LockAddScene()
+        {
+            Tag = "LockLogic";
+        }
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button clickbutton = new Button();
+        HorizontalScrolViewLayout roomhorizontalScrol;
+        VerticalScrolViewLayout middle;
+        public string clickTag = "no";
+        public SceneUI tempScene = null;
+        Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+        public void Show()
+        {
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addscene,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var foolrname = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
+            };
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = roomhorizontalScrol.Bottom;
+            middle.Height = Application.GetRealHeight(1920 - 260 - 200 - 184);
+            middle.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            this.AddChidren(middle);
+
+            var saveframeLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveframeLayout);
+
+            var btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveframeLayout.AddChidren(btnsave);
+
+            btnsave.MouseUpEventHandler += (sender2, e2) =>
+            {
+                if (clickTag == "no" || tempScene == null)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                              Language.StringByID(MyInternationalizationString.complete));
+                    alert.Show();
+                    return;
+                }
+                if (actionsInfo.ContainsKey("LinkType"))
+                {
+                    actionsInfo.Remove("LinkType");
+                }
+                actionsInfo.Add("LinkType", 2);
+                LogicIfon.AddSceneactions(tempScene, actionsInfo);
+                var lockLogicCommunalPage = new LockLogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockLogicCommunalPage.Show(() => { });
+
+            };
+
+            ///閫変腑妤煎眰
+            foolrname.MouseUpEventHandler += (sender, e) =>
+            {
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                flMain.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    flMain.RemoveFromParent();
+                };
+                var foolrbj = new VerticalScrolViewLayout
+                {
+
+                    Width = Application.GetRealWidth(400),
+                    Height = Application.GetRealHeight(600),
+                    X = Application.GetRealWidth(1080 - 400 - 60),
+                    Y = Application.GetRealHeight(184 + 50),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    Radius = (uint)Application.GetRealHeight(30),
+                };
+                flMain.AddChidren(foolrbj);
+                ///榛樿璋冭瘯
+
+                foreach (var foolr in Config.Instance.Home.FloorDics)
+                {
+                    var foolrRowLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(150),
+                    };
+                    foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolrname = new Button
+                    {
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        Tag = foolr.Key,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolrname);
+
+
+                    EventHandler<MouseEventArgs> foolrclick = (sender13, e13) =>
+                    {
+                        roomhorizontalScrol.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
+                        middle.RemoveAll();
+                        flMain.RemoveFromParent();
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list);
+                    };
+                    foolrRowLayout.MouseUpEventHandler += foolrclick;
+                    btnfoolrname.MouseUpEventHandler += foolrclick;
+
+
+                }
+            };
+
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
+            {
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
+                {
+                    roomlists.AddRange(Common.Room.Lists);
+                }
+                else
+                {
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+                }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+
+            }
+
+
+            ///绗竴娆¤繘鏉�
+            AllRoomView(roomlists);
+
+        }
+        /// <summary>
+        /// 鏄剧ず鎵�鏈夋埧闂寸殑鏂规硶
+        /// </summary>
+        /// <param name="RoomList"></param>
+        void AllRoomView(List<Common.Room> RoomList)
+        {
+            for (int i = 0; i < RoomList.Count; i++)
+            {
+                var room = RoomList[i];
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+
+                if (i == 0)
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    SceneView(room.SceneUIList);
+
+                }
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    SceneView(room.SceneUIList);
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
+        }
+        /// <summary>
+        /// 鏄剧ず鎵�鏈夌殑鍦烘櫙鐨勬柟娉�
+        /// </summary>
+        /// <param name="scenelist"></param>
+        void SceneView(List<SceneUI> scenelist)
+        {
+            middle.RemoveAll();
+            foreach (var scene in scenelist)
+            {
+                var sceneFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                };
+                middle.AddChidren(sceneFramelayout);
+
+
+                var sceneIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(81),
+                    Height = Application.GetRealHeight(81),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(55),
+                    UnSelectedImagePath = "ZigeeLogic/scene.png",
+
+                };
+                sceneFramelayout.AddChidren(sceneIconBtn);
+
+                var sceneRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                sceneFramelayout.AddChidren(sceneRow);
+
+                var scenename = new Button
+                {
+                    Text = scene.Name,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                };
+                sceneRow.AddChidren(scenename);
+
+                var selectedBtn = new Button
+                {
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(789),
+                    UnSelectedImagePath = "ZigeeLogic/selected.png",
+                    Visible = false,
+                    Gravity = Gravity.CenterVertical,
+                };
+                sceneRow.AddChidren(selectedBtn);
+
+                EventHandler<MouseEventArgs> sceneclick = (sender, e) =>
+                {
+                    tempScene = scene;
+                    clickTag = "yes";
+                    clickbutton.Visible = false;
+                    clickbutton = selectedBtn;
+                    selectedBtn.Visible = true;
+                    if (actionsInfo.ContainsKey("DeviceAddr"))
+                    {
+                        actionsInfo.Remove("DeviceAddr");
+                    }
+                    actionsInfo.Add("DeviceAddr", scene.Id);
+                };
+
+                sceneFramelayout.MouseUpEventHandler += sceneclick;
+                sceneIconBtn.MouseUpEventHandler += sceneclick;
+                sceneRow.MouseUpEventHandler += sceneclick;
+                scenename.MouseUpEventHandler += sceneclick;
+                selectedBtn.MouseUpEventHandler += sceneclick;
+
+            }
+
+        }
+
+
+
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
new file mode 100755
index 0000000..1d13ab0
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockIfon.cs
@@ -0,0 +1,63 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared;
+
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class LockIfon
+    {
+        /// <summary>
+        /// 褰撳墠闂ㄩ攣
+        /// </summary>
+        public static ZigBee.Device.DoorLock DoorLock=null;
+        /// <summary>
+        /// 褰撳墠鎴愬憳鐨勪俊鎭�
+        /// </summary>
+        public static UserCenter.MemberInfoRes UserMemberInfoRes = null;
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鎵�鏈夌殑鎴愬憳
+        /// </summary>
+        /// <returns></returns>
+        public static List<ZigBee.Device.DoorLock.LocaDoorLockObj> GetUserList()
+        {
+            var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
+            locaDoorLockObjlist.Clear();
+            foreach (var dictionary in DoorLock.localDoorLockUserList)
+            {
+                if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount)) {
+                    //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
+                    continue;
+                }
+                var @null = locaDoorLockObjlist.Find((o) => { return o.ConnectedAccount == dictionary.Value.ConnectedAccount; });
+                if (@null == null)
+                {
+                    locaDoorLockObjlist.Add(dictionary.Value);
+                }
+
+            }
+            return locaDoorLockObjlist;
+        }
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鏌愪釜鎴愬憳鐨勪俊鎭�
+        /// </summary>
+        /// <returns></returns>
+        public static List<ZigBee.Device.DoorLock.LocaDoorLockObj> GetUserIfon(string SubAccountDistributedMark)
+        {
+            var locaDoorLockObjlist = new List<ZigBee.Device.DoorLock.LocaDoorLockObj>();
+            locaDoorLockObjlist.Clear();
+            foreach (var dictionary in DoorLock.localDoorLockUserList)
+            {
+                if (string.IsNullOrEmpty(dictionary.Value.ConnectedAccount))
+                {
+                    //涓嶇煡閬撲紶杩囨潵ConnectedAccount涓轰粈涔堜负绌猴紝闃叉鎶涘紓甯革紱
+                    continue;
+                }
+                if (dictionary.Value.ConnectedAccount ==SubAccountDistributedMark)
+                {
+                    locaDoorLockObjlist.Add(dictionary.Value);
+                }
+            }
+            return locaDoorLockObjlist;
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
new file mode 100755
index 0000000..37ff757
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -0,0 +1,1144 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class LockLogicCommunalPage : FrameLayout
+    {
+
+        public LockLogicCommunalPage()
+        {
+            UserView.HomePage.Instance.RemoveViewByTag("LockLogic");
+            Tag = "LockLogic";
+        }
+        EditText logicTextBox;
+        public void Show(Action action)
+        {
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.selection,
+            };
+            topRowLayout.AddChidren(titleName);
+            if (Common.Logic.CurrentLogic.LogicId != 0)
+            {
+                titleName.Text = Language.StringByID(MyInternationalizationString.editlinkageevent);
+            }
+            else
+            {
+                titleName.Text = Language.StringByID(MyInternationalizationString.addlinkageevent);
+            }
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                action();
+                RemoveFromParent();
+            };
+
+            #endregion
+
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184 - 180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+
+            #region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
+            var logicnamefl = new FrameLayout
+            {
+                Height = Application.GetRealHeight(130),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            middle.AddChidren(logicnamefl);
+
+            var text = new Button
+            {
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                X = Application.GetRealWidth(58),
+                TextAlignment = TextAlignment.CenterLeft,
+                //Text = "鑷姩鍖栧悕绉�",
+                TextID = MyInternationalizationString.automationname,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Y = Application.GetRealHeight(35),
+            };
+            logicnamefl.AddChidren(text);
+
+            logicTextBox = new EditText
+            {
+                Y = Application.GetRealHeight(35),
+                Width = Application.GetRealWidth(1080 - 58 - 300),
+                Height = Application.GetRealHeight(60),
+                X = text.Right,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                TextSize = 13,
+                Text = Common.Logic.CurrentLogic.LogicName,
+                //TextID=MyInternationalizationString.automation1,
+            };
+            logicnamefl.AddChidren(logicTextBox);
+
+            var fraline = new FrameLayout
+            {
+                Height = Application.GetRealHeight(30),
+            };
+            middle.AddChidren(fraline);
+            #endregion
+
+            #region -----鏄剧ず閫昏緫鏉′欢-----
+
+
+            var conditionFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(conditionFrameLayout);
+
+
+            var conditionRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            conditionFrameLayout.AddChidren(conditionRowLayout);
+
+
+            conditionRowLayout.AddChidren(new Button
+            {
+
+                Text = Language.StringByID(MyInternationalizationString.ifcondition),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                TextSize = 16,
+                Gravity = Gravity.CenterVertical,
+            });
+
+            var conditionadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965 + 58),
+
+            };
+            conditionFrameLayout.AddChidren(conditionadd1);
+
+            var conditionadd = new Button
+            {
+
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/add.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+
+            };
+            conditionRowLayout.AddChidren(conditionadd);
+            ///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> conditionaddclick = (sender, e) =>
+            {
+                var addCondition = new AddCondition();
+                addCondition.conditionsIndex = -1;
+                UserView.HomePage.Instance.AddChidren(addCondition);
+                UserView.HomePage.Instance.PageIndex += 1;
+                addCondition.Show();
+            };
+            conditionadd.MouseUpEventHandler += conditionaddclick;
+            conditionadd1.MouseUpEventHandler += conditionaddclick;
+            List<Dictionary<string, string>> ListConditions = new List<Dictionary<string, string>>();
+            ListConditions.Clear();
+            ListConditions.AddRange(Common.Logic.CurrentLogic.Conditions);
+            ListConditions.Add(new Dictionary<string, string>());
+            for (int i = 0; i < ListConditions.Count; i++)
+            {
+                if (i == (ListConditions.Count - 1))
+                {
+
+                    var addfl = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(addfl);
+                    var addbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+                    };
+                    addfl.AddChidren(addbtn);
+
+
+                    var addtextbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.selectunlockingmode,
+                        X = Application.GetRealWidth(390),
+                    };
+                    addfl.AddChidren(addtextbtn);
+
+                    EventHandler<MouseEventArgs> addconditionsclick = (sender, e) =>
+                    {
+                        var addCondition = new AddCondition();
+                        ///璁板綍绱㈠紩
+                        addCondition.conditionsIndex = -1;
+                        UserView.HomePage.Instance.AddChidren(addCondition);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        addCondition.Show();
+                    };
+                    addbtn.MouseUpEventHandler += addconditionsclick;
+                    addtextbtn.MouseUpEventHandler += addconditionsclick;
+                }
+                else
+                {
+                    var devicesFrameLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var conditionIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        //UnSelectedImagePath = "ZigeeLogic/time.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(conditionIcon);
+
+
+                    var conditionsRowLayout = new RowLayout
+                    {
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    devicesFrameLayout.AddChidren(conditionsRowLayout);
+
+                    var Type = int.Parse(ListConditions[i]["Type"]);
+                    var conditions = ListConditions[i];
+                    switch (Type)
+                    {
+                        case 1:
+                            {
+                                var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == conditions["MacAddr"] && obj.DeviceEpoint.ToString() == conditions["Epoint"]; });
+                                if (deviceinof == null)
+                                {
+                                    continue;
+                                }
+                                ///鏄剧ず璁惧鍚嶇О
+                                var btndevice = new Button
+                                {
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Text = deviceinof.DeviceEpointName,
+                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                };
+                                conditionsRowLayout.AddChidren(btndevice);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevice.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                conditionsRowLayout.AddChidren(btnregionname);
+                                ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Device.Logic.Send.RoomNmae(btnregionname, deviceinof);
+
+
+                                var deviceedit = new Button
+                                {
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                                    Text = Language.StringByID(MyInternationalizationString.edit),
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                                    Tag=i,
+                                };
+                                conditionsRowLayout.AddRightView(deviceedit);
+                                deviceedit.MouseUpEventHandler += (sender, e) =>
+                                {
+                                    var addCondition = new AddCondition();
+                                    ///璁板綍绱㈠紩
+                                    addCondition.conditionsIndex = int.Parse(deviceedit.Tag.ToString());
+                                    UserView.HomePage.Instance.AddChidren(addCondition);
+                                    UserView.HomePage.Instance.PageIndex += 1;
+                                    addCondition.Show();
+                                };
+
+                                ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
+                                var devicestatus = new Button
+                                {
+                                    Width = Application.GetRealWidth(400),
+                                    Height = Application.GetRealHeight(130),
+                                    Gravity = Gravity.CenterVertical,
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    X = Application.GetRealWidth(400),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                conditionsRowLayout.AddChidren(devicestatus);
+
+                                switch (deviceinof.Type)
+                                {
+                                    case DeviceType.DoorLock:
+                                        {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
+                                            //for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
+                                            //{
+                                            //    if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
+                                            //    {
+                                            //        if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
+                                            //        {
+                                            //            devicestatus.Text = conditions["Account"];
+                                            //            break;
+                                            //        }
+                                            //    }
+                                            //}
+
+                                            //(0鎸夐敭/3鍗�/15鎸囩汗)
+                                            switch (conditions["AttriButeId"])
+                                            {
+                                                case "0":
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.lockpassword);
+                                                    }
+                                                    break;
+                                                case "3":
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.ic);
+                                                    }
+                                                    break;
+                                                case "15":
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.fingerprint);
+                                                    }
+                                                    break;
+
+                                            }
+
+                                        }
+                                        break;
+                                }
+
+                            }
+                            break;
+                    }
+                    ///鍒犻櫎鎺т欢
+                    var del = new Button
+                    {
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+                        Text = Language.StringByID(MyInternationalizationString.del),
+                    };
+                    conditionsRowLayout.AddRightView(del);
+
+                    del.MouseUpEventHandler += (sender, e) =>
+                    {
+
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                              Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                        alert.ResultEventHandler += (sender1, e1) =>
+                        {
+                            if (e1)
+                            {
+                                var lockLogicCommunalPage = new LockLogicCommunalPage();
+                                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                lockLogicCommunalPage.Show(() => { });
+                            }
+                        };
+                        alert.Show();
+
+                    };
+
+                }
+            }
+
+
+            #endregion
+
+            #region  ----鏄剧ず鎵ц鐩爣----
+
+            var targetFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(targetFrameLayout);
+
+
+            var targetRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            targetFrameLayout.AddChidren(targetRowLayout);
+
+
+            var btntargettitle = new Button
+            {
+
+                Text = Language.StringByID(MyInternationalizationString.execute),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                TextSize = 16,
+                Gravity = Gravity.CenterVertical,
+            };
+            targetRowLayout.AddChidren(btntargettitle);
+
+            var btntargetadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965 + 58),
+            };
+            targetFrameLayout.AddChidren(btntargetadd1);
+
+            var btntargetadd = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/add.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+            };
+            targetRowLayout.AddChidren(btntargetadd);
+            EventHandler<MouseEventArgs> btntargetaddclick = (sender, e) =>
+            {
+                Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+                var addAction = new AddAction();
+                UserView.HomePage.Instance.AddChidren(addAction);
+                UserView.HomePage.Instance.PageIndex += 1;
+                addAction.Show();
+            };
+            btntargetadd1.MouseUpEventHandler += btntargetaddclick;
+            btntargetadd.MouseUpEventHandler += btntargetaddclick;
+
+            List<Dictionary<string, object>> ListActions = new List<Dictionary<string, object>>();
+            ListActions.Clear();
+            ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
+            ListActions.Add(new Dictionary<string, object>());
+
+            for (int i = 0; i < ListActions.Count; i++)
+            {
+                if (i == (ListActions.Count - 1))
+                {
+
+                    var addfl = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(addfl);
+                    var addbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+                    };
+                    addfl.AddChidren(addbtn);
+
+
+                    var addtextbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.lockaddaction,
+                        X = Application.GetRealWidth(390),
+                    };
+                    addfl.AddChidren(addtextbtn);
+                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
+                    {
+                        Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+                        var addAction = new AddAction();
+                        UserView.HomePage.Instance.AddChidren(addAction);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        addAction.Show();
+                    };
+                    addbtn.MouseUpEventHandler += addfunctionclick;
+                    addtextbtn.MouseUpEventHandler += addfunctionclick;
+                }
+                else
+                {
+
+                    var devicesFrameLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var actionsIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        // UnSelectedImagePath = "ZigeeLogic/time.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(actionsIcon);
+
+
+                    var actionsrowLayout = new RowLayout
+                    {
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    devicesFrameLayout.AddChidren(actionsrowLayout);
+
+
+                    var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
+                    var actions = ListActions[i];
+
+                    switch (linkType)
+                    {
+                        case 0:
+                            {
+                                var obj1 = actions["DeviceAddr"].ToString();
+                                var obj2 = actions["Epoint"].ToString();
+                                var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return ((obj.DeviceAddr == obj1) && (obj.DeviceEpoint.ToString() == obj2)); });
+                                if (deviceinof == null)
+                                {
+                                    continue;
+                                }
+
+                                ///璁惧鍚嶇ОButton
+                                var btndevicename = new Button
+                                {
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(450),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Text = deviceinof.DeviceEpointName,
+                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                };
+                                actionsrowLayout.AddChidren(btndevicename);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevicename.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(450),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(btnregionname);
+                                ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Device.Logic.Send.RoomNmae(btnregionname, deviceinof);
+                                ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
+                                var devicestatus = new Button
+                                {
+                                    Width = Application.GetRealWidth(350),
+                                    Height = Application.GetRealHeight(130),
+                                    Gravity = Gravity.CenterVertical,
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    X = Application.GetRealWidth(450),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(devicestatus);
+
+                                ///缂栬緫璁惧鐘舵�丅utton
+                                var deviceedit = new Button
+                                {
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                                    Text = Language.StringByID(MyInternationalizationString.edit),
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                                };
+                                actionsrowLayout.AddRightView(deviceedit);
+
+                                ///缂栬緫鐐瑰嚮浜嬩欢
+                                deviceedit.MouseUpEventHandler += (sender, e) =>
+                                {
+                                   
+                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                    this.AddChidren(flMain);
+                                    LockAddDevice.CurrentDeviceStateView(flMain, deviceinof, true);
+                                };
+
+
+                                switch (deviceinof.Type)
+                                {
+                                    case DeviceType.OnOffOutput:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.DimmableLight:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "3")
+                                                {
+                                                    var intvalue = int.Parse(status["Data1"]);
+                                                    var lightbrightnessvalue = (intvalue * 100) / 254;
+                                                    devicestatus.Text = lightbrightnessvalue.ToString() + "%";
+                                                }
+                                                else if (status["TaskType"].ToString() == "1")
+                                                {
+
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.WindowCoveringDevice:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/curtain.png";
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"] == "6")
+                                                {
+                                                    if (status["Data1"] == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+                                                    }
+                                                    else if (status["Data1"] == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+                                                    }
+                                                    else if (status["Data1"] == "5")
+                                                    {
+                                                        devicestatus.Text = status["Data2"] + "%";
+                                                    }
+                                                }
+
+                                            }
+                                        }
+                                        break;
+                                    case DeviceType.AirSwitch:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.Thermostat:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/ac.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            string modetext = "", temperaturetext = "", speedtext = "";
+                                            bool ifclose = false;
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                        ifclose = false;
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+                                                        ifclose = true;
+                                                    }
+
+                                                }
+                                                else if (status["TaskType"].ToString() == "5")
+                                                {
+                                                    if (status["Data1"] == "3")
+                                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "3":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                                }
+                                                                break;
+                                                            case "4":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                                }
+                                                                break;
+                                                            case "1":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                                }
+                                                                break;
+                                                            case "8":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                                }
+                                                                break;
+                                                            case "7":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                                }
+                                                                break;
+                                                        }
+                                                    }
+                                                    else if (status["Data1"] == "6")
+                                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "1":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                                }
+                                                                break;
+
+                                                            case "2":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                                }
+                                                                break;
+                                                            case "3":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                                }
+                                                                break;
+
+                                                        }
+                                                    }
+                                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                                    else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
+                                                    {
+                                                        var s = int.Parse(status["Data2"]) / 100;
+                                                        temperaturetext = s.ToString();
+                                                    }
+                                                    else if (status["Data1"] == "20")
+                                                    {
+                                                        temperaturetext = "鏃�";
+                                                    }
+
+
+                                                }
+
+                                            }
+                                            if (ifclose)
+                                            {
+                                                devicestatus.Text = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
+                                            }
+                                            else
+                                            {
+                                                devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                            }
+                                        }
+                                        break;
+
+                                }
+
+
+                            }
+                            break;
+                        case 2:
+                            {
+
+                                var sceneinof = Common.Room.AllRoomSceneUIList.Find((obj) => { return obj.Id.ToString() == actions["DeviceAddr"].ToString(); });
+                                if (sceneinof == null)
+                                {
+                                    continue;
+                                }
+
+                                actionsIcon.UnSelectedImagePath = "ZigeeLogic/scene.png";
+                                ///璁惧鍚嶇ОButton
+                                var btndevicename = new Button
+                                {
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(500),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Text = sceneinof.Name,
+                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                };
+                                actionsrowLayout.AddChidren(btndevicename);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevicename.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(500),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(btnregionname);
+                                /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Common.Room room = new Common.Room();
+                                btnregionname.Text = room.GetRoomNameBySceneId(sceneinof.Id);
+                                //Send.RoomNmae(btnregionname, deviceinof);
+
+
+
+                            }
+                            break;
+
+                    }
+                    ///鍒犻櫎鎺т欢
+                    var del = new Button
+                    {
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+                        Text = Language.StringByID(MyInternationalizationString.del),
+                    };
+                    actionsrowLayout.AddRightView(del);
+
+                    del.MouseUpEventHandler += (sender, e) =>
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                               Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                        alert.ResultEventHandler += (sender1, e1) =>
+                        {
+                            if (e1)
+                            {
+                                Common.Logic.CurrentLogic.Actions.Remove(actions);
+                                                          }
+                        };
+                        alert.Show();
+
+                    };
+
+                }
+            }
+
+            #endregion
+
+            #region  ----鎺ㄩ�佽缃�----
+
+            var fraline1 = new FrameLayout
+            {
+                Height = Application.GetRealHeight(30),
+            };
+            middle.AddChidren(fraline1);
+
+            var pushFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(pushFrameLayout);
+
+            var pushswitchRowlayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            pushFrameLayout.AddChidren(pushswitchRowlayout);
+
+            var btnswitchtxet = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+                TextID = MyInternationalizationString.pushswitch,
+            };
+            pushswitchRowlayout.AddChidren(btnswitchtxet);
+
+            var btnswitch = new Button
+            {
+                Width = Application.GetMinRealAverage(104),
+                Height = Application.GetMinRealAverage(63),
+                UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+                SelectedImagePath = "ZigeeLogic/logicopen.png",
+                X = Application.GetRealWidth(965 - 104),
+                Gravity = Gravity.CenterVertical,
+            };
+            pushswitchRowlayout.AddChidren(btnswitch);
+            btnswitch.MouseUpEventHandler += (sender1, e1) =>
+            {
+                btnswitch.IsSelected = !btnswitch.IsSelected;
+                if (btnswitch.IsSelected)
+                {
+
+                }
+                else
+                {
+
+                }
+            };
+
+
+            var custompushFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(custompushFrameLayout);
+
+            var custompushRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            custompushFrameLayout.AddChidren(custompushRowLayout);
+
+            var btncustompush = new Button
+            {
+                TextID = MyInternationalizationString.custompush,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+            };
+            custompushRowLayout.AddChidren(btncustompush);
+
+
+            var custompushback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+            };
+            custompushRowLayout.AddChidren(custompushback);
+            EventHandler<MouseEventArgs> customclick = (sender, e) =>
+            {
+                var CustomText = new CustomText();
+                UserView.HomePage.Instance.AddChidren(CustomText);
+                UserView.HomePage.Instance.PageIndex += 1;
+                CustomText.Show();
+
+            };
+            btncustompush.MouseUpEventHandler += customclick;
+            custompushback.MouseUpEventHandler += customclick;
+            custompushRowLayout.MouseUpEventHandler += customclick;
+
+            #endregion
+
+
+            var saveFrameLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFrameLayout);
+
+            var btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveFrameLayout.AddChidren(btnsave);
+            btnsave.MouseUpEventHandler += async (sender, e) =>
+            {
+                var name = logicTextBox.Text.Trim();
+                if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
+                {
+                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
+                    return;
+                }
+                var logicname = Common.Logic.LockLogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
+                if (logicname != null)
+                {
+                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
+                    return;
+                }
+
+                Common.Logic.CurrentLogic.LogicName = name;
+
+                //鍒ゆ柇鏄柊娣诲姞閫昏緫(榛樿0)杩樻槸淇敼閫昏緫
+                CommonPage.Loading.Start();
+                if (Common.Logic.CurrentLogic.LogicId == 0)
+                {
+                    //鍙戦�佹坊鍔犻�昏緫鍛戒护
+                    var logicifon = await Send.AddModifyLogic(Common.Logic.CurrentLogic);
+                    if (logicifon != null && logicifon.LogicId != 0)
+                    {
+                        Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
+                        Common.Logic.LockLogicList.Add(Common.Logic.CurrentLogic);
+                    }
+                }
+                else
+                {
+                    //鍙戦�佷慨鏀归�昏緫鍛戒护
+                    Send.AddModifyLogic(Common.Logic.CurrentLogic);
+                }
+
+                CommonPage.Loading.Hide();
+                UserView.HomePage.Instance.RemoveViewByTag("LockLogic");
+                UserView.HomePage.Instance.RemoveViewByTag("LockLogicList");
+                var doorLockLogicList = new LockLogicList();
+                UserView.HomePage.Instance.AddChidren(doorLockLogicList);
+                UserView.HomePage.Instance.PageIndex += 1;
+                doorLockLogicList.Show();
+            };
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
new file mode 100755
index 0000000..8870208
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -0,0 +1,244 @@
+锘縰sing System;
+using Shared;
+using Shared.Common;
+using Shared.R;
+
+namespace Shared.Phone.Device.Logic.DoorLockLogic
+{
+    public class LockLogicList : FrameLayout
+    {
+
+        public LockLogicList()
+        {
+            Tag = "LockLogicList";
+        }
+        VerticalScrolViewLayout middle;
+        public async void Show()
+        {
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.linkageevent,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var addiocn = new Button
+            {
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                X = Application.GetRealWidth(1080 - 108 - 58),
+                UnSelectedImagePath = "ZigeeLogic/lockadd.png",
+                Y = Application.GetRealHeight(184 - 72 - 20),
+            };
+            topRowLayout.AddChidren(addiocn);
+            addiocn.MouseUpEventHandler += (sender, e) =>
+            {
+                //new涓�涓柊閫昏緫瀵硅薄锛�
+                Common.Logic.CurrentLogic = new Common.Logic();
+                Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+                Common.Logic.CurrentLogic.LogicType = 1;
+                Common.Logic.CurrentLogic.Relationship = 1;
+                //Config.Instance.Guid鐢ㄦ潵璇嗗埆璐﹀彿韬唤锛�
+                var accounts = new System.Collections.Generic.Dictionary<string, string>();
+                accounts.Add("Account", Config.Instance.Guid);
+                Common.Logic.CurrentLogic.Accounts.Add(accounts);
+                Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
+                var lockLogicCommunalPage = new LockLogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                lockLogicCommunalPage.Show(() => { });
+            };
+            #endregion
+
+            middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            CommonPage.Loading.Start();
+            if (Common.Logic.LockLogicList.Count == 0)
+            {
+                var Idlist = await Send.GetLogicId(1);
+                if (Idlist.Count != 0)
+                {
+                    var listlogic = await Send.ReadList(Idlist.Count, 1);
+                    //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
+                    for (int j = 0; j < listlogic.Count; j++)
+                    {
+                        var logic = listlogic[j];
+                        if (logic.LogicType == 0)
+                        {
+                            continue;
+                        }
+                        bool yes = false;
+                        for (int a = 0; a < logic.Accounts.Count; a++)
+                        {
+                            if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
+                            {
+                                //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
+                                yes = true;
+                                break;
+                            }
+                        }
+                        if (yes)
+                        {
+                            Common.Logic.LockLogicList.Add(listlogic[j]);
+                        }
+                    }
+                }
+            }
+            //鑷姩鍖�
+            Automationview();
+            CommonPage.Loading.Hide();
+        }
+
+        void Automationview()
+        {
+            middle.RemoveAll();
+            for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
+            {
+                var logic = Common.Logic.LockLogicList[i];
+                var logicRowlayout = new RowLayout
+                {
+                    Width = Application.GetRealWidth(1080),
+                    Height = Application.GetRealHeight(190),
+                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+
+                };
+                middle.AddChidren(logicRowlayout);
+
+                var logicnameBtn = new Button
+                {
+                    Height = Application.GetRealHeight(190),
+                    Width = Application.GetRealWidth(600),
+                    Text = logic.LogicName,
+                    X = Application.GetRealWidth(58),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Gravity = Gravity.CenterVertical,
+                };
+                logicRowlayout.AddChidren(logicnameBtn);
+
+
+                var logicswitchBtn = new Button
+                {
+                    Width = Application.GetMinRealAverage(104),
+                    Height = Application.GetMinRealAverage(63),
+                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+                    SelectedImagePath = "ZigeeLogic/logicopen.png",
+                    X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
+                    Gravity = Gravity.CenterVertical,
+                };
+                logicRowlayout.AddChidren(logicswitchBtn);
+
+                logicswitchBtn.MouseUpEventHandler += (sender, e) =>
+                {
+                    logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
+                    if (logicswitchBtn.IsSelected)
+                    {
+                        //閫昏緫寮�
+                        logic.IsEnable = 1;
+                    }
+                    else
+                    {
+                        //閫昏緫鍏�
+                        logic.IsEnable = 0;
+                    }
+                    Send.LogicControlSwitch(logic);
+
+                };
+                ///缂栬緫
+                var edit = new Button
+                {
+                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                    Text = Language.StringByID(MyInternationalizationString.edit),
+                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                };
+                logicRowlayout.AddRightView(edit);
+                edit.MouseUpEventHandler += (sender, e) =>
+                {
+                    Common.Logic.CurrentLogic = logic;
+                    var lockLogicCommunalPage = new LockLogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    lockLogicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(); });
+
+                };
+
+
+                ///鍒犻櫎
+                var del = new Button
+                {
+                    BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+                    Text = Language.StringByID(MyInternationalizationString.del),
+                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                };
+                logicRowlayout.AddRightView(del);
+                del.MouseUpEventHandler += (sender, e) =>
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                             Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                    alert.ResultEventHandler += (sender1, e1) =>
+                    {
+                        if (e1)
+                        {
+                            Common.Logic.LogicList.Remove(logic);
+                            Automationview();
+                            Send.DelLogic(logic.LogicId);
+                        }
+                    };
+                    alert.Show();
+
+                };
+            }
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index b5394a8..27e264e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -1,4 +1,7 @@
-锘縰sing System;
+锘�
+ 
+
+using System;
 using System.Collections.Generic;
 using Shared;
 using Shared.Phone;
@@ -6,266 +9,104 @@
 using Shared.Common;
 namespace Shared.Phone.Device.Logic
 {
+
     public class EverymonthPage : FrameLayout
     {
-
-      
-        public void Show()
+        public EverymonthPage()
         {
-
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            var topFrameLayout = new FrameLayout
+            Tag = "Logic";
+        }
+        public void Show(string titlename)
+        {
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.cycle,
-                TextSize = 17,
-                TextColor=ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                Text = titlename,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var hdl = new Button
+            var clickBtn = new Button
             {
-                Width = Application.GetRealWidth(154),
-                Height = Application.GetRealHeight(90),
-                X = Application.GetRealWidth(1080-170),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "Logo/Logo.png",
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            //topFrameLayout.AddChidren(hdl);
-
-            var back = new Button
-            {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
-            };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
             };
 
-            var titlerl = new RowLayout
+            var back = new Button
             {
-                Height = Application.GetRealHeight(180),
-                //BackgroundColor = 0xff0f0f0f,
-                Y = Application.GetRealHeight(220),
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            AddChidren(titlerl);
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                RemoveFromParent();
+            };
+            #endregion
 
-            titlerl.AddChidren(
-              new Button
-              {
-                  X = Application.GetRealWidth(40),
-                  //Text = "璇烽�夋嫨閲嶅鎵ц鍛ㄦ湡",
-                  TextID = MyInternationalizationString.repeat,
-                  TextSize = 17,
-                  TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-              }
-            );
-
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = titlerl.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220 - 180);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
 
-            var startdaterow = new RowLayout
+            var frameLayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(80),
+                X = Application.GetRealWidth(50),
+                Width = Application.GetRealWidth(1080 - 100),
+                Height = Application.GetRealHeight(180 * 5 + 50),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
             };
-            middle.AddChidren(startdaterow);
-
-            var btnstartdatetext = new Button
+            middle.AddChidren(frameLayout);
+            
+       
+            var saveBtn = new Button
             {
-                TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(300),
-                X = Application.GetRealWidth(30),
-                TextID = MyInternationalizationString.startdate,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Y = middle.Height - Application.GetRealHeight(260),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
             };
-            startdaterow.AddChidren(btnstartdatetext);
+            middle.AddChidren(saveBtn);
 
-            var btnstartdate = new Button
+            var monselectedlist = new List<string>();
+            monselectedlist.Clear();
+            if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 3)
             {
-                X = Application.GetRealWidth(330),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(600),
-                TextAlignment = TextAlignment.CenterLeft,
-                Tag = "0",
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            startdaterow.AddChidren(btnstartdate);
-
-            var btnstartback = new Button
-            {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity = Gravity.CenterVertical,
-            };
-            startdaterow.AddChidren(btnstartback);
-
-            var enddaterow = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-            };
-            middle.AddChidren(enddaterow);
-            var btnenddatetext = new Button
-            {
-                TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(300),
-                X = Application.GetRealWidth(30),
-                TextID = MyInternationalizationString.enddate,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            enddaterow.AddChidren(btnenddatetext);
-
-            var btnenddate = new Button
-            {
-                X = Application.GetRealWidth(330),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(600),
-                TextAlignment = TextAlignment.CenterLeft,
-                Tag = "0",
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            enddaterow.AddChidren(btnenddate);
-
-            var btnendtimeback = new Button
-            {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
-                Gravity=Gravity.CenterVertical,
-            };
-            enddaterow.AddChidren(btnendtimeback);
-
-
-            EventHandler<MouseEventArgs> startdateclick = (sender33, e33) =>
-            {
-                var list = new List<string> { };
-                for (int day = 1; day <= 31; day++)
-                {
-                    list.Add(day.ToString() + " " + Language.StringByID(MyInternationalizationString.day));
-                }
-                //PickerView.Show(list, (obj) =>
-                //{
-                //    var day = obj.Split(' ')[0];
-                //    if (btnenddate.Tag.ToString() != "0" && int.Parse(btnenddate.Tag.ToString()) < int.Parse(day))
-                //    {
-                //        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                //                               Language.StringByID(MyInternationalizationString.monthday),
-                //                               Language.StringByID(MyInternationalizationString.OK));
-                //        alert.Show();
-                //    }
-                //    else
-                //    {
-                //        btnstartdate.Text = Language.StringByID(MyInternationalizationString.monthly) + day + Language.StringByID(MyInternationalizationString.day);
-                //        btnstartdate.Tag = day;
-                //        if (string.IsNullOrEmpty(btnenddate.Text))
-                //        {
-                //            btnenddate.Text = Language.StringByID(MyInternationalizationString.monthly) + day + Language.StringByID(MyInternationalizationString.day);
-                //            btnenddate.Tag = day;
-                //        }
-                //        Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
-                //        int a = int.Parse(btnstartdate.Tag.ToString());
-                //        int b = int.Parse(btnenddate.Tag.ToString());
-                //        string s = "";
-                //        for (int i = 32; i > 0; i--)
-                //        {
-                //            if (i >=a  && i <= b)
-                //            {
-                //                s += "1";
-                //            }
-                //            else
-                //            {
-                //                s += "0";
-                //            }
-                //        }
-                //        var intvalue = Convert.ToInt32(s, 2);
-                //        Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;
-                //    }
-                //}, Language.StringByID(MyInternationalizationString.complete), "112");
-            };
-            startdaterow.MouseUpEventHandler += startdateclick;
-            btnstartdate.MouseUpEventHandler += startdateclick;
-            btnstartdatetext.MouseUpEventHandler += startdateclick;
-            btnstartback.MouseUpEventHandler += startdateclick;
-
-
-            EventHandler<MouseEventArgs> enddateclick = (sender33, e33) =>
-            {
-                var list = new List<string> { };
-                for (int day = 1; day <= 31; day++)
-                {
-                    list.Add(day.ToString() + " " + Language.StringByID(MyInternationalizationString.day));
-                }
-                //PickerView.Show(list, (obj) =>
-                //{
-                //    var day = obj.Split(' ')[0];
-                //    if (btnstartdate.Tag.ToString() != "0" && int.Parse(btnstartdate.Tag.ToString()) > int.Parse(day))
-                //    {
-                //        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                //                               Language.StringByID(MyInternationalizationString.monthday),
-                //                               Language.StringByID(MyInternationalizationString.OK));
-                //        alert.Show();
-                //    }
-                //    else
-                //    {
-                //        btnenddate.Text = Language.StringByID(MyInternationalizationString.monthly) + day + Language.StringByID(MyInternationalizationString.day);
-                //        btnenddate.Tag = day;
-                //        if (string.IsNullOrEmpty(btnstartdate.Text))
-                //        {
-                //            btnstartdate.Text = Language.StringByID(MyInternationalizationString.monthly) + day + Language.StringByID(MyInternationalizationString.day);
-                //            btnstartdate.Tag = day;
-                //        }
-
-                //        Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
-                //        int a = int.Parse(btnstartdate.Tag.ToString());
-                //        int b = int.Parse(btnenddate.Tag.ToString());
-                //        string s = "";
-                //        for (int i = 32; i > 0; i--)
-                //        {
-                //            if (i >= a && i <= b)
-                //            {
-                //                s += "1";
-                //            }
-                //            else
-                //            {
-                //                s += "0";
-                //            }
-                //        }
-                //        var intvalue = Convert.ToInt32(s, 2);
-                //        Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;
-
-                //    }
-                //}, Language.StringByID(MyInternationalizationString.complete), "112");
-            };
-            enddaterow.MouseUpEventHandler += enddateclick;
-            btnenddate.MouseUpEventHandler += enddateclick;
-            btnenddatetext.MouseUpEventHandler += enddateclick;
-            btnendtimeback.MouseUpEventHandler += enddateclick;
-
-            if(Common.Logic.CurrentLogic.TimeAttribute.Repeat==3){
                 if (Common.Logic.CurrentLogic.TimeAttribute.MonthDate != 0)
                 {
                     string len = "";
-                    int minvalue = 0;
                     var maxvalue = Convert.ToString(Common.Logic.CurrentLogic.TimeAttribute.MonthDate, 2);
                     var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
                     for (int j = 31; j >= 0; j--)
@@ -278,20 +119,121 @@
                         var strvalue = len.Substring(j, 1);
                         if (strvalue == "1")
                         {
-                            minvalue = j + 1;
-                            break;
+                            monselectedlist.Add((j + 1).ToString());
                         }
                     }
 
-                    btnstartdate.Text = Language.StringByID(MyInternationalizationString.monthly) + minvalue.ToString() + Language.StringByID(MyInternationalizationString.day);
-                    btnstartdate.Tag = minvalue.ToString();
-                    btnenddate.Text = Language.StringByID(MyInternationalizationString.monthly) + maxvalue.Length.ToString() + Language.StringByID(MyInternationalizationString.day);
-                    btnenddate.Tag = maxvalue.Length.ToString();
-
-
                 }
             }
+
+
+            int k = 1;
+            for (int i = 0; i < 5; i++)
+            {
+                var timeRow = new RowLayout
+                {
+                    Height = Application.GetRealHeight(180),
+                    Y = Application.GetRealHeight(180 * i),
+                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                };
+                frameLayout.AddChidren(timeRow);
+                for (int j = 1; j < 8; j++)
+                {
+                    if (k > 31)
+                    {
+                        continue;
+                    }
+
+                    var monBtn = new Button
+                    {
+
+                        Text = k.ToString().Length == 1 ? "0" + k.ToString() : k.ToString(),
+                        Y = Application.GetRealHeight(40),
+                        Height = Application.GetRealHeight(100),
+                        Width = Application.GetRealWidth(100),
+                        X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
+                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        Radius = (uint)Application.GetRealHeight(50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
+                        Tag = k,
+                    };
+                    timeRow.AddChidren(monBtn);
+
+
+
+                    if (monselectedlist.Contains(k.ToString()))
+                    {
+                        monBtn.IsSelected = true;
+                    }
+                    k++;
+
+                    monBtn.MouseDownEventHandler += (sender, e) =>
+                    {
+                        monBtn.IsSelected = !monBtn.IsSelected;
+                        var selectedmon = monselectedlist.Find((c) => { return c == monBtn.Tag.ToString(); });
+                        if (monBtn.IsSelected)
+                        {
+                            if (selectedmon == null)
+                            {
+                                monselectedlist.Add(monBtn.Tag.ToString());
+
+                            }
+
+                        }
+                        else
+                        {
+                            if (selectedmon != null)
+                            {
+                                monselectedlist.Remove(monBtn.Tag.ToString());
+                            }
+                        }
+                    };
+                }
+            }
+
+
+
+            saveBtn.MouseUpEventHandler += (sedder, e) =>
+            {
+
+                if (monselectedlist.Count == 0)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                                     Language.StringByID(MyInternationalizationString.selectweek),
+                                                 Language.StringByID(MyInternationalizationString.complete));
+
+                    alert.Show();
+                    return;
+                }
+                string s = "";
+                for (int i = 32; i > 0; i--)
+                {
+                    var selectedmon = monselectedlist.Find((a) => { return a == i.ToString(); });
+                    if (selectedmon != null)
+                    {
+                        s += "1";
+                    }
+                    else
+                    {
+                        s += "0";
+                    }
+
+                }
+                var intvalue = Convert.ToInt32(s, 2);
+                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
+                Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;
+
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+
+            };
+
+
+
         }
     }
-           
-}
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
new file mode 100755
index 0000000..fa588ac
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -0,0 +1,252 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared;
+using Shared.Common;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+    public class IgnoreTime : FrameLayout
+    {
+
+        public IgnoreTime()
+        {
+            Tag = "Logic";
+
+        }
+        Button selectedIcon = new Button();
+        public void Show(CommonDevice common, string name, bool edit, int timevalue)
+        {
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(600),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                Text = name,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            #endregion
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184 - 260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+            int selectetimedvalue = 0;
+            var timestrlist = new List<string> { "2", "5", "10", "20", "30", Language.StringByID(MyInternationalizationString.logiccustom) };
+            foreach (var intvalue in timestrlist)
+            {
+
+                var timeframelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                };
+                middle.AddChidren(timeframelayout);
+
+                var timeniconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(81),
+                    Height = Application.GetRealHeight(81),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(55),
+                    UnSelectedImagePath = "ZigeeLogic/point.png",
+
+                };
+                timeframelayout.AddChidren(timeniconBtn);
+
+                var timeRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                };
+                timeframelayout.AddChidren(timeRow);
+
+                var timeBtn = new Button
+                {
+                    Text = intvalue.ToString() + Language.StringByID(MyInternationalizationString.Minute),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Tag = intvalue,
+                };
+                timeRow.AddChidren(timeBtn);
+
+
+                var selected = new SelectedButton(789);
+                timeRow.AddChidren(selected);
+                //鍒ゆ柇涓�涓瓧绗︽槸瀛楃涓茶繕鏄暟瀛�
+                if (intvalue.Length < 3)
+                {
+                    if (timevalue== int.Parse(intvalue) * 60)
+                    {
+                        selectedIcon.Visible = false;
+                        selectedIcon = selected;
+                        selected.Visible = true;
+                    }
+                }
+                else
+                {
+                    timeRow.LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+                }
+                EventHandler<MouseEventArgs> timeclick = (sender, e) =>
+                {
+                    selectedIcon.Visible = false;
+                    selectedIcon = selected;
+                    selected.Visible = true;
+                    if (Language.StringByID(MyInternationalizationString.logiccustom) == timeBtn.Tag.ToString())
+                    {
+                        var secondList = new List<string>();
+                        var minuteList = new List<string>();
+                        for (int i = 0; i < 61; i++)
+                        {
+                            if (i < 10)
+                            {
+                                var a = "0" + i.ToString();
+                                secondList.Add(a + " " + Language.StringByID(MyInternationalizationString.second));
+                                minuteList.Add(a + " " + Language.StringByID(MyInternationalizationString.minute));
+                            }
+                            else
+                            {
+                                secondList.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.second));
+                                minuteList.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.minute));
+                            }
+
+                        }
+                        int selectIndex1 = timevalue / 60;
+                        int selectIndex2 = timevalue % 60;
+                        PickerView.ShowNormal(minuteList, secondList, new List<string>(), (Index1, Index2, Index3) =>
+                          {
+                              selectetimedvalue = int.Parse(minuteList[Index1].Split(' ')[0]) * 60 + int.Parse(secondList[Index2].Split(' ')[0]);
+                              timemethod(common, selectetimedvalue, timevalue, edit);
+                          }, selectIndex1, selectIndex2, 0, Language.StringByID(MyInternationalizationString.logiccustom));
+                    }
+                    else
+                    {
+                        selectetimedvalue = int.Parse(timeBtn.Tag.ToString()) * 60;
+                    }
+                };
+                timeframelayout.MouseUpEventHandler += timeclick;
+                timeniconBtn.MouseUpEventHandler += timeclick;
+                timeRow.MouseUpEventHandler += timeclick;
+                timeBtn.MouseUpEventHandler += timeclick;
+                selected.MouseUpEventHandler += timeclick;
+            }
+
+            var saveFrameLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFrameLayout);
+
+            var btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveFrameLayout.AddChidren(btnsave);
+            btnsave.MouseUpEventHandler += (sender, e) =>
+            {
+                timemethod(common, selectetimedvalue, timevalue, edit);
+            };
+        }
+
+        public void timemethod(CommonDevice common, int selectetimedvalue, int timevalue, bool edit)
+        {
+
+            var deviceConditionsInfo = new Dictionary<string, string>();
+            deviceConditionsInfo.Add("Type", "1");
+            deviceConditionsInfo.Add("IsValid", "1");
+            deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+            deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+            deviceConditionsInfo.Add("Cluster_ID", "1280");
+            deviceConditionsInfo.Add("AttriButeId", "1281");
+            deviceConditionsInfo.Add("AttriButeData1", "0");
+            deviceConditionsInfo.Add("AttriButeData2", "0");
+            deviceConditionsInfo.Add("Range", "1");
+            if (selectetimedvalue != 0)
+            {
+                if (timevalue != selectetimedvalue)
+                {
+                    if (deviceConditionsInfo.ContainsKey("IgnoreTime"))
+                    {
+                        deviceConditionsInfo.Remove("IgnoreTime");
+                    }
+                    deviceConditionsInfo.Add("IgnoreTime", selectetimedvalue.ToString());
+                    LogicIfon.AddDeviceconditions(common, deviceConditionsInfo);
+                }
+
+            }
+            else
+            {
+                if (!edit)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                           Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                           Language.StringByID(MyInternationalizationString.complete));
+                    alert.Show();
+                    return;
+                }
+
+            }
+            var logicCommunalPage = new LogicCommunalPage();
+            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+            UserView.HomePage.Instance.PageIndex += 1;
+            logicCommunalPage.Show(() => { });
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 171aa2f..4f954b9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -20,33 +20,28 @@
         EditText logicTextBox;
         public void Show(Action action)
         {
-
-            this.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-
-            var topFrameLayout1 = new FrameLayout
+            
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(80),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout1);
-
-            var topFrameLayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-            };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.selection,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
             if (Common.Logic.CurrentLogic.LogicId != 0)
             {
                 titleName.Text = Language.StringByID(MyInternationalizationString.editautomation);
@@ -56,195 +51,183 @@
                 titleName.Text = Language.StringByID(MyInternationalizationString.newautomation);
             }
 
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
-           
+            topRowLayout.AddChidren(back);
             back.MouseDownEventHandler += (sender, e) =>
             {
-                //if (Common.Logic.CurrentLogic.LogicId != 0)
-                //{
-                //    Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
-                //    action();
-                //    Send.AddModifyLogic(Common.Logic.CurrentLogic);
-                //}
                 action();
                 RemoveFromParent();
             };
 
 
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220 - 194);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+            #endregion
+
+
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184-180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
-            var fl = new FrameLayout
-            {
-                Height = Application.GetRealHeight(280),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            middle.AddChidren(fl);
-
-            #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
-            var weekfl = new FrameLayout
-            {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(20),
-            };
-            fl.AddChidren(weekfl);
-
-            var btnweektext = new Button
-            {
-                Width = Application.GetRealWidth(900 - 300),
-                Height = Application.GetRealHeight(70),
-                X = Application.GetRealWidth(140 + 300),
-                TextAlignment = TextAlignment.CenterRight,
-                //Text = "姣忓ぉ",
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID = MyInternationalizationString.everyday,
-            };
-            weekfl.AddChidren(btnweektext);
-            var settxet = new Button
-            {
-                Width = Application.GetRealWidth(900 - 500),
-                Height = Application.GetRealHeight(70),
-                X = Application.GetRealWidth(140 + 500),
-                TextAlignment = TextAlignment.CenterRight,
-                Y = btnweektext.Bottom,
-                //Text = "璁剧疆鍛ㄦ湡",
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID = MyInternationalizationString.setupcycle,
-            };
-            weekfl.AddChidren(settxet);
-
-            UpdateWeek(btnweektext);
-
-            EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
-            {
-                /*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
-                //var cycle = new Cycle(() => { UpdateWeek(btnweektext); });
-                //UserView.HomePage.Instance.AddChidren(cycle);
-                //UserView.HomePage.Instance.PageIndex += 1;
-                //cycle.Show();
-
-                var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
-                UserView.HomePage.Instance.AddChidren(cyclicCycle);
-                UserView.HomePage.Instance.PageIndex += 1;
-                cyclicCycle.Show();
-            };
-            btnweektext.MouseUpEventHandler += cycleclick;
-            settxet.MouseUpEventHandler += cycleclick;
-            #endregion
 
             #region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
             var logicnamefl = new FrameLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = weekfl.Bottom,
-                //BackgroundColor=0xff453736,
+                Height = Application.GetRealHeight(130),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
             };
-            fl.AddChidren(logicnamefl);
+            middle.AddChidren(logicnamefl);
 
             var text = new Button
             {
-                Width = Application.GetRealWidth(600),
+                Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
-                X = Application.GetRealWidth(50),
+                X = Application.GetRealWidth(58),
                 TextAlignment = TextAlignment.CenterLeft,
                 //Text = "鑷姩鍖栧悕绉�",
                 TextID = MyInternationalizationString.automationname,
-                TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Y = Application.GetRealHeight(35),
             };
             logicnamefl.AddChidren(text);
 
             logicTextBox = new EditText
             {
-                Width = Application.GetRealWidth(900),
+                Y = Application.GetRealHeight(35),
+                Width = Application.GetRealWidth(1080-58-300),
                 Height = Application.GetRealHeight(60),
-                X = Application.GetRealWidth(40 + 20),
-                Y = text.Bottom + Application.GetRealHeight(10),
+                X = text.Right,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                 TextSize = 13,
                 Text = Common.Logic.CurrentLogic.LogicName,
                 //TextID=MyInternationalizationString.automation1,
             };
             logicnamefl.AddChidren(logicTextBox);
 
-            var btnline = new Button
+            var fraline = new FrameLayout
             {
-                Height = Application.GetRealHeight(4),
-                Y = Application.GetRealHeight(140 - 4),
-                BackgroundColor = ZigbeeColor.Current.LogicLineColor,
+                Height = Application.GetRealHeight(30),
             };
-            logicnamefl.AddChidren(btnline);
+            middle.AddChidren(fraline);
             #endregion
 
             #region -----鏄剧ず閫昏緫鏉′欢-----
+
+
+            var conditionFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(conditionFrameLayout);
+
+
             var conditionRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(150),
-                //BackgroundColor = 0xff323232,
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            middle.AddChidren(conditionRowLayout);
+            conditionFrameLayout.AddChidren(conditionRowLayout);
+
 
             conditionRowLayout.AddChidren(new Button
             {
+
+                Text = Language.StringByID(MyInternationalizationString.ifcondition),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
-                //Text = "濡傛灉",
-                TextID = MyInternationalizationString.ifcondition,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                // Gravity = Gravity.CenterVertical,
-                TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                Y = Application.GetRealHeight(90),
                 TextSize = 16,
+                Gravity = Gravity.CenterVertical,
             });
+
+            var conditionadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965 + 58),
+
+            };
+            conditionFrameLayout.AddChidren(conditionadd1);
 
             var conditionadd = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(100),
+
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/add.png",
-                X = Application.GetRealWidth(1080 - 140),
+                X = Application.GetRealWidth(965 - 58),
                 Gravity = Gravity.CenterVertical,
+
             };
             conditionRowLayout.AddChidren(conditionadd);
             ///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
-            conditionadd.MouseUpEventHandler += (sender, e) =>
+            EventHandler<MouseEventArgs> conditionaddclick = (sender, e) =>
             {
-                ConditionView();
+                if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+                {
+                    ConditionView(false);
+                }
+                else
+                {
+                    var addLogicPage = new AddLogicPage();
+                    UserView.HomePage.Instance.AddChidren(addLogicPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    addLogicPage.Show();
+                }
             };
-
-
+            conditionadd.MouseUpEventHandler += conditionaddclick;
+            conditionadd1.MouseUpEventHandler += conditionaddclick;
             List<Dictionary<string, string>> ListConditions = new List<Dictionary<string, string>>();
             ListConditions.Clear();
             ListConditions.AddRange(Common.Logic.CurrentLogic.Conditions);
             ListConditions.Add(new Dictionary<string, string>());
             if (Common.Logic.CurrentLogic.Conditions.Count > 1)
             {
-                //inputVerticalScrolViewLayout.Height = Application.GetRealHeight(160 * ListConditions.Count) + Application.GetRealHeight(60);
                 var row = new FrameLayout
                 {
                     Height = Application.GetRealHeight(60),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                 };
-                //inputVerticalScrolViewLayout.AddChidren(row);
                 middle.AddChidren(row);
                 var relationship = new Button
                 {
                     Width = Application.GetRealWidth(600),
                     Height = Application.GetRealHeight(60),
                     TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealWidth(40),
-                    TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+                    X = Application.GetRealWidth(58),
+                    TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
                 };
                 row.AddChidren(relationship);
                 if (Common.Logic.CurrentLogic.Relationship == 0)
@@ -255,6 +238,14 @@
                 {
                     relationship.Text = Language.StringByID(MyInternationalizationString.followingconditions) + Language.StringByID(MyInternationalizationString.anycondition);
                 }
+                EventHandler<MouseEventArgs> editclick = (sender, e) =>
+                {
+
+                    ConditionView(true);
+                };
+                row.MouseUpEventHandler += editclick;
+                relationship.MouseUpEventHandler += editclick;
+
             }
             for (int i = 0; i < ListConditions.Count; i++)
             {
@@ -263,34 +254,80 @@
 
                     var addfl = new FrameLayout
                     {
-                        Height = Application.GetRealHeight(160),
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                     };
                     middle.AddChidren(addfl);
                     var addbtn = new Button
                     {
-                        Height = Application.GetRealHeight(120),
-                        Width = Application.GetRealWidth(1000),
-                        X = Application.GetRealWidth(40),
-                        Y = Application.GetRealHeight(40),
-                        Radius = (uint)Application.GetRealHeight(30),
-                        //Text = "娣诲姞鏉′欢",
-                        BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                        TextID = MyInternationalizationString.addconditions,
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
                     };
                     addfl.AddChidren(addbtn);
-                    addbtn.MouseUpEventHandler += (sender, e) =>
+
+
+                    var addtextbtn = new Button
                     {
-                        ConditionView();
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.addconditions,
+                        X = Application.GetRealWidth(390),
                     };
+                    addfl.AddChidren(addtextbtn);
+
+                    EventHandler<MouseEventArgs> addconditionsclick = (sender, e) =>
+                    {
+                        if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+                        {
+                            ConditionView(false);
+                        }
+                        else
+                        {
+                            var addLogicPage = new AddLogicPage();
+                            UserView.HomePage.Instance.AddChidren(addLogicPage);
+                            UserView.HomePage.Instance.PageIndex += 1;
+                            addLogicPage.Show();
+                        }
+                    };
+                    addbtn.MouseUpEventHandler += addconditionsclick;
+                    addtextbtn.MouseUpEventHandler += addconditionsclick;
                 }
                 else
                 {
-                    var conditionsowLayout = new RowLayout
+                    var devicesFrameLayout = new FrameLayout
                     {
-                        Height = Application.GetRealHeight(160),
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                     };
-                    middle.AddChidren(conditionsowLayout);
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var conditionIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        //UnSelectedImagePath = "ZigeeLogic/time.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(conditionIcon);
+
+
+                    var conditionsRowLayout = new RowLayout
+                    {
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    devicesFrameLayout.AddChidren(conditionsRowLayout);
+
                     var Type = int.Parse(ListConditions[i]["Type"]);
                     var conditions = ListConditions[i];
                     switch (Type)
@@ -302,31 +339,39 @@
                                 ///鏄剧ず鏃堕棿
                                 var timevalue = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
-                                    Width = Application.GetRealWidth(800),
+                                    Width = Application.GetRealWidth(200),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
-                                    //Text = starttime,
-                                    //TextColor = 0xff121212,
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(timevalue);
+                                conditionsRowLayout.AddChidren(timevalue);
+
+
+                                var timeTxet = new Button
+                                {
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    Gravity = Gravity.CenterVertical,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
+                                };
+                                conditionsRowLayout.AddChidren(timeTxet);
 
 
                                 var timeedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(timeedit);
+                                conditionsRowLayout.AddRightView(timeedit);
 
                                 timeedit.MouseUpEventHandler += (sender, e) =>
                                 {
                                     var timePoint = new TimePoint();
                                     UserView.HomePage.Instance.AddChidren(timePoint);
                                     UserView.HomePage.Instance.PageIndex += 1;
-                                    timePoint.IsDeviceEditor = true;
+                                    timePoint.IsEditor = true;
                                     timePoint.Show(conditions);
                                 };
 
@@ -337,49 +382,57 @@
                                         {
                                             string s = "";
                                             s = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.time) + conditions["StartHour"] + ":" + s;
+                                            timevalue.Text = conditions["StartHour"] + ":" + s;
+                                            timeTxet.TextID = MyInternationalizationString.immediateexecution;
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/timepoint.png";
                                         }
                                         break;
                                     case 1:
+                                        timevalue.TextID = MyInternationalizationString.sunrise;
+                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/sunrise.png";
                                         if (int.Parse(conditions["AdjustTime"]) > 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunriseafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else if (int.Parse(conditions["AdjustTime"]) < 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunrisebefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunrise);
+                                            //timeTxet.Text = Language.StringByID(MyInternationalizationString.sunrise);
                                         }
                                         break;
                                     case 2:
+                                        timevalue.TextID = MyInternationalizationString.sunset;
+                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/sunset.png";
                                         if (int.Parse(conditions["AdjustTime"]) > 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunsetafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else if (int.Parse(conditions["AdjustTime"]) < 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunsetbefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
+                                            // timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
                                         }
                                         break;
                                     case 3:
+                                        timevalue.TextID = MyInternationalizationString.noon;
+                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/noon.png";
                                         if (int.Parse(conditions["AdjustTime"]) > 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.noonafter) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else if (int.Parse(conditions["AdjustTime"]) < 0)
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.noonbefore) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+                                            timeTxet.Text = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
                                         }
                                         else
                                         {
-                                            timevalue.Text = Language.StringByID(MyInternationalizationString.noon);
+                                            // timeTxet.Text = Language.StringByID(MyInternationalizationString.noon);
                                         }
                                         break;
                                 }
@@ -388,37 +441,46 @@
                             break;
                         case 5:
                             {
+                                conditionIcon.UnSelectedImagePath = "ZigeeLogic/timeparagraph.png";
                                 string s1 = "", s2 = "";
                                 s1 = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
                                 s2 = conditions["StopMin"].Length < 2 ? "0" + conditions["StopMin"] : conditions["StopMin"];
                                 ///鏄剧ず鏃堕棿
                                 var timevalue = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
-                                    Width = Application.GetRealWidth(500),
+                                    Width = Application.GetRealWidth(400),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
                                     Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2,
                                     //TextColor = 0xff121212,
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(timevalue);
-
+                                conditionsRowLayout.AddChidren(timevalue);
+                                var timeTxet = new Button
+                                {
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    Gravity = Gravity.CenterVertical,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                    X = conditionsRowLayout.Width - Application.GetRealWidth(400),
+                                    TextID = MyInternationalizationString.timeframe,
+                                };
+                                conditionsRowLayout.AddChidren(timeTxet);
 
                                 var timeedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    //TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(timeedit);
+                                conditionsRowLayout.AddRightView(timeedit);
                                 timeedit.MouseUpEventHandler += (sender, e) =>
                                 {
                                     var timePage = new TimePage();
                                     UserView.HomePage.Instance.AddChidren(timePage);
                                     UserView.HomePage.Instance.PageIndex += 1;
                                     timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
-                                    timePage.IsDeviceEditor1 = true;
+                                    timePage.IsEditor = true;
                                     timePage.Show();
                                 };
                             }
@@ -433,52 +495,74 @@
                                 ///鏄剧ず璁惧鍚嶇О
                                 var btndevice = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
-                                    Width = Application.GetRealWidth(500),
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(400),
                                     TextAlignment = TextAlignment.CenterLeft,
-                                    Gravity = Gravity.CenterVertical,
                                     Text = deviceinof.DeviceEpointName,
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                                    //TextColor = 0xff121212,
                                 };
-                                conditionsowLayout.AddChidren(btndevice);
+                                conditionsRowLayout.AddChidren(btndevice);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevice.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                conditionsRowLayout.AddChidren(btnregionname);
+                                ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Send.RoomNmae(btnregionname, deviceinof);
 
 
                                 var deviceedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(deviceedit);
+                                conditionsRowLayout.AddRightView(deviceedit);
                                 deviceedit.MouseUpEventHandler += (sender, e) =>
                                 {
-                                    //var selectedDeviceState = new SelectedDeviceState();
-                                    //UserView.HomePage.Instance.AddChidren(selectedDeviceState);
-                                    //UserView.HomePage.Instance.PageIndex += 1;
-                                    //selectedDeviceState.IsDeviceEditor = true;
-                                    //selectedDeviceState.Show(deviceinof);
-                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-                                    this.AddChidren(flMain);
-                                    DeviceStateCondition.CurrentDeviceView(flMain, deviceinof, true);
+
+                                    if (deviceinof.Type != DeviceType.DoorLock)
+                                    {
+                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                        this.AddChidren(flMain);
+                                        DeviceStateCondition.CurrentDeviceView(flMain, deviceinof, true);
+                                    }
+                                    else
+                                    {
+                                        var memberList = new MemberList();
+                                        UserView.HomePage.Instance.AddChidren(memberList);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        MemberList.edit = true;
+                                        memberList.Show(deviceinof);
+                                    }
+
                                 };
 
                                 ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
                                 var devicestatus = new Button
                                 {
-                                    Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Width = Application.GetRealWidth(400),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
                                     TextAlignment = TextAlignment.CenterRight,
-                                    X = Application.GetRealWidth(1080 - 340),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    X = Application.GetRealWidth(400),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(devicestatus);
+                                conditionsRowLayout.AddChidren(devicestatus);
 
                                 switch (deviceinof.Type)
                                 {
                                     case DeviceType.OnOffOutput:
                                         {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
                                             if (conditions["AttriButeId"] == "0")
                                             {
                                                 if (conditions["AttriButeData1"] == "1")
@@ -512,6 +596,7 @@
                                         {
                                             var iASZonedevice = deviceinof as IASZone;
                                             var intvalue = conditions["AttriButeData1"];
+                                            conditionIcon.UnSelectedImagePath = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
                                             switch (iASZonedevice.IasDeviceType)
                                             {
                                                 case 13:
@@ -522,36 +607,56 @@
                                                         }
                                                         else
                                                         {
-                                                            devicestatus.TextID = MyInternationalizationString.unmanned;
+                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
+                                                            if (second != 0)
+                                                            {
+                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+                                                            }
+                                                            else
+                                                            {
+                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+                                                            }
                                                         }
                                                     }
                                                     break;
                                                 case 21:
-                                                    {
-                                                        if (intvalue == "1")
-                                                        {
-                                                            devicestatus.TextID = MyInternationalizationString.logicopen;
-                                                        }
-                                                        else
-                                                        {
-                                                            devicestatus.TextID = MyInternationalizationString.logicclose;
-                                                        }
-                                                    }
-                                                    break;
                                                 case 22:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.logicopen;
                                                         }
                                                         else
                                                         {
-                                                            devicestatus.TextID = MyInternationalizationString.logicclose;
+                                                            if (conditions.ContainsKey("IgnoreTime"))
+                                                            {
+
+                                                                int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+                                                                int second = int.Parse(conditions["IgnoreTime"]) % 60;
+                                                                if (second != 0)
+                                                                {
+                                                                    devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+                                                                }
+                                                                else
+                                                                {
+                                                                    devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+                                                                }
+
+                                                            }
+                                                            else
+                                                            {
+                                                                devicestatus.TextID = MyInternationalizationString.logicclose;
+                                                            }
                                                         }
                                                     }
                                                     break;
                                                 case 40:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.smokescreen;
@@ -561,6 +666,7 @@
                                                     break;
                                                 case 42:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.waterleakage;
@@ -573,6 +679,7 @@
                                                     break;
                                                 case 43:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.gas;
@@ -582,6 +689,7 @@
                                                     break;
                                                 case 277:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -591,6 +699,7 @@
                                                     break;
                                                 default:
                                                     {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
                                                         if (intvalue == "1")
                                                         {
                                                             devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -603,23 +712,45 @@
                                         break;
                                     case DeviceType.OnOffSwitch:
                                         {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/panel.png";
                                             devicestatus.Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + conditions["Epoint"];
-                                            //if (conditions["Epoint"] == "1")
-                                            //{
-                                            //    devicestatus.TextID = MyInternationalizationString.button1;
-                                            //}
-                                            //else if (conditions["Epoint"] == "2")
-                                            //{
-                                            //    devicestatus.TextID = MyInternationalizationString.button2;
-                                            //}
-                                            //else if (conditions["Epoint"] == "3")
-                                            //{
-                                            //    devicestatus.TextID = MyInternationalizationString.button3;
-                                            //}
-                                            //else if (conditions["Epoint"] == "4")
-                                            //{
-                                            //    devicestatus.TextID = MyInternationalizationString.button4;
-                                            //}
+                                        }
+                                        break;
+                                    case DeviceType.DoorLock:
+                                        {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
+                                            for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
+                                            {
+                                                if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
+                                                {
+                                                    if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
+                                                    {
+                                                        devicestatus.Text = conditions["Account"];
+                                                        break;
+
+                                                    }
+                                                }
+
+                                            }
+                                        }
+                                        break;
+                                    case DeviceType.TemperatureSensor:
+                                       // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+                                        var dev = deviceinof as TemperatureSensor;
+                                        if (conditions["Cluster_ID"]=="1026") {
+                                            dev.SensorDiv = 1;
+                                        } else {
+                                            dev.SensorDiv = 2;
+                                        }
+                                        if (conditions["Cluster_ID"] == "1026")
+                                        {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+                                            devicestatus.Text = ">" + conditions["AttriButeData1"] + "鈩�";
+                                        }
+                                        else
+                                        {
+                                            conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+                                            devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
                                         }
                                         break;
 
@@ -637,7 +768,6 @@
                                 ///鏄剧ず閫昏緫鍚嶇О
                                 var btnlogic = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
                                     Width = Application.GetRealWidth(700),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
@@ -645,16 +775,16 @@
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                     //TextColor = 0xff121212,
                                 };
-                                conditionsowLayout.AddChidren(btnlogic);
+                                conditionsRowLayout.AddChidren(btnlogic);
 
 
                                 var logicedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(logicedit);
+                                conditionsRowLayout.AddRightView(logicedit);
                                 logicedit.MouseUpEventHandler += (sender, e) =>
                                 {
                                     var selectedLogicStatus = new SelectedLogicStatus();
@@ -668,14 +798,13 @@
                                 var logicstatus = new Button
                                 {
                                     Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
-                                    //TextColor = 0xff121212,
-                                    X = Application.GetRealWidth(1080 - 330),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                                     TextAlignment = TextAlignment.CenterRight,
+                                    X = Application.GetRealWidth(500),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(logicstatus);
+                                conditionsRowLayout.AddChidren(logicstatus);
 
                                 if (conditions["IsValid"] == "1")
                                 {
@@ -691,7 +820,6 @@
                             {
                                 var btnsecurity = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
                                     Width = Application.GetRealWidth(700),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
@@ -700,16 +828,16 @@
                                     //TextColor = 0xff121212,
                                     TextID = MyInternationalizationString.security,
                                 };
-                                conditionsowLayout.AddChidren(btnsecurity);
+                                //conditionsRowLayout.AddChidren(btnsecurity);
 
 
                                 var btnsecurityedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(btnsecurityedit);
+                                conditionsRowLayout.AddRightView(btnsecurityedit);
                                 btnsecurityedit.MouseUpEventHandler += (sender, e) =>
                                 {
                                     //var securityPage = new SecurityPage();
@@ -726,22 +854,33 @@
                                 ///鏄剧ず瀹夐槻鏉′欢鐘舵�佹帶浠�
                                 var securitystatus = new Button
                                 {
-                                    Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Width = Application.GetRealWidth(500),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
-                                    TextAlignment = TextAlignment.CenterRight,
-                                    X = Application.GetRealWidth(1080 - 330),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(securitystatus);
+                                conditionsRowLayout.AddChidren(securitystatus);
 
                                 if (conditions["EnOrWithdrawMode"] == "1")
                                 {
+                                    conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
                                     securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
                                 }
                                 else
                                 {
-                                    securitystatus.Text = Language.StringByID(MyInternationalizationString.defence);
+                                    if (conditions["ModeId"] == "1")
+                                    {
+                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
+                                        securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
+
+                                    }
+                                    else
+                                    {
+                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
+                                        securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
+
+                                    }
                                 }
                             }
                             break;
@@ -749,7 +888,6 @@
                             {
                                 var btnlocation = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
                                     Width = Application.GetRealWidth(700),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
@@ -758,16 +896,16 @@
                                     //TextColor = 0xff121212,
                                     TextID = MyInternationalizationString.geographicalposition,
                                 };
-                                conditionsowLayout.AddChidren(btnlocation);
+                                conditionsRowLayout.AddChidren(btnlocation);
 
 
                                 var btnlocationedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
-                                conditionsowLayout.AddRightView(btnlocationedit);
+                                conditionsRowLayout.AddRightView(btnlocationedit);
                                 btnlocationedit.MouseUpEventHandler += (sender, e) =>
                                 {
 
@@ -779,21 +917,26 @@
                                 var locationstatus = new Button
                                 {
                                     Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
                                     TextAlignment = TextAlignment.CenterRight,
-                                    X = Application.GetRealWidth(1080 - 330),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    X = Application.GetRealWidth(500),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
-                                conditionsowLayout.AddChidren(locationstatus);
-
-                                if (conditions["AtHome"] == "1")
+                                conditionsRowLayout.AddChidren(locationstatus);
+                                foreach (var radius in Common.Logic.CurrentLogic.Accounts)
                                 {
-                                    locationstatus.Text = Language.StringByID(MyInternationalizationString.athome);
-                                }
-                                else
-                                {
-                                    locationstatus.Text = Language.StringByID(MyInternationalizationString.leavehome);
+                                    if (radius["Type"] == "7")
+                                    {
+                                        if (conditions["AtHome"] == "1")
+                                        {
+                                            locationstatus.Text = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + "绫�";
+                                        }
+                                        else
+                                        {
+                                            locationstatus.Text = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + "绫�";
+                                        }
+                                    }
                                 }
                             }
                             break;
@@ -802,10 +945,10 @@
                     ///鍒犻櫎鎺т欢
                     var del = new Button
                     {
-                        BackgroundColor = ZigbeeColor.Current.LogicDelBackgroundColor,
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
                         Text = Language.StringByID(MyInternationalizationString.del),
                     };
-                    conditionsowLayout.AddRightView(del);
+                    conditionsRowLayout.AddRightView(del);
 
                     del.MouseUpEventHandler += (sender, e) =>
                     {
@@ -834,38 +977,59 @@
             #endregion
 
             #region  ----鏄剧ず鎵ц鐩爣----
+
+            var targetFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(targetFrameLayout);
+
+
             var targetRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(150),
-                // BackgroundColor = 0xff323232,
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            middle.AddChidren(targetRowLayout);
+            targetFrameLayout.AddChidren(targetRowLayout);
 
 
             var btntargettitle = new Button
             {
-                //Text = "灏辨墽琛�",
+
+                Text = Language.StringByID(MyInternationalizationString.execute),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                Y = Application.GetRealHeight(90),
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
                 TextSize = 16,
-                TextID = MyInternationalizationString.execute,
+                Gravity = Gravity.CenterVertical,
             };
             targetRowLayout.AddChidren(btntargettitle);
 
+            var btntargetadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965+58),
+            };
+            targetFrameLayout.AddChidren(btntargetadd1);
+
             var btntargetadd = new Button
             {
-                Width = Application.GetRealWidth(100),
-                Height = Application.GetRealHeight(100),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/add.png",
-                X = Application.GetRealWidth(1080 - 140),
+                X = Application.GetRealWidth(965 - 58),
                 Gravity = Gravity.CenterVertical,
             };
             targetRowLayout.AddChidren(btntargetadd);
-            btntargetadd.MouseUpEventHandler += (sender, e) =>
+            EventHandler<MouseEventArgs> btntargetaddclick = (sender, e) =>
             {
                 Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
                 var deviceTarget = new DeviceTarget();
@@ -873,55 +1037,13 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 deviceTarget.Show();
             };
-
+            btntargetadd1.MouseUpEventHandler += btntargetaddclick;
+            btntargetadd.MouseUpEventHandler += btntargetaddclick;
 
             List<Dictionary<string, object>> ListActions = new List<Dictionary<string, object>>();
             ListActions.Clear();
             ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
-            //ListActions.Add(new Dictionary<string, object>());
-            ListActions.Add(new Dictionary<string, object>() { ["LinkType"] = "11" });
-            bool tag = false;
-            for (int i = 0; i < ListActions.Count; i++)
-            {
-                var linkType = ListActions[i]["LinkType"].ToString();
-                if (linkType == "10")
-                {
-                    if (ListActions[i + 1]["LinkType"].ToString() == "0")
-                    {
-                        var delaytime = ListActions[i]["DelayTime"].ToString();
-                        if (ListActions[i + 1].ContainsKey("Time"))
-                        {
-                            ListActions[i + 1].Remove("Time");
-                        }
-                        ListActions[i + 1].Add("Time", delaytime);
-                    }
-                    tag = true;
-                    //break;
-                }
-
-            }
-
-            if (!tag)
-            {
-                for (int i = 0; i < ListActions.Count; i++)
-                {
-                    var linkType = ListActions[i]["LinkType"].ToString();
-                    if (linkType == "0")
-                    {
-                        var second = ListActions[i]["Time"].ToString();
-                        if (second != "0")
-                        {
-                            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
-                            actionsInfo.Add("LinkType", 10);
-                            actionsInfo.Add("DelayTime", second);
-                            ListActions.Insert(i, actionsInfo);
-                        }
-
-                    }
-
-                }
-            }
-
+            ListActions.Add(new Dictionary<string, object>());
 
             for (int i = 0; i < ListActions.Count; i++)
             {
@@ -930,23 +1052,32 @@
 
                     var addfl = new FrameLayout
                     {
-                        Height = Application.GetRealHeight(160),
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                     };
                     middle.AddChidren(addfl);
                     var addbtn = new Button
                     {
-                        Height = Application.GetRealHeight(120),
-                        Width = Application.GetRealWidth(1000),
-                        X = Application.GetRealWidth(40),
-                        Y = Application.GetRealHeight(40),
-                        Radius = (uint)Application.GetRealHeight(30),
-                        //Text = "娣诲姞鍔熻兘",
-                        BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                        TextID = MyInternationalizationString.addfunction,
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
                     };
                     addfl.AddChidren(addbtn);
-                    addbtn.MouseUpEventHandler += (sender, e) =>
+
+
+                    var addtextbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.addfunction,
+                        X = Application.GetRealWidth(390),
+                    };
+                    addfl.AddChidren(addtextbtn);
+                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
                     {
                         Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
                         var deviceTarget = new DeviceTarget();
@@ -954,67 +1085,49 @@
                         UserView.HomePage.Instance.PageIndex += 1;
                         deviceTarget.Show();
                     };
+                    addbtn.MouseUpEventHandler += addfunctionclick;
+                    addtextbtn.MouseUpEventHandler += addfunctionclick;
                 }
                 else
                 {
+
+                    var devicesFrameLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var actionsIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        // UnSelectedImagePath = "ZigeeLogic/time.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(actionsIcon);
+
+
                     var actionsrowLayout = new RowLayout
                     {
-                        Height = Application.GetRealHeight(160),
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                     };
-                    middle.AddChidren(actionsrowLayout);
+                    devicesFrameLayout.AddChidren(actionsrowLayout);
+
 
                     var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
                     var actions = ListActions[i];
 
                     switch (linkType)
                     {
-                        case 10:
-                            {
-                                var delaytime = actions["DelayTime"].ToString();
-
-                                var btnDelayTime = new Button
-                                {
-                                    X = Application.GetRealWidth(40),
-                                    Width = Application.GetRealWidth(382),
-                                    Height = Application.GetRealHeight(80),
-                                    TextAlignment = TextAlignment.CenterLeft,
-                                    Text = delaytime,
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                                };
-                                actionsrowLayout.AddChidren(btnDelayTime);
-
-                                ///缂栬緫璁惧鐘舵�丅utton
-                                var timeedit = new Button
-                                {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
-                                    Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                                };
-                                actionsrowLayout.AddRightView(timeedit);
-                                timeedit.MouseUpEventHandler += (sender, e) =>
-                                {
-                                    DeviceTarget.DelayTimeView(actions);
-                                };
-
-                                //if (tag)
-                                //{  
-                                //    if (ListActions[i + 1]["LinkType"].ToString() == "0")
-                                //    {
-                                //        if (ListActions[i + 1].ContainsKey("Time"))
-                                //        {
-                                //            ListActions[i + 1].Remove("Time");
-                                //        }
-                                //        ListActions[i + 1].Add("Time", delaytime);
-                                //        ///绉婚櫎鏃ф暟鎹啀娣诲姞鏂版暟鎹�
-                                //        //Common.Logic.CurrentLogic.Actions.RemoveAt(i+1);
-                                //        //Common.Logic.CurrentLogic.Actions.Insert(i + 1, Common.Logic.CurrentLogic.Actions[i + 1]);
-                                //    }
-                                //}
-                            }
-                            break;
                         case 0:
                             {
-
                                 var obj1 = actions["DeviceAddr"].ToString();
                                 var obj2 = actions["Epoint"].ToString();
                                 var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return ((obj.DeviceAddr == obj1) && (obj.DeviceEpoint.ToString() == obj2)); });
@@ -1023,21 +1136,12 @@
                                     continue;
                                 }
 
-                                if (i != 0 && ListActions[i - 1]["LinkType"].ToString() != "10")
-                                {
-                                    if (ListActions[i].ContainsKey("Time"))
-                                    {
-                                        ListActions[i].Remove("Time");
-                                    }
-                                    ListActions[i].Add("Time", 0);
-                                }
-
                                 ///璁惧鍚嶇ОButton
                                 var btndevicename = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
-                                    Width = Application.GetRealWidth(382),
-                                    Height = Application.GetRealHeight(80),
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(450),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Text = deviceinof.DeviceEpointName,
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -1047,13 +1151,12 @@
                                 ///鍖哄煙(鎴块棿)鍚嶇ОButton
                                 var btnregionname = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
-                                    Y = Application.GetRealHeight(80),
-                                    Width = Application.GetRealWidth(382),
+                                    Y = btndevicename.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(450),
                                     TextAlignment = TextAlignment.CenterLeft,
-                                    Height = Application.GetRealHeight(80),
+                                    Height = Application.GetRealHeight(50),
                                     Text = "",//Language.StringByID(MyInternationalizationString.customroom),
-                                    TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
                                 actionsrowLayout.AddChidren(btnregionname);
                                 ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
@@ -1061,34 +1164,27 @@
                                 ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
                                 var devicestatus = new Button
                                 {
-                                    Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Width = Application.GetRealWidth(350),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
                                     TextAlignment = TextAlignment.CenterRight,
-                                    X = Application.GetRealWidth(1080 - 340),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    X = Application.GetRealWidth(450),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
                                 actionsrowLayout.AddChidren(devicestatus);
 
                                 ///缂栬緫璁惧鐘舵�丅utton
                                 var deviceedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
                                 actionsrowLayout.AddRightView(deviceedit);
 
                                 ///缂栬緫鐐瑰嚮浜嬩欢
                                 deviceedit.MouseUpEventHandler += (sender, e) =>
                                 {
-                                    //var deviceStatePage = new DeviceStatePage();
-                                    //UserView.HomePage.Instance.AddChidren(deviceStatePage);
-                                    //UserView.HomePage.Instance.PageIndex += 1;
-                                    //deviceStatePage.IsDeviceEditor = true;
-                                    //deviceStatePage.Show(deviceinof);
-
-                                    //ActionModifyDeviceStateView(deviceinof);
                                     var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                     this.AddChidren(flMain);
                                     LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
@@ -1099,6 +1195,8 @@
                                 {
                                     case DeviceType.OnOffOutput:
                                         {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
+
                                             var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
                                             if (TaskList == null)
                                             {
@@ -1108,13 +1206,20 @@
                                             {
                                                 if (status["TaskType"].ToString() == "1")
                                                 {
-                                                    if (status["Data1"].ToString() == "1")
+                                                    if (status["Data1"].ToString() == "0")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
                                                     }
-                                                    else
+                                                    else if (status["Data1"].ToString() == "1")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
                                                     }
                                                 }
 
@@ -1124,6 +1229,7 @@
                                         break;
                                     case DeviceType.DimmableLight:
                                         {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
                                             var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
                                             if (TaskList == null)
                                             {
@@ -1139,13 +1245,14 @@
                                                 }
                                                 else if (status["TaskType"].ToString() == "1")
                                                 {
-                                                    if (status["Data1"].ToString() == "1")
+
+                                                    if (status["Data1"].ToString() == "0")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
                                                     }
-                                                    else
+                                                    else if (status["Data1"].ToString() == "2")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
                                                     }
                                                 }
 
@@ -1156,6 +1263,7 @@
                                         break;
                                     case DeviceType.WindowCoveringDevice:
                                         {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/curtain.png";
                                             var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
                                             if (TaskList == null)
                                             {
@@ -1167,17 +1275,161 @@
                                                 {
                                                     if (status["Data1"] == "0")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.open);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
                                                     }
                                                     else if (status["Data1"] == "1")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + Language.StringByID(MyInternationalizationString.close);
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
                                                     }
                                                     else if (status["Data1"] == "5")
                                                     {
-                                                        devicestatus.Text = devicestatus.Text + status["Data2"] + "%";
+                                                        devicestatus.Text = status["Data2"] + "%";
                                                     }
                                                 }
+
+                                            }
+                                        }
+                                        break;
+                                    case DeviceType.AirSwitch:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.Thermostat:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/ac.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            string modetext = "", temperaturetext="", speedtext = "";
+                                            bool ifclose = false;
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                       // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                        ifclose = false;
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+                                                        ifclose = true;
+                                                    }
+
+                                                }
+                                                else if (status["TaskType"].ToString() == "5")
+                                                {
+                                                    if (status["Data1"] == "3")
+                                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "3":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                                }
+                                                                break;
+                                                            case "4":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                                }
+                                                                break;
+                                                            case "1":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                                }
+                                                                break;
+                                                            case "8":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                                }
+                                                                break;
+                                                            case "7":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                                }
+                                                                break;
+                                                        }
+                                                    }
+                                                    else if (status["Data1"] == "6")
+                                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "1":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                                }
+                                                                break;
+
+                                                            case "2":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                                }
+                                                                break;
+                                                            case "3":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                                }
+                                                                break;
+
+                                                        }
+                                                    }
+                                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                                    else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
+                                                    {
+                                                        var s = int.Parse(status["Data2"]) /100;
+                                                        temperaturetext = s.ToString();
+                                                    }
+                                                    else if (status["Data1"] == "20")
+                                                    {
+                                                        temperaturetext = "鏃�";
+                                                    }
+
+
+                                                }
+
+                                            }
+                                            if (ifclose)
+                                            {
+                                                devicestatus.Text = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
+                                            }
+                                            else
+                                            {
+                                                devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
 
                                             }
                                         }
@@ -1196,18 +1448,37 @@
                                 {
                                     continue;
                                 }
-                                ///鏄剧ず閫昏緫鍚嶇О
-                                var btnlogic = new Button
+
+                                actionsIcon.UnSelectedImagePath = "ZigeeLogic/scene.png";
+                                ///璁惧鍚嶇ОButton
+                                var btndevicename = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
                                     Width = Application.GetRealWidth(500),
                                     TextAlignment = TextAlignment.CenterLeft,
-                                    Gravity = Gravity.CenterVertical,
                                     Text = sceneinof.Name,
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                                    //TextColor = 0xff121212,
                                 };
-                                actionsrowLayout.AddChidren(btnlogic);
+                                actionsrowLayout.AddChidren(btndevicename);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevicename.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(500),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(btnregionname);
+                                /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Common.Room room = new Common.Room();
+                                btnregionname.Text = room.GetRoomNameBySceneId(sceneinof.Id);
+                                //Send.RoomNmae(btnregionname, deviceinof);
+
+
 
                             }
                             break;
@@ -1221,7 +1492,6 @@
                                 ///鏄剧ず閫昏緫鍚嶇О
                                 var btnlogic = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
                                     Width = Application.GetRealWidth(500),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
@@ -1234,9 +1504,9 @@
 
                                 var logicedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
                                 actionsrowLayout.AddRightView(logicedit);
                                 logicedit.MouseUpEventHandler += (sender, e) =>
@@ -1275,7 +1545,6 @@
                             {
                                 var btnsecurity = new Button
                                 {
-                                    X = Application.GetRealWidth(40),
                                     Width = Application.GetRealWidth(700),
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Gravity = Gravity.CenterVertical,
@@ -1283,14 +1552,14 @@
                                     //TextColor = 0xff121212,
                                     TextID = MyInternationalizationString.security,
                                 };
-                                actionsrowLayout.AddChidren(btnsecurity);
+                                //actionsrowLayout.AddChidren(btnsecurity);
 
 
                                 var btnsecurityedit = new Button
                                 {
-                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor,
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
                                     Text = Language.StringByID(MyInternationalizationString.edit),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                                 };
                                 actionsrowLayout.AddRightView(btnsecurityedit);
                                 btnsecurityedit.MouseUpEventHandler += (sender, e) =>
@@ -1305,13 +1574,11 @@
                                 ///鏄剧ず瀹夐槻鏉′欢鐘舵�佹帶浠�
                                 var securitystatus = new Button
                                 {
-                                    Width = Application.GetRealWidth(300),
-                                    Height = Application.GetRealHeight(160),
+                                    Width = Application.GetRealWidth(500),
+                                    Height = Application.GetRealHeight(130),
                                     Gravity = Gravity.CenterVertical,
-                                    //TextColor = 0xff121212,
-                                    X = Application.GetRealWidth(1080 - 330),
-                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                                    TextAlignment = TextAlignment.CenterRight,
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                                 };
                                 actionsrowLayout.AddChidren(securitystatus);
 
@@ -1320,11 +1587,12 @@
                                 {
                                     if (actions["Password"].ToString() == "888888")
                                     {
-
+                                        actionsIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
                                         securitystatus.Text = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
                                     }
                                     else
                                     {
+                                        actionsIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
                                         securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
 
                                     }
@@ -1333,22 +1601,77 @@
                                 {
                                     if (actions["SecurityModeId"].ToString() == "1")
                                     {
-
+                                        actionsIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
                                         securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
                                     }
                                     else if (actions["SecurityModeId"].ToString() == "2")
                                     {
+                                        actionsIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
                                         securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
                                     }
                                 }
 
                             }
                             break;
+                        case 7:
+                            {
+                                var delaytimevalue = int.Parse(actions["DelayTime"].ToString());
+                                var Minutes = delaytimevalue / 60;
+                                var seconds = delaytimevalue % 60;
+
+                                actionsIcon.UnSelectedImagePath = "ZigeeLogic/delay.png";
+                                ///寤舵椂Button
+                                var delaytimeBtn = new Button
+                                {
+                                    Width = Application.GetRealWidth(500),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(delaytimeBtn);
+                                if (Minutes != 0)
+                                {
+                                    if (seconds == 0)
+                                    {
+                                        delaytimeBtn.Text = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute);
+                                    }
+                                    else
+                                    {
+                                        delaytimeBtn.Text = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute) + seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
+
+                                    }
+                                }
+                                else
+                                {
+                                    delaytimeBtn.Text = seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
+                                }
+
+
+                                ///寤舵椂缂栬緫Button
+                                var delaytimeedit = new Button
+                                {
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                                    Text = Language.StringByID(MyInternationalizationString.edit),
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                                    Tag = i,
+                                };
+                                actionsrowLayout.AddRightView(delaytimeedit);
+
+                                ///缂栬緫鐐瑰嚮浜嬩欢
+                                delaytimeedit.MouseUpEventHandler += (sender, e) =>
+                                {
+                                    var delayTime = new DelayTime();
+                                    UserView.HomePage.Instance.AddChidren(delayTime);
+                                    UserView.HomePage.Instance.PageIndex += 1;
+                                    delayTime.Show(int.Parse(delaytimeedit.Tag.ToString()), true);
+                                };
+
+                            };
+                            break;
                     }
                     ///鍒犻櫎鎺т欢
                     var del = new Button
                     {
-                        BackgroundColor = ZigbeeColor.Current.LogicDelBackgroundColor,
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
                         Text = Language.StringByID(MyInternationalizationString.del),
                     };
                     actionsrowLayout.AddRightView(del);
@@ -1377,98 +1700,173 @@
 
             #endregion
 
-            #region  ----鎺ㄩ�佽缃�----
-            /*
-            var pushRowLayout = new RowLayout
+            #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
+
+            var fraline1 = new FrameLayout
             {
-                Height = Application.GetRealHeight(150),
+                Height = Application.GetRealHeight(30),
             };
-            middle.AddChidren(pushRowLayout);
- 
-            var btnpushtitle = new Button
-            {
-                //Text = "鎺ㄩ�佽缃�",
-                //TextSize = 16,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                //Gravity = Gravity.CenterVertical,
-                TextID = MyInternationalizationString.pushset,
-                TextColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                Y = Application.GetRealHeight(90),
-                Width = Application.GetRealWidth(300),
-                Height = Application.GetRealHeight(60),
-                TextSize = 16,
-                //TextID = MyInternationalizationString.execute,
-            };
-            pushRowLayout.AddChidren(btnpushtitle);
- 
-            var pushswitchRowlayout = new RowLayout
+            middle.AddChidren(fraline1);
+
+
+            var weekFrameLayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
-                LineColor = ZigbeeColor.Current.LogicLineColor,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(pushswitchRowlayout);
- 
+            middle.AddChidren(weekFrameLayout);
+            var weekRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            weekFrameLayout.AddChidren(weekRowLayout);
+
+            var settxet = new Button
+            {
+                Text = Language.StringByID(MyInternationalizationString.setupcycle),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+            };
+            weekRowLayout.AddChidren(settxet);
+            var btnweektext = new Button
+            {
+                Width = Application.GetRealWidth(595),
+                Height = Application.GetRealHeight(60),
+                TextAlignment = TextAlignment.CenterRight,
+                //Text = "姣忓ぉ",
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                TextID = MyInternationalizationString.everyday,
+                Y = Application.GetRealHeight(35),
+                X = settxet.Right,
+            };
+            weekRowLayout.AddChidren(btnweektext);
+
+            var nextBtn = new Button
+            {
+
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+
+            };
+            weekRowLayout.AddChidren(nextBtn);
+
+            UpdateWeek(btnweektext);
+            EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
+            {
+                /*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
+                var cycle = new Cycle(() => { UpdateWeek(btnweektext); });
+                UserView.HomePage.Instance.AddChidren(cycle);
+                UserView.HomePage.Instance.PageIndex += 1;
+                cycle.Show();
+
+                //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
+                //UserView.HomePage.Instance.AddChidren(cyclicCycle);
+                //UserView.HomePage.Instance.PageIndex += 1;
+                //cyclicCycle.Show();
+            };
+            btnweektext.MouseUpEventHandler += cycleclick;
+            nextBtn.MouseUpEventHandler += cycleclick;
+            #endregion
+
+            #region  ----鎺ㄩ�佽缃�----
+
+            var pushFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(pushFrameLayout);
+
+            var pushswitchRowlayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            pushFrameLayout.AddChidren(pushswitchRowlayout);
+
             var btnswitchtxet = new Button
             {
-                //Text = "鎺ㄩ�佸紑鍏�",
-                X = Application.GetRealWidth(40),
                 TextAlignment = TextAlignment.CenterLeft,
-                Gravity = Gravity.CenterVertical,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
                 TextID = MyInternationalizationString.pushswitch,
             };
             pushswitchRowlayout.AddChidren(btnswitchtxet);
- 
+
             var btnswitch = new Button
             {
-                Width = Application.GetMinRealAverage(183),
-                Height = Application.GetMinRealAverage(123),
-                UnSelectedImagePath = "ZigeeLogic/Switch.png",
-                SelectedImagePath = "ZigeeLogic/SwitchSelected.png",
-                X = Application.GetRealWidth(1080 - 200),
+                Width = Application.GetMinRealAverage(104),
+                Height = Application.GetMinRealAverage(63),
+                UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+                SelectedImagePath = "ZigeeLogic/logicopen.png",
+                X = Application.GetRealWidth(965 - 104),
                 Gravity = Gravity.CenterVertical,
             };
             pushswitchRowlayout.AddChidren(btnswitch);
- 
             btnswitch.MouseUpEventHandler += (sender1, e1) =>
             {
                 btnswitch.IsSelected = !btnswitch.IsSelected;
                 if (btnswitch.IsSelected)
                 {
- 
+
                 }
                 else
                 {
- 
+
                 }
             };
- 
-            var custompushRowLayout = new RowLayout
+
+
+            var custompushFrameLayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(custompushRowLayout);
- 
+            middle.AddChidren(custompushFrameLayout);
+
+            var custompushRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            custompushFrameLayout.AddChidren(custompushRowLayout);
+
             var btncustompush = new Button
             {
                 TextID = MyInternationalizationString.custompush,
-                //Text = "鑷畾涔夋帹閫�",
                 TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(300),
-                X = Application.GetRealWidth(40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
             };
             custompushRowLayout.AddChidren(btncustompush);
- 
- 
+
+
             var custompushback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
+                X = Application.GetRealWidth(965 - 58),
                 Gravity = Gravity.CenterVertical,
             };
             custompushRowLayout.AddChidren(custompushback);
@@ -1478,34 +1876,41 @@
                 UserView.HomePage.Instance.AddChidren(CustomText);
                 UserView.HomePage.Instance.PageIndex += 1;
                 CustomText.Show();
- 
+
             };
             btncustompush.MouseUpEventHandler += customclick;
             custompushback.MouseUpEventHandler += customclick;
             custompushRowLayout.MouseUpEventHandler += customclick;
-            */
+
             #endregion
 
 
+            var saveFrameLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFrameLayout);
+
             var btnsave = new Button
             {
-                Height = Application.GetRealHeight(150),//194
-                Y = middle.Bottom + Application.GetRealHeight(15),
-                //Text = "淇濆瓨",
-                Width = Application.GetRealWidth(500),
-                Radius = (uint)Application.GetRealHeight(50),
-                BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
-                X = Application.GetRealWidth(290),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                 TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
             };
-            if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
-            {
-                AddChidren(btnsave);
-            }
+            saveFrameLayout.AddChidren(btnsave);
             btnsave.MouseUpEventHandler += async (sender, e) =>
             {
                 var name = logicTextBox.Text.Trim();
-
+                //if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
+                //{
+                //    AddChidren(btnsave);
+                //}
                 if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
                 {
                     new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
@@ -1572,41 +1977,23 @@
                 case 3:
                     {
 
-                        string len = "";
-                        int maxvalue = 0, minvalue = 0;
+                        string len = "", value = "";
                         var stringvalue = Convert.ToString(Common.Logic.CurrentLogic.TimeAttribute.MonthDate, 2);
                         var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
                         for (int j = 31; j >= 0; j--)
                         {
                             len += str.Substring(j, 1);
                         }
-                        //鎵惧嚭鏈�灏忓��
                         for (int j = 0; j < len.Length; j++)
                         {
                             var strvalue = len.Substring(j, 1);
                             if (strvalue == "1")
                             {
-                                minvalue = j + 1;
-                                break;
+                                value += (j + 1).ToString() + ",";
                             }
                         }
-                        //鎵惧嚭鏈�澶у��
-                        for (int j = 0; j < len.Length; j++)
-                        {
-                            var strvalue = len.Substring(j, 1);
-                            if (strvalue == "1")
-                            {
-                                maxvalue = j + 1;
-                            }
-                        }
-                        if (minvalue == maxvalue)
-                        {
-                            btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + minvalue.ToString() + Language.StringByID(MyInternationalizationString.day);
-                        }
-                        else
-                        {
-                            btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + minvalue.ToString() + Language.StringByID(MyInternationalizationString.day) + "-" + Language.StringByID(MyInternationalizationString.monthly) + maxvalue.ToString() + Language.StringByID(MyInternationalizationString.day);
-                        }
+                        btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
+
                     }; break;
                 case 4:
                     {
@@ -1827,129 +2214,240 @@
 
         }
 
-        void ConditionView()
+        void ConditionView(bool edit)
         {
             Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
-            if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+
+            #region 缁勫悎鏉′欢View
+            FrameLayout flMain = new FrameLayout { BackgroundColor = 0x50000000 };
+            this.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender2, e2) =>
             {
-                #region 缁勫悎鏉′欢View
-                FrameLayout flMain = new FrameLayout { BackgroundColor = 0x00000000 };
-                this.AddChidren(flMain);
-                flMain.MouseUpEventHandler += (sender2, e2) =>
-                {
-                    flMain.RemoveFromParent();
-                };
+                flMain.RemoveFromParent();
+            };
 
-                var frameLayout = new FrameLayout
-                {
-                    Y = Application.GetRealHeight(1920 - 680 - 50),
-                    Height = Application.GetRealHeight(680),
-                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                    Width = Application.GetRealWidth(1000),
-                    X = Application.GetRealWidth(40),
-                    Radius = (uint)Application.GetRealHeight(40),
-                };
-                flMain.AddChidren(frameLayout);
+            var timetypeframelayout1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(timetypeframelayout1);
+            var framelayout = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(framelayout);
 
-                var titlerow = new FrameLayout
-                {
-                    Height = Application.GetRealHeight(150),
-                };
-                frameLayout.AddChidren(titlerow);
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            framelayout.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
-                var titlebtn = new Button
-                {
-                    //Text = "璇烽�夋嫨澶氭潯浠剁粍鍚�",
-                    TextID = MyInternationalizationString.multicondition,
-                    TextSize = 16,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                };
-                titlerow.AddChidren(titlebtn);
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.condition,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
 
-                var androw = new RowLayout
-                {
-                    Height = Application.GetRealHeight(160),
-                    Y = titlerow.Bottom,
-                };
-                frameLayout.AddChidren(androw);
-                var andbtn = new Button
-                {
-                    Width = Application.GetRealWidth(600),
-                    TextID = MyInternationalizationString.Allconditions,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    //Text = "婊¤冻鍏ㄩ儴鏉′欢鏃�",
-                    TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealHeight(50),
-                };
-                androw.AddChidren(andbtn);
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
 
-                var orrow = new RowLayout
-                {
-                    Height = Application.GetRealHeight(160),
-                    Y = androw.Bottom,
-                };
-                frameLayout.AddChidren(orrow);
-                var orbtn = new Button
-                {
-                    Width = Application.GetRealWidth(600),
-                    TextID = MyInternationalizationString.anycondition,
-                    //Text = "婊¤冻浠讳竴鏉′欢鏃�",
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealHeight(50)
-                };
-                orrow.AddChidren(orbtn);
+            #region  -------婊¤冻鎵�鏈夋潯浠�   婊¤冻鍏朵腑涓�涓潯浠�
 
-                var cancelbtn = new Button
-                {
-                    TextID = MyInternationalizationString.cancel,
-                    TextSize = 16,
-                    Y = orrow.Bottom + Application.GetRealHeight(30),
-                    Height = Application.GetRealHeight(160),
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                };
-                frameLayout.AddChidren(cancelbtn);
-                cancelbtn.MouseUpEventHandler += (sender4, e4) =>
-                {
-                    flMain.RemoveFromParent();
-                };
-                #endregion
 
-                //婊¤冻鍏ㄩ儴鏉′欢鏃剁偣鍑讳簨浠� simulation;
-                EventHandler<MouseEventArgs> andclick = (sender6, e6) =>
+            #region  -------婊¤冻鎵�鏈夋潯浠�
+
+
+            var andFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom + Application.GetRealHeight(20),
+            };
+            framelayout.AddChidren(andFrameLayout);
+
+
+            var androw = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            andFrameLayout.AddChidren(androw);
+            var andbtn = new Button
+            {
+
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.Allconditions,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+
+            };
+            androw.AddChidren(andbtn);
+
+            var andSelected = new SelectedButton();
+            androw.AddChidren(andSelected);
+            #endregion
+            #region  -------婊¤冻鍏朵腑涓�涓潯浠�
+
+            var orFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = andFrameLayout.Bottom,
+
+            };
+            framelayout.AddChidren(orFrameLayout);
+
+
+
+            var orrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            orFrameLayout.AddChidren(orrow);
+            var orbtn = new Button
+            {
+
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.anycondition,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            orrow.AddChidren(orbtn);
+
+            var orSelected = new SelectedButton();
+            orrow.AddChidren(orSelected);
+            #endregion
+            ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> andclick = (sedner14, e14) =>
+            {
+                andSelected.Visible = true;
+                orSelected.Visible = false;
+                andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+            };
+            androw.MouseUpEventHandler += andclick;
+            andbtn.MouseUpEventHandler += andclick;
+            andSelected.MouseUpEventHandler += andclick;
+            andFrameLayout.MouseUpEventHandler += andclick;
+
+
+            ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> orclick = (sedner15, e15) =>
+            {
+                andSelected.Visible = false;
+                orSelected.Visible = true;
+                andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+            };
+            orrow.MouseUpEventHandler += orclick;
+            orbtn.MouseUpEventHandler += orclick;
+            orSelected.MouseUpEventHandler += orclick;
+            orFrameLayout.MouseUpEventHandler += orclick;
+
+            #endregion
+            #endregion
+
+            if (edit)
+            {
+                if (Common.Logic.CurrentLogic.Relationship == 0)
                 {
-                    flMain.RemoveFromParent();
+                    andSelected.Visible = true;
+                    orSelected.Visible = false;
+                    andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                    orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                }
+                else
+                {
+                    andSelected.Visible = false;
+                    orSelected.Visible = true;
+                    andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                    orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                }
+            }
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+                if (!andSelected.Visible && !orSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
+                flMain.RemoveFromParent();
+
+                if (andSelected.Visible)
+                {
                     Common.Logic.CurrentLogic.Relationship = 0;
-                    var addLogicPage = new AddLogicPage();
-                    UserView.HomePage.Instance.AddChidren(addLogicPage);
-                    UserView.HomePage.Instance.PageIndex += 1;
-                    addLogicPage.Show();
-                };
-                androw.MouseUpEventHandler += andclick;
-                andbtn.MouseUpEventHandler += andclick;
 
-                //婊¤冻浠讳竴鏉′欢鏃剁偣鍑讳簨浠�
-                EventHandler<MouseEventArgs> orclick = (sender6, e6) =>
+                }
+                if (orSelected.Visible)
                 {
-                    flMain.RemoveFromParent();
                     Common.Logic.CurrentLogic.Relationship = 1;
+
+                }
+                if (edit)
+                {
+                    if (Common.Logic.CurrentLogic.LogicId != 0)
+                    {
+                        Send.LogicControlSwitch(Common.Logic.CurrentLogic);
+                    }
+                    var logicCommunalPage = new LogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    logicCommunalPage.Show(() => { });
+                }
+                else
+                {
                     var addLogicPage = new AddLogicPage();
                     UserView.HomePage.Instance.AddChidren(addLogicPage);
                     UserView.HomePage.Instance.PageIndex += 1;
                     addLogicPage.Show();
-                };
-                orrow.MouseUpEventHandler += orclick;
-                orbtn.MouseUpEventHandler += orclick;
-            }
-            else
-            {
-                var addLogicPage = new AddLogicPage();
-                UserView.HomePage.Instance.AddChidren(addLogicPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                addLogicPage.Show();
-            }
-        }
+                }
+            };
 
+        }
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index 296d3fb..cb9097a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -16,83 +16,139 @@
         {
             Tag = "Logic";
         }
-        Button SelectedButton = new Button();
-        HorizontalScrolViewLayout horizontalScrol;
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button devicetypeButton = new Button();
         VerticalScrolViewLayout middle;
+        FrameLayout clickframeLayout = new FrameLayout();
+        Button clickbutton = new Button();
+        Button clicktextcolcrbutton = new Button();
         public void Show()
         {
-            UserView.HomePage.Instance.ScrollEnabled = false;
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
 
-            var topFrameLayout = new RowLayout
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(220),
-                Y = Application.GetRealHeight(80),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.devicestate,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.devicestate,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
+            topRowLayout.AddChidren(back);
             back.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
                 UserView.HomePage.Instance.ScrollEnabled = true;
             };
 
-            var  roomname = new Button
+            var foolrname = new Button
             {
-                Width = Application.GetMinRealAverage(300 + 300-30),
-                Height = Application.GetMinRealAverage(80),
-                X = Application.GetRealWidth(1080 - 300 - 30 - 300),
-                Y = Application.GetRealHeight(120),
-                TextAlignment = TextAlignment.CenterRight,
-                //Text = "鑷畾涔夋埧闂�",
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID=MyInternationalizationString.customroom,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
             };
-            topFrameLayout.AddChidren(roomname);
-
-           var  horizontalScrolfl = new FrameLayout
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
             {
-                Height = Application.GetRealHeight(220 + 30),
-                Y = topFrameLayout.Bottom,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            var roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+
+            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58-200),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58+200),
             };
-            AddChidren(horizontalScrolfl);
-
-
-             horizontalScrol = new HorizontalScrolViewLayout()
+            this.AddChidren(devicetypehorizontalScrol1);
+            ///璁惧绫诲瀷婊戝姩鎺т欢
+            var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
             {
-                Width = Application.GetRealWidth(1080 - 40),
-                Height = Application.GetRealHeight(180 + 30),
-                Y = Application.GetRealHeight(40),
-                X = Application.GetRealWidth(40),
-                Radius = (uint)Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                Radius = (uint)Application.GetRealHeight(50),
+
             };
-            horizontalScrolfl.AddChidren(horizontalScrol);
+            this.AddChidren(devicetypehorizontalScrol);
 
             middle = new VerticalScrolViewLayout();
-            middle.Y = horizontalScrolfl.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 300 - 250);
+            middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
+            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
             middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            middle.X = Application.GetRealWidth(58);
+            middle.Radius = (uint)Application.GetRealHeight(50);
             this.AddChidren(middle);
 
             ///鐩墠鏀寔鐨勮澶�
@@ -100,10 +156,14 @@
                 DeviceType.OnOffOutput,
                 DeviceType.DimmableLight,
                 DeviceType.WindowCoveringDevice,
+                DeviceType.Thermostat,
+                DeviceType.AirSwitch,
             };
 
-            ///鎴块棿鐐瑰嚮浜嬩欢
-            roomname.MouseUpEventHandler += (sender, e) =>
+
+
+            ///妤煎眰鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
             {
 
                 var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -112,101 +172,191 @@
                 {
                     flMain.RemoveFromParent();
                 };
-                var roombj = new VerticalScrolViewLayout
+                var foolrbj = new VerticalScrolViewLayout
                 {
 
                     Width = Application.GetRealWidth(400),
                     Height = Application.GetRealHeight(600),
                     X = Application.GetRealWidth(1080 - 400 - 60),
-                    Y = Application.GetRealHeight(220 + 30 + 80),
+                    Y = Application.GetRealHeight(184 + 50),
                     BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                     Radius = (uint)Application.GetRealHeight(30),
                 };
-                flMain.AddChidren(roombj);
-                List<Common.Room> roomlist = new List<Common.Room>();
-                roomlist.Clear();
-                Common.Room customroom = new Common.Room();
-                customroom.Name = Language.StringByID(MyInternationalizationString.customroom);
-                foreach (var device in Common.Logic.LogicDviceList)
+                flMain.AddChidren(foolrbj);
+                foreach (var foolr in Config.Instance.Home.FloorDics)
                 {
-                    
-                    var deviceui = customroom.GetDeviceUI(device);
-                    if (deviceui != null)
-                    {
-                        customroom.DeviceUIList.Add(deviceui);
-                    }
 
-                }
-                roomlist.Add(customroom);
-                roomlist.AddRange(Common.Room.Lists);
-                foreach (var room in roomlist)
-                {
-                    var rowLayout = new RowLayout
+                    var foolrRowLayout = new FrameLayout
                     {
                         Height = Application.GetRealHeight(150),
                     };
-                    roombj.AddChidren(rowLayout);
+                    foolrbj.AddChidren(foolrRowLayout);
 
-                    var btnroomname = new Button
+                    var btnfoolrname = new Button
                     {
-                        Width = Application.GetRealWidth(300),
-                        Text = room.Name,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        X = Application.GetRealWidth(30),
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
                         TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        //SelectedTextColor=0xfffc744b,
+                        Tag = foolr.Key,
                     };
-                    rowLayout.AddChidren(btnroomname);
+                    foolrRowLayout.AddChidren(btnfoolrname);
 
-                    EventHandler<MouseEventArgs> roomclick = (sender1, e1) =>
+
+                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                     {
-
+                        roomhorizontalScrol.RemoveAll();
+                        devicetypehorizontalScrol.RemoveAll();
+                        middle.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
                         flMain.RemoveFromParent();
-                        roomname.Text = room.Name;
-                        var list = new List<DeviceUI>();
-                        foreach (var device in room.DeviceUIList) {
-                            if (!deviceTypeList.Contains(device.CommonDevice.Type))
-                            {
-                                continue;
-                            }
-                            list.Add(device);
-                        }
-                        AllDeviceTypeView(list);
-
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
                     };
-                    rowLayout.MouseUpEventHandler += roomclick;
-                    btnroomname.MouseUpEventHandler += roomclick;
+                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
+                    btnfoolrname.MouseUpEventHandler += foolrnameclick;
+
 
                 }
+
             };
-           
-            Common.Room customroom1 = new Common.Room();
-            foreach (var device in Common.Logic.LogicDviceList)
+            foolrname.MouseUpEventHandler += foorlclick;
+            dropdown.MouseUpEventHandler += foorlclick;
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
             {
-                //杩囨护鎺夋病鏈夌敤鍒拌澶囷紱
-                if (!deviceTypeList.Contains(device.Type))
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
                 {
-                    continue;
+                    roomlists.AddRange(Common.Room.Lists);
                 }
-                var deviceui = customroom1.GetDeviceUI(device);
-                if (deviceui != null)
+                else
                 {
-                    customroom1.DeviceUIList.Add(deviceui);
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
                 }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
 
             }
 
-            AllDeviceTypeView(customroom1.DeviceUIList);
+
+            AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+
+
+        }
+        /// <summary>
+        /// 鍔犺浇鎵�鏈夋埧闂寸殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            for (int i = 0; i < roomlist.Count; i++)
+            {
+                var room = roomlist[i];
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+                if (i == 0)
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+                }
+
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
         }
 
         /// <summary>
         ///鍔犺浇璇ュ尯鍩熸墍鏈夎澶囩殑瑙嗗浘鏂规硶
         /// </summary>
-        void AllDeviceTypeView(List<DeviceUI> devicelist)
+        void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
         {
 
             List<string> devicetypelist = new List<string>();
             devicetypelist.Clear();
-          
+
             #region  ------鎺掑垪璁惧绫诲瀷------
             var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
             if (lightjosn != null)
@@ -218,58 +368,99 @@
             {
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
             }
-          
-            #endregion
-                     
-            horizontalScrol.RemoveAll();
-            foreach (var devicetype in devicetypelist)
+            var ac = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.Thermostat);
+            if (ac != null)
             {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.AC));
+            }
+            var airSwitch = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.AirSwitch);
+            if (airSwitch != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Airswitch));
+            }
+
+            #endregion
+
+            devicetypehorizontalScrol.RemoveAll();
+            for (int i = 0; i < devicetypelist.Count; i++)
+            {
+
+                var devicetype = devicetypelist[i];
+
+                var spaceRowLayout = new FrameLayout();
+                devicetypehorizontalScrol.AddChidren(spaceRowLayout);
+                if (i == 0)
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(37);
+                }
+                else
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(80);
+                }
 
                 var deviceRowLayout = new FrameLayout
                 {
-                    Height = Application.GetRealHeight(180 + 30),
-                    Width = Application.GetRealWidth(250),
+                    Width = Application.GetRealWidth(156 + 20),
+                    Height = Application.GetRealHeight(280 - 30),
+                    Y = Application.GetRealHeight(30),
                 };
-                horizontalScrol.AddChidren(deviceRowLayout);
+                devicetypehorizontalScrol.AddChidren(deviceRowLayout);
+
+                var backgroundColor = new Button
+                {
+                    Width = Application.GetRealWidth(156),
+                    Height = Application.GetRealHeight(180),
+                    X = Application.GetRealWidth(10),
+                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
+                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
+                };
+                deviceRowLayout.AddChidren(backgroundColor);
+
 
                 var devicetypeicon = new Button
                 {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
-                    X = Application.GetRealWidth(70),
+                    Width = Application.GetRealWidth(84),
+                    Height = Application.GetRealHeight(84),
+                    X = Application.GetRealWidth(46),
+                    Y = Application.GetRealHeight(30),
                 };
                 deviceRowLayout.AddChidren(devicetypeicon);
-                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/Light.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/LightSelected.png";
-                }
-                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
-                {
-                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/Curtain.png";
-                    devicetypeicon.SelectedImagePath = "ZigeeLogic/CurtainSelected.png";
-                }
-
-
 
                 var devicetypename = new Button
                 {
-                    Width = Application.GetRealWidth(250),
-                    Height = Application.GetRealHeight(50),
+                    Width = Application.GetRealWidth(176),
+                    Height = Application.GetRealHeight(40),
                     Text = devicetype,
                     TextAlignment = TextAlignment.Center,
-                    Y = devicetypeicon.Bottom + Application.GetRealHeight(20),
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Y = backgroundColor.Bottom,
+                    TextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 10,
                 };
                 deviceRowLayout.AddChidren(devicetypename);
-
+                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedlight.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedac.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                }
                 EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
                 {
+
+                    devicetypeButton.IsSelected = false;
+                    devicetypeButton = backgroundColor;
+                    backgroundColor.IsSelected = true;
                     List<DeviceType> list = new List<DeviceType>();
                     list.Clear();
-                    SelectedButton.IsSelected = false;
-                    SelectedButton = devicetypeicon;
-                    SelectedButton.IsSelected = true;
                     ///鍒嗙被鏄剧ず锛堜緥濡傜伅鍏夛細{鐏厜1锛岀伅鍏�2...}锛�
                     if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
                     {
@@ -280,6 +471,14 @@
                     {
                         list.Add(DeviceType.WindowCoveringDevice);
                     }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                    {
+                        list.Add(DeviceType.Thermostat);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                    {
+                        list.Add(DeviceType.AirSwitch);
+                    }
 
                     ActionDeviceView(list, devicelist);
 
@@ -287,16 +486,17 @@
                 deviceRowLayout.MouseUpEventHandler += devicetypeclick;
                 devicetypename.MouseUpEventHandler += devicetypeclick;
                 devicetypeicon.MouseUpEventHandler += devicetypeclick;
+                backgroundColor.MouseUpEventHandler += devicetypeclick;
 
             }
             ///鏄剧ず鎴块棿鎵�鏈夎澶�
-            ActionDeviceView( new List<DeviceType>(), devicelist);
+            ActionDeviceView(new List<DeviceType>(), devicelist);
         }
         /// <summary>
         /// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
         /// </summary>
         /// <param name="devicelist">璁惧鍒楄〃</param>
-        void ActionDeviceView( List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+        void ActionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
         {
             middle.RemoveAll();
             foreach (var common in devicelist)
@@ -306,45 +506,109 @@
                 {
                     continue;
                 }
-             
-                var row = new RowLayout
+
+                var deviceFramelayout = new FrameLayout
                 {
-                    Height = Application.GetRealHeight(180),
+                    Height = Application.GetRealHeight(160),
+                };
+                middle.AddChidren(deviceFramelayout);
+
+                var bjFramelayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(112),
+                    Height = Application.GetRealHeight(112),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(30 + 9),
+                    Radius = (uint)Application.GetRealHeight(56),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                deviceFramelayout.AddChidren(bjFramelayout);
+
+                var deviceIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    Gravity = Gravity.Center,
 
                 };
-                middle.AddChidren(row);
+                bjFramelayout.AddChidren(deviceIconBtn);
+
+                var deviceRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                deviceFramelayout.AddChidren(deviceRow);
 
                 var devicename = new Button
                 {
-                    Gravity = Gravity.CenterVertical,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    X = Application.GetRealWidth(40),
-                    Width = Application.GetRealWidth(600),
-                    //SelectedBackgroundColor = 0xFFE9652D,
                     Text = common.CommonDevice.DeviceEpointName,
+                    TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
                 };
-                row.AddChidren(devicename);
-
-                var btndeviceback = new Button
+                deviceRow.AddChidren(devicename);
+                switch (common.CommonDevice.Type)
                 {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
-                    UnSelectedImagePath = "ZigeeLogic/Next.png",
-                    X = Application.GetRealWidth(1080 - 140),
-                    Gravity = Gravity.CenterVertical,
-                };
-                row.AddChidren(btndeviceback);
+
+                    case DeviceType.OnOffOutput:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/light.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedlight.png";
+                        }
+                        break;
+                    case DeviceType.DimmableLight:
+                        {
+
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selecteddimmableLight.png";
+                        }
+                        break;
+                    case DeviceType.WindowCoveringDevice:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/curtain.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                        }
+                        break;
+                    case DeviceType.Thermostat:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/ac.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedac.png";
+                        }
+                        break;
+                    case DeviceType.AirSwitch:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                        }
+                        break;
+                }
 
                 EventHandler<MouseEventArgs> devicclick = (sen, e) =>
                 {
+                    clickbutton.IsSelected = false;
+                    clickbutton = deviceIconBtn;
+                    deviceIconBtn.IsSelected = true;
+                    clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                    clickframeLayout = bjFramelayout;
+                    bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+                    clicktextcolcrbutton.IsSelected = false;
+                    clicktextcolcrbutton = devicename;
+                    devicename.IsSelected = true;
+
                     var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                     this.AddChidren(flMain);
                     CurrentDeviceStateView(flMain, common.CommonDevice, false);
                 };
-                row.MouseUpEventHandler += devicclick;
+                deviceFramelayout.MouseUpEventHandler += devicclick;
+                bjFramelayout.MouseUpEventHandler += devicclick;
+                deviceIconBtn.MouseUpEventHandler += devicclick;
+                deviceRow.MouseUpEventHandler += devicclick;
                 devicename.MouseUpEventHandler += devicclick;
-                btndeviceback.MouseUpEventHandler += devicclick;
 
             }
         }
@@ -364,50 +628,76 @@
             {
                 flMain.RemoveFromParent();
             };
+            var devicefra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(devicefra1);
+
             var devicefra = new FrameLayout
             {
 
-                Width = Application.GetRealWidth(1080 - 80),
-                X = Application.GetRealWidth(40),
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530 + 160),
+                Y = Application.GetRealHeight(1920 - 530 - 160),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(devicefra);
 
-
-
-            var devicename = new Button
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
             {
-                Y = Application.GetRealHeight(20),
-                Text = common.DeviceEpointName,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(150),
-                Width = Application.GetRealWidth(1080 - 80),
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            devicefra.AddChidren(devicename);
+            devicefra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text = common.DeviceEpointName,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
 
 
-
-            if (actionsInfo.ContainsKey("LinkType"))
-            {
-                actionsInfo.Remove("LinkType");
-            }
-            if (actionsInfo.ContainsKey("DeviceAddr"))
-            {
-                actionsInfo.Remove("DeviceAddr");
-            }
-            if (actionsInfo.ContainsKey("Epoint"))
-            {
-                actionsInfo.Remove("Epoint");
-            }
-            if (actionsInfo.ContainsKey("Time"))
-            {
-                actionsInfo.Remove("Time");
-            }
-            if (actionsInfo.ContainsKey("TaskList"))
-            {
-                actionsInfo.Remove("TaskList");
-            }
+            string SelectedDeviceStatusaction = "no";
             actionsInfo.Add("LinkType", 0);
             actionsInfo.Add("DeviceAddr", common.DeviceAddr);
             actionsInfo.Add("Epoint", common.DeviceEpoint);
@@ -432,6 +722,7 @@
             }
             switch (common.Type)
             {
+                
                 ///鐏厜
                 case DeviceType.OnOffOutput:
                     {
@@ -454,123 +745,162 @@
                         switchdictionary.Add("Data1", "0");
                         switchdictionary.Add("Data2", "0");
                         taskListInfo.Add(switchdictionary);
-                       
+
                         #endregion
 
                         #region  鐏厜View
 
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
-                        devicefra.Height = Application.GetRealHeight(720);
-                        var OnOffOutputfra = new FrameLayout
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 2+ 30),
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
-                        devicefra.AddChidren(OnOffOutputfra);
+                        devicefra.AddChidren(openframelayout);
 
                         var openrowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-                        OnOffOutputfra.AddChidren(openrowlayout);
+                        openframelayout.AddChidren(openrowlayout);
 
                         var btnopen = new Button
                         {
-                            //Text = "寮�",
+                            Width = Application.GetRealWidth(600),
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         openrowlayout.AddChidren(btnopen);
 
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var openBtnSelected = new SelectedButton();
                         openrowlayout.AddChidren(openBtnSelected);
-
+                        #endregion
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
                         var closerowlayout = new RowLayout
                         {
-                            Y = openrowlayout.Bottom,
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-                        OnOffOutputfra.AddChidren(closerowlayout);
+                        closeframelayout.AddChidren(closerowlayout);
 
                         var btnclose = new Button
                         {
                             //Text = "鍏�",
                             TextID = MyInternationalizationString.close,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
                             Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         closerowlayout.AddChidren(btnclose);
 
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical,
-                        };
+                        var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
 
                         #endregion
 
                         ///纭浜嬩欢
                         EventHandler<MouseEventArgs> openclick = (sender, e) =>
                         {
+                            SelectedDeviceStatusaction = "yes";
                             openBtnSelected.Visible = true;
                             closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
                             switchdictionary.Add("Data1", "1");//榛樿鍊�
-                            LogicIfon.AddDeviceactions(common,actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
+
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
                         btnopen.MouseUpEventHandler += openclick;
                         openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
                         ///鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            SelectedDeviceStatusaction = "yes";
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
                             switchdictionary.Add("Data1", "0");//榛樿鍊�
-                            LogicIfon.AddDeviceactions(common, actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
+
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
                         btnclose.MouseUpEventHandler += closeclick;
                         closeBtnSelected.MouseUpEventHandler += closeclick;
-                       
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
 
+                        };
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
                         if (edit && TaskList != null)
                         {
                             foreach (var value in TaskList)
@@ -586,12 +916,21 @@
                                         switchdictionary.Add("Data1", "1");
                                         openBtnSelected.Visible = true;
                                         closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = false;
                                     }
-                                    else
+                                    else if (value["Data1"] == "0")
                                     {
                                         switchdictionary.Add("Data1", "0");
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                    }
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
                                     }
                                     break;
                                 }
@@ -607,208 +946,290 @@
 
                         #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
                         Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
-                        if (switchdictionary.ContainsKey("TaskType"))
-                        {
-                            switchdictionary.Remove("TaskType");
-                        }
-                        if (switchdictionary.ContainsKey("Data1"))
-                        {
-                            switchdictionary.Remove("Data1");
-                        }
                         if (switchdictionary.ContainsKey("Data2"))
                         {
                             switchdictionary.Remove("Data2");
                         }
-                        switchdictionary.Add("TaskType", "1");
-                        switchdictionary.Add("Data1", "0");
                         switchdictionary.Add("Data2", "0");
                         taskListInfo.Add(switchdictionary);
-                        //Dictionary<string, string> brightnessdictionary = new Dictionary<string, string>();
-                        //if (brightnessdictionary.ContainsKey("TaskType"))
-                        //{
-                        //    switchdictionary.Remove("TaskType");
-                        //}
-                        //if (brightnessdictionary.ContainsKey("Data1"))
-                        //{
-                        //    brightnessdictionary.Remove("Data1");
-                        //}
-                        //if (brightnessdictionary.ContainsKey("Data2"))
-                        //{
-                        //    switchdictionary.Remove("Data2");
-                        //}
-                        //brightnessdictionary.Add("TaskType", "3");
-                        //brightnessdictionary.Add("Data1", "0");
-                        //brightnessdictionary.Add("Data2", "0");
-                        //taskListInfo.Add(brightnessdictionary);
+
                         #endregion
 
                         #region  鐏厜View
 
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 900);
-                        devicefra.Height = Application.GetRealHeight(900);
-                        var OnOffOutputfra = new FrameLayout
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 3 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 3 + 210 + 160);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 3 + 30),
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
-                        devicefra.AddChidren(OnOffOutputfra);
+                        devicefra.AddChidren(openframelayout);
 
                         var openrowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                         };
-                        OnOffOutputfra.AddChidren(openrowlayout);
+                        openframelayout.AddChidren(openrowlayout);
 
                         var btnopen = new Button
                         {
-                            //Text = "寮�",
+                            Width = Application.GetRealWidth(600),
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         openrowlayout.AddChidren(btnopen);
 
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var openBtnSelected = new SelectedButton();
                         openrowlayout.AddChidren(openBtnSelected);
 
-                        var closerowlayout = new RowLayout
+                        var horizontalSeekBarRow = new RowLayout
                         {
                             Y = openrowlayout.Bottom,
-                            Height = Application.GetRealHeight(180),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-                        OnOffOutputfra.AddChidren(closerowlayout);
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
 
                         var btnclose = new Button
                         {
                             //Text = "鍏�",
                             TextID = MyInternationalizationString.close,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
                             Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         closerowlayout.AddChidren(btnclose);
 
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical,
-                        };
+                        var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
-
-                        var customrowlayout = new RowLayout
-                        {
-                            Height = Application.GetRealHeight(180),
-                            Y = closerowlayout.Bottom,
-                        };
-                        OnOffOutputfra.AddChidren(customrowlayout);
-
-                        var Btncustom = new Button
-                        {
-                            //Text = "鑷畾涔変寒搴�",
-                            TextID = MyInternationalizationString.custombrightness,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-
-                        };
-                        customrowlayout.AddChidren(Btncustom);
                         #endregion
 
-                        ///纭浜嬩欢
-                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
                         {
-                            openBtnSelected.Visible = true;
-                            closeBtnSelected.Visible = false;
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
+
+                        #endregion
+
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
-                            switchdictionary.Add("Data1", "1");//榛樿鍊�
-                            LogicIfon.AddDeviceactions(common, actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
                         btnopen.MouseUpEventHandler += openclick;
                         openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
                         ///鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
+                            switchdictionary.Add("TaskType", "1");
                             switchdictionary.Add("Data1", "0");//榛樿鍊�
-                            LogicIfon.AddDeviceactions(common, actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
+
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
                         btnclose.MouseUpEventHandler += closeclick;
                         closeBtnSelected.MouseUpEventHandler += closeclick;
-                        ///鑷畾涔変寒搴︿簨浠�
-                        EventHandler<MouseEventArgs> customclick = (sender, e) =>
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
                         {
-                            var setDeviceState = new SetDeviceState();
-                            UserView.HomePage.Instance.AddChidren(setDeviceState);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            setDeviceState.Show(common, Btncustom.Text, edit);
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
 
                         };
-                        customrowlayout.MouseUpEventHandler += customclick;
-                        Btncustom.MouseUpEventHandler += customclick;
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
 
                         if (edit && TaskList != null)
                         {
                             foreach (var value in TaskList)
                             {
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                if (switchdictionary.ContainsKey("TaskType"))
+                                {
+                                    switchdictionary.Remove("TaskType");
+                                }
                                 if (value["TaskType"] == "1")
                                 {
-                                    if (switchdictionary.ContainsKey("Data1"))
-                                    {
-                                        switchdictionary.Remove("Data1");
-                                    }
-                                    if (value["Data1"] == "1")
-                                    {
-                                        switchdictionary.Add("Data1", "1");
-                                        openBtnSelected.Visible = true;
-                                        closeBtnSelected.Visible = false;
-                                    }
-                                    else
+                                    switchdictionary.Add("TaskType", "1");
+                                    if (value["Data1"] == "0")
                                     {
                                         switchdictionary.Add("Data1", "0");
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                     }
-                                    break;
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+
                                 }
+                                else if (value["TaskType"] == "3")
+                                {
+                                    switchdictionary.Add("TaskType", "3");
+                                    switchdictionary.Add("Data1", value["Data1"]);
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                    takebackBtnSelected.Visible = false;
+                                    horizontalSeekBarVol.IsCanMove = true;
+                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                    horizontalSeekBarVol.Progress = int.Parse(value["Data1"])*100/254;
+                                    Progressvalue = horizontalSeekBarVol.Progress;
+
+                                }
+                                break;
 
                             }
                         }
@@ -824,198 +1245,201 @@
                         {
                             switchdictionary.Remove("TaskType");
                         }
-                        if (switchdictionary.ContainsKey("Data1"))
-                        {
-                            switchdictionary.Remove("Data1");
-                        }
-                        if (switchdictionary.ContainsKey("Data2"))
-                        {
-                            switchdictionary.Remove("Data2");
-                        }
                         switchdictionary.Add("TaskType", "6");
-                        switchdictionary.Add("Data1", "1");
-                        switchdictionary.Add("Data2", "0");
+
                         taskListInfo.Add(switchdictionary);
 
-                        //Dictionary<string, string> brightnessdictionary = new Dictionary<string, string>();
-                        //if (brightnessdictionary.ContainsKey("TaskType"))
-                        //{
-                        //    brightnessdictionary.Remove("TaskType");
-                        //}
-                        //if (brightnessdictionary.ContainsKey("Data2"))
-                        //{
-                        //    brightnessdictionary.Remove("Data2");
-                        //}
-                        //if (brightnessdictionary.ContainsKey("Data1"))
-                        //{
-                        //    brightnessdictionary.Remove("Data1");
-                        //}
-                        //brightnessdictionary.Add("TaskType", "6");
-                        //brightnessdictionary.Add("Data1", "5");
-                        //brightnessdictionary.Add("Data2", "0");
-                        //taskListInfo.Add(brightnessdictionary);
-                        #endregion  
-
+                        #endregion
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 2 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 2 + 210 + 160);
                         #region 绐楀笜View
-                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 900);
-                        devicefra.Height = Application.GetRealHeight(900);
-                        var windowCoveringfra = new FrameLayout
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
                         {
-                            Y = Application.GetRealHeight(180),
-                            Height = Application.GetRealHeight(180 * 3 + 30),
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
                         };
-                        devicefra.AddChidren(windowCoveringfra);
+                        devicefra.AddChidren(openframelayout);
 
                         var openrowlayout = new RowLayout
                         {
-                            Height = Application.GetRealHeight(180),
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                         };
-                        windowCoveringfra.AddChidren(openrowlayout);
+                        openframelayout.AddChidren(openrowlayout);
 
                         var btnopen = new Button
                         {
-                            //Text = "寮�",
+                            Width = Application.GetRealWidth(600),
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            //SelectedBackgroundColor = 0xfffe5e00,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         openrowlayout.AddChidren(btnopen);
 
-                        var openBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var openBtnSelected = new SelectedButton();
                         openrowlayout.AddChidren(openBtnSelected);
 
-                        var closerowlayout = new RowLayout
+
+                        var horizontalSeekBarRow = new RowLayout
                         {
                             Y = openrowlayout.Bottom,
-                            Height = Application.GetRealHeight(180),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                         };
-                        windowCoveringfra.AddChidren(closerowlayout);
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
 
                         var btnclose = new Button
                         {
                             //Text = "鍏�",
                             TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(300),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                         };
                         closerowlayout.AddChidren(btnclose);
 
-                        var closeBtnSelected = new Button
-                        {
-                            X = Application.GetRealWidth(1000 - 150),
-                            Width = Application.GetMinRealAverage(110),
-                            Height = Application.GetMinRealAverage(110),
-                            UnSelectedImagePath = "Item/YesSelected.png",
-                            Visible = false,
-                            Gravity = Gravity.CenterVertical
-                        };
+                        var closeBtnSelected = new SelectedButton();
                         closerowlayout.AddChidren(closeBtnSelected);
-
-
-                        var customrowlayout = new RowLayout
-                        {
-                            Height = Application.GetRealHeight(180),
-                            Y = closerowlayout.Bottom,
-                        };
-                        windowCoveringfra.AddChidren(customrowlayout);
-
-                        var Btncustom = new Button
-                        {
-                            //Text = "鑷畾涔夌櫨鍒嗘瘮",
-                            TextID = MyInternationalizationString.custompercentage,
-                            TextAlignment = TextAlignment.CenterLeft,
-                            X = Application.GetRealWidth(40),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(180),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-
-                        };
-                        customrowlayout.AddChidren(Btncustom);
                         #endregion
 
-                        ///鐐瑰嚮纭浜嬩欢
-                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
-                        {
 
-                            openBtnSelected.Visible = true;
-                            closeBtnSelected.Visible = false;
+
+                        #endregion
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
-                            switchdictionary.Add("Data1", "0");
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
 
-                            LogicIfon.AddDeviceactions(common, actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
 
                         };
                         openrowlayout.MouseUpEventHandler += openclick;
                         btnopen.MouseUpEventHandler += openclick;
                         openBtnSelected.MouseUpEventHandler += openclick;
-                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
                         EventHandler<MouseEventArgs> closeclick = (sender, e) =>
                         {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                             openBtnSelected.Visible = false;
                             closeBtnSelected.Visible = true;
+
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
-                            switchdictionary.Add("Data1", "1");
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data2", "0");
+                            switchdictionary.Add("Data1", "1");//榛樿鍊�
 
-                            LogicIfon.AddDeviceactions(common, actionsInfo);
-                            var logicCommunalPage = new LogicCommunalPage();
-                            UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            logicCommunalPage.Show(() => { });
                         };
                         closerowlayout.MouseUpEventHandler += closeclick;
                         btnclose.MouseUpEventHandler += closeclick;
                         closeBtnSelected.MouseUpEventHandler += closeclick;
-                        ///鑷畾涔変寒搴︿簨浠�
-                        EventHandler<MouseEventArgs> customclick = (sender, e) =>
-                        {
-                            var setDeviceState = new SetDeviceState();
-                            UserView.HomePage.Instance.AddChidren(setDeviceState);
-                            UserView.HomePage.Instance.PageIndex += 1;
-                            setDeviceState.Show(common, Btncustom.Text, edit);
+                        closeframelayout.MouseUpEventHandler += closeclick;
 
-                        };
-                        customrowlayout.MouseUpEventHandler += customclick;
-                        Btncustom.MouseUpEventHandler += customclick;
+
+
                         if (edit && TaskList != null)
                         {
                             foreach (var value in TaskList)
                             {
                                 if (value["TaskType"] == "6")
                                 {
-                                    if (value["Data1"] == "0")
+                                    if (value["Data1"] == "5")
                                     {
                                         if (switchdictionary.ContainsKey("Data1"))
                                         {
                                             switchdictionary.Remove("Data1");
                                         }
-                                        switchdictionary.Add("Data1", "0");
+                                        if (switchdictionary.ContainsKey("Data2"))
+                                        {
+                                            switchdictionary.Remove("Data2");
+                                        }
+                                        switchdictionary.Add("Data1", "5");
+                                        switchdictionary.Add("Data2", value["Data2"]);
+                                        horizontalSeekBarVol.IsCanMove = true;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
                                         openBtnSelected.Visible = true;
                                         closeBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
+                                        Progressvalue = horizontalSeekBarVol.Progress;
                                     }
                                     else if (value["Data1"] == "1")
                                     {
@@ -1026,6 +1450,8 @@
                                         switchdictionary.Add("Data1", "1");
                                         openBtnSelected.Visible = false;
                                         closeBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
                                     }
 
                                 }
@@ -1034,28 +1460,645 @@
                         }
                     }
                     break;
+                ///绌烘皵寮�鍏�
+                case DeviceType.AirSwitch: {
+                        {
+
+                            #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                            Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "0");
+                            switchdictionary.Add("Data2", "0");
+                            taskListInfo.Add(switchdictionary);
+
+                            #endregion
+
+                            #region  绌烘皵鐏厜View
+
+                            #region 寮�
+
+                            var openframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = timetype.Bottom + Application.GetRealHeight(20),
+                            };
+                            devicefra.AddChidren(openframelayout);
+
+                            var openrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            openframelayout.AddChidren(openrowlayout);
+
+                            var btnopen = new Button
+                            {
+                                Width = Application.GetRealWidth(600),
+                                TextID = MyInternationalizationString.open,
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            openrowlayout.AddChidren(btnopen);
+
+                            var openBtnSelected = new SelectedButton();
+                            openrowlayout.AddChidren(openBtnSelected);
+                            #endregion
+                            #region  鍏�
+                            var closeframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = openframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(closeframelayout);
+                            var closerowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            closeframelayout.AddChidren(closerowlayout);
+
+                            var btnclose = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.close,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            closerowlayout.AddChidren(btnclose);
+
+                            var closeBtnSelected = new SelectedButton();
+                            closerowlayout.AddChidren(closeBtnSelected);
+                            #endregion
+                            #region   鍙栧弽
+                            var takebackframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = closeframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(takebackframelayout);
+                            var takebackrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                            };
+                            takebackframelayout.AddChidren(takebackrowlayout);
+
+                            var btntakeback = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.onoff,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            takebackrowlayout.AddChidren(btntakeback);
+
+                            var takebackBtnSelected = new SelectedButton();
+                            takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                            #endregion
+
+
+                            #endregion
+
+                            ///纭浜嬩欢
+                            EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = true;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+
+                            };
+                            openrowlayout.MouseUpEventHandler += openclick;
+                            btnopen.MouseUpEventHandler += openclick;
+                            openBtnSelected.MouseUpEventHandler += openclick;
+                            openframelayout.MouseUpEventHandler += openclick;
+                            ///鍙栨秷浜嬩欢
+                            EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = true;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                            };
+                            closerowlayout.MouseUpEventHandler += closeclick;
+                            btnclose.MouseUpEventHandler += closeclick;
+                            closeBtnSelected.MouseUpEventHandler += closeclick;
+                            closeframelayout.MouseUpEventHandler += closeclick;
+                            //鍙栧弽
+                            EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = true;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                            };
+                            takebackrowlayout.MouseUpEventHandler += takebackclick;
+                            btntakeback.MouseUpEventHandler += takebackclick;
+                            takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                            takebackframelayout.MouseUpEventHandler += takebackclick;
+                            if (edit && TaskList != null)
+                            {
+                                foreach (var value in TaskList)
+                                {
+                                    if (value["TaskType"] == "1")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        if (value["Data1"] == "1")
+                                        {
+                                            switchdictionary.Add("Data1", "1");
+                                            openBtnSelected.Visible = true;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "0")
+                                        {
+                                            switchdictionary.Add("Data1", "0");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = true;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "2")
+                                        {
+                                            switchdictionary.Add("Data1", "2");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = true;
+                                        }
+                                        break;
+                                    }
+
+                                }
+                            }
+
+                        }
+                    }
+                    break;
+                    
+                case DeviceType.Thermostat:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> modedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
+                        taskListInfo.Add(switchdictionary);
+                        taskListInfo.Add(temperaturedictionary);
+                        taskListInfo.Add(modedictionary);
+                        taskListInfo.Add(speeddictionary);
+                        dictionary(switchdictionary, "TaskType", "1");
+                        dictionary(switchdictionary, "Data2", "0");
+                        dictionary(temperaturedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "Data1", "3");
+                        dictionary(speeddictionary, "TaskType", "5");
+                        dictionary(speeddictionary, "Data1", "6");
+
+                        #endregion
+
+                        #region  绌鸿皟View
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160*2);
+                        devicefra.Height = Application.GetRealHeight(600+ 210 + 160*2);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+                        #endregion
+
+                        #region  绌鸿皟鐘舵�乂iew
+                        var PickerViewfra = new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(PickerViewfra);
+
+
+                        var pausePickerViewfra= new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(pausePickerViewfra);
+
+
+
+                        var mUIPickerView = new UIPickerView
+                        {
+                            Height = Application.GetRealHeight(600-5),
+                        };
+                        PickerViewfra.AddChidren(mUIPickerView);
+                        var line = new Button
+                        {
+                            Y = Application.GetRealHeight(600-5),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(5),
+                            X = Application.GetRealWidth(80),
+                            BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        PickerViewfra.AddChidren(line);
+
+                        var mList1 = new List<string>();
+                        var mList2 = new List<string> {
+                         Language.StringByID(MyInternationalizationString.logiccool),
+                         Language.StringByID(MyInternationalizationString.logicheat),
+                         Language.StringByID(MyInternationalizationString.logicauto),
+                         Language.StringByID(MyInternationalizationString.logicdry),
+                         Language.StringByID(MyInternationalizationString.logicfanonly),
+                        };
+                        var mList3 = new List<string>{
+                         Language.StringByID(MyInternationalizationString.logiclow),
+                         Language.StringByID(MyInternationalizationString.logicmedium),
+                         Language.StringByID(MyInternationalizationString.logichigh),
+                          };
+                        for (int i = 16; i < 33; i++)
+                        {
+                            mList1.Add(i.ToString() +" " + "鈩�");
+                        }
+                        mUIPickerView.setNPicker(mList1, mList2, mList3);
+                        ///榛樿鐘舵��
+                       
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = PickerViewfra.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+                      
+                   
+
+                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+                        {
+                            if (openBtnSelected.Visible)
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                var temperature = mList1[s1].Split(' ')[0];
+                                var modestring = mList2[s2].Split(' ')[0];
+                                var speedstring = mList3[s3].Split(' ')[0];
+                                ModeState(modestring, temperaturedictionary, modedictionary);
+                                var a = int.Parse(temperature) * 100;
+                                dictionary(temperaturedictionary, "Data2", a.ToString());
+
+                                SpeedState(speedstring, speeddictionary);
+
+
+                            }
+                        };
+
+                        #endregion
+                        //榛樿26,鑷姩,涓
+                        int indextemperature = 10, indexmode = 2, indexspeed = 1;
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    dictionary(switchdictionary, "Data1", value["Data1"]);
+                                    if (value["Data1"] == "1")
+                                    {
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(0);
+                                    }
+                                    else if (value["Data1"] == "0")
+                                    {
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(600);
+                                    }
+
+                                }
+                                else if (value["TaskType"] == "5")
+                                {
+                                    if (value["Data1"] == "3")
+                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                        dictionary(modedictionary, "Data2", value["Data2"]);
+                                        string modetext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "3":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                    //indexmode = 0;
+                                                }
+                                                break;
+                                            case "4":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                    //  indexmode = 1;
+                                                }
+                                                break;
+                                            case "1":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                    //   indexmode = 2;
+                                                }
+                                                break;
+                                            case "8":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                    //  indexmode = 3;
+                                                }
+                                                break;
+                                            case "7":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                    //indexmode = 4;
+                                                }
+                                                break;
+                                        }
+                                        indexmode = mList2.IndexOf(modetext);
+                                    }
+                                    else if (value["Data1"] == "6")
+                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                        dictionary(speeddictionary, "Data2", value["Data2"]);
+                                        string speedtext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "1":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                    //indexspeed = 0;
+                                                }
+                                                break;
+
+                                            case "2":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                    // indexspeed = 1;
+                                                }
+                                                break;
+                                            case "3":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                    // indexspeed = 2;
+                                                }
+                                                break;
+
+                                        }
+                                        indexspeed = mList3.IndexOf(speedtext);
+                                    }
+                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                    else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")
+                                    {
+                                        var s = int.Parse(value["Data2"]) / 100;
+                                        indextemperature = mList1.IndexOf(s.ToString() + " " + "鈩�");
+                                        dictionary(temperaturedictionary, "Data1", value["Data1"]);
+                                        dictionary(temperaturedictionary, "Data2", value["Data2"]);
+                                    }
+
+                                }
+                            }
+                        }
+                        ///鏇存柊鏈�鏂扮┖璋冪姸鎬侊紱
+                        mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
+
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(0);
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            dictionary(switchdictionary, "Data1", "1");
+                            var temperature = mList1[indextemperature].Split(' ')[0];
+                            var modestring = mList2[indexmode].Split(' ')[0];
+                            var speedstring = mList3[indexspeed].Split(' ')[0];
+
+                            ModeState(modestring, temperaturedictionary, modedictionary);
+                            var a = int.Parse(temperature) * 100;
+                            dictionary(temperaturedictionary, "Data2", a.ToString());
+                            SpeedState(speedstring, speeddictionary);
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(600);
+
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            dictionary(switchdictionary, "Data1", "0");
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                    }
+                    break;
+                   
+                    
             }
 
-
-            var cancel = new Button
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
-                Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y = devicefra.Height - Application.GetRealHeight(160),
 
-            };
-            devicefra.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender, e) =>
-            {
+                if (SelectedDeviceStatusaction == "yes")
+                {
+                    LogicIfon.AddDeviceactions(common, actionsInfo);
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                               Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+
+                }
                 flMain.RemoveFromParent();
-                UserView.HomePage.Instance.ScrollEnabled = true;
+                var logicCommunalPage = new LogicCommunalPage();
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+
             };
-
-
 
         }
+
+        public  static void dictionary(Dictionary<string, string> deviceactionsInfo, string Key, string Value)
+        {
+            if (deviceactionsInfo.ContainsKey(Key))
+            {
+                deviceactionsInfo.Remove(Key);
+            }
+            deviceactionsInfo.Add(Key, Value);
+        }
+        /// <summary>
+        /// 绌鸿皟妯″紡鐨勭姸鎬�
+        /// </summary>
+        /// <param name="modestring"></param>
+        /// <param name="temperaturedictionary"></param>
+        /// <param name="modedictionary"></param>
+        public static void ModeState(string modestring,Dictionary<string,string> temperaturedictionary, Dictionary<string, string> modedictionary)
+        {
+
+            if (modestring == Language.StringByID(MyInternationalizationString.logiccool))
+            {
+                dictionary(modedictionary, "Data2", "3");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicheat))
+            {
+
+                dictionary(modedictionary, "Data2", "4");
+                dictionary(temperaturedictionary, "Data1", "4");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicauto))
+            {
+
+                dictionary(modedictionary, "Data2", "1");
+                dictionary(temperaturedictionary, "Data1", "7");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicdry))
+            {
+
+                dictionary(modedictionary, "Data2", "8");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicfanonly))
+            {
+                dictionary(temperaturedictionary, "Data1", "20");
+                dictionary(modedictionary, "Data2", "7");
+            }
+
+        }
+        /// <summary>
+        /// 椋庨�熺殑妯″紡
+        /// </summary>
+        /// <param name="speedstring"></param>
+        /// <param name="speeddictionary"></param>
+        public static void SpeedState(string speedstring, Dictionary<string, string> speeddictionary) {
+
+            if (speedstring == Language.StringByID(MyInternationalizationString.logiclow))
+            {
+
+                dictionary(speeddictionary, "Data2", "1");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logicmedium))
+            {
+
+                dictionary(speeddictionary, "Data2", "2");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logichigh))
+            {
+
+                dictionary(speeddictionary, "Data2", "3");
+            }
+
+        }
+
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 6d3e7a7..78c77e8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -1,16 +1,19 @@
 锘縰sing System;
 using System.Collections.Generic;
+using Shared;
+using ZigBee.Device;
+
 namespace Shared.Phone.Device.Logic
 {
     public class LogicIfon
     {
-       #region ----閫昏緫鏉′欢杈撳叆----
+        #region ----閫昏緫鏉′欢杈撳叆----
         /// <summary>
         /// 娣诲姞璁惧鏉′欢鐨勬柟娉�
         /// </summary>
         /// <param name="common">Common.</param>
         /// <param name="objecttype">Objecttype.</param>
-        public static void AddDeviceconditions(ZigBee.Device.CommonDevice common, Dictionary<string, string> objecttype)
+        public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
         {
             for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
             {
@@ -18,9 +21,32 @@
                 {
                     if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
                     {
-                        Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
-                        Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
-                        return;
+                        if (common.Type == DeviceType.TemperatureSensor)//璁惧娓╁害浼犳劅鍣ㄦ湁鐐圭壒鍒�
+                        {
+                            var dev = common as TemperatureSensor;
+                            string str = "";
+                            if (dev.SensorDiv == 1)
+                            {
+                                str = "1026";
+                            }
+                            else
+                            {
+                                str = "1029";
+                            }
+                            if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == str)
+                            {
+                                Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+                                Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+                                return;
+                            }
+
+                        }
+                        else
+                        {
+                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+                            Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+                            return;
+                        }
                     }
 
                 }
@@ -39,7 +65,7 @@
                 if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "2")
                 {
 
-                    if (Common.Logic.CurrentLogic.Conditions[i]["Condition_LogicId"] ==logic.LogicId.ToString())
+                    if (Common.Logic.CurrentLogic.Conditions[i]["Condition_LogicId"] == logic.LogicId.ToString())
                     {
                         Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
                         Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
@@ -80,7 +106,7 @@
         {
             for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
             {
-                if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "7")
+                if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == objecttype["Type"])
                 {
 
                     Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -93,7 +119,6 @@
             Common.Logic.CurrentLogic.Conditions.Add(objecttype);
         }
         #endregion
-
         #region ----閫昏緫杈撳嚭鐩爣----
 
         /// <summary>
@@ -107,7 +132,7 @@
             {
                 if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "0")
                 {
-                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() ==common.DeviceAddr&& Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() ==common.DeviceEpoint.ToString())
+                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == common.DeviceAddr && Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() == common.DeviceEpoint.ToString())
                     {
                         Common.Logic.CurrentLogic.Actions.RemoveAt(i);
                         Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -122,13 +147,13 @@
         /// </summary>
         /// <param name="Scene">Common.</param>
         /// <param name="actionsInfo">Objecttype.</param>
-        public static void AddSceneactions(Shared.Common.SceneUI Scene,Dictionary<string, object> actionsInfo)
+        public static void AddSceneactions(Shared.Common.SceneUI Scene, Dictionary<string, object> actionsInfo)
         {
             for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
             {
                 if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "2")
                 {
-                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() ==Scene.Id.ToString())
+                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == Scene.Id.ToString())
                     {
                         Common.Logic.CurrentLogic.Actions.RemoveAt(i);
                         Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -162,14 +187,14 @@
         /// </summary>
         /// <param name="objecttype">Objecttype.</param>
         /// <param name="o">O.</param>
-        public static void AddLogicactions(Common.Logic logic,Dictionary<string, object> actionsInfo)
+        public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
         {
 
             for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
             {
                 if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "4")
                 {
-                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() ==logic.LogicId.ToString())
+                    if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == logic.LogicId.ToString())
                     {
                         Common.Logic.CurrentLogic.Actions.RemoveAt(i);
                         Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
@@ -181,7 +206,26 @@
 
         }
         #endregion
+        #region ----鍏宠仈app璐﹀彿----
+        /// <summary>
+        /// 鍏宠仈app璐﹀彿
+        /// </summary>
+        /// <param name="accountsInfo"></param>
+        public static void Addaccounts(Dictionary<string, string> accountsInfo)
+        {
+            for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
+            {
+                if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == accountsInfo["Type"])
+                {
+                    Common.Logic.CurrentLogic.Accounts.RemoveAt(i);
+                    Common.Logic.CurrentLogic.Accounts.Insert(i, accountsInfo);
+                    return;
+                }
+            }
+            Common.Logic.CurrentLogic.Accounts.Add(accountsInfo);
+        }
+        #endregion
     }
 
-   
+
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
new file mode 100755
index 0000000..39fe971
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -0,0 +1,389 @@
+锘縰sing System;
+using Shared;
+using Shared.R;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using ZigBee.Device;
+using Shared.Common;
+namespace Shared.Phone.Device.Logic
+{
+    public class MemberList : FrameLayout
+    {
+        Button selectedIcon = new Button();
+        public static Action action;
+        public static bool edit=false;
+        Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
+        Dictionary<string, string> userdictionary = new Dictionary<string, string>();
+
+        public void Show(CommonDevice common, Dictionary<string, string> editdeviceConditionsInfo=null)
+        {
+            if (!edit)
+            {
+                deviceConditionsInfo.Add("Type", "1");
+                deviceConditionsInfo.Add("IsValid", "1");
+                deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+                deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+                deviceConditionsInfo.Add("Cluster_ID", "64529");
+                deviceConditionsInfo.Add("AttriButeData1", "2");
+                deviceConditionsInfo.Add("Range", "0");
+                editdeviceConditionsInfo = deviceConditionsInfo;
+            }
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.userlist,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                action();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            #endregion
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            foreach (var user in Send.UserList)
+            {
+
+                var userFramelayout = new RowLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                };
+                middle.AddChidren(userFramelayout);
+
+
+                var userRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(1080 - 81 - 58),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(81),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                };
+                userFramelayout.AddChidren(userRow);
+
+                var userBtn = new Button
+                {
+                    Text = user.MembershipName,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                };
+                userRow.AddChidren(userBtn);
+
+                var userBack = new Button
+                {
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
+                    UnSelectedImagePath = "ZigeeLogic/next.png",
+                    X = Application.GetRealWidth(1080 - 81 - 58 - 58),
+                    Gravity = Gravity.CenterVertical,
+                };
+                userRow.AddChidren(userBack);
+
+                EventHandler<MouseEventArgs> useridclick = (sender, e) =>
+                {
+                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                    this.AddChidren(flMain);
+                    flMain.MouseUpEventHandler += (sender1, e1) =>
+                   {
+                       flMain.RemoveFromParent();
+                   };
+
+                    var lockcolorfra = new FrameLayout
+                    {
+                        Width = Application.GetRealWidth(1080),
+                        Height = Application.GetRealHeight(100),
+                        Y = Application.GetRealHeight(1920 - 100),
+                        BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    };
+                    flMain.AddChidren(lockcolorfra);
+
+                    var lockcolorfra1 = new FrameLayout
+                    {
+
+                        Width = Application.GetRealWidth(1080),
+                        Height = Application.GetRealHeight(530),
+                        Y = Application.GetRealHeight(1920 - 530),
+                        BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        Radius = (uint)Application.GetRealHeight(60),
+                    };
+                    flMain.AddChidren(lockcolorfra1);
+
+                    #region  -------鍙栨秷   瀹屾垚
+                    var lockRow = new RowLayout
+                    {
+                        Height = Application.GetRealHeight(140),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    lockcolorfra1.AddChidren(lockRow);
+                    var Btncancel = new Button
+                    {
+                        TextID = MyInternationalizationString.cancel,
+                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                        Height = Application.GetRealHeight(140),
+                        Width = Application.GetRealWidth(200),
+                        X = Application.GetRealWidth(80),
+                        TextAlignment = TextAlignment.CenterLeft,
+                    };
+                    lockRow.AddChidren(Btncancel);
+                    Btncancel.MouseUpEventHandler += (sender16, e16) =>
+                    {
+                        flMain.RemoveFromParent();
+                        UserView.HomePage.Instance.ScrollEnabled = true;
+                    };
+
+                    var Btntitle = new Button
+                    {
+                        TextID = MyInternationalizationString.security,
+                        TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                        Height = Application.GetRealHeight(140),
+                        Width = Application.GetRealWidth(320),
+                        TextAlignment = TextAlignment.Center,
+                        X = Btncancel.Right + Application.GetRealWidth(100),
+                        TextSize = 16,
+                        Text = user.MembershipName,
+                    };
+                    lockRow.AddChidren(Btntitle);
+                    var Btncomplete = new Button
+                    {
+                        TextID = MyInternationalizationString.complete,
+                        TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                        Height = Application.GetRealHeight(140),
+                        Width = Application.GetRealWidth(200),
+                        TextAlignment = TextAlignment.CenterRight,
+                        X = Btntitle.Right + Application.GetRealWidth(100),
+
+                    };
+                    lockRow.AddChidren(Btncomplete);
+                    #endregion
+
+                    string SelectedDeviceStatuscondition = "";
+                    lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
+                    lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
+                    for (int i = 0; i < user.UserIdMode.Count; i++)
+                    {
+                        var userid = user.UserIdMode[i];
+                        var doorlockfra = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * i),
+                        };
+                        lockcolorfra1.AddChidren(doorlockfra);
+
+                        var doorlockRow = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        doorlockfra.AddChidren(doorlockRow);
+
+                        var doorlockBtn = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        doorlockRow.AddChidren(doorlockBtn);
+                        //(1鎸夐敭/3鍗�/15鎸囩汗)
+                        string[] s = userid.Split('_');
+                        switch (s[1])
+                        {
+                            case "0":
+                                {
+                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
+                                }
+                                break;
+                            case "3":
+                                {
+                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
+                                }
+                                break;
+                            case "15":
+                                {
+                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
+                                }
+                                break;
+                        }
+                        var doorlockSelected = new Button
+                        {
+                            X = Application.GetRealWidth(860),
+                            Width = Application.GetMinRealAverage(60),
+                            Height = Application.GetMinRealAverage(60),
+                            UnSelectedImagePath = "ZigeeLogic/selected.png",
+                            Visible = false,
+                            Gravity = Gravity.CenterVertical,
+
+                        };
+                        doorlockRow.AddChidren(doorlockSelected);
+                        if ((user.UserIdMode.Count - 1) == i)
+                        {
+                            doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                        }
+                        EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
+                        {
+                            SelectedDeviceStatuscondition = "DoorLock";
+                            selectedIcon.Visible = false;
+                            selectedIcon = doorlockSelected;
+                            doorlockSelected.Visible = true;
+                            //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            if (deviceConditionsInfo.ContainsKey("AttriButeId"))
+                            {
+                                deviceConditionsInfo.Remove("AttriButeId");
+                            }
+                            if (deviceConditionsInfo.ContainsKey("AttriButeData2"))
+                            {
+                                deviceConditionsInfo.Remove("AttriButeData2");
+                            }
+                            deviceConditionsInfo.Add("AttriButeId", s[1]);
+                            deviceConditionsInfo.Add("AttriButeData2", s[0]);
+
+                            if (userdictionary.ContainsKey("Account"))
+                            {
+                                userdictionary.Remove("Account");
+                            }
+                            if (userdictionary.ContainsKey("Type"))
+                            {
+                                userdictionary.Remove("Type");
+                            }
+                            if (userdictionary.ContainsKey("UserId"))
+                            {
+                                userdictionary.Remove("UserId");
+                            }
+                            userdictionary.Add("Account", Btntitle.Text+doorlockBtn.Text);
+                            userdictionary.Add("Type", "1");
+                            userdictionary.Add("UserId", s[0]);
+                        };
+                        doorlockRow.MouseUpEventHandler += doorlockclick;
+                        doorlockBtn.MouseUpEventHandler += doorlockclick;
+                        doorlockSelected.MouseUpEventHandler += doorlockclick;
+                        doorlockfra.MouseUpEventHandler += doorlockclick;
+                        if (edit)
+                        {
+                            if (editdeviceConditionsInfo["AttriButeData2"] == s[1])
+                            {
+                                selectedIcon.Visible = false;
+                                selectedIcon = doorlockSelected;
+                                doorlockSelected.Visible = true;
+
+                            }
+                          
+                        }
+
+                    }
+
+
+                    Btncomplete.MouseUpEventHandler += (sender3, e3) =>
+                    {
+                        if (SelectedDeviceStatuscondition != "")
+                        {
+
+                            for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
+                            {
+                                if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
+                                {
+                                    if ((Common.Logic.CurrentLogic.Conditions[i]["MacAddr"] == common.DeviceAddr) && (Common.Logic.CurrentLogic.Conditions[i]["Epoint"] == common.DeviceEpoint.ToString()))
+                                    {
+                                        if (Common.Logic.CurrentLogic.Conditions[i]["AttriButeId"] == editdeviceConditionsInfo["AttriButeId"] && Common.Logic.CurrentLogic.Conditions[i]["AttriButeData2"] == editdeviceConditionsInfo["AttriButeData2"])
+                                        {
+                                            Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+                                            Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
+                                            for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
+                                            {
+                                                if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == editdeviceConditionsInfo["AttriButeData2"])
+                                                {
+                                                    Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
+                                                    Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
+                                                }
+                                            }
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+
+                            Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
+                            Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
+
+                        }
+                        else
+                        {
+                            if (!edit)
+                            {
+                                var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                                       Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                                       Language.StringByID(MyInternationalizationString.complete));
+                                alert.Show();
+                                return;
+                            }
+
+                        }
+                        flMain.RemoveFromParent();
+                        var logicCommunalPage = new LogicCommunalPage();
+                        UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        logicCommunalPage.Show(() => { });
+
+                    };
+
+                };
+                userBtn.MouseUpEventHandler += useridclick;
+                userBack.MouseUpEventHandler += useridclick;
+                userFramelayout.MouseUpEventHandler += useridclick;
+                userRow.MouseUpEventHandler += useridclick;
+
+            }
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index 4cfcdd7..395bc71 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -20,230 +20,318 @@
 
         public void Show()
         {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            this.AddChidren(new Button
-            {
-                Height = Application.GetRealHeight(80),
-            });
 
-            var topFrameLayout = new FrameLayout
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.securitymode,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.securitymode,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
-            var back = new Button
+            var clickBtn = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
             };
 
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                RemoveFromParent();
+            };
+            #endregion
 
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            var middle = new FrameLayout();
+            middle.Y = topRowLayout.Bottom;
+            middle.Height = Application.GetRealHeight(1920 - 184);
+            middle.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
             this.AddChidren(middle);
 
-            if (actionsInfo.ContainsKey("LinkType"))
+            var btnsave = new Button
             {
-                actionsInfo.Remove("LinkType");
-            }
-            if (actionsInfo.ContainsKey("SecurityModeId"))
-            {
-                actionsInfo.Remove("SecurityModeId");
-            }
-            if (actionsInfo.ContainsKey("CheckIASStatus"))
-            {
-                actionsInfo.Remove("CheckIASStatus");
-            }
-            if (actionsInfo.ContainsKey("IsDelayStart"))
-            {
-                actionsInfo.Remove("IsDelayStart");
-            }
-            
-            actionsInfo.Add("LinkType", 6);
-            actionsInfo.Add("SecurityModeId", 0);
-            actionsInfo.Add("CheckIASStatus", 0);
-            actionsInfo.Add("IsDelayStart", 0);
-           
+                Y= middle.Height-Application.GetRealHeight(260),
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
 
-            #region ----甯冮槻 鎾ら槻 鑳佽揩鎾ら槻----
-            var defenceRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
             };
-            middle.AddChidren(defenceRowLayout);
+            middle.AddChidren(btnsave);
 
-            var btndefence = new Button
+
+
+
+            #region ----(鍦ㄥ/绂诲)甯冮槻 鎾ら槻 鑳佽揩鎾ら槻----
+            #region  鍦ㄥ甯冮槻
+
+
+            var athomeFrameLayout = new FrameLayout
             {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.defence,
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(athomeFrameLayout);
+
+            var athomeiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/athome.png",
+
+            };
+            athomeFrameLayout.AddChidren(athomeiconBtn);
+
+            var athomedefenceRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            athomeFrameLayout.AddChidren(athomedefenceRowLayout);
+
+            var btnathomedefence = new Button
+            {
+                Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text="甯冮槻",
             };
-            defenceRowLayout.AddChidren(btndefence);
+            athomedefenceRowLayout.AddChidren(btnathomedefence);
+            var athomedefenceSelected = new SelectedButton(789);
+            athomedefenceRowLayout.AddChidren(athomedefenceSelected);
+            #endregion
 
-            var defenceSelected = new Button
+            #region  绂诲甯冮槻
+
+            var leavehomeFrameLayout = new FrameLayout
             {
-                X = Application.GetRealWidth(1080 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
+                Height = Application.GetRealHeight(160),
+                Y = athomeFrameLayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            defenceRowLayout.AddChidren(defenceSelected);
+            middle.AddChidren(leavehomeFrameLayout);
 
-            var withdrawalRowLayout = new RowLayout
+
+            var leavehomeiconBtn = new Button
             {
-                Height = Application.GetRealHeight(180),
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/leavehome.png",
+
             };
-            middle.AddChidren(withdrawalRowLayout);
+            leavehomeFrameLayout.AddChidren(leavehomeiconBtn);
 
-            var btnwithdrawal = new Button
+
+            var leavehomedefenceRowLayout = new RowLayout
             {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.withdrawal,
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            leavehomeFrameLayout.AddChidren(leavehomedefenceRowLayout);
+
+            var leavehomebtndefence = new Button
+            {
+                Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鎾ら槻",
-            };
-            withdrawalRowLayout.AddChidren(btnwithdrawal);
 
-            var withdrawalSelected = new Button
-            {
-                X = Application.GetRealWidth(1080 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
             };
-            withdrawalRowLayout.AddChidren(withdrawalSelected);
-         
-            var urgentwithdrawalRowLayout = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-            };
-            middle.AddChidren(urgentwithdrawalRowLayout);
-
-            var btnurgentwithdrawal = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.urgentwithdrawal,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(40),
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                //Text = "鑳佽揩鎾ら槻",
-            };
-            urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
-
-            var urgentwithdrawalSelected = new Button
-            {
-                X = Application.GetRealWidth(1080 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
-            urgentwithdrawalRowLayout.AddChidren(urgentwithdrawalSelected);
+            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
+            var leavehomedefenceSelected = new SelectedButton(789);
+            leavehomedefenceRowLayout.AddChidren(leavehomedefenceSelected);
 
             #endregion
 
-            string strvalue = "";
-            ///甯冮槻鐐瑰嚮浜嬩欢
-            EventHandler<MouseEventArgs> copenclick = (seder, e) =>
+            #region  鎾ら槻
+
+
+            var withdrawalFrameLayout = new FrameLayout
             {
-                defenceSelected.Visible = true;
-                withdrawalSelected.Visible = false;
-                urgentwithdrawalSelected.Visible = false;
-                SecurityView(strvalue);
+                Height = Application.GetRealHeight(160),
+                Y = leavehomeFrameLayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(withdrawalFrameLayout);
+
+
+            var withdrawaliconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/withdrawal.png",
 
             };
-            btndefence.MouseUpEventHandler += copenclick;
-            defenceRowLayout.MouseUpEventHandler += copenclick;
+            withdrawalFrameLayout.AddChidren(withdrawaliconBtn);
 
+
+
+            var withdrawalRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            withdrawalFrameLayout.AddChidren(withdrawalRowLayout);
+
+            var btnwithdrawal = new Button
+            {
+
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextID = MyInternationalizationString.withdrawal,
+
+            };
+            withdrawalRowLayout.AddChidren(btnwithdrawal);
+            var withdrawalSelected = new SelectedButton(789);
+            withdrawalRowLayout.AddChidren(withdrawalSelected);
+
+            #endregion
+
+            #region  鑳佽揩鎾ら槻
+            var urgentwithdFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = withdrawalFrameLayout.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(urgentwithdFrameLayout);
+
+
+            var urgentwithdiconBtn = new Button
+            {
+                Width = Application.GetRealWidth(81),
+                Height = Application.GetRealHeight(81),
+                X = Application.GetRealWidth(58),
+                Y = Application.GetRealHeight(55),
+                UnSelectedImagePath = "ZigeeLogic/withdrawal.png",
+
+            };
+            urgentwithdFrameLayout.AddChidren(urgentwithdiconBtn);
+
+            var urgentwithdrawalRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(850),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(176),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            urgentwithdFrameLayout.AddChidren(urgentwithdrawalRowLayout);
+
+            var btnurgentwithdrawal = new Button
+            {
+                TextID = MyInternationalizationString.urgentwithdrawal,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+            };
+            urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
+
+            var urgentwithdrawalSelected = new SelectedButton(789);
+            urgentwithdrawalRowLayout.AddChidren(urgentwithdrawalSelected);
+            #endregion
+
+            #endregion
+
+            ///鍦ㄥ甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> athomeclick = (sedner14, e14) =>
+            {
+                athomedefenceSelected.Visible = true;
+                leavehomedefenceSelected.Visible = false;
+                withdrawalSelected.Visible = false;
+                urgentwithdrawalSelected.Visible = false;
+            };
+            athomedefenceRowLayout.MouseUpEventHandler += athomeclick;
+            btnathomedefence.MouseUpEventHandler += athomeclick;
+            athomedefenceSelected.MouseUpEventHandler += athomeclick;
+            athomeFrameLayout.MouseUpEventHandler += athomeclick;
+            athomeiconBtn.MouseUpEventHandler += athomeclick;
+
+            ///绂诲甯冮槻鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
+            {
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = true;
+                withdrawalSelected.Visible = false;
+                urgentwithdrawalSelected.Visible = false;
+            };
+            leavehomedefenceRowLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomebtndefence.MouseUpEventHandler += leavehomeclick;
+            leavehomedefenceSelected.MouseUpEventHandler += leavehomeclick;
+            leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
+            leavehomeiconBtn.MouseUpEventHandler += leavehomeclick;
 
             ///鎾ら槻鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> disableclick = (seder, e) =>
             {
-                defenceSelected.Visible = false;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = true;
                 urgentwithdrawalSelected.Visible = false;
-                if (actionsInfo.ContainsKey("Password"))
-                {
-                    actionsInfo.Remove("Password");
-                }
-                actionsInfo.Add("Password", "999999");
-                if (actionsInfo.ContainsKey("SecurityModeId"))
-                {
-                    actionsInfo.Remove("SecurityModeId");
-                }
-                if (actionsInfo.ContainsKey("SecuritySetting"))
-                {
-                    actionsInfo.Remove("SecuritySetting");
-                }
-                actionsInfo.Add("SecurityModeId", "0");
-                actionsInfo.Add("SecuritySetting", "0");
-                LogicIfon.AddSecurityactions(actionsInfo);
-                this.RemoveFromParent();
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
+
             };
             withdrawalRowLayout.MouseUpEventHandler += disableclick;
             btnwithdrawal.MouseUpEventHandler += disableclick;
+            withdrawalSelected.MouseUpEventHandler += disableclick;
+            withdrawalFrameLayout.MouseUpEventHandler += disableclick;
+            withdrawaliconBtn.MouseUpEventHandler += disableclick;
 
             ///鑳佽揩鎾ら槻鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs> urgentwithdrawalclick = (seder, e) =>
             {
-                defenceSelected.Visible = false;
+                athomedefenceSelected.Visible = false;
+                leavehomedefenceSelected.Visible = false;
                 withdrawalSelected.Visible = false;
                 urgentwithdrawalSelected.Visible = true;
-                if (actionsInfo.ContainsKey("Password"))
-                {
-                    actionsInfo.Remove("Password");
-                }
-                if (actionsInfo.ContainsKey("SecuritySetting"))
-                {
-                    actionsInfo.Remove("SecuritySetting");
-                }
-                actionsInfo.Add("Password", "888888");
-                actionsInfo.Add("SecuritySetting", "0");
-                LogicIfon.AddSecurityactions(actionsInfo);
-                this.RemoveFromParent();
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
             };
             urgentwithdrawalRowLayout.MouseUpEventHandler += urgentwithdrawalclick;
             btnurgentwithdrawal.MouseUpEventHandler += urgentwithdrawalclick;
+            urgentwithdrawalSelected.MouseUpEventHandler+= urgentwithdrawalclick;
+            urgentwithdFrameLayout.MouseUpEventHandler += urgentwithdrawalclick;
+            urgentwithdiconBtn.MouseUpEventHandler += urgentwithdrawalclick;
 
             if (IsDeviceEditor)
             {
@@ -251,18 +339,20 @@
                 {
                     if (actions["LinkType"].ToString() == "6")
                     {
-                        
+
                         if (actions["SecuritySetting"].ToString() == "0")
                         {
                             if (actions["Password"].ToString() == "888888")
                             {
-                                defenceSelected.Visible = false;
+                                athomedefenceSelected.Visible = false;
+                                leavehomedefenceSelected.Visible = false;
                                 withdrawalSelected.Visible = false;
                                 urgentwithdrawalSelected.Visible = true;
                             }
                             else
                             {
-                                defenceSelected.Visible = false;
+                                athomedefenceSelected.Visible = false;
+                                leavehomedefenceSelected.Visible = false;
                                 withdrawalSelected.Visible = true;
                                 urgentwithdrawalSelected.Visible = false;
                             }
@@ -270,10 +360,18 @@
                         }
                         else if (actions["SecuritySetting"].ToString() == "1")
                         {
-                            strvalue = actions["SecurityModeId"].ToString();
-                            defenceSelected.Visible = true;
+                            athomedefenceSelected.Visible = true;
+                            leavehomedefenceSelected.Visible = false;
                             withdrawalSelected.Visible = false;
                             urgentwithdrawalSelected.Visible = false;
+                        }
+                        else if (actions["SecuritySetting"].ToString() == "2")
+                        {
+                            athomedefenceSelected.Visible = false;
+                            leavehomedefenceSelected.Visible = true;
+                            withdrawalSelected.Visible = false;
+                            urgentwithdrawalSelected.Visible = false;
+
                         }
                         break;
 
@@ -282,146 +380,87 @@
                 }
 
             }
+                        
 
-
-        }
-
-        void SecurityView(string strvalue)
-        {
-            FrameLayout flMain = new FrameLayout { BackgroundColor = 0x00000000 };
-            this.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender, e) =>
+            btnsave.MouseUpEventHandler += (sender, e) =>
             {
-                flMain.RemoveFromParent();
-            };
-
-            var frameLayout = new FrameLayout
-            {
-                Y = Application.GetRealHeight(1920 - 360),
-                Height = Application.GetRealHeight(360),
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-            };
-            flMain.AddChidren(frameLayout);
-
-          var athomeRow = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-            };
-            frameLayout.AddChidren(athomeRow);
-
-            var athomeBtn = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.athome,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            athomeRow.AddChidren(athomeBtn);
-
-            var athomeSelected = new Button
-            {
-                X = Application.GetRealWidth(1080 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
-            athomeRow.AddChidren(athomeSelected);
-
-            var leavehomeRow = new RowLayout
-            {
-                Height = Application.GetRealHeight(180),
-                Y = athomeRow.Bottom,
-            };
-            frameLayout.AddChidren(leavehomeRow);
-            var leavehomeBtn = new Button
-            {
-                Width = Application.GetRealWidth(600),
-                TextID = MyInternationalizationString.leavehome,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-            };
-            leavehomeRow.AddChidren(leavehomeBtn);
-
-            var leavehomeSelected = new Button
-            {
-                X = Application.GetRealWidth(1080 - 150),
-                Width = Application.GetMinRealAverage(110),
-                Height = Application.GetMinRealAverage(110),
-                UnSelectedImagePath = "Item/YesSelected.png",
-                Visible = false,
-                Gravity = Gravity.CenterVertical
-            };
-            leavehomeRow.AddChidren(leavehomeSelected);
-
-            EventHandler<MouseEventArgs> athomeclick = (sender6, e6) =>
-            {
-                flMain.RemoveFromParent();
-                if (actionsInfo.ContainsKey("SecurityModeId"))
+                if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
                 {
-                    actionsInfo.Remove("SecurityModeId");
+                    return;
                 }
-                if (actionsInfo.ContainsKey("SecuritySetting"))
+
+                if (actionsInfo.ContainsKey("LinkType"))
                 {
-                    actionsInfo.Remove("SecuritySetting");
+                    actionsInfo.Remove("LinkType");
                 }
+                if (actionsInfo.ContainsKey("CheckIASStatus"))
+                {
+                    actionsInfo.Remove("CheckIASStatus");
+                }
+                if (actionsInfo.ContainsKey("IsDelayStart"))
+                {
+                    actionsInfo.Remove("IsDelayStart");
+                }
+
+                actionsInfo.Add("LinkType", 6);
+                actionsInfo.Add("CheckIASStatus", 0);
+                actionsInfo.Add("IsDelayStart", 0);
+                
                 if (actionsInfo.ContainsKey("Password"))
                 {
                     actionsInfo.Remove("Password");
                 }
-                actionsInfo.Add("Password", "666666");
-                actionsInfo.Add("SecurityModeId", "1");
-                actionsInfo.Add("SecuritySetting", "1");
-                LogicIfon.AddSecurityactions(actionsInfo);
-                var logicCommunalPage = new LogicCommunalPage();
-                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show(() => { });
-
-            };
-            athomeRow.MouseUpEventHandler += athomeclick;
-            athomeBtn.MouseUpEventHandler += athomeclick;
-            athomeSelected.MouseUpEventHandler += athomeclick;
-
-            EventHandler<MouseEventArgs> leavehomeclick = (sender6, e6) =>
-            {
-                flMain.RemoveFromParent();
-                if (actionsInfo.ContainsKey("SecurityModeId"))
-                {
-                    actionsInfo.Remove("SecurityModeId");
-                }
                 if (actionsInfo.ContainsKey("SecuritySetting"))
                 {
                     actionsInfo.Remove("SecuritySetting");
                 }
-                if(actionsInfo.ContainsKey("Password"))
+                if (actionsInfo.ContainsKey("SecurityModeId"))
                 {
-                    actionsInfo.Remove("Password");
+                    actionsInfo.Remove("SecurityModeId");
                 }
-                actionsInfo.Add("Password", "666666");
-                actionsInfo.Add("SecurityModeId", "2");
-                actionsInfo.Add("SecuritySetting", "1");
+                ///鍦ㄥ甯冮槻
+                if (athomedefenceSelected.Visible)
+                {
+                    actionsInfo.Add("SecuritySetting", "1");
+                    actionsInfo.Add("SecurityModeId", "1");
+                    actionsInfo.Add("Password", "666666");
+
+                }
+                ///绂诲甯冮槻
+                if (leavehomedefenceSelected.Visible)
+                {
+                    actionsInfo.Add("SecuritySetting", "1");
+                    actionsInfo.Add("SecurityModeId", "2");
+                    actionsInfo.Add("Password", "666666");
+
+                }
+                ///鎾ら槻
+                if (withdrawalSelected.Visible)
+                {
+                    actionsInfo.Add("SecuritySetting", "0");
+                    actionsInfo.Add("SecurityModeId", "0");
+                    actionsInfo.Add("Password", "999999");
+
+                }
+                ///绱ц揩鎾ら槻
+                if (urgentwithdrawalSelected.Visible)
+                {
+                    actionsInfo.Add("SecuritySetting", "0");
+                    actionsInfo.Add("SecurityModeId", "0");
+                    actionsInfo.Add("Password", "888888");
+
+                }
                 LogicIfon.AddSecurityactions(actionsInfo);
+                this.RemoveFromParent();
                 var logicCommunalPage = new LogicCommunalPage();
                 UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                 UserView.HomePage.Instance.PageIndex += 1;
                 logicCommunalPage.Show(() => { });
 
+
             };
-            leavehomeRow.MouseUpEventHandler += leavehomeclick;
-            leavehomeBtn.MouseUpEventHandler += leavehomeclick;
-            leavehomeSelected.MouseUpEventHandler += leavehomeclick;
-
-            if (strvalue == "1")
-            {
-                athomeSelected.Visible = true;
-                leavehomeSelected.Visible = false;
-            }
-            else if (strvalue == "2")
-            {
-                leavehomeSelected.Visible = true;
-                athomeSelected.Visible = false;
-
-            }
         }
+
+       
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs
new file mode 100755
index 0000000..8c3bfec
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SelectedButton.cs
@@ -0,0 +1,45 @@
+锘縰sing System;
+using Shared;
+namespace Shared.Phone.Device.Logic
+{
+    public class SelectedButton : Button
+    {
+
+        /// <summary>
+        /// 妯潗鏍囦綅缃�
+        /// </summary>
+        /// <param name="Xwidth"></param>
+        public SelectedButton(int Xwidth = 860)
+        {
+            X = Application.GetRealWidth(Xwidth);
+            Width = Application.GetMinRealAverage(60);
+            Height = Application.GetMinRealAverage(60);
+            UnSelectedImagePath = "ZigeeLogic/selected.png";
+            Visible = false;
+            Gravity = Gravity.CenterVertical;
+        }
+        ///// <summary>
+        ///// 妯潗鏍囦綅缃�
+        ///// </summary>
+        ///// <param name="Xwidth"></param>
+        //public void SelectedBtnIcon(int Xwidth = 860)
+        //{
+        //    X = Application.GetRealWidth(Xwidth);
+        //    Width = Application.GetMinRealAverage(60);
+        //    Height = Application.GetMinRealAverage(60);
+        //    UnSelectedImagePath = "ZigeeLogic/selected.png";
+        //    Visible = false;
+        //    Gravity = Gravity.CenterVertical;
+        //}
+        //public void BackBtnIcon()
+        //{
+        //    Width = Application.GetRealWidth(30);
+        //    Height = Application.GetRealHeight(51);
+        //    X = Application.GetRealWidth(58);
+        //    Y = Application.GetRealHeight(98);
+        //    //Gravity = Gravity.CenterVertical;
+        //    UnSelectedImagePath = "ZigeeLogic/back.png";
+        //}
+
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 3cb527e..a4e865e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -3,16 +3,18 @@
 using Newtonsoft.Json.Linq;
 using ZigBee.Device;
 using ZigBee.Common;
+using Shared.Common;
 
 namespace Shared.Phone.Device.Logic
 {
     public class Send
     {
+
         /// <summary>
         /// 鑾峰彇LogicId鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<List<int>> GetLogicId()
+        public static async System.Threading.Tasks.Task<List<int>> GetLogicId(int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
@@ -51,6 +53,8 @@
                 mainGateWay.GwResDataAction += action;
 
                 var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2004 } };
+                var jObjectdata1 = new JObject { { "LogicType", LogicType } };
+                jObject.Add("Data", jObjectdata1);
                 mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
                 //await System.Threading.Tasks.Task.Run(async () =>
                 //{
@@ -72,7 +76,7 @@
         /// 鑾峰彇Logic鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId)
+        public static async System.Threading.Tasks.Task<Common.Logic> GetLogic(int LogicId,int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
@@ -97,8 +101,9 @@
                         logic.LogicName = Logicifon["LogicName"]?.ToString();
 
                         logic.Relationship = int.Parse(Logicifon["Relationship"]?.ToString());
-                        logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
+                        logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
                         logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
+                        logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
                         var listactions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(Logicifon["Actions"].ToString());
                         if (listactions != null)
                         {
@@ -133,7 +138,7 @@
 
                         }
 
-                    };
+                    }
                 };
                 var mainGateWay = ZbGateway.MainGateWay;
                 if (mainGateWay == null)
@@ -146,7 +151,8 @@
                 {
                     var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2002 } };
                     var data = new JObject {
-                        { "LogicId",LogicId}
+                        { "LogicId",LogicId},
+                        { "LogicType",LogicType}
                         };
                     jObject.Add("Data", data);
                     ZbGateway.MainGateWay?.Send("Logic/GetLogicInfo", jObject.ToString());
@@ -251,10 +257,6 @@
 
                 try
                 {
-                    //var bytes = new byte[64];
-                    //var LogicNameBytes = System.Text.Encoding.UTF8.GetBytes(logic.LogicName);
-                    //Array.Copy(LogicNameBytes, 0, bytes, 0, 64 < LogicNameBytes.Length ? 64 : LogicNameBytes.Length);
-                    //logic.LogicName = System.Text.Encoding.UTF8.GetString(bytes);
 
                     var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2000 } };
                     var selectMonthList = new JArray { };
@@ -310,8 +312,13 @@
                                     ["AttriButeId"] = int.Parse(dictionary["AttriButeId"]),
                                     ["AttriButeData1"] = int.Parse(dictionary["AttriButeData1"]),
                                     ["AttriButeData2"] = int.Parse(dictionary["AttriButeData2"]),
-                                    ["Range"] = int.Parse(dictionary["Range"]),
+                                    ["Range"] = int.Parse(dictionary["Range"])
                                 };
+                                if (dictionary.ContainsKey("IgnoreTime"))
+                                {
+                                    dInfo.Add("IgnoreTime", int.Parse(dictionary["IgnoreTime"]));
+                                }
+
                                 conditions.Add(dInfo);
                                 break;
                             case 2:
@@ -434,16 +441,51 @@
                                 };
                                 actions.Add(cdInfo);
                                 break;
+                            case 7:
+                                var timeInfo = new JObject
+                                {
+                                    ["LinkType"] = int.Parse(dictionary["LinkType"].ToString()),
+                                    ["DelayTime"] = int.Parse(dictionary["DelayTime"].ToString()),
+                                };
+                                actions.Add(timeInfo);
+                                break;
                         }
+                    }
+                    var accounts = new JArray();
+                    foreach (var dictionary in logic.Accounts) {
+                        var Type = int.Parse(dictionary["Type"]);
+                        switch (Type)
+                        {
+                            case 1: {
+                                    ///
+                                } break;
+                            case 7:
+                                {
+                                    var location = new JObject
+                                    {
+                                        ["Type"] = int.Parse(dictionary["Type"]),
+                                        ["Account"] = dictionary["Account"],
+                                        ["Longitude"] = int.Parse(dictionary["Longitude"]),
+                                        ["Latitude"] = int.Parse(dictionary["Latitude"]),
+                                        ["Radius"] = int.Parse(dictionary["Radius"]),
+
+                                    };
+                                    accounts.Add(location);
+                                }
+                                break;
+                        }
+
                     }
                     var data = new JObject{
                         { "LogicId",logic.LogicId},
                         { "IsEnable", logic.IsEnable} ,
                         { "LogicName", logic.LogicName},
                         { "Relationship",logic.Relationship} ,
+                        { "LogicCustomPushText",logic.LogicCustomPushText} ,
                         { "TimeAttribute", timeAttribute} ,
                         { "Conditions", conditions },
                         { "Actions", actions },
+                        { "Accounts", accounts },
                     };
                     jObject.Add("Data", data);
                     ZbGateway.MainGateWay?.Send("Logic/AddLogic", jObject.ToString());
@@ -503,8 +545,9 @@
                 jObject.Add("Data", date);
                 date.Add("LogicId", logic.LogicId);
                 date.Add("IsEnable", logic.IsEnable);
-                //date.Add("LogicName", logic.LogicName);
-                //date.Add("Relationship", logic.Relationship);
+                date.Add("LogicName", logic.LogicName);
+                date.Add("Relationship", logic.Relationship);
+                date.Add("LogicCustomPushText", logic.LogicCustomPushText);
                 mainGateWay?.Send("Logic/ReviseAttribute", jObject.ToString());
                 //await System.Threading.Tasks.Task.Run(async () =>
                 //{
@@ -526,13 +569,13 @@
         /// 鑾峰彇Logic鍒楄〃鐨勬柟娉�
         /// </summary>
         /// <returns>The logic identifier.</returns>
-        public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum)
+        public static async System.Threading.Tasks.Task<List<Common.Logic>> ReadList(int sum,int LogicType)
         {
             return await System.Threading.Tasks.Task.Run(async () =>
             {
 
                 var listLogic = new List<Common.Logic>();
-                bool @bool = false;
+               // bool @bool = false;
                 Action<string, string> action = (topic, data) =>
                 {
                     var gatewayID = topic.Split('/')[0];
@@ -550,6 +593,7 @@
                         logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
                         logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
                         logic.LogicName = Logicifon["LogicName"].ToString();
+                        logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
                         logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
                         logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
                         logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
@@ -599,10 +643,10 @@
                         }
 
                     }
-                    if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
-                    {
-                        @bool = true;
-                    }
+                    //if (topic == $"{gatewayID}/Logic/AllLogicNum_Respon")
+                    //{
+                    //    @bool = true;
+                    //}
                 };
                 var mainGateWay = ZbGateway.MainGateWay;
                 if (mainGateWay == null)
@@ -614,6 +658,8 @@
                 try
                 {
                     var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2015 } };
+                    var jObjectdata = new JObject { { "LogicType", LogicType } };
+                    jObject.Add("Data", jObjectdata);
                     ZbGateway.MainGateWay?.Send("Logic/GetAllLogicListInfo", jObject.ToString());
                 }
                 catch { }
@@ -621,28 +667,241 @@
                 while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
                 {
                     await System.Threading.Tasks.Task.Delay(100);
-                    //if (sum == listLogic.Count)
-                    //{
-                    //    break;
-                    //}
-                    if (@bool)
+                    if (sum == listLogic.Count)
                     {
                         break;
                     }
+                    //if (@bool)
+                    //{
+                    //    break;
+                    //}
                 }
                 ZbGateway.MainGateWay.GwResDataAction -= action;
                 return listLogic;
             });
         }
         // <summary>
-        /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+        /// 閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
         /// </summary>
         /// <param name="btnregionname">Btnregionname.</param>
         /// <param name="device">Device.</param>
         public static void RoomNmae(Button btnregionname, CommonDevice device)
         {
-            var room = new Common.Room();
+            var room = new Common.Room();
             btnregionname.Text = room.GetRoomNameByDevice(device);
         }
+
+        public static List<Common.Room> GetRoomList(string floorId)
+        {
+            return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
+
+        }
+
+        #region  ----鑾峰彇闂ㄩ攣
+        public static List<DoorLock> ReadDoorLockIfon(string doorlockMac)
+        {
+            List<DoorLock> list = new List<DoorLock>();
+            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";//瀛愯处鍙峰拰涓昏处鍙峰彲鑳介摼鎺ヤ笉鍚�
+            System.Net.WebClient webClient = new System.Net.WebClient();
+            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
+            postValues.Add("RequestVersion", CommonPage.RequestVersion);
+            postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
+            System.Threading.Tasks.Task.Run(() =>
+           {
+               try
+               {
+
+                   byte[] responseArray = webClient.UploadValues(url, postValues);
+                   var str = System.Text.Encoding.UTF8.GetString(responseArray);
+                   var jObject = JObject.Parse(str);
+                   if (jObject == null || jObject["StateCode"].ToString() != "Success")
+                   {
+                       return;
+                   }
+                   var pageData = jObject["ResponseData"]["PageData"].ToString();
+                   var datalist = JArray.Parse(pageData);
+                   for (int i = 0; i < datalist.Count; i++)
+                   {
+                       var data = JObject.Parse(datalist[i].ToString());
+                       if (Config.Instance.HomeId == data["Id"].ToString())
+                       {
+                           Residential residential = new Residential();
+
+                           if (Convert.ToBoolean(data["IsOthreShare"].ToString()))
+                           {
+                                //鍒嗕韩鑰匢D
+                                residential.Id = data["Id"].ToString();
+                                //鏄惁鏄垎浜处鍙穂true(鏄垎浜�);false;(涓嶆槸鍒嗕韩)];
+                                residential.IsOthreShare = Convert.ToBoolean(data["IsOthreShare"].ToString());
+                                //鍒嗕韩鑰呬綇瀹匢D
+                                residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
+                               residential.IsOtherAccountCtrl = true;
+                               residential.doorlockmac = doorlockMac;
+                               list = ReadToken(residential);
+                           }
+                           else
+                           {
+                               residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
+                               residential.Token = Config.Instance.Token;
+                               residential.Id = Config.Instance.HomeId;
+                               residential.IsOtherAccountCtrl = false;
+                               residential.doorlockmac = doorlockMac;
+                               list = ReadDoorLock(residential);
+
+                           }
+                       }
+
+                   }
+               }
+               catch { }
+           });
+            var datetime = DateTime.Now;
+            while ((DateTime.Now - datetime).TotalMilliseconds < 3*1000)
+            {
+                if (list.Count != 0)
+                {
+                    break;
+                }
+            }
+            return list;
+
+        }
+
+        public static List<DoorLock> ReadToken(Residential residential)
+        {
+            List<DoorLock> list = new List<DoorLock>();
+            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
+            System.Net.WebClient webClient = new System.Net.WebClient();
+            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
+            postValues.Add("RequestVersion", CommonPage.RequestVersion);
+            postValues.Add("LoginAccessToken", Config.Instance.Token);
+            postValues.Add("MainAccountId", residential.MainUserDistributedMark);
+            postValues.Add("SharedHid", residential.Id);
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                try
+                {
+                    byte[] responseArray = webClient.UploadValues(url, postValues);
+                    var str = System.Text.Encoding.UTF8.GetString(responseArray);
+                    var jObject = JObject.Parse(str);
+                    if (jObject == null || jObject["StateCode"].ToString() != "Success")
+                    {
+                        return;
+                    }
+                    var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString();
+                    var RequestToken = jObject["ResponseData"]["RequestToken"].ToString();
+                    Residential lockifon = new Residential();
+                    lockifon.Url = RequestBaseUrl + "/App/GetDoorLockPager";
+                    lockifon.Token = RequestToken;
+                    lockifon.Id = Config.Instance.HomeId;
+                    lockifon.IsOtherAccountCtrl = true;
+                    lockifon.doorlockmac = residential.doorlockmac;
+                    list = ReadDoorLock(lockifon);
+
+                }
+                catch { }
+            });
+            var datetime = DateTime.Now;
+            while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
+            {
+                if (list.Count != 0)
+                {
+                    break;
+                }
+            }
+            return list;
+        }
+
+        public static List<DoorLock> ReadDoorLock(Residential lockifon)
+        {
+            List<DoorLock> list = new List<DoorLock>();
+            System.Net.WebClient webClient = new System.Net.WebClient(); 
+            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
+            postValues.Add("RequestVersion", CommonPage.RequestVersion);
+            postValues.Add("LoginAccessToken", lockifon.Token);
+            postValues.Add("HomeId", lockifon.Id);
+            postValues.Add("DoorLockId", lockifon.doorlockmac);//闂ㄩ攣Mac19091
+            postValues.Add("IsOtherAccountCtrl", lockifon.IsOtherAccountCtrl.ToString());
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                try
+                {
+
+                    byte[] responseArray = webClient.UploadValues(lockifon.Url, postValues);
+                    var str = System.Text.Encoding.UTF8.GetString(responseArray);
+                    var jObject = JObject.Parse(str);
+                    if (jObject == null || jObject["StateCode"].ToString() != "Success")
+                    {
+                        return;
+                    }
+                    var pageData = jObject["ResponseData"]["PageData"].ToString();
+                    var datalist = JArray.Parse(pageData);
+                    for (int i = 0; i < datalist.Count; i++)
+                    {
+                        var data = JObject.Parse(datalist[i].ToString());
+                        DoorLock doorLock = new DoorLock();
+                        doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
+                        doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
+                        doorLock.CloudAccountId = data["CloudAccountId"].ToString();
+                        list.Add(doorLock);
+                    }
+
+                }
+                catch
+                {
+
+                }
+
+            });
+            var datetime = DateTime.Now;
+            while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
+            {
+                if (list.Count != 0)
+                {
+                    break;
+                }
+            }
+            return list;
+        }
+
+        public class Residential
+        {
+            public string Id = string.Empty;
+            public bool IsOthreShare;
+            public string MainUserDistributedMark = string.Empty;
+            public string Url = string.Empty;
+            public string Token = string.Empty;
+            public bool IsOtherAccountCtrl;
+            public string doorlockmac;
+        }
+
+        public class DoorLock
+        {
+            public string DoorLockLocalUserId = string.Empty;
+            public int OpenLockMode;
+            public string CloudAccountId = string.Empty;
+            /// <summary>
+            /// 韬唤+瑙﹀彂婧�(0鎸夐敭/3鍗�/15鎸囩汗)
+            /// </summary>
+            public string UserIdMode
+            {
+                get
+                {
+                    return DoorLockLocalUserId + "_" + OpenLockMode.ToString();
+                }
+            }
+        }
+
+        public class MembershipIfon
+        {
+            public string MembershipId = string.Empty;
+            public List<string> UserIdMode=new List<string>();
+            public string MembershipName = string.Empty;
+        }
+
+        public static List<MembershipIfon> UserList = new List<MembershipIfon>();
+
+        
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs
deleted file mode 100755
index bd9932d..0000000
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SetDeviceState.cs
+++ /dev/null
@@ -1,681 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using Shared;
-using Shared.R;
-using Shared.Phone;
-using ZigBee.Device;
-using Shared.Common;
-
-namespace Shared.Phone.Device.Logic
-{
-    public class SetDeviceState:FrameLayout
-    {
-        public SetDeviceState()
-        {
-            Tag = "Logic";
-        }
-        Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
-        List<Dictionary<string, string>> taskListInfo = new List<Dictionary<string, string>>();
-        public void Show (CommonDevice common,string topText,bool edit)
-        {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            UserView.HomePage.Instance.ScrollEnabled = false;
-            var topFrameLayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
-            };
-            AddChidren(topFrameLayout);
-
-            var titleName = new Button {
-                Text =topText,
-                //TextID = MyInternationalizationString.adddevice,
-                TextSize = 17,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
-            };
-            topFrameLayout.AddChidren (titleName);
-
-            var back = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                X = Application.GetRealWidth (20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
-            };
-            topFrameLayout.AddChidren (back);
-            back.MouseDownEventHandler += (sender, e) => {
-                RemoveFromParent ();
-                UserView.HomePage.Instance.ScrollEnabled = true;
-            };
-
-        
-            var middle = new FrameLayout ();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight (1920 - 220);
-            middle.BackgroundColor =ZigbeeColor.Current.LogicBackgroundColor;
-            this.AddChidren (middle);
-
-            var bjframelayout = new FrameLayout
-            {
-                X = Application.GetRealWidth(50),
-                Width = Application.GetRealWidth(1080 - 100),
-                Height = Application.GetRealHeight(1300),
-                Y=Application.GetRealHeight(50),
-                BackgroundColor= ZigbeeColor.Current.LogicTopViewBackgroundColor,
-            };
-            middle.AddChidren(bjframelayout);
-
-            List<Dictionary<string,string>> TaskList = null;
-            foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
-            {
-                if (deviceinfo["LinkType"].ToString() == "0")
-                {
-
-                    if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr &&deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
-                    {
-                        TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
-                        break;
-                    }
-                }
-            }
-            string SelectedDeviceStatus = "no";
-
-            if (actionsInfo.ContainsKey("LinkType"))
-            {
-                actionsInfo.Remove("LinkType");
-            }
-            if (actionsInfo.ContainsKey("DeviceAddr"))
-            {
-                actionsInfo.Remove("DeviceAddr");
-            }
-            if (actionsInfo.ContainsKey("Epoint"))
-            {
-                actionsInfo.Remove("Epoint");
-            }
-            if (actionsInfo.ContainsKey("Time"))
-            {
-                actionsInfo.Remove("Time");
-            }
-            if (actionsInfo.ContainsKey("TaskList"))
-            {
-                actionsInfo.Remove("TaskList");
-            }
-            actionsInfo.Add("LinkType", 0);
-            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
-            actionsInfo.Add("Epoint", common.DeviceEpoint);
-            actionsInfo.Add("Time", 0);
-            actionsInfo.Add("TaskList", taskListInfo);
-            switch (common.Type)
-            {
-                case DeviceType.DimmableLight:
-                    {
-                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
-                        //Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
-                        //if (switchdictionary.ContainsKey("TaskType"))
-                        //{
-                        //    switchdictionary.Remove("TaskType");
-                        //}
-                        //if (switchdictionary.ContainsKey("Data1"))
-                        //{
-                        //    switchdictionary.Remove("Data1");
-                        //}
-                        //if (switchdictionary.ContainsKey("Data2"))
-                        //{
-                        //    switchdictionary.Remove("Data2");
-                        //}
-                        //switchdictionary.Add("TaskType", "1");
-                        //switchdictionary.Add("Data1", "0");
-                        //switchdictionary.Add("Data2", "0");
-                        //taskListInfo.Add(switchdictionary);
-                        Dictionary<string, string> brightnessdictionary = new Dictionary<string, string>();
-                        if (brightnessdictionary.ContainsKey("TaskType"))
-                        {
-                            brightnessdictionary.Remove("TaskType");
-                        }
-                        if (brightnessdictionary.ContainsKey("Data1"))
-                        {
-                            brightnessdictionary.Remove("Data1");
-                        }
-                        if (brightnessdictionary.ContainsKey("Data2"))
-                        {
-                            brightnessdictionary.Remove("Data2");
-                        }
-                        brightnessdictionary.Add("TaskType", "3");
-                        brightnessdictionary.Add("Data1", "0");
-                        brightnessdictionary.Add("Data2", "0");
-                        taskListInfo.Add(brightnessdictionary);
-                        #endregion
-                     
-                        #region  鐏厜View
-                        var Btndevicename = new Button
-                        {
-                            Text = common.DeviceEpointName,
-                            Y = Application.GetRealHeight(150),
-                            X = Application.GetRealWidth(190),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(150),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            TextSize = 16,
-                            TextAlignment = TextAlignment.Center,
-                        };
-                        bjframelayout.AddChidren(Btndevicename);
-
-
-                        var Btniocn = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Light.png",
-                            X = Application.GetRealWidth(440),
-                            Y = Btndevicename.Bottom + Application.GetRealHeight(100),
-                        };
-                        bjframelayout.AddChidren(Btniocn);
-
-                        var Btnvelue = new Button
-                        {
-                            Width = Application.GetRealWidth(200),
-                            Height = Application.GetRealHeight(130),
-                            X = Application.GetRealWidth(390),
-                            Y = Btniocn.Bottom + Application.GetRealHeight(100),
-                            TextAlignment = TextAlignment.Center,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            Text = "0%",
-                        };
-                        bjframelayout.AddChidren(Btnvelue);
-
-                        var horizontalSeekBarVolframelayout = new FrameLayout
-                        {
-                            Y = Btnvelue.Bottom,
-                            Width = Application.GetRealWidth(880),
-                            Height = Application.GetRealHeight(80),
-                            X = Application.GetRealWidth(50),
-                        };
-                        bjframelayout.AddChidren(horizontalSeekBarVolframelayout);
-
-
-                        var horizontalSeekBarVol = new HorizontalSeekBar
-                        {
-                            Width = Application.GetRealWidth(880 - 50),
-                            Height = Application.GetRealHeight(80),
-                            Radius = (uint)Application.GetRealHeight(25),
-                            X = Application.GetRealWidth(25),
-                            Gravity = Gravity.CenterVertical,
-                            ProgressColor = 0xffFE5E00,
-                            Max = 100,
-                            SleepTime = 1000,
-                            ThumbRadius = 9,
-                            //IsCanClick=false
-                        };
-                        horizontalSeekBarVolframelayout.AddChidren(horizontalSeekBarVol);
-
-
-                        var Btnswitch = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Light.png",
-                            SelectedImagePath = "Room/LightSelected.png",
-                            X = Application.GetRealWidth(440),
-                            Y = horizontalSeekBarVolframelayout.Bottom + Application.GetRealHeight(80),
-                        };
-                        //bjframelayout.AddChidren(Btnswitch);
-
-                        var textfl = new FrameLayout
-                        {
-                            Width = Application.GetRealWidth(980),
-                            Height = Application.GetRealHeight(160),
-                            BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                            Y = Application.GetRealHeight(1300 - 160),
-                        };
-                        bjframelayout.AddChidren(textfl);
-
-                        var Btnregioniocn = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Light.png",
-                            X = Application.GetRealWidth(40),
-                            Y = Application.GetRealHeight(25),
-                        };
-                        textfl.AddChidren(Btnregioniocn);
-
-                        var Btnregionname = new Button
-                        {
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(110),
-                            X = Application.GetRealWidth(150 + 30),
-                            TextAlignment = TextAlignment.CenterLeft,
-                            Text ="",
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            Y = Application.GetRealHeight(25),
-                        };
-                        textfl.AddChidren(Btnregionname);
-                        Send.RoomNmae(Btnregionname,common);
-                        #endregion
-                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
-                        {
-                            SelectedDeviceStatus = "selected";
-                            Btnvelue.Text = horizontalSeekBarVol.Progress.ToString() + "%";
-
-                            if (brightnessdictionary.ContainsKey("Data1"))
-                            {
-                                brightnessdictionary.Remove("Data1");
-                            }
-                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;//鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
-                            brightnessdictionary.Add("Data1", lightbrightnessvalue.ToString());
-                            //var dd = (lightbrightnessvalue * 100)/254+1;
-                        };
-
-                        Btnswitch.MouseUpEventHandler += (sender, e) =>
-                        {
-                            SelectedDeviceStatus = "selected";
-                            Btnswitch.IsSelected = !Btnswitch.IsSelected;
-                         
-                            //if (switchdictionary.ContainsKey("Data1"))
-                            //{
-                            //    switchdictionary.Remove("Data1");
-                            //}
-                            //if (Btnswitch.IsSelected)
-                            //{
-                            //    switchdictionary.Add("Data1", "1");
-                            //}
-                            //else
-                            //{
-                            //    switchdictionary.Add("Data1", "0");
-                            //}
-                        };
-
-                        if (edit&&TaskList!=null)
-                        {
-                            foreach (var value in TaskList)
-                            {
-                                if (value["TaskType"] == "1")
-                                {
-                                    //if (switchdictionary.ContainsKey("Data1"))
-                                    //{
-                                    //    switchdictionary.Remove("Data1");
-                                    //}
-                                    //if (value["Data1"] == "1")
-                                    //{
-                                    //    switchdictionary.Add("Data1", "1");
-                                    //    Btnswitch.IsSelected = true;
-                                    //}
-                                    //else
-                                    //{
-                                    //    switchdictionary.Add("Data1", "0");
-                                    //    Btnswitch.IsSelected = false;
-                                    //}
-                                }
-                                else if (value["TaskType"] == "3")
-                                {
-                                    if (brightnessdictionary.ContainsKey("Data1"))
-                                    {
-                                        brightnessdictionary.Remove("Data1");
-                                    }
-                                    var intvalue = int.Parse(value["Data1"]);
-                                    brightnessdictionary.Add("Data1", intvalue.ToString());
-                                    var lightbrightnessvalue = (intvalue * 100) / 254;
-                                    Btnvelue.Text = lightbrightnessvalue.ToString() + "%";
-                                    horizontalSeekBarVol.Progress = lightbrightnessvalue;
-
-                                }
-                            }
-                        }
-
-                    }
-                    break;
-                case DeviceType.WindowCoveringDevice:
-                    {
-                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
-                        //Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
-                        //if (switchdictionary.ContainsKey("TaskType"))
-                        //{
-                        //    switchdictionary.Remove("TaskType");
-                        //}
-                        //if (switchdictionary.ContainsKey("Data1"))
-                        //{
-                        //    switchdictionary.Remove("Data1");
-                        //}
-                        //if (switchdictionary.ContainsKey("Data2"))
-                        //{
-                        //    switchdictionary.Remove("Data2");
-                        //}
-                        //switchdictionary.Add("TaskType", "6");
-                        //switchdictionary.Add("Data1", "1");
-                        //switchdictionary.Add("Data2", "0");
-                        //taskListInfo.Add(switchdictionary);                    
-                       
-                        Dictionary<string, string> brightnessdictionary = new Dictionary<string, string>();
-                        if (brightnessdictionary.ContainsKey("TaskType"))
-                        {
-                            brightnessdictionary.Remove("TaskType");
-                        }
-                        if (brightnessdictionary.ContainsKey("Data2"))
-                        {
-                            brightnessdictionary.Remove("Data2");
-                        }
-                        if (brightnessdictionary.ContainsKey("Data1"))
-                        {
-                            brightnessdictionary.Remove("Data1");
-                        }
-                        brightnessdictionary.Add("TaskType", "6");
-                        brightnessdictionary.Add("Data1", "5");
-                        brightnessdictionary.Add("Data2", "0");
-                        taskListInfo.Add(brightnessdictionary);
-                        #endregion  
-
-                        #region  绐楀笜View
-
-                        var Btndevicename = new Button
-                        {
-                            Text = common.DeviceEpointName,
-                            Y = Application.GetRealHeight(150),
-                            X = Application.GetRealWidth(190),
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(150),
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            TextSize = 16,
-                            TextAlignment = TextAlignment.Center,
-                        };
-                        bjframelayout.AddChidren(Btndevicename);
-
-
-                        var Btniocn = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Curtain.png",
-                            X = Application.GetRealWidth(440),
-                            Y = Btndevicename.Bottom + Application.GetRealHeight(100),
-                        };
-                        bjframelayout.AddChidren(Btniocn);
-
-                        var Btnvelue = new Button
-                        {
-                            Width = Application.GetRealWidth(200),
-                            Height = Application.GetRealHeight(130),
-                            X = Application.GetRealWidth(390),
-                            Y = Btniocn.Bottom + Application.GetRealHeight(100),
-                            TextAlignment = TextAlignment.Center,
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            Text = "0%",
-                        };
-                        bjframelayout.AddChidren(Btnvelue);
-
-                        var horizontalSeekBarVolframelayout = new FrameLayout
-                        {
-                            Y = Btnvelue.Bottom,
-                            Width = Application.GetRealWidth(880),
-                            Height = Application.GetRealHeight(80),
-                            X = Application.GetRealWidth(50),
-                        };
-                        bjframelayout.AddChidren(horizontalSeekBarVolframelayout);
-
-
-                        var horizontalSeekBarVol = new HorizontalSeekBar
-                        {
-                            Width = Application.GetRealWidth(880 - 50),
-                            Height = Application.GetRealHeight(80),
-                            Radius = (uint)Application.GetRealHeight(25),
-                            X = Application.GetRealWidth(25),
-                            Gravity = Gravity.CenterVertical,
-                            ProgressColor = 0xffFE5E00,
-                            Max = 100,
-                            SleepTime = 1000,
-                            ThumbRadius = 9,
-                            //IsCanClick=false
-                        };
-                        horizontalSeekBarVolframelayout.AddChidren(horizontalSeekBarVol);
-                       
-
-                        var Btnswitch = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Curtain.png",
-                            SelectedImagePath = "Room/CurtainSelected.png",
-                            X = Application.GetRealWidth(440),
-                            Y = horizontalSeekBarVolframelayout.Bottom + Application.GetRealHeight(80),
-                        };
-                        //bjframelayout.AddChidren(Btnswitch);
-
-                        var textfl = new FrameLayout
-                        {
-                            Width = Application.GetRealWidth(980),
-                            Height = Application.GetRealHeight(160),
-                            BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor,
-                            Y = Application.GetRealHeight(1300 - 160),
-                        };
-                        bjframelayout.AddChidren(textfl);
-
-                        var Btnregioniocn = new Button
-                        {
-                            Width = Application.GetRealWidth(110),
-                            Height = Application.GetRealHeight(110),
-                            UnSelectedImagePath = "Room/Curtain.png",
-                            X = Application.GetRealWidth(40),
-                            Y = Application.GetRealHeight(25),
-                        };
-                        textfl.AddChidren(Btnregioniocn);
-
-                        var Btnregionname = new Button
-                        {
-                            Width = Application.GetRealWidth(600),
-                            Height = Application.GetRealHeight(110),
-                            X = Application.GetRealWidth(150 + 30),
-                            TextAlignment = TextAlignment.CenterLeft,
-                            Text ="",
-                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                            Y = Application.GetRealHeight(25),
-                        };
-                        textfl.AddChidren(Btnregionname);
-                        Send.RoomNmae(Btnregionname,common);
-                        #endregion
-
-                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
-                        {
-                            SelectedDeviceStatus = "selected";
-                            Btnvelue.Text = horizontalSeekBarVol.Progress.ToString() + "%";
-                            if (brightnessdictionary.ContainsKey("Data1"))
-                            {
-                                brightnessdictionary.Remove("Data1");
-                            }
-                            brightnessdictionary.Add("Data1", "5");
-                            if (brightnessdictionary.ContainsKey("Data2"))
-                            {
-                                brightnessdictionary.Remove("Data2");
-                            }
-                            brightnessdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
-                          
-                           
-                        };
-
-                        Btnswitch.MouseUpEventHandler += (sender, e) =>
-                        {
-                            SelectedDeviceStatus = "selected";
-                            Btnswitch.IsSelected = !Btnswitch.IsSelected;
-                            //if (switchdictionary.ContainsKey("Data1"))
-                            //{
-                            //    switchdictionary.Remove("Data1");
-                            //}
-                            //if (Btnswitch.IsSelected)
-                            //{
-                            //    switchdictionary.Add("Data1", "0");
-                            //}
-                            //else
-                            //{
-                            //    switchdictionary.Add("Data1", "1");
-                            //}
-                        };
-
-
-                        if (edit && TaskList != null)
-                        {
-                            foreach (var value in TaskList)
-                            {
-                                if (value["TaskType"] == "6")
-                                {
-                                    if (value["Data1"] == "5")
-                                    {
-                                        if (brightnessdictionary.ContainsKey("Data2"))
-                                        {
-                                            brightnessdictionary.Remove("Data2");
-                                        }
-                                        var lightbrightnessvalue = int.Parse(value["Data2"]);
-                                        brightnessdictionary.Add("Data2", lightbrightnessvalue.ToString());
-                                        Btnvelue.Text = lightbrightnessvalue.ToString() + "%";
-                                        horizontalSeekBarVol.Progress = lightbrightnessvalue;
-                                    }
-                                }
-
-                            }
-                        }
-                 
-                        /*
-                        if (edit && TaskList != null)
-                        {
-                            foreach (var value in TaskList)
-                            {
-                                if (value["TaskType"] == "6")
-                                {
-
-                                    if (value["Data1"] == "0")
-                                    {
-                                        if (switchdictionary.ContainsKey("Data1"))
-                                        {
-                                            switchdictionary.Remove("Data1");
-                                        }
-                                        switchdictionary.Add("Data1", "0");
-                                        Btnswitch.IsSelected = true;
-                                    }
-                                    else if (value["Data1"] == "1")
-                                    {
-                                        if (switchdictionary.ContainsKey("Data1"))
-                                        {
-                                            switchdictionary.Remove("Data1");
-                                        }
-                                        switchdictionary.Add("Data1", "1");
-                                        Btnswitch.IsSelected = false;
-                                    }
-                                    else if (value["Data1"] == "5")
-                                    {
-                                        if (brightnessdictionary.ContainsKey("Data2"))
-                                        {
-                                            brightnessdictionary.Remove("Data2");
-                                        }
-                                        var lightbrightnessvalue = int.Parse(value["Data2"]);
-                                        brightnessdictionary.Add("Data2", lightbrightnessvalue.ToString());
-                                        Btnvelue.Text = lightbrightnessvalue.ToString() + "%";
-                                        horizontalSeekBarVol.Progress = lightbrightnessvalue;
-                                    }
-                                }
-
-                            }
-                        }
-                  */
-
-                    }
-                    break;
-
-            }
-            var btnsave = new Button
-            {
-                Height = Application.GetRealHeight(150),//194
-                Y = bjframelayout.Bottom+Application.GetRealHeight(100),
-                //Text = "淇濆瓨",
-                Width = Application.GetRealWidth(500),
-                Radius = (uint)Application.GetRealHeight(50),
-                BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
-                X = Application.GetRealWidth(290),
-                TextID=MyInternationalizationString.Save,
-            };
-            middle.AddChidren(btnsave);
-            btnsave.MouseUpEventHandler += (sedder, e) => {
-                if (SelectedDeviceStatus == "selected")
-                {
-                    LogicIfon.AddDeviceactions(common,actionsInfo);
-                }
-                else
-                {
-                    if (!edit)
-                    {
-                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                                                       Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
-                                                  Language.StringByID(MyInternationalizationString.complete));
-
-                        alert.Show();
-                        return;
-                    }
-                    edit = false;
-                }
-                this.RemoveFromParent ();
-                var logicCommunalPage = new LogicCommunalPage ();
-                UserView.HomePage.Instance.AddChidren (logicCommunalPage);
-                UserView.HomePage.Instance.PageIndex += 1;
-                logicCommunalPage.Show (()=>{});
-            };
-
-        }
-
-        void FreshAirReadupdateModeImage (int mode, Button btn,Button btn1)
-        {
-            ///鏂伴:mode:(0:鏅鸿兘锛�1:鏂伴锛�2:鍐呭惊鐜紝3:鎭掓俯)
-            switch (mode) {
-            case 0:
-                btn.UnSelectedImagePath = "FreshAir/FASmart.png";
-                btn1.UnSelectedImagePath = "FreshAir/FASmart.png";
-                break;
-            case 1:
-                btn.UnSelectedImagePath = "FreshAir/FAManual.png";
-                btn1.UnSelectedImagePath = "FreshAir/FAManual.png";
-                break;
-            case 2:
-                btn.UnSelectedImagePath = "FreshAir/FAInternalCirculation.png";
-                btn1.UnSelectedImagePath = "FreshAir/FAInternalCirculation.png";
-                break;
-            case 3:
-                btn.UnSelectedImagePath = "FreshAir/FAConstantTemp.png";
-                btn1.UnSelectedImagePath = "FreshAir/FAConstantTemp.png";
-                break;
-            default:
-                btn.UnSelectedImagePath = "FreshAir/FASmart.png";
-                btn1.UnSelectedImagePath = "FreshAir/FASmart.png";
-                break;
-            }
-        }
-
-        void ACupdateModeImage (int mode, Button btn,Button btn1)
-        {
-            ///绌鸿皟:mode:(0锛氬埗鍐凤紝1锛氬埗鐑紝2锛氶�氶锛�3锛氳嚜鍔紝4锛氭娊婀�)
-            switch (mode) {
-            case 0:
-                btn.UnSelectedImagePath = "AC/ACRefrigeration.png";
-                btn1.UnSelectedImagePath = "AC/ACRefrigeration.png";
-                break;
-            case 1:
-                btn.UnSelectedImagePath = "AC/ACHeating.png";
-                btn1.UnSelectedImagePath = "AC/ACHeating.png";
-                break;
-            case 2:
-                btn.UnSelectedImagePath = "AC/ACModeAuto.png";
-                btn1.UnSelectedImagePath = "AC/ACModeAuto.png";
-                break;
-            case 3:
-                btn.UnSelectedImagePath = "AC/ACAuto.png";
-                btn1.UnSelectedImagePath = "AC/ACAuto.png";
-                break;
-            case 4:
-                btn.UnSelectedImagePath = "AC/ACDehumidification.png";
-                btn1.UnSelectedImagePath = "AC/ACDehumidification.png";
-                break;
-            default:
-                btn.UnSelectedImagePath = "AC/ACRefrigeration.png";
-                btn1.UnSelectedImagePath = "AC/ACRefrigeration.png";
-                break;
-            }
-        }
-
-    }
-}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
new file mode 100755
index 0000000..6d20209
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceAction.cs
@@ -0,0 +1,2102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.R;
+using ZigBee.Device;
+namespace Shared.Phone.Device.Logic
+{
+    public class TemplateDeviceAction:FrameLayout
+    {
+        public TemplateDeviceAction()
+        {
+            Tag = "Logic";
+        }
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button devicetypeButton = new Button();
+        VerticalScrolViewLayout middle;
+        FrameLayout clickframeLayout = new FrameLayout();
+        Button clickbutton = new Button();
+        Button clicktextcolcrbutton = new Button();
+        
+        public void Show()
+        {
+
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.devicestate,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var foolrname = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                //TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
+            };
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            var roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+
+            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58 - 200),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58 + 200),
+            };
+            this.AddChidren(devicetypehorizontalScrol1);
+            ///璁惧绫诲瀷婊戝姩鎺т欢
+            var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                Radius = (uint)Application.GetRealHeight(50),
+
+            };
+            this.AddChidren(devicetypehorizontalScrol);
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
+            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            middle.X = Application.GetRealWidth(58);
+            middle.Radius = (uint)Application.GetRealHeight(50);
+            this.AddChidren(middle);
+
+            ///鐩墠鏀寔鐨勮澶�
+            List<DeviceType> deviceTypeList = new List<DeviceType> {
+                DeviceType.OnOffOutput,
+                //DeviceType.DimmableLight,
+                //DeviceType.WindowCoveringDevice,
+                //DeviceType.Thermostat,
+                //DeviceType.AirSwitch,
+            };
+
+
+
+            ///妤煎眰鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
+            {
+
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                flMain.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    flMain.RemoveFromParent();
+                };
+                var foolrbj = new VerticalScrolViewLayout
+                {
+
+                    Width = Application.GetRealWidth(400),
+                    Height = Application.GetRealHeight(600),
+                    X = Application.GetRealWidth(1080 - 400 - 60),
+                    Y = Application.GetRealHeight(184 + 50),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    Radius = (uint)Application.GetRealHeight(30),
+                };
+                flMain.AddChidren(foolrbj);
+                foreach (var foolr in Config.Instance.Home.FloorDics)
+                {
+
+                    var foolrRowLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(150),
+                    };
+                    foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolrname = new Button
+                    {
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        //SelectedTextColor=0xfffc744b,
+                        Tag = foolr.Key,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolrname);
+
+
+                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
+                    {
+                        roomhorizontalScrol.RemoveAll();
+                        devicetypehorizontalScrol.RemoveAll();
+                        middle.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
+                        flMain.RemoveFromParent();
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+                    };
+                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
+                    btnfoolrname.MouseUpEventHandler += foolrnameclick;
+
+
+                }
+
+            };
+            foolrname.MouseUpEventHandler += foorlclick;
+            dropdown.MouseUpEventHandler += foorlclick;
+
+            ///绗竴娆¤繘鏉�
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
+            {
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
+                {
+                    roomlists.AddRange(Common.Room.Lists);
+                }
+                else
+                {
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+                }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+
+            }
+            AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+        }
+        /// <summary>
+        /// 鍔犺浇鎵�鏈夋埧闂寸殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            for (int i = 0; i < roomlist.Count; i++)
+            {
+                var room = roomlist[i];
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+                if (i == 0)
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+                }
+
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
+        }
+
+        /// <summary>
+        ///鍔犺浇璇ュ尯鍩熸墍鏈夎澶囩殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+
+            List<string> devicetypelist = new List<string>();
+            devicetypelist.Clear();
+
+            #region  ------鎺掑垪璁惧绫诲瀷------
+            var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+            if (lightjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
+            }
+            var curtainjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.WindowCoveringDevice);
+            if (curtainjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
+            }
+            var ac = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.Thermostat);
+            if (ac != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.AC));
+            }
+            var airSwitch = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.AirSwitch);
+            if (airSwitch != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Airswitch));
+            }
+
+            #endregion
+
+            devicetypehorizontalScrol.RemoveAll();
+            for (int i = 0; i < devicetypelist.Count; i++)
+            {
+
+                var devicetype = devicetypelist[i];
+
+                var spaceRowLayout = new FrameLayout();
+                devicetypehorizontalScrol.AddChidren(spaceRowLayout);
+                if (i == 0)
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(37);
+                }
+                else
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(80);
+                }
+
+                var deviceRowLayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(156 + 20),
+                    Height = Application.GetRealHeight(280 - 30),
+                    Y = Application.GetRealHeight(30),
+                };
+                devicetypehorizontalScrol.AddChidren(deviceRowLayout);
+
+                var backgroundColor = new Button
+                {
+                    Width = Application.GetRealWidth(156),
+                    Height = Application.GetRealHeight(180),
+                    X = Application.GetRealWidth(10),
+                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
+                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
+                };
+                deviceRowLayout.AddChidren(backgroundColor);
+
+
+                var devicetypeicon = new Button
+                {
+                    Width = Application.GetRealWidth(84),
+                    Height = Application.GetRealHeight(84),
+                    X = Application.GetRealWidth(46),
+                    Y = Application.GetRealHeight(30),
+                };
+                deviceRowLayout.AddChidren(devicetypeicon);
+
+                var devicetypename = new Button
+                {
+                    Width = Application.GetRealWidth(176),
+                    Height = Application.GetRealHeight(40),
+                    Text = devicetype,
+                    TextAlignment = TextAlignment.Center,
+                    Y = backgroundColor.Bottom,
+                    TextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 10,
+                };
+                deviceRowLayout.AddChidren(devicetypename);
+                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedlight.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedac.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                }
+                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
+                {
+
+                    devicetypeButton.IsSelected = false;
+                    devicetypeButton = backgroundColor;
+                    backgroundColor.IsSelected = true;
+                    List<DeviceType> list = new List<DeviceType>();
+                    list.Clear();
+                    ///鍒嗙被鏄剧ず锛堜緥濡傜伅鍏夛細{鐏厜1锛岀伅鍏�2...}锛�
+                    if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                    {
+                        list.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
+                        list.Add(DeviceType.DimmableLight);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                    {
+                        list.Add(DeviceType.WindowCoveringDevice);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.AC))
+                    {
+                        list.Add(DeviceType.Thermostat);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Airswitch))
+                    {
+                        list.Add(DeviceType.AirSwitch);
+                    }
+
+                    ActionDeviceView(list, devicelist);
+
+                };
+                deviceRowLayout.MouseUpEventHandler += devicetypeclick;
+                devicetypename.MouseUpEventHandler += devicetypeclick;
+                devicetypeicon.MouseUpEventHandler += devicetypeclick;
+                backgroundColor.MouseUpEventHandler += devicetypeclick;
+
+            }
+            ///鏄剧ず鎴块棿鎵�鏈夎澶�
+            ActionDeviceView(new List<DeviceType>(), devicelist);
+        }
+        /// <summary>
+        /// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
+        /// </summary>
+        /// <param name="devicelist">璁惧鍒楄〃</param>
+        void ActionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+        {
+            middle.RemoveAll();
+            foreach (var common in devicelist)
+            {
+
+                if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.CommonDevice.Type))
+                {
+                    continue;
+                }
+
+                var deviceFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                };
+                middle.AddChidren(deviceFramelayout);
+
+                var bjFramelayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(112),
+                    Height = Application.GetRealHeight(112),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(30 + 9),
+                    Radius = (uint)Application.GetRealHeight(56),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                deviceFramelayout.AddChidren(bjFramelayout);
+
+                var deviceIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    Gravity = Gravity.Center,
+
+                };
+                bjFramelayout.AddChidren(deviceIconBtn);
+
+                var deviceRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                deviceFramelayout.AddChidren(deviceRow);
+
+                var devicename = new Button
+                {
+                    Text = common.CommonDevice.DeviceEpointName,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                };
+                deviceRow.AddChidren(devicename);
+                switch (common.CommonDevice.Type)
+                {
+
+                    case DeviceType.OnOffOutput:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/light.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedlight.png";
+                        }
+                        break;
+                    case DeviceType.DimmableLight:
+                        {
+
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selecteddimmableLight.png";
+                        }
+                        break;
+                    case DeviceType.WindowCoveringDevice:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/curtain.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                        }
+                        break;
+                    case DeviceType.Thermostat:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/ac.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedac.png";
+                        }
+                        break;
+                    case DeviceType.AirSwitch:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedairswitch.png";
+                        }
+                        break;
+                }
+
+                EventHandler<MouseEventArgs> devicclick = (sen, e) =>
+                {
+                    clickbutton.IsSelected = false;
+                    clickbutton = deviceIconBtn;
+                    deviceIconBtn.IsSelected = true;
+                    clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                    clickframeLayout = bjFramelayout;
+                    bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+                    clicktextcolcrbutton.IsSelected = false;
+                    clicktextcolcrbutton = devicename;
+                    devicename.IsSelected = true;
+
+                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                    this.AddChidren(flMain);
+                    CurrentDeviceStateView(flMain, common.CommonDevice, false);
+                };
+                deviceFramelayout.MouseUpEventHandler += devicclick;
+                bjFramelayout.MouseUpEventHandler += devicclick;
+                deviceIconBtn.MouseUpEventHandler += devicclick;
+                deviceRow.MouseUpEventHandler += devicclick;
+                devicename.MouseUpEventHandler += devicclick;
+
+            }
+        }
+        /// <summary>
+        /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
+        /// </summary>
+        /// <param name="common">Common.</param>
+        public static void CurrentDeviceStateView(FrameLayout flMain, CommonDevice common, bool edit)
+        {
+            //涓嶈褰撳墠鐣岄潰婊戝姩
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+            List<Dictionary<string, string>> taskListInfo = new List<Dictionary<string, string>>();
+            //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            //this.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender, e) =>
+            {
+                flMain.RemoveFromParent();
+            };
+            var devicefra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(devicefra1);
+
+            var devicefra = new FrameLayout
+            {
+
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530 + 160),
+                Y = Application.GetRealHeight(1920 - 530 - 160),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(devicefra);
+
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            devicefra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text = common.DeviceEpointName,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+
+            string SelectedDeviceStatusaction = "no";
+            actionsInfo.Add("LinkType", 0);
+            actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+            actionsInfo.Add("Epoint", common.DeviceEpoint);
+            actionsInfo.Add("Time", 0);
+            actionsInfo.Add("TaskList", taskListInfo);
+
+            List<Dictionary<string, string>> TaskList = null;
+            if (edit)
+            {
+                foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+                {
+                    if (deviceinfo["LinkType"].ToString() == "0")
+                    {
+
+                        if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+                        {
+                            TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
+                            break;
+                        }
+                    }
+                }
+            }
+            switch (common.Type)
+            {
+
+                ///鐏厜
+                case DeviceType.OnOffOutput:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("TaskType"))
+                        {
+                            switchdictionary.Remove("TaskType");
+                        }
+                        if (switchdictionary.ContainsKey("Data1"))
+                        {
+                            switchdictionary.Remove("Data1");
+                        }
+                        if (switchdictionary.ContainsKey("Data2"))
+                        {
+                            switchdictionary.Remove("Data2");
+                        }
+                        switchdictionary.Add("TaskType", "1");
+                        switchdictionary.Add("Data1", "0");
+                        switchdictionary.Add("Data2", "0");
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+
+                        #region  鐏厜View
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+                        #endregion
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
+
+                        #endregion
+
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                        };
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    if (switchdictionary.ContainsKey("Data1"))
+                                    {
+                                        switchdictionary.Remove("Data1");
+                                    }
+                                    if (value["Data1"] == "1")
+                                    {
+                                        switchdictionary.Add("Data1", "1");
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = false;
+                                    }
+                                    else if (value["Data1"] == "0")
+                                    {
+                                        switchdictionary.Add("Data1", "0");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                    }
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
+                                    }
+                                    break;
+                                }
+
+                            }
+                        }
+
+                    }
+                    break;
+                ///璋冨厜鐏厜
+                case DeviceType.DimmableLight:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("Data2"))
+                        {
+                            switchdictionary.Remove("Data2");
+                        }
+                        switchdictionary.Add("Data2", "0");
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+
+                        #region  鐏厜View
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 3 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 3 + 210 + 160);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+                        var horizontalSeekBarRow = new RowLayout
+                        {
+                            Y = openrowlayout.Bottom,
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+                        #region   鍙栧弽
+                        var takebackframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = closeframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(takebackframelayout);
+                        var takebackrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        takebackframelayout.AddChidren(takebackrowlayout);
+
+                        var btntakeback = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.onoff,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        takebackrowlayout.AddChidren(btntakeback);
+
+                        var takebackBtnSelected = new SelectedButton();
+                        takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                        #endregion
+
+
+                        #endregion
+
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "3");
+                            //鏈�澶т寒搴﹀�兼槸254闇�瑕佽浆鎹紱
+                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            takebackBtnSelected.Visible = false;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        //鍙栧弽
+                        EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = false;
+                            takebackBtnSelected.Visible = true;
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                        };
+                        takebackrowlayout.MouseUpEventHandler += takebackclick;
+                        btntakeback.MouseUpEventHandler += takebackclick;
+                        takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                        takebackframelayout.MouseUpEventHandler += takebackclick;
+
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                if (switchdictionary.ContainsKey("TaskType"))
+                                {
+                                    switchdictionary.Remove("TaskType");
+                                }
+                                if (value["TaskType"] == "1")
+                                {
+                                    switchdictionary.Add("TaskType", "1");
+                                    if (value["Data1"] == "0")
+                                    {
+                                        switchdictionary.Add("Data1", "0");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        takebackBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+                                    else if (value["Data1"] == "2")
+                                    {
+                                        switchdictionary.Add("Data1", "2");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        takebackBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+
+                                }
+                                else if (value["TaskType"] == "3")
+                                {
+                                    switchdictionary.Add("TaskType", "3");
+                                    switchdictionary.Add("Data1", value["Data1"]);
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                    takebackBtnSelected.Visible = false;
+                                    horizontalSeekBarVol.IsCanMove = true;
+                                    horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                    horizontalSeekBarVol.Progress = int.Parse(value["Data1"]) * 100 / 254;
+                                    Progressvalue = horizontalSeekBarVol.Progress;
+
+                                }
+                                break;
+
+                            }
+                        }
+
+                    }
+                    break;
+                ///绐楀笜
+                case DeviceType.WindowCoveringDevice:
+                    {
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        if (switchdictionary.ContainsKey("TaskType"))
+                        {
+                            switchdictionary.Remove("TaskType");
+                        }
+                        switchdictionary.Add("TaskType", "6");
+
+                        taskListInfo.Add(switchdictionary);
+
+                        #endregion
+                        devicefra.Y = Application.GetRealHeight(1920 - 160 * 2 - 210 - 160);
+                        devicefra.Height = Application.GetRealHeight(160 * 2 + 210 + 160);
+                        #region 绐楀笜View
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160 + 160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+
+                        var horizontalSeekBarRow = new RowLayout
+                        {
+                            Y = openrowlayout.Bottom,
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(160),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(horizontalSeekBarRow);
+                        var horizontalSeekBarVol = new HorizontalSeekBar
+                        {
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(80),
+                            Radius = (uint)Application.GetRealHeight(25),
+                            Y = Application.GetRealHeight(25),
+                            //Gravity = Gravity.CenterVertical,
+                            ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected,
+                            Max = 100,
+                            SleepTime = 1000,
+                            ThumbRadius = 9,
+                            IsCanMove = false
+                        };
+                        horizontalSeekBarRow.AddChidren(horizontalSeekBarVol);
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+
+
+                        #endregion
+                        int Progressvalue = 100;
+                        horizontalSeekBarVol.ProgressChanged += (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            Progressvalue = horizontalSeekBarVol.Progress;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
+
+                        };
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = true;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            horizontalSeekBarVol.Progress = Progressvalue;
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data1", "5");
+                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatusaction = "yes";
+                            horizontalSeekBarVol.IsCanMove = false;
+                            horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("Data2", "0");
+                            switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+
+
+
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "6")
+                                {
+                                    if (value["Data1"] == "5")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        if (switchdictionary.ContainsKey("Data2"))
+                                        {
+                                            switchdictionary.Remove("Data2");
+                                        }
+                                        switchdictionary.Add("Data1", "5");
+                                        switchdictionary.Add("Data2", value["Data2"]);
+                                        horizontalSeekBarVol.IsCanMove = true;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected;
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        horizontalSeekBarVol.Progress = int.Parse(value["Data2"]);
+                                        Progressvalue = horizontalSeekBarVol.Progress;
+                                    }
+                                    else if (value["Data1"] == "1")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        switchdictionary.Add("Data1", "1");
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        horizontalSeekBarVol.IsCanMove = false;
+                                        horizontalSeekBarVol.ProgressColor = ZigbeeColor.Current.LogicProgressColor;
+                                    }
+
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+                ///绌烘皵寮�鍏�
+                case DeviceType.AirSwitch:
+                    {
+                        {
+
+                            #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                            Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                            if (switchdictionary.ContainsKey("TaskType"))
+                            {
+                                switchdictionary.Remove("TaskType");
+                            }
+                            if (switchdictionary.ContainsKey("Data1"))
+                            {
+                                switchdictionary.Remove("Data1");
+                            }
+                            if (switchdictionary.ContainsKey("Data2"))
+                            {
+                                switchdictionary.Remove("Data2");
+                            }
+                            switchdictionary.Add("TaskType", "1");
+                            switchdictionary.Add("Data1", "0");
+                            switchdictionary.Add("Data2", "0");
+                            taskListInfo.Add(switchdictionary);
+
+                            #endregion
+
+                            #region  绌烘皵鐏厜View
+
+                            #region 寮�
+
+                            var openframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = timetype.Bottom + Application.GetRealHeight(20),
+                            };
+                            devicefra.AddChidren(openframelayout);
+
+                            var openrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            openframelayout.AddChidren(openrowlayout);
+
+                            var btnopen = new Button
+                            {
+                                Width = Application.GetRealWidth(600),
+                                TextID = MyInternationalizationString.open,
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            openrowlayout.AddChidren(btnopen);
+
+                            var openBtnSelected = new SelectedButton();
+                            openrowlayout.AddChidren(openBtnSelected);
+                            #endregion
+                            #region  鍏�
+                            var closeframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = openframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(closeframelayout);
+                            var closerowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                            };
+                            closeframelayout.AddChidren(closerowlayout);
+
+                            var btnclose = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.close,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            closerowlayout.AddChidren(btnclose);
+
+                            var closeBtnSelected = new SelectedButton();
+                            closerowlayout.AddChidren(closeBtnSelected);
+                            #endregion
+                            #region   鍙栧弽
+                            var takebackframelayout = new FrameLayout
+                            {
+                                Height = Application.GetRealHeight(160),
+                                Y = closeframelayout.Bottom,
+                            };
+                            devicefra.AddChidren(takebackframelayout);
+                            var takebackrowlayout = new RowLayout
+                            {
+                                Y = Application.GetRealHeight(30),
+                                Width = Application.GetRealWidth(920),
+                                Height = Application.GetRealHeight(130),
+                                X = Application.GetRealWidth(80),
+                                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                            };
+                            takebackframelayout.AddChidren(takebackrowlayout);
+
+                            var btntakeback = new Button
+                            {
+                                //Text = "鍏�",
+                                TextID = MyInternationalizationString.onoff,
+                                Width = Application.GetRealWidth(600),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            };
+                            takebackrowlayout.AddChidren(btntakeback);
+
+                            var takebackBtnSelected = new SelectedButton();
+                            takebackrowlayout.AddChidren(takebackBtnSelected);
+
+                            #endregion
+
+
+                            #endregion
+
+                            ///纭浜嬩欢
+                            EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = true;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "1");//榛樿鍊�
+
+
+                            };
+                            openrowlayout.MouseUpEventHandler += openclick;
+                            btnopen.MouseUpEventHandler += openclick;
+                            openBtnSelected.MouseUpEventHandler += openclick;
+                            openframelayout.MouseUpEventHandler += openclick;
+                            ///鍙栨秷浜嬩欢
+                            EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = true;
+                                takebackBtnSelected.Visible = false;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "0");//榛樿鍊�
+
+                            };
+                            closerowlayout.MouseUpEventHandler += closeclick;
+                            btnclose.MouseUpEventHandler += closeclick;
+                            closeBtnSelected.MouseUpEventHandler += closeclick;
+                            closeframelayout.MouseUpEventHandler += closeclick;
+                            //鍙栧弽
+                            EventHandler<MouseEventArgs> takebackclick = (sender, e) =>
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = false;
+                                takebackBtnSelected.Visible = true;
+                                if (switchdictionary.ContainsKey("Data1"))
+                                {
+                                    switchdictionary.Remove("Data1");
+                                }
+                                switchdictionary.Add("Data1", "2");//榛樿鍊�
+
+                            };
+                            takebackrowlayout.MouseUpEventHandler += takebackclick;
+                            btntakeback.MouseUpEventHandler += takebackclick;
+                            takebackBtnSelected.MouseUpEventHandler += takebackclick;
+                            takebackframelayout.MouseUpEventHandler += takebackclick;
+                            if (edit && TaskList != null)
+                            {
+                                foreach (var value in TaskList)
+                                {
+                                    if (value["TaskType"] == "1")
+                                    {
+                                        if (switchdictionary.ContainsKey("Data1"))
+                                        {
+                                            switchdictionary.Remove("Data1");
+                                        }
+                                        if (value["Data1"] == "1")
+                                        {
+                                            switchdictionary.Add("Data1", "1");
+                                            openBtnSelected.Visible = true;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "0")
+                                        {
+                                            switchdictionary.Add("Data1", "0");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = true;
+                                            takebackBtnSelected.Visible = false;
+                                        }
+                                        else if (value["Data1"] == "2")
+                                        {
+                                            switchdictionary.Add("Data1", "2");
+                                            openBtnSelected.Visible = false;
+                                            closeBtnSelected.Visible = false;
+                                            takebackBtnSelected.Visible = true;
+                                        }
+                                        break;
+                                    }
+
+                                }
+                            }
+
+                        }
+                    }
+                    break;
+
+                case DeviceType.Thermostat:
+                    {
+
+                        #region  ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
+                        Dictionary<string, string> switchdictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> temperaturedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> modedictionary = new Dictionary<string, string>();
+                        Dictionary<string, string> speeddictionary = new Dictionary<string, string>();
+                        taskListInfo.Add(switchdictionary);
+                        taskListInfo.Add(temperaturedictionary);
+                        taskListInfo.Add(modedictionary);
+                        taskListInfo.Add(speeddictionary);
+                        dictionary(switchdictionary, "TaskType", "1");
+                        dictionary(switchdictionary, "Data2", "0");
+                        dictionary(temperaturedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "TaskType", "5");
+                        dictionary(modedictionary, "Data1", "3");
+                        dictionary(speeddictionary, "TaskType", "5");
+                        dictionary(speeddictionary, "Data1", "6");
+
+                        #endregion
+
+                        #region  绌鸿皟View
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 600 - 210 - 160 * 2);
+                        devicefra.Height = Application.GetRealHeight(600 + 210 + 160 * 2);
+
+                        #region 寮�
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+                        #endregion
+
+                        #region  绌鸿皟鐘舵�乂iew
+                        var PickerViewfra = new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(PickerViewfra);
+
+
+                        var pausePickerViewfra = new FrameLayout
+                        {
+                            Y = openframelayout.Bottom,
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(pausePickerViewfra);
+
+
+
+                        var mUIPickerView = new UIPickerView
+                        {
+                            Height = Application.GetRealHeight(600 - 5),
+                        };
+                        PickerViewfra.AddChidren(mUIPickerView);
+                        var line = new Button
+                        {
+                            Y = Application.GetRealHeight(600 - 5),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(5),
+                            X = Application.GetRealWidth(80),
+                            BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        PickerViewfra.AddChidren(line);
+
+                        var mList1 = new List<string>();
+                        var mList2 = new List<string> {
+                         Language.StringByID(MyInternationalizationString.logiccool),
+                         Language.StringByID(MyInternationalizationString.logicheat),
+                         Language.StringByID(MyInternationalizationString.logicauto),
+                         Language.StringByID(MyInternationalizationString.logicdry),
+                         Language.StringByID(MyInternationalizationString.logicfanonly),
+                        };
+                        var mList3 = new List<string>{
+                         Language.StringByID(MyInternationalizationString.logiclow),
+                         Language.StringByID(MyInternationalizationString.logicmedium),
+                         Language.StringByID(MyInternationalizationString.logichigh),
+                          };
+                        for (int i = 16; i < 33; i++)
+                        {
+                            mList1.Add(i.ToString() + " " + "鈩�");
+                        }
+                        mUIPickerView.setNPicker(mList1, mList2, mList3);
+                        ///榛樿鐘舵��
+
+
+                        #endregion
+
+                        #region  鍏�
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = PickerViewfra.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+
+
+                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+                        {
+                            if (openBtnSelected.Visible)
+                            {
+                                SelectedDeviceStatusaction = "yes";
+                                var temperature = mList1[s1].Split(' ')[0];
+                                var modestring = mList2[s2].Split(' ')[0];
+                                var speedstring = mList3[s3].Split(' ')[0];
+                                ModeState(modestring, temperaturedictionary, modedictionary);
+                                var a = int.Parse(temperature) * 100;
+                                dictionary(temperaturedictionary, "Data2", a.ToString());
+
+                                SpeedState(speedstring, speeddictionary);
+
+
+                            }
+                        };
+
+                        #endregion
+                        //榛樿26,鑷姩,涓
+                        int indextemperature = 10, indexmode = 2, indexspeed = 1;
+                        if (edit && TaskList != null)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    dictionary(switchdictionary, "Data1", value["Data1"]);
+                                    if (value["Data1"] == "1")
+                                    {
+                                        openBtnSelected.Visible = true;
+                                        closeBtnSelected.Visible = false;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(0);
+                                    }
+                                    else if (value["Data1"] == "0")
+                                    {
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                        pausePickerViewfra.Height = Application.GetRealHeight(600);
+                                    }
+
+                                }
+                                else if (value["TaskType"] == "5")
+                                {
+                                    if (value["Data1"] == "3")
+                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                        dictionary(modedictionary, "Data2", value["Data2"]);
+                                        string modetext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "3":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                    //indexmode = 0;
+                                                }
+                                                break;
+                                            case "4":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                    //  indexmode = 1;
+                                                }
+                                                break;
+                                            case "1":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                    //   indexmode = 2;
+                                                }
+                                                break;
+                                            case "8":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                    //  indexmode = 3;
+                                                }
+                                                break;
+                                            case "7":
+                                                {
+                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                    //indexmode = 4;
+                                                }
+                                                break;
+                                        }
+                                        indexmode = mList2.IndexOf(modetext);
+                                    }
+                                    else if (value["Data1"] == "6")
+                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                        dictionary(speeddictionary, "Data2", value["Data2"]);
+                                        string speedtext = "";
+                                        switch (value["Data2"])
+                                        {
+                                            case "1":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                    //indexspeed = 0;
+                                                }
+                                                break;
+
+                                            case "2":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                    // indexspeed = 1;
+                                                }
+                                                break;
+                                            case "3":
+                                                {
+                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                    // indexspeed = 2;
+                                                }
+                                                break;
+
+                                        }
+                                        indexspeed = mList3.IndexOf(speedtext);
+                                    }
+                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                    else if (value["Data1"] == "4" || value["Data1"] == "5" || value["Data1"] == "7")
+                                    {
+                                        var s = int.Parse(value["Data2"]) / 100;
+                                        indextemperature = mList1.IndexOf(s.ToString() + " " + "鈩�");
+                                        dictionary(temperaturedictionary, "Data1", value["Data1"]);
+                                        dictionary(temperaturedictionary, "Data2", value["Data2"]);
+                                    }
+
+                                }
+                            }
+                        }
+                        ///鏇存柊鏈�鏂扮┖璋冪姸鎬侊紱
+                        mUIPickerView.setCurrentItems(indextemperature, indexmode, indexspeed);
+
+                        ///纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(0);
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            dictionary(switchdictionary, "Data1", "1");
+                            var temperature = mList1[indextemperature].Split(' ')[0];
+                            var modestring = mList2[indexmode].Split(' ')[0];
+                            var speedstring = mList3[indexspeed].Split(' ')[0];
+
+                            ModeState(modestring, temperaturedictionary, modedictionary);
+                            var a = int.Parse(temperature) * 100;
+                            dictionary(temperaturedictionary, "Data2", a.ToString());
+                            SpeedState(speedstring, speeddictionary);
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+
+                        ///鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            pausePickerViewfra.Height = Application.GetRealHeight(600);
+
+                            SelectedDeviceStatusaction = "yes";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            dictionary(switchdictionary, "Data1", "0");
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                    }
+                    break;
+
+
+            }
+
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+
+                if (SelectedDeviceStatusaction == "yes")
+                {
+                    LogicIfon.AddDeviceactions(common, actionsInfo);
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                               Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+
+                }
+                flMain.RemoveFromParent();
+                var templatePage = new TemplatePage();
+                UserView.HomePage.Instance.AddChidren(templatePage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                templatePage.Show();
+
+            };
+
+        }
+
+        public static void dictionary(Dictionary<string, string> deviceactionsInfo, string Key, string Value)
+        {
+            if (deviceactionsInfo.ContainsKey(Key))
+            {
+                deviceactionsInfo.Remove(Key);
+            }
+            deviceactionsInfo.Add(Key, Value);
+        }
+        /// <summary>
+        /// 绌鸿皟妯″紡鐨勭姸鎬�
+        /// </summary>
+        /// <param name="modestring"></param>
+        /// <param name="temperaturedictionary"></param>
+        /// <param name="modedictionary"></param>
+        public static void ModeState(string modestring, Dictionary<string, string> temperaturedictionary, Dictionary<string, string> modedictionary)
+        {
+
+            if (modestring == Language.StringByID(MyInternationalizationString.logiccool))
+            {
+                dictionary(modedictionary, "Data2", "3");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicheat))
+            {
+
+                dictionary(modedictionary, "Data2", "4");
+                dictionary(temperaturedictionary, "Data1", "4");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicauto))
+            {
+
+                dictionary(modedictionary, "Data2", "1");
+                dictionary(temperaturedictionary, "Data1", "7");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicdry))
+            {
+
+                dictionary(modedictionary, "Data2", "8");
+                dictionary(temperaturedictionary, "Data1", "5");
+            }
+            else if (modestring == Language.StringByID(MyInternationalizationString.logicfanonly))
+            {
+                dictionary(temperaturedictionary, "Data1", "20");
+                dictionary(modedictionary, "Data2", "7");
+            }
+
+        }
+        /// <summary>
+        /// 椋庨�熺殑妯″紡
+        /// </summary>
+        /// <param name="speedstring"></param>
+        /// <param name="speeddictionary"></param>
+        public static void SpeedState(string speedstring, Dictionary<string, string> speeddictionary)
+        {
+
+            if (speedstring == Language.StringByID(MyInternationalizationString.logiclow))
+            {
+
+                dictionary(speeddictionary, "Data2", "1");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logicmedium))
+            {
+
+                dictionary(speeddictionary, "Data2", "2");
+
+            }
+            else if (speedstring == Language.StringByID(MyInternationalizationString.logichigh))
+            {
+
+                dictionary(speeddictionary, "Data2", "3");
+            }
+
+        }
+
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
new file mode 100755
index 0000000..1489f2e
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateDeviceCondition.cs
@@ -0,0 +1,1452 @@
+锘縰sing System;
+using Shared;
+using Shared.R;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using ZigBee.Device;
+using Shared.Common;
+namespace Shared.Phone.Device.Logic
+{
+    
+    public class TemplateDeviceCondition : FrameLayout
+    {
+        public TemplateDeviceCondition()
+        {
+            Tag = "Logic";
+
+        }
+        Button roombjButton = new Button();
+        Button roomTextButton = new Button();
+        Button devicetypeButton = new Button();
+        VerticalScrolViewLayout middle;
+        FrameLayout clickframeLayout = new FrameLayout();
+        Button clickbutton = new Button();
+        Button clicktextcolcrbutton = new Button();
+
+        public void Show()
+        {
+
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(160),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.devicestate,
+            };
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var foolrname = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = Application.GetRealWidth(1080 - 400 - 120),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                // TextID = MyInternationalizationString.customroom,
+                Text = Config.Instance.Home.GetCurrentFloorName,
+            };
+            topRowLayout.AddChidren(foolrname);
+            var dropdown = new Button
+            {
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterRight,
+                X = foolrname.Right,
+                Width = Application.GetRealWidth(72),
+                Height = Application.GetRealHeight(72),
+                Y = Application.GetRealHeight(92),
+                UnSelectedImagePath = "ZigeeLogic/drop-down.png",
+            };
+            topRowLayout.AddChidren(dropdown);
+            #endregion
+
+            ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
+            if (Common.Room.Lists.Count == 0)
+            {
+                return;
+            }
+            ///鎴块棿婊戝姩鎺т欢
+            var roomhorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(200),
+                Y = topRowLayout.Bottom,
+                X = Application.GetRealWidth(58),
+            };
+            this.AddChidren(roomhorizontalScrol);
+
+            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58 - 200),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58 + 200),
+            };
+            this.AddChidren(devicetypehorizontalScrol1);
+            ///璁惧绫诲瀷婊戝姩鎺т欢
+            var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(280),
+                Y = roomhorizontalScrol.Bottom,
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                Radius = (uint)Application.GetRealHeight(50),
+
+            };
+            this.AddChidren(devicetypehorizontalScrol);
+
+            middle = new VerticalScrolViewLayout();
+            middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
+            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+            middle.X = Application.GetRealWidth(58);
+            middle.Radius = (uint)Application.GetRealHeight(50);
+            this.AddChidren(middle);
+
+            ///鐩墠鏀寔鐨勮澶�
+            var deviceTypeList = new List<DeviceType> {
+                DeviceType.IASZone,
+                //DeviceType.OnOffSwitch,
+                //DeviceType.OnOffOutput,//妤兼鐏�
+                //DeviceType.DoorLock
+            };
+
+            ///妤煎眰鐐瑰嚮浜嬩欢
+            EventHandler<MouseEventArgs> foorlclick=(sender,e) =>
+            {
+
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                this.AddChidren(flMain);
+                flMain.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    flMain.RemoveFromParent();
+                };
+                var foolrbj = new VerticalScrolViewLayout
+                {
+
+                    Width = Application.GetRealWidth(400),
+                    Height = Application.GetRealHeight(600),
+                    X = Application.GetRealWidth(1080 - 400 - 60),
+                    Y = Application.GetRealHeight(184 + 50),
+                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                    Radius = (uint)Application.GetRealHeight(30),
+                };
+                flMain.AddChidren(foolrbj);
+                ///榛樿璋冭瘯
+                foreach (var foolr in Config.Instance.Home.FloorDics)
+                {
+                    var foolrRowLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(150),
+                    };
+                    foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolrname = new Button
+                    {
+                        Width = Application.GetRealWidth(250),
+                        Height = Application.GetRealHeight(160),
+                        Text = foolr.Value,
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        Tag = foolr.Key,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolrname);
+
+
+                    EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
+                    {
+                        roomhorizontalScrol.RemoveAll();
+                        devicetypehorizontalScrol.RemoveAll();
+                        middle.RemoveAll();
+                        foolrname.Text = btnfoolrname.Text;
+                        flMain.RemoveFromParent();
+                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
+                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+
+                    };
+                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
+                    btnfoolrname.MouseUpEventHandler += foolrnameclick;
+
+
+                }
+
+            };
+            foolrname.MouseUpEventHandler += foorlclick;
+            dropdown.MouseUpEventHandler += foorlclick;
+
+            var roomlists = new List<Common.Room>();
+            roomlists.Clear();
+            if (Config.Instance.Home.FloorDics.Count < 2)
+            {
+                foolrname.Visible = false;
+                dropdown.Visible = false;
+                if (Config.Instance.Home.FloorDics.Count == 0)
+                {
+                    roomlists.AddRange(Common.Room.Lists);
+                }
+                else
+                {
+                    roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+                }
+            }
+            else
+            {
+                roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
+
+            }
+
+            AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
+        }
+        /// <summary>
+        /// 鍔犺浇鎵�鏈夋埧闂寸殑瑙嗗浘鏂规硶
+        /// </summary>
+        void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            for (int i = 0; i < roomlist.Count; i++)
+            {
+                var room = roomlist[i];
+
+                var fra = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(200),
+                    Width = Application.GetRealWidth(255),
+                };
+                roomhorizontalScrol.AddChidren(fra);
+
+                var roombjBtn = new Button
+                {
+                    Height = Application.GetRealHeight(158),
+                    Width = Application.GetRealWidth(255),
+                    UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+                    SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+                    Y = Application.GetRealHeight(21),
+                };
+                fra.AddChidren(roombjBtn);
+
+                var roomnameBtn = new Button
+                {
+
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
+                    Text = room.Name,
+                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
+
+                };
+                fra.AddChidren(roomnameBtn);
+
+                if (i == 0)//
+                {
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+                }
+
+
+                EventHandler<MouseEventArgs> roomclick = (sender, e) =>
+                {
+
+
+                    roombjButton.IsSelected = false;
+                    roombjButton = roombjBtn;
+                    roombjBtn.IsSelected = true;
+
+                    roomTextButton.IsSelected = false;
+                    roomTextButton = roomnameBtn;
+                    roomnameBtn.IsSelected = true;
+
+                    var list = new List<DeviceUI>();
+                    foreach (var device in room.DeviceUIList)
+                    {
+                        if (device.CommonDevice == null)
+                        {
+                            continue;
+                        }
+                        if (!deviceTypeList.Contains(device.CommonDevice.Type))
+                        {
+                            continue;
+                        }
+                        list.Add(device);
+                    }
+                    AllDeviceTypeView(list, devicetypehorizontalScrol);
+
+
+                };
+                roomnameBtn.MouseUpEventHandler += roomclick;
+                roombjBtn.MouseUpEventHandler += roomclick;
+
+            }
+        }
+        /// <summary>
+        /// 鍔犺浇璇ュ尯鍩熸墍鏈夎澶囪鍥炬柟娉�
+        /// </summary>0
+        /// <param name="devicelist">Devicelist.</param>
+        void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
+        {
+            List<string> devicetypelist = new List<string>();
+            devicetypelist.Clear();
+            #region  ------鎺掑垪璁惧绫诲瀷------
+            ///鏆傛椂闅愯棌鐏厜鍜岀獥甯樿澶�
+            var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.ColorDimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+            if (lightjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
+            }
+            var curtainjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.WindowCoveringDevice);
+            if (curtainjosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
+            }
+
+            var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone);
+            if (iASZonejosn != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
+            }
+            var onOffSwitchjson = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.OnOffSwitch);
+            if (onOffSwitchjson != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.OnOffSwitch));
+            }
+            var doorLock = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DoorLock);
+            if (doorLock != null)
+            {
+                devicetypelist.Add(Language.StringByID(MyInternationalizationString.doorLock));
+            }
+            #endregion
+
+            devicetypehorizontalScrol.RemoveAll();
+            for (int i = 0; i < devicetypelist.Count; i++)
+            {
+
+                var devicetype = devicetypelist[i];
+
+                var spaceRowLayout = new FrameLayout();
+                devicetypehorizontalScrol.AddChidren(spaceRowLayout);
+                if (i == 0)
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(37);
+                }
+                else
+                {
+                    spaceRowLayout.Width = Application.GetRealWidth(80);
+                }
+
+                var deviceRowLayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(156 + 20),
+                    Height = Application.GetRealHeight(280 - 30),
+                    Y = Application.GetRealHeight(30),
+                };
+                devicetypehorizontalScrol.AddChidren(deviceRowLayout);
+
+                var backgroundColor = new Button
+                {
+                    Width = Application.GetRealWidth(156),
+                    Height = Application.GetRealHeight(180),
+                    X = Application.GetRealWidth(10),
+                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
+                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
+                };
+                deviceRowLayout.AddChidren(backgroundColor);
+
+
+                var devicetypeicon = new Button
+                {
+                    Width = Application.GetRealWidth(84),
+                    Height = Application.GetRealHeight(84),
+                    X = Application.GetRealWidth(46),
+                    Y = Application.GetRealHeight(30),
+                };
+                deviceRowLayout.AddChidren(devicetypeicon);
+
+                var devicetypename = new Button
+                {
+                    Width = Application.GetRealWidth(176),
+                    Height = Application.GetRealHeight(40),
+                    Text = devicetype,
+                    TextAlignment = TextAlignment.Center,
+                    Y = backgroundColor.Bottom,
+                    TextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 10,
+                };
+                deviceRowLayout.AddChidren(devicetypename);
+                if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedlight.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/LightSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedcurtain.png";
+                    //devicetypeicon.SelectedImagePath = "ZigeeLogic/CurtainSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.OnOffSwitch))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedpanel.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/OnOffSwitchSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selectedsenor.png";
+                    // devicetypeicon.SelectedImagePath = "ZigeeLogic/SensorSelected.png";
+                }
+                else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
+                {
+                    devicetypeicon.UnSelectedImagePath = "ZigeeLogic/selecteddoorlock.png";
+                }
+                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
+                {
+                    List<DeviceType> list = new List<DeviceType>();
+                    list.Clear();
+                    devicetypeButton.IsSelected = false;
+                    devicetypeButton = backgroundColor;
+                    backgroundColor.IsSelected = true;
+                    ///鍒嗙被鏄剧ず锛堜緥濡傜伅鍏夛細{鐏厜1锛岀伅鍏�2...}锛�
+                    if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
+                    {
+                        list.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
+                    {
+                        list.Add(DeviceType.WindowCoveringDevice);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.OnOffSwitch))
+                    {
+                        list.Add(DeviceType.OnOffSwitch);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
+                    {
+                        list.Add(DeviceType.IASZone);
+                    }
+                    else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
+                    {
+                        list.Add(DeviceType.DoorLock);
+                    }
+
+                    ConditionDeviceView(list, devicelist);
+
+                };
+                deviceRowLayout.MouseUpEventHandler += devicetypeclick;
+                devicetypename.MouseUpEventHandler += devicetypeclick;
+                devicetypeicon.MouseUpEventHandler += devicetypeclick;
+                backgroundColor.MouseUpEventHandler += devicetypeclick;
+
+            }
+            ///鏄剧ず鎴块棿鎵�鏈夎澶�
+            ConditionDeviceView(new List<DeviceType>(), devicelist);
+
+        }
+        /// <summary>
+        /// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
+        /// </summary>
+        /// <param name="deviceTypelist">Device typelist.</param>
+        /// <param name="devicelist">璁惧鍒楄〃</param>
+        void ConditionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+        {
+            middle.RemoveAll();
+
+            foreach (var common in devicelist)
+            {
+
+                if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.CommonDevice.Type))
+                {
+                    continue;
+                }
+                if (common.CommonDevice.Type == DeviceType.IASZone)
+                {
+                    var iASZonedevice = common.CommonDevice as IASZone;
+                    if (iASZonedevice.DeviceID != 1026 || iASZonedevice.IasDeviceType != 13)
+                    {
+                        continue;
+                    }
+                }
+
+                var deviceFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                };
+                middle.AddChidren(deviceFramelayout);
+
+                var bjFramelayout = new FrameLayout
+                {
+                    Width = Application.GetRealWidth(112),
+                    Height = Application.GetRealHeight(112),
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(30 + 9),
+                    Radius = (uint)Application.GetRealHeight(56),
+                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+                };
+                deviceFramelayout.AddChidren(bjFramelayout);
+
+                var deviceIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(82),
+                    Height = Application.GetRealHeight(82),
+                    Gravity = Gravity.Center,
+
+                };
+                bjFramelayout.AddChidren(deviceIconBtn);
+
+                var deviceRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176 + 10),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
+                };
+                deviceFramelayout.AddChidren(deviceRow);
+
+                var devicename = new Button
+                {
+                    Text = common.CommonDevice.DeviceEpointName,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                };
+                deviceRow.AddChidren(devicename);
+                switch (common.CommonDevice.Type)
+                {
+                    case DeviceType.OnOffOutput:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/light.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedlight.png";
+                        }
+                        break;
+                    case DeviceType.IASZone:
+                        {
+                            var iASZonedevice = common.CommonDevice as IASZone;
+                            if (iASZonedevice.DeviceID != 1026)
+                            {
+                                break;
+                            }
+                            deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+                            deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
+
+
+                        }
+                        break;
+                    case DeviceType.OnOffSwitch:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/panel.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedpanel.png";
+                        }
+                        break;
+                    case DeviceType.DoorLock:
+                        {
+                            deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
+                            deviceIconBtn.SelectedImagePath = "ZigeeLogic/selecteddoorlock.png";
+                        }
+                        break;
+                }
+
+                EventHandler<MouseEventArgs> devicclick = (sen, e) =>
+                {
+                    clickbutton.IsSelected = false;
+                    clickbutton = deviceIconBtn;
+                    deviceIconBtn.IsSelected = true;
+                    clickframeLayout.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+                    clickframeLayout = bjFramelayout;
+                    bjFramelayout.BackgroundColor = ZigbeeColor.Current.LogicIconBackgroundColor;
+                    clicktextcolcrbutton.IsSelected = false;
+                    clicktextcolcrbutton = devicename;
+                    devicename.IsSelected = true;
+                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                    this.AddChidren(flMain);
+                    CurrentDeviceView(flMain, common.CommonDevice, false);
+                };
+                deviceFramelayout.MouseUpEventHandler += devicclick;
+                bjFramelayout.MouseUpEventHandler += devicclick;
+                deviceIconBtn.MouseUpEventHandler += devicclick;
+                deviceRow.MouseUpEventHandler += devicclick;
+                devicename.MouseUpEventHandler += devicclick;
+
+
+            }
+        }
+        /// <summary>
+        /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
+        /// </summary>
+        /// <param name="common">Common.</param>
+        public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
+        {
+            //涓嶈褰撳墠鐣岄潰婊戝姩
+            UserView.HomePage.Instance.ScrollEnabled = false;
+            List<Dictionary<string, string>> doorlockConditionsInfo = new List<Dictionary<string, string>>();
+            Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
+            dictionary(deviceConditionsInfo, "Type", "1");
+            dictionary(deviceConditionsInfo, "IsValid", "1");
+            dictionary(deviceConditionsInfo, "MacAddr", common.DeviceAddr);
+            dictionary(deviceConditionsInfo, "Epoint", common.DeviceEpoint.ToString());
+            //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            //this.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender, e) =>
+            {
+                flMain.RemoveFromParent();
+
+
+            };
+
+            var devicefra1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(devicefra1);
+
+            var devicefra = new FrameLayout
+            {
+
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(devicefra);
+
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            devicefra.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.security,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+                Text = common.DeviceEpointName,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+            string SelectedDeviceStatuscondition = "";
+
+            Dictionary<string, string> devices = null;
+            if (edit)
+            {
+                foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
+                {
+                    if (deviceinfo["Type"] == "1")
+                    {
+                        if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
+                        {
+                            devices = deviceinfo;
+                            break;
+
+                        }
+                    }
+                }
+            }
+            switch (common.Type)
+            {
+                ///鐏厜
+                case DeviceType.OnOffOutput:
+                    {
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "6");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                        dictionary(deviceConditionsInfo, "Range", "1");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+                        #region  鐏厜View
+
+
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+                        ///鐐瑰嚮纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            SelectedDeviceStatuscondition = "OnOffOutput";
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");//榛樿鍊�
+
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            SelectedDeviceStatuscondition = "OnOffOutput";
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+                        if (edit && devices != null)
+                        {
+                            if (devices["AttriButeId"] == "0")
+                            {
+                                if (devices["AttriButeData1"] == "1")
+                                {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                }
+                                else
+                                {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                    openBtnSelected.Visible = false;
+                                    closeBtnSelected.Visible = true;
+
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case DeviceType.WindowCoveringDevice:
+                    {
+
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "258");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "8");
+                        dictionary(deviceConditionsInfo, "Range", "0");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+                        #region 绐楀笜View
+                        devicefra.Y = Application.GetRealHeight(1920 - 30 - 720);
+                        devicefra.Height = Application.GetRealHeight(720);
+                        var windowCoveringfra = new FrameLayout
+                        {
+                            Y = Application.GetRealHeight(180),
+                            Height = Application.GetRealHeight(180 * 2 + 30),
+                        };
+                        devicefra.AddChidren(windowCoveringfra);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Height = Application.GetRealHeight(180),
+                        };
+                        windowCoveringfra.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            //Text = "寮�",
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            X = Application.GetRealWidth(50),
+                            Width = Application.GetRealWidth(300),
+                            Height = Application.GetRealHeight(180),
+                            //SelectedBackgroundColor = 0xfffe5e00,
+                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new Button
+                        {
+                            X = Application.GetRealWidth(1000 - 150),
+                            Width = Application.GetMinRealAverage(110),
+                            Height = Application.GetMinRealAverage(110),
+                            UnSelectedImagePath = "Item/YesSelected.png",
+                            Visible = false,
+                            Gravity = Gravity.CenterVertical
+                        };
+                        openrowlayout.AddChidren(openBtnSelected);
+
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = openrowlayout.Bottom,
+                            Height = Application.GetRealHeight(180),
+                        };
+                        windowCoveringfra.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            X = Application.GetRealWidth(50),
+                            Width = Application.GetRealWidth(300),
+                            Height = Application.GetRealHeight(180),
+                            TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new Button
+                        {
+                            X = Application.GetRealWidth(1000 - 150),
+                            Width = Application.GetMinRealAverage(110),
+                            Height = Application.GetMinRealAverage(110),
+                            UnSelectedImagePath = "Item/YesSelected.png",
+                            Visible = false,
+                            Gravity = Gravity.CenterVertical
+                        };
+                        closerowlayout.AddChidren(closeBtnSelected);
+                        #endregion
+
+                        ///鐐瑰嚮纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "95");//榛樿鍊�
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatuscondition = "WindowCoveringDevice";
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "5");//榛樿鍊�
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+
+                        if (edit && devices != null)
+                        {
+                            if (devices["AttriButeId"] == "8")
+                            {
+                                if (int.Parse(devices["AttriButeData1"]) > 5)
+                                {
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                }
+                                else
+                                {
+                                    openBtnSelected.Visible = false;
+                                    closeBtnSelected.Visible = true;
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case DeviceType.IASZone:
+                    {
+
+                        var iASZonedevice = common as IASZone;
+                        if (iASZonedevice.DeviceID != 1026)
+                        {
+                            break;
+                        }
+
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "1280");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "1281");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+                        #region  瀹夐槻璁惧View
+
+                        var openframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(openframelayout);
+
+                        var openrowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                        };
+                        openframelayout.AddChidren(openrowlayout);
+
+                        var btnopen = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextID = MyInternationalizationString.open,
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        openrowlayout.AddChidren(btnopen);
+
+                        var openBtnSelected = new SelectedButton();
+                        openrowlayout.AddChidren(openBtnSelected);
+
+
+                        var closeframelayout = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = openframelayout.Bottom,
+                        };
+                        devicefra.AddChidren(closeframelayout);
+                        var closerowlayout = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        closeframelayout.AddChidren(closerowlayout);
+
+                        var btnclose = new Button
+                        {
+                            //Text = "鍏�",
+                            TextID = MyInternationalizationString.close,
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                        };
+                        closerowlayout.AddChidren(btnclose);
+
+                        var closeBtnSelected = new SelectedButton();
+                        closerowlayout.AddChidren(closeBtnSelected);
+
+
+                        #endregion
+
+                        int timevalue = 0;
+                        ///鐐瑰嚮纭浜嬩欢
+                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatuscondition = "IASZone";
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            openBtnSelected.Visible = true;
+                            closeBtnSelected.Visible = false;
+                            if (iASZonedevice.IasDeviceType == 13)
+                            {
+                                closeBtnSelected.Visible = true;
+                            }
+                            dictionary(deviceConditionsInfo, "Range", "5");
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "1");
+
+
+                        };
+                        openrowlayout.MouseUpEventHandler += openclick;
+                        btnopen.MouseUpEventHandler += openclick;
+                        openBtnSelected.MouseUpEventHandler += openclick;
+                        openframelayout.MouseUpEventHandler += openclick;
+                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        EventHandler<MouseEventArgs> closeclick = (sender, e) =>
+                        {
+                            SelectedDeviceStatuscondition = "IASZone";
+                            btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            openBtnSelected.Visible = false;
+                            closeBtnSelected.Visible = true;
+                            dictionary(deviceConditionsInfo, "Range", "1");
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+                            if (iASZonedevice.IasDeviceType == 13)
+                            {
+                                SelectedDeviceStatuscondition = "no";
+                                btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                openBtnSelected.Visible = false;
+                                closeBtnSelected.Visible = true;
+                                var ignoreTime = new IgnoreTime();
+                                UserView.HomePage.Instance.AddChidren(ignoreTime);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                ignoreTime.Show(common, btnclose.Text, edit, timevalue);
+                            }
+
+
+                        };
+                        closerowlayout.MouseUpEventHandler += closeclick;
+                        btnclose.MouseUpEventHandler += closeclick;
+                        closeBtnSelected.MouseUpEventHandler += closeclick;
+                        closeframelayout.MouseUpEventHandler += closeclick;
+
+
+
+                        switch (iASZonedevice.IasDeviceType)
+                        {
+                            case 13:
+                                {
+                                    btnopen.TextID = MyInternationalizationString.someone;
+                                    btnclose.TextID = MyInternationalizationString.unattendedtime1;
+                                    closeBtnSelected.UnSelectedImagePath = "ZigeeLogic/next.png";
+                                    closeBtnSelected.Visible = true;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
+                                }
+                                break;
+                            case 21:
+                            case 22:
+                                {
+                                    #region
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 3 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 * 3 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.logicopen;
+                                    btnclose.TextID = MyInternationalizationString.logicclose;
+                                    closerowlayout.LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
+
+
+
+                                    var timeoutframelayout = new FrameLayout
+                                    {
+                                        Height = Application.GetRealHeight(160),
+                                        Y = closeframelayout.Bottom,
+                                    };
+                                    devicefra.AddChidren(timeoutframelayout);
+                                    var timeoutrowlayout = new RowLayout
+                                    {
+                                        Y = Application.GetRealHeight(30),
+                                        Width = Application.GetRealWidth(920),
+                                        Height = Application.GetRealHeight(130),
+                                        X = Application.GetRealWidth(80),
+                                        LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                                    };
+                                    timeoutframelayout.AddChidren(timeoutrowlayout);
+
+                                    var btntimeout = new Button
+                                    {
+                                        TextID = MyInternationalizationString.closetimeout,
+                                        Width = Application.GetRealWidth(600),
+                                        TextAlignment = TextAlignment.CenterLeft,
+                                        TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                    };
+                                    timeoutrowlayout.AddChidren(btntimeout);
+
+                                    var timeoutBtnSelected = new Button
+                                    {
+                                        X = Application.GetRealWidth(860),
+                                        Width = Application.GetMinRealAverage(60),
+                                        Height = Application.GetMinRealAverage(60),
+                                        UnSelectedImagePath = "ZigeeLogic/next.png",
+                                        Gravity = Gravity.CenterVertical,
+                                    };
+                                    timeoutrowlayout.AddChidren(timeoutBtnSelected);
+                                    EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
+                                    {
+                                        SelectedDeviceStatuscondition = "no";
+                                        btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = false;
+                                        var ignoreTime = new IgnoreTime();
+                                        UserView.HomePage.Instance.AddChidren(ignoreTime);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        ignoreTime.Show(common, btntimeout.Text, edit, timevalue);
+
+                                    };
+                                    timeoutframelayout.MouseUpEventHandler += timeoutclick;
+                                    timeoutrowlayout.MouseUpEventHandler += timeoutclick;
+                                    btntimeout.MouseUpEventHandler += timeoutclick;
+                                    timeoutBtnSelected.MouseUpEventHandler += timeoutclick;
+
+                                    #endregion
+                                }
+                                break;
+
+                            case 40:
+                                {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.smokescreen;
+                                    //btnclose.TextID = MyInternationalizationString.nosmokescreen;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                                }
+                                break;
+                            case 42:
+                                {
+                                    btnopen.TextID = MyInternationalizationString.waterleakage;
+                                    btnclose.TextID = MyInternationalizationString.noleakage;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    closeframelayout.AddChidren(closerowlayout);
+
+                                }
+                                break;
+                            case 43:
+                                {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.gas;
+                                    //btnclose.TextID = MyInternationalizationString.nogas;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                                }
+                                break;
+                            case 44:
+                                {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.emergencybutton;
+                                    //btnclose.TextID = MyInternationalizationString.nosmokescreen;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                                }
+                                break;
+
+                            case 277:
+                                {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.callthepolice;
+                                    //btnclose.TextID = MyInternationalizationString.nosmokescreen;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                                }
+                                break;
+                            default:
+                                {
+                                    devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                                    devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                                    btnopen.TextID = MyInternationalizationString.callthepolice;
+                                    openframelayout.AddChidren(openrowlayout);
+                                    openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+                                }
+                                break;
+                        }
+                        if (edit && devices != null)
+                        {
+                            if (devices["AttriButeId"] == "1281")
+                            {
+                                if (devices["AttriButeData1"] == "1")
+                                {
+                                    btnopen.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                    btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                    openBtnSelected.Visible = true;
+                                    closeBtnSelected.Visible = false;
+                                }
+                                else
+                                {
+                                    if (devices.ContainsKey("IgnoreTime"))
+                                    {
+                                        timevalue = int.Parse(devices["IgnoreTime"]);
+                                    }
+                                    else
+                                    {
+                                        btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                                        btnclose.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                                        openBtnSelected.Visible = false;
+                                        closeBtnSelected.Visible = true;
+                                    }
+                                }
+                            }
+
+
+                        }
+
+                    }
+                    break;
+                case DeviceType.OnOffSwitch:
+                    {
+
+                        dictionary(deviceConditionsInfo, "Cluster_ID", "1282");
+                        dictionary(deviceConditionsInfo, "AttriButeId", "1283");
+                        dictionary(deviceConditionsInfo, "Range", "0");//鎸夐敭鐗规畩
+                        dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+                        dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
+                        devicefra.Height = Application.GetRealHeight(140 + 160 + 20 + 50);
+                        var OnOffOutputfra = new FrameLayout
+                        {
+                            Height = Application.GetRealHeight(160),
+                            Y = timetype.Bottom + Application.GetRealHeight(20),
+                        };
+                        devicefra.AddChidren(OnOffOutputfra);
+
+                        var buttonRow = new RowLayout
+                        {
+                            Y = Application.GetRealHeight(30),
+                            Width = Application.GetRealWidth(920),
+                            Height = Application.GetRealHeight(130),
+                            X = Application.GetRealWidth(80),
+                            LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+                        };
+                        OnOffOutputfra.AddChidren(buttonRow);
+
+                        var button = new Button
+                        {
+                            Width = Application.GetRealWidth(600),
+                            TextAlignment = TextAlignment.CenterLeft,
+                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
+                            //SelectedBackgroundColor = 0xfffe5e00,
+                        };
+                        buttonRow.AddChidren(button);
+
+                        var buttonSelected = new SelectedButton();
+                        buttonRow.AddChidren(buttonSelected);
+                        EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
+                        {
+                            buttonSelected.Visible = true;
+                            SelectedDeviceStatuscondition = "OnOffSwitch";
+                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+
+                        };
+                        buttonRow.MouseUpEventHandler += buttonclick;
+                        button.MouseUpEventHandler += buttonclick;
+                        buttonSelected.MouseUpEventHandler += buttonclick;
+                        OnOffOutputfra.MouseUpEventHandler += buttonclick;
+
+                        if (edit && devices != null)
+                        {
+                            buttonSelected.Visible = true;
+                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                        }
+
+                    }
+                    break;
+                case DeviceType.DoorLock:
+                    {
+                        #region  ------
+                        var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
+                        //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
+                        var pra = new UserCenter.MemberListInfoPra();
+                        string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+                        var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+                        Send.UserList.Clear();
+                        for (int i = 0; i < listInfo.Count; i++)
+                        {
+                            var membership = new Send.MembershipIfon();
+                            var membershipifon = listInfo[i];
+                            for (int j = 0; j < doorlockifonlist.Count; j++)
+                            {
+                                ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
+                                if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
+                                {
+                                    membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
+                                    membership.MembershipName = membershipifon.UserName;
+                                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
+
+                                }
+
+                            }
+                            if (membership.UserIdMode.Count != 0)
+                            {
+                                ///杩囨护鎺夐噸澶嶆暟鎹紱
+                                var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
+                                if (str == null)
+                                {
+                                    Send.UserList.Add(membership);
+                                }
+                            }
+
+                        }
+                        #endregion
+
+                        var memberList = new MemberList();
+                        UserView.HomePage.Instance.AddChidren(memberList);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        MemberList.action += () => { flMain.RemoveFromParent(); };
+                        memberList.Show(common);
+                    }
+                    break;
+
+            }
+
+            Btncomplete.MouseUpEventHandler += (sender2, e2) =>
+            {
+                //UserView.HomePage.Instance.ScrollEnabled = true;
+                if (SelectedDeviceStatuscondition != "")
+                {
+                    LogicIfon.AddDeviceconditions(common, deviceConditionsInfo);
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                               Language.StringByID(MyInternationalizationString.complete));
+                        alert.Show();
+                        return;
+                    }
+
+                }
+                flMain.RemoveFromParent();
+                var templatePage = new TemplatePage();
+                UserView.HomePage.Instance.AddChidren(templatePage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                templatePage.Show();
+
+            };
+
+
+        }
+
+        public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
+        {
+            if (deviceConditionsInfo.ContainsKey(Key))
+            {
+                deviceConditionsInfo.Remove(Key);
+            }
+            deviceConditionsInfo.Add(Key, Value);
+        }
+
+
+
+    }
+
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
new file mode 100755
index 0000000..f78d342
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -0,0 +1,1739 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+    public class TemplatePage : FrameLayout
+    {
+
+        public TemplatePage()
+        {
+            UserView.HomePage.Instance.RemoveViewByTag("Logic");
+            Tag = "Logic";
+        }
+        EditText logicTextBox;
+        /// <summary>
+        /// 鍥炬爣鐨勭储寮�
+        /// </summary>
+        public static string s;
+        public void Show()
+        {
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
+            {
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+            };
+            this.AddChidren(topRowLayout);
+
+            var titleName = new Button
+            {
+                TextSize = 16,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.selection,
+            };
+            topRowLayout.AddChidren(titleName);
+            if (Common.Logic.CurrentLogic.LogicId != 0)
+            {
+                titleName.Text = Language.StringByID(MyInternationalizationString.editautomation);
+            }
+            else
+            {
+                titleName.Text = Language.StringByID(MyInternationalizationString.newautomation);
+            }
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
+            };
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+
+
+
+            #endregion
+
+
+
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184 - 180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            var logiciconfl = new FrameLayout
+            {
+                Height = Application.GetRealHeight(436 + 30),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            middle.AddChidren(logiciconfl);
+            var iconBtn = new Button
+            {
+                Width = Application.GetRealWidth(936),
+                Height = Application.GetRealHeight(436),
+                X = Application.GetRealWidth(72),
+                Y = Application.GetRealHeight(30),
+                UnSelectedImagePath = "ZigeeLogic/logicbj" + s + ".png",
+            };
+            logiciconfl.AddChidren(iconBtn);
+
+
+            #region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
+            var logicnamefl = new FrameLayout
+            {
+                Height = Application.GetRealHeight(130),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            middle.AddChidren(logicnamefl);
+
+            var text = new Button
+            {
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                X = Application.GetRealWidth(58),
+                TextAlignment = TextAlignment.CenterLeft,
+                //Text = "鑷姩鍖栧悕绉�",
+                TextID = MyInternationalizationString.automationname,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Y = Application.GetRealHeight(35),
+            };
+            logicnamefl.AddChidren(text);
+
+            logicTextBox = new EditText
+            {
+                Y = Application.GetRealHeight(35),
+                Width = Application.GetRealWidth(900),
+                Height = Application.GetRealHeight(60),
+                X = text.Right,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                TextSize = 13,
+                Text = Common.Logic.CurrentLogic.LogicName,
+                //TextID=MyInternationalizationString.automation1,
+            };
+            logicnamefl.AddChidren(logicTextBox);
+
+            var fraline = new FrameLayout
+            {
+                Height = Application.GetRealHeight(30),
+            };
+            middle.AddChidren(fraline);
+            #endregion
+
+            #region -----鏄剧ず閫昏緫鏉′欢-----
+
+
+            var conditionFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(conditionFrameLayout);
+
+
+            var conditionRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            conditionFrameLayout.AddChidren(conditionRowLayout);
+
+
+            conditionRowLayout.AddChidren(new Button
+            {
+
+                Text = Language.StringByID(MyInternationalizationString.ifcondition),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                TextSize = 16,
+                Gravity = Gravity.CenterVertical,
+            });
+
+            var conditionadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965 + 58),
+
+            };
+            conditionFrameLayout.AddChidren(conditionadd1);
+
+            var conditionadd = new Button
+            {
+
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/add.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+
+            };
+            conditionRowLayout.AddChidren(conditionadd);
+            ///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> conditionaddclick = (sender, e) =>
+            {
+                if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+                {
+                    ConditionView(false);
+                }
+                else
+                {
+                    Common.Logic.LogicDviceList.Clear();
+                    if (Common.Logic.LogicDviceList.Count == 0)
+                    {
+                        Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+                    }
+                    var templateDeviceCondition = new TemplateDeviceCondition();
+                    UserView.HomePage.Instance.AddChidren(templateDeviceCondition);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    templateDeviceCondition.Show();
+                }
+            };
+            conditionadd.MouseUpEventHandler += conditionaddclick;
+            conditionadd1.MouseUpEventHandler += conditionaddclick;
+            List<Dictionary<string, string>> ListConditions = new List<Dictionary<string, string>>();
+            ListConditions.Clear();
+            ListConditions.AddRange(Common.Logic.CurrentLogic.Conditions);
+            ListConditions.Add(new Dictionary<string, string>());
+            if (Common.Logic.CurrentLogic.Conditions.Count > 1)
+            {
+                var row = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(60),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                };
+                middle.AddChidren(row);
+                var relationship = new Button
+                {
+                    Width = Application.GetRealWidth(600),
+                    Height = Application.GetRealHeight(60),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    X = Application.GetRealWidth(58),
+                    TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                };
+                row.AddChidren(relationship);
+                if (Common.Logic.CurrentLogic.Relationship == 0)
+                {
+                    relationship.Text = Language.StringByID(MyInternationalizationString.followingconditions) + Language.StringByID(MyInternationalizationString.Allconditions);
+                }
+                else
+                {
+                    relationship.Text = Language.StringByID(MyInternationalizationString.followingconditions) + Language.StringByID(MyInternationalizationString.anycondition);
+                }
+                EventHandler<MouseEventArgs> editclick = (sender, e) =>
+                {
+
+                    ConditionView(true);
+                };
+                row.MouseUpEventHandler += editclick;
+                relationship.MouseUpEventHandler += editclick;
+
+            }
+            for (int i = 0; i < ListConditions.Count; i++)
+            {
+                if (i == (ListConditions.Count - 1))
+                {
+
+                    var addfl = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(addfl);
+                    var addbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+                    };
+                    addfl.AddChidren(addbtn);
+
+
+                    var addtextbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.addconditions,
+                        X = Application.GetRealWidth(390),
+                    };
+                    addfl.AddChidren(addtextbtn);
+
+                    EventHandler<MouseEventArgs> addconditionsclick = (sender, e) =>
+                    {
+                        if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+                        {
+                            ConditionView(false);
+                        }
+                        else
+                        {
+                            var templateDeviceCondition = new TemplateDeviceCondition();
+                            UserView.HomePage.Instance.AddChidren(templateDeviceCondition);
+                            UserView.HomePage.Instance.PageIndex += 1;
+                            templateDeviceCondition.Show();
+                        }
+                    };
+                    addbtn.MouseUpEventHandler += addconditionsclick;
+                    addtextbtn.MouseUpEventHandler += addconditionsclick;
+                }
+                else
+                {
+                    var devicesFrameLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var conditionIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        UnSelectedImagePath = "ZigeeLogic/sensor13.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(conditionIcon);
+
+
+                    var conditionsRowLayout = new RowLayout
+                    {
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    devicesFrameLayout.AddChidren(conditionsRowLayout);
+
+                    var Type = int.Parse(ListConditions[i]["Type"]);
+                    var conditions = ListConditions[i];
+                    switch (Type)
+                    {
+
+                        /// (0:鏃堕棿鐐规潯浠�;1:璁惧鐘舵�佸彉鍖栨潯浠�;2:鍏朵粬閫昏緫鏉′欢;3:璁℃暟鍣ㄦ潯浠�;4:鍊掕鏃�;5:鏃堕棿娈垫潯浠�;6:瀹夐槻鏉′欢;7:鍦扮悊浣嶇疆)
+                        case 1:
+                            {
+                                var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == conditions["MacAddr"] && obj.DeviceEpoint.ToString() == conditions["Epoint"]; });
+                                if (deviceinof == null)
+                                {
+                                    continue;
+                                }
+                                ///鏄剧ず璁惧鍚嶇О
+                                var btndevice = new Button
+                                {
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Text = deviceinof.DeviceEpointName,
+                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                };
+                                conditionsRowLayout.AddChidren(btndevice);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevice.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(400),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                conditionsRowLayout.AddChidren(btnregionname);
+                                ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Send.RoomNmae(btnregionname, deviceinof);
+
+
+                                var deviceedit = new Button
+                                {
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                                    Text = Language.StringByID(MyInternationalizationString.edit),
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                                };
+                                conditionsRowLayout.AddRightView(deviceedit);
+                                deviceedit.MouseUpEventHandler += (sender, e) =>
+                                {
+                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                    this.AddChidren(flMain);
+                                    TemplateDeviceCondition.CurrentDeviceView(flMain, deviceinof, true);
+
+                                };
+
+                                ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
+                                var devicestatus = new Button
+                                {
+                                    Width = Application.GetRealWidth(400),
+                                    Height = Application.GetRealHeight(130),
+                                    Gravity = Gravity.CenterVertical,
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    X = Application.GetRealWidth(400),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                conditionsRowLayout.AddChidren(devicestatus);
+
+                                switch (deviceinof.Type)
+                                {
+                                    case DeviceType.IASZone:
+                                        {
+                                            var iASZonedevice = deviceinof as IASZone;
+                                            var intvalue = conditions["AttriButeData1"];
+                                            switch (iASZonedevice.IasDeviceType)
+                                            {
+                                                case 13:
+                                                    {
+                                                        if (intvalue == "1")
+                                                        {
+                                                            devicestatus.TextID = MyInternationalizationString.someone;
+                                                        }
+                                                        else
+                                                        {
+                                                            int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+                                                            int second = int.Parse(conditions["IgnoreTime"]) % 60;
+                                                            if (second != 0)
+                                                            {
+                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+                                                            }
+                                                            else
+                                                            {
+                                                                devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+                                                            }
+                                                        }
+                                                    }
+                                                    break;
+                                               
+                                                default:
+                                                    {
+                                                        conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
+                                                        if (intvalue == "1")
+                                                        {
+                                                            devicestatus.TextID = MyInternationalizationString.callthepolice;
+                                                        }
+                                                    }
+                                                    break;
+
+                                            }
+                                        }
+                                        break;
+
+                                }
+
+                            }
+                            break;
+                    }
+                    ///鍒犻櫎鎺т欢
+                    var del = new Button
+                    {
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+                        Text = Language.StringByID(MyInternationalizationString.del),
+                    };
+                    conditionsRowLayout.AddRightView(del);
+
+                    del.MouseUpEventHandler += (sender, e) =>
+                    {
+
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                              Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                        alert.ResultEventHandler += (sender1, e1) =>
+                        {
+                            if (e1)
+                            {
+                                Common.Logic.CurrentLogic.Conditions.Remove(conditions);
+                                var templatePage = new TemplatePage();
+                                UserView.HomePage.Instance.AddChidren(templatePage);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                templatePage.Show();
+                            }
+                        };
+                        alert.Show();
+
+                    };
+
+                }
+            }
+
+
+            #endregion
+
+            #region  ----鏄剧ず鎵ц鐩爣----
+
+            var targetFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(targetFrameLayout);
+
+
+            var targetRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            targetFrameLayout.AddChidren(targetRowLayout);
+
+
+            var btntargettitle = new Button
+            {
+
+                Text = Language.StringByID(MyInternationalizationString.execute),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                TextSize = 16,
+                Gravity = Gravity.CenterVertical,
+            };
+            targetRowLayout.AddChidren(btntargettitle);
+
+            var btntargetadd1 = new Button
+            {
+
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(57),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(965 + 58),
+            };
+            targetFrameLayout.AddChidren(btntargetadd1);
+
+            var btntargetadd = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/add.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+            };
+            targetRowLayout.AddChidren(btntargetadd);
+            EventHandler<MouseEventArgs> btntargetaddclick = (sender, e) =>
+            {
+                Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+                var templateDeviceAction = new TemplateDeviceAction();
+                UserView.HomePage.Instance.AddChidren(templateDeviceAction);
+                UserView.HomePage.Instance.PageIndex += 1;
+                templateDeviceAction.Show();
+            };
+            btntargetadd1.MouseUpEventHandler += btntargetaddclick;
+            btntargetadd.MouseUpEventHandler += btntargetaddclick;
+
+            List<Dictionary<string, object>> ListActions = new List<Dictionary<string, object>>();
+            ListActions.Clear();
+            ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
+            ListActions.Add(new Dictionary<string, object>());
+
+            for (int i = 0; i < ListActions.Count; i++)
+            {
+                if (i == (ListActions.Count - 1))
+                {
+
+                    var addfl = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(160 + 30 + 50),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(addfl);
+                    var addbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(130 + 50),
+                        Width = Application.GetRealWidth(908),
+                        Y = Application.GetRealHeight(30),
+                        X = Application.GetRealWidth(86),
+                        UnSelectedImagePath = "ZigeeLogic/logicaddcolor.png",
+                    };
+                    addfl.AddChidren(addbtn);
+
+
+                    var addtextbtn = new Button
+                    {
+                        Height = Application.GetRealHeight(58),
+                        Width = Application.GetRealWidth(300),
+                        Y = Application.GetRealHeight(45 + 30),
+                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                        TextID = MyInternationalizationString.addfunction,
+                        X = Application.GetRealWidth(390),
+                    };
+                    addfl.AddChidren(addtextbtn);
+                    EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
+                    {
+                        Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+                        var templateDeviceAction = new TemplateDeviceAction();
+                        UserView.HomePage.Instance.AddChidren(templateDeviceAction);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        templateDeviceAction.Show();
+                    };
+                    addbtn.MouseUpEventHandler += addfunctionclick;
+                    addtextbtn.MouseUpEventHandler += addfunctionclick;
+                }
+                else
+                {
+
+                    var devicesFrameLayout = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(130),
+                        BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    };
+                    middle.AddChidren(devicesFrameLayout);
+
+                    ///鏄剧ず鍥炬爣
+                    var actionsIcon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        X = Application.GetRealWidth(104),
+                        Y = Application.GetRealHeight(25),
+                        // UnSelectedImagePath = "ZigeeLogic/time.png",
+
+                    };
+                    devicesFrameLayout.AddChidren(actionsIcon);
+
+
+                    var actionsrowLayout = new RowLayout
+                    {
+                        Width = Application.GetRealWidth(800),
+                        Height = Application.GetRealHeight(130),
+                        X = Application.GetRealWidth(222),
+                        LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    };
+                    devicesFrameLayout.AddChidren(actionsrowLayout);
+
+
+                    var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
+                    var actions = ListActions[i];
+
+                    switch (linkType)
+                    {
+                        case 0:
+                            {
+                                var obj1 = actions["DeviceAddr"].ToString();
+                                var obj2 = actions["Epoint"].ToString();
+                                var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return ((obj.DeviceAddr == obj1) && (obj.DeviceEpoint.ToString() == obj2)); });
+                                if (deviceinof == null)
+                                {
+                                    continue;
+                                }
+
+                                ///璁惧鍚嶇ОButton
+                                var btndevicename = new Button
+                                {
+                                    Y = Application.GetRealHeight(20),
+                                    Height = Application.GetRealHeight(50),
+                                    Width = Application.GetRealWidth(450),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Text = deviceinof.DeviceEpointName,
+                                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                };
+                                actionsrowLayout.AddChidren(btndevicename);
+
+                                ///鍖哄煙(鎴块棿)鍚嶇ОButton
+                                var btnregionname = new Button
+                                {
+                                    Y = btndevicename.Bottom + Application.GetRealHeight(10),
+                                    Width = Application.GetRealWidth(450),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    Height = Application.GetRealHeight(50),
+                                    Text = "",//Language.StringByID(MyInternationalizationString.customroom),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(btnregionname);
+                                ///閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+                                Send.RoomNmae(btnregionname, deviceinof);
+                                ///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
+                                var devicestatus = new Button
+                                {
+                                    Width = Application.GetRealWidth(350),
+                                    Height = Application.GetRealHeight(130),
+                                    Gravity = Gravity.CenterVertical,
+                                    TextAlignment = TextAlignment.CenterRight,
+                                    X = Application.GetRealWidth(450),
+                                    TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                };
+                                actionsrowLayout.AddChidren(devicestatus);
+
+                                ///缂栬緫璁惧鐘舵�丅utton
+                                var deviceedit = new Button
+                                {
+                                    BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+                                    Text = Language.StringByID(MyInternationalizationString.edit),
+                                    TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                                };
+                                actionsrowLayout.AddRightView(deviceedit);
+
+                                ///缂栬緫鐐瑰嚮浜嬩欢
+                                deviceedit.MouseUpEventHandler += (sender, e) =>
+                                {
+                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                    this.AddChidren(flMain);
+                                    TemplateDeviceAction.CurrentDeviceStateView(flMain, deviceinof, true);
+                                };
+
+
+                                switch (deviceinof.Type)
+                                {
+                                    case DeviceType.OnOffOutput:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/light.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.DimmableLight:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/dimmableLight.png";
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "3")
+                                                {
+                                                    var intvalue = int.Parse(status["Data1"]);
+                                                    var lightbrightnessvalue = (intvalue * 100) / 254;
+                                                    devicestatus.Text = lightbrightnessvalue.ToString() + "%";
+                                                }
+                                                else if (status["TaskType"].ToString() == "1")
+                                                {
+
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.WindowCoveringDevice:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/curtain.png";
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"] == "6")
+                                                {
+                                                    if (status["Data1"] == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+                                                    }
+                                                    else if (status["Data1"] == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+                                                    }
+                                                    else if (status["Data1"] == "5")
+                                                    {
+                                                        devicestatus.Text = status["Data2"] + "%";
+                                                    }
+                                                }
+
+                                            }
+                                        }
+                                        break;
+                                    case DeviceType.AirSwitch:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/airswitch.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+
+                                                    }
+                                                    else if (status["Data1"].ToString() == "2")
+                                                    {
+
+                                                        devicestatus.Text = Language.StringByID(MyInternationalizationString.onoff);
+                                                    }
+                                                }
+
+                                            }
+
+                                        }
+                                        break;
+                                    case DeviceType.Thermostat:
+                                        {
+                                            actionsIcon.UnSelectedImagePath = "ZigeeLogic/ac.png";
+
+                                            var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (TaskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            string modetext = "", temperaturetext = "", speedtext = "";
+                                            bool ifclose = false;
+                                            foreach (var status in TaskList)
+                                            {
+                                                if (status["TaskType"].ToString() == "1")
+                                                {
+                                                    if (status["Data1"].ToString() == "0")
+                                                    {
+                                                        // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                                        ifclose = false;
+                                                    }
+                                                    else if (status["Data1"].ToString() == "1")
+                                                    {
+                                                        //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
+                                                        ifclose = true;
+                                                    }
+
+                                                }
+                                                else if (status["TaskType"].ToString() == "5")
+                                                {
+                                                    if (status["Data1"] == "3")
+                                                    {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "3":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logiccool);
+                                                                }
+                                                                break;
+                                                            case "4":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicheat);
+                                                                }
+                                                                break;
+                                                            case "1":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicauto);
+                                                                }
+                                                                break;
+                                                            case "8":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicdry);
+                                                                }
+                                                                break;
+                                                            case "7":
+                                                                {
+                                                                    modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+                                                                }
+                                                                break;
+                                                        }
+                                                    }
+                                                    else if (status["Data1"] == "6")
+                                                    {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+                                                        switch (status["Data2"])
+                                                        {
+                                                            case "1":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+                                                                }
+                                                                break;
+
+                                                            case "2":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+                                                                }
+                                                                break;
+                                                            case "3":
+                                                                {
+                                                                    speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+                                                                }
+                                                                break;
+
+                                                        }
+                                                    }
+                                                    //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+                                                    else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
+                                                    {
+                                                        var s = int.Parse(status["Data2"]) / 100;
+                                                        temperaturetext = s.ToString();
+                                                    }
+                                                    else if (status["Data1"] == "20")
+                                                    {
+                                                        temperaturetext = "鏃�";
+                                                    }
+
+
+                                                }
+
+                                            }
+                                            if (ifclose)
+                                            {
+                                                devicestatus.Text = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
+                                            }
+                                            else
+                                            {
+                                                devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
+
+                                            }
+                                        }
+                                        break;
+
+                                }
+
+
+                            }
+                            break;
+                    }
+                    ///鍒犻櫎鎺т欢
+                    var del = new Button
+                    {
+                        BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+                        Text = Language.StringByID(MyInternationalizationString.del),
+                    };
+                    actionsrowLayout.AddRightView(del);
+
+                    del.MouseUpEventHandler += (sender, e) =>
+                    {
+                        var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+                                               Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
+                        alert.ResultEventHandler += (sender1, e1) =>
+                        {
+                            if (e1)
+                            {
+                                Common.Logic.CurrentLogic.Actions.Remove(actions);
+                                var templatePage = new TemplatePage();
+                                UserView.HomePage.Instance.AddChidren(templatePage);
+                                UserView.HomePage.Instance.PageIndex += 1;
+                                templatePage.Show();
+                            }
+                        };
+                        alert.Show();
+
+                    };
+
+                }
+            }
+
+            #endregion
+
+            #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
+
+            var fraline1 = new FrameLayout
+            {
+                Height = Application.GetRealHeight(30),
+            };
+            middle.AddChidren(fraline1);
+
+
+            var weekFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(weekFrameLayout);
+            var weekRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            weekFrameLayout.AddChidren(weekRowLayout);
+
+            var settxet = new Button
+            {
+                Text = Language.StringByID(MyInternationalizationString.setupcycle),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+            };
+            weekRowLayout.AddChidren(settxet);
+            var btnweektext = new Button
+            {
+                Width = Application.GetRealWidth(595),
+                Height = Application.GetRealHeight(60),
+                TextAlignment = TextAlignment.CenterRight,
+                //Text = "姣忓ぉ",
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                TextID = MyInternationalizationString.everyday,
+                Y = Application.GetRealHeight(35),
+                X = settxet.Right,
+            };
+            weekRowLayout.AddChidren(btnweektext);
+
+            var nextBtn = new Button
+            {
+
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+
+            };
+            weekRowLayout.AddChidren(nextBtn);
+
+            UpdateWeek(btnweektext);
+            EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
+            {
+                /*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
+                var cycle = new Cycle(() => { UpdateWeek(btnweektext); });
+                UserView.HomePage.Instance.AddChidren(cycle);
+                UserView.HomePage.Instance.PageIndex += 1;
+                cycle.Show();
+
+                //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
+                //UserView.HomePage.Instance.AddChidren(cyclicCycle);
+                //UserView.HomePage.Instance.PageIndex += 1;
+                //cyclicCycle.Show();
+            };
+            btnweektext.MouseUpEventHandler += cycleclick;
+            nextBtn.MouseUpEventHandler += cycleclick;
+            #endregion
+
+            #region  ----鎺ㄩ�佽缃�----
+
+            var pushFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(pushFrameLayout);
+
+            var pushswitchRowlayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            pushFrameLayout.AddChidren(pushswitchRowlayout);
+
+            var btnswitchtxet = new Button
+            {
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+                TextID = MyInternationalizationString.pushswitch,
+            };
+            pushswitchRowlayout.AddChidren(btnswitchtxet);
+
+            var btnswitch = new Button
+            {
+                Width = Application.GetMinRealAverage(104),
+                Height = Application.GetMinRealAverage(63),
+                UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+                SelectedImagePath = "ZigeeLogic/logicopen.png",
+                X = Application.GetRealWidth(965 - 104),
+                Gravity = Gravity.CenterVertical,
+            };
+            pushswitchRowlayout.AddChidren(btnswitch);
+            btnswitch.MouseUpEventHandler += (sender1, e1) =>
+            {
+                btnswitch.IsSelected = !btnswitch.IsSelected;
+                if (btnswitch.IsSelected)
+                {
+
+                }
+                else
+                {
+
+                }
+            };
+
+
+            var custompushFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(custompushFrameLayout);
+
+            var custompushRowLayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            custompushFrameLayout.AddChidren(custompushRowLayout);
+
+            var btncustompush = new Button
+            {
+                TextID = MyInternationalizationString.custompush,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                Gravity = Gravity.CenterVertical,
+            };
+            custompushRowLayout.AddChidren(btncustompush);
+
+
+            var custompushback = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = Application.GetRealWidth(965 - 58),
+                Gravity = Gravity.CenterVertical,
+            };
+            custompushRowLayout.AddChidren(custompushback);
+            EventHandler<MouseEventArgs> customclick = (sender, e) =>
+            {
+                var CustomText = new CustomText();
+                UserView.HomePage.Instance.AddChidren(CustomText);
+                UserView.HomePage.Instance.PageIndex += 1;
+                CustomText.Show();
+
+            };
+            btncustompush.MouseUpEventHandler += customclick;
+            custompushback.MouseUpEventHandler += customclick;
+            custompushRowLayout.MouseUpEventHandler += customclick;
+
+            #endregion
+
+
+            var saveFrameLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFrameLayout);
+
+            var btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveFrameLayout.AddChidren(btnsave);
+            btnsave.MouseUpEventHandler += async (sender, e) =>
+            {
+                var name = logicTextBox.Text.Trim();
+                //if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
+                //{
+                //    AddChidren(btnsave);
+                //}
+                if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
+                {
+                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
+                    return;
+                }
+                var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
+                if (logicname != null)
+                {
+                    new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
+                    return;
+                }
+
+                Common.Logic.CurrentLogic.LogicName = name;
+
+                //鍒ゆ柇鏄柊娣诲姞閫昏緫(榛樿0)杩樻槸淇敼閫昏緫
+                CommonPage.Loading.Start();
+                if (Common.Logic.CurrentLogic.LogicId == 0)
+                {
+                    //鍙戦�佹坊鍔犻�昏緫鍛戒护
+                    var logicifon = await Send.AddModifyLogic(Common.Logic.CurrentLogic);
+                    if (logicifon != null && logicifon.LogicId != 0)
+                    {
+                        Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
+                        Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
+                    }
+                }
+                else
+                {
+                    //鍙戦�佷慨鏀归�昏緫鍛戒护
+                    Send.AddModifyLogic(Common.Logic.CurrentLogic);
+                }
+
+                CommonPage.Loading.Hide();
+                UserView.HomePage.Instance.RemoveViewByTag("Logic");
+                Category.Category.instance?.RefreshBodyView();
+                //UserView.HomePage.Instance.RemoveAt("Logic1");
+                //Category.Category category = new Category.Category();
+                //UserView.HomePage.Instance.AddChidren(category);
+                //UserView.HomePage.Instance.PageIndex += 1;
+                //category.Show(2);
+            };
+
+
+        }
+        /// <summary>
+        /// 鏇存柊鎵ц鍛ㄦ湡鐨勬柟娉�
+        /// </summary>
+        /// <param name="btndisplaycycle">Btndisplaycycle.</param>
+        void UpdateWeek(Button btndisplaycycle)
+        {
+
+            switch (Common.Logic.CurrentLogic.TimeAttribute.Repeat)
+            {
+                ///0:鍙墽琛屼竴娆★紝鎵ц鍚嶪sEnable鍊肩疆;1,浠婂勾鍐呮墽琛�;2锛氭瘡澶╂墽琛�;3锛氭瘡鏈堟墽琛�;4锛氭瘡骞存墽琛�;5锛氬懆閲嶅銆�
+                case 0:
+                    {
+                        btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.executeonce);
+                    }; break;
+                case 1: { }; break;
+                case 2:
+                    {
+                        btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyday);
+                    }; break;
+                case 3:
+                    {
+
+                        string len = "", value = "";
+                        var stringvalue = Convert.ToString(Common.Logic.CurrentLogic.TimeAttribute.MonthDate, 2);
+                        var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
+                        for (int j = 31; j >= 0; j--)
+                        {
+                            len += str.Substring(j, 1);
+                        }
+                        for (int j = 0; j < len.Length; j++)
+                        {
+                            var strvalue = len.Substring(j, 1);
+                            if (strvalue == "1")
+                            {
+                                value += (j + 1).ToString() + ",";
+                            }
+                        }
+                        btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
+
+                    }; break;
+                case 4:
+                    {
+
+                        Dictionary<int, int> dictionary = new Dictionary<int, int>();
+                        ///鎵惧嚭鎵ц鐨勬湀浠藉拰澶╂暟
+                        if (Common.Logic.CurrentLogic.TimeAttribute.SelectMonDate.Count != 0)
+                        {
+                            for (int i = 0; i < Common.Logic.CurrentLogic.TimeAttribute.SelectMonDate.Count; i++)
+                            {
+                                var dayvalue = Common.Logic.CurrentLogic.TimeAttribute.SelectMonDate[i];
+                                if (dayvalue != 0)
+                                {
+                                    dictionary.Add(i + 1, dayvalue);
+                                }
+                            }
+                        }
+                        if (dictionary.Count != 0 && dictionary.Count == 1)
+                        {
+                            string len = "", leng = "";
+                            int minvalue = 0, Maximum = 0;
+                            foreach (var value in dictionary)
+                            {
+                                ///鍙栧嚭鏈堜唤
+                                var month = value.Key;
+                                ///鍙栧嚭鏃ユ暟
+                                var day = value.Value;
+                                var maxvalue = Convert.ToString(day, 2);
+                                var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+                                for (int j = 31; j >= 0; j--)
+                                {
+                                    len += str.Substring(j, 1);
+                                }
+
+                                for (int j = 0; j < len.Length; j++)
+                                {
+                                    var strvalue = len.Substring(j, 1);
+                                    if (strvalue == "1")
+                                    {
+                                        minvalue = j + 1;
+                                        break;
+                                    }
+                                }
+                                for (int j = 0; j < len.Length; j++)
+                                {
+                                    var strvalue = len.Substring(j, 1);
+                                    if (strvalue == "1")
+                                    {
+                                        Maximum = j + 1;
+                                    }
+                                }
+
+                                if (month.ToString().Length < 2)
+                                {
+                                    leng = "0" + month.ToString();
+                                }
+                                else
+                                {
+                                    leng = month.ToString();
+                                }
+                                if (minvalue == Maximum)
+                                {
+                                    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString());
+                                }
+                                else
+                                {
+                                    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-" + leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+                                }
+                            }
+
+                        }
+                        else
+                        {
+                            int b = 0;
+                            string stringtext = "";
+                            foreach (var value in dictionary)
+                            {
+                                string len = "", leng = "";
+                                int minvalue = 0, Maximum = 0;
+                                ///鍙栧嚭鏈堜唤
+                                var month = value.Key;
+                                ///鍙栧嚭鏃ユ暟
+                                var day = value.Value;
+                                var maxvalue = Convert.ToString(day, 2);
+                                var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
+                                for (int j = 31; j >= 0; j--)
+                                {
+                                    len += str.Substring(j, 1);
+                                }
+
+
+                                if (month.ToString().Length < 2)
+                                {
+                                    leng = "0" + month.ToString();
+                                }
+                                else
+                                {
+                                    leng = month.ToString();
+                                }
+
+
+
+                                if (b == 0)
+                                {
+                                    for (int j = 0; j < len.Length; j++)
+                                    {
+                                        var strvalue = len.Substring(j, 1);
+                                        if (strvalue == "1")
+                                        {
+                                            minvalue = j + 1;
+                                            break;
+                                        }
+                                    }
+                                    stringtext += leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-";
+
+                                }
+
+                                if (b == dictionary.Count - 1)
+                                {
+                                    for (int j = 0; j < len.Length; j++)
+                                    {
+                                        var strvalue = len.Substring(j, 1);
+                                        if (strvalue == "1")
+                                        {
+                                            Maximum = j + 1;
+                                        }
+                                    }
+                                    stringtext += leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
+
+                                }
+                                b++;
+                            }
+                            btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyyear) + stringtext;
+                        }
+
+                    }; break;
+                case 5:
+                    {
+                        string len = "", text = "";
+                        List<int> listvalueInt = new List<int>();
+                        listvalueInt.Clear();
+                        var maxvalue = Convert.ToString(Common.Logic.CurrentLogic.TimeAttribute.WeekDay, 2);
+                        var str = maxvalue.Insert(0, new string('0', 8 - maxvalue.Length));
+                        for (int j = 7; j >= 0; j--)
+                        {
+                            len += str.Substring(j, 1);
+                        }
+
+                        for (int j = 0; j < len.Length; j++)
+                        {
+                            var strvalue = len.Substring(j, 1);
+                            if (strvalue == "1")
+                            {
+                                listvalueInt.Add(j + 1);
+
+
+                                if ((j + 1) == 1)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.mon) + ",";
+                                }
+                                else if ((j + 1) == 2)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.tue) + ",";
+                                }
+                                else if ((j + 1) == 3)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.wed) + ",";
+                                }
+                                else if ((j + 1) == 4)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.thu) + ",";
+                                }
+                                else if ((j + 1) == 5)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.frl) + ",";
+                                }
+                                else if ((j + 1) == 6)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.sat) + ",";
+                                }
+                                else if ((j + 1) == 7)
+                                {
+                                    text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
+                                    //text += Language.StringByID(MyInternationalizationString.sun) + ",";
+                                }
+
+
+                            }
+                        }
+                        //鏆傛椂闅愯棌鎺夛紝闇�瑕佹樉绀哄懆鏈拰宸ヤ綔鏃ュ啀鏀惧紑锛�
+                        //if (listvalueInt.Count == 5 && !listvalueInt.Contains(6) && !listvalueInt.Contains(7))
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.workingday);
+                        //}
+                        //else if (listvalueInt.Count == 2 && listvalueInt.Contains(6) && listvalueInt.Contains(7))
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.weekend);
+                        //}
+                        //else if (listvalueInt.Count == 7)
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyday);
+                        //}
+                        //else
+                        //{
+                        //    btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+                        //}
+                        btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
+                        //btndisplaycycle.Text = text.TrimEnd(',');
+                    }; break;
+            }
+
+
+        }
+
+        void ConditionView(bool edit)
+        {
+            Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+
+            #region 缁勫悎鏉′欢View
+            FrameLayout flMain = new FrameLayout { BackgroundColor = 0x50000000 };
+            this.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender2, e2) =>
+            {
+                flMain.RemoveFromParent();
+            };
+
+            var timetypeframelayout1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            flMain.AddChidren(timetypeframelayout1);
+            var framelayout = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(530),
+                Y = Application.GetRealHeight(1920 - 530),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
+            };
+            flMain.AddChidren(framelayout);
+
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
+            {
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            framelayout.AddChidren(timetype);
+            var Btncancel = new Button
+            {
+                TextID = MyInternationalizationString.cancel,
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
+            {
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
+            };
+
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.condition,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+
+            #region  -------婊¤冻鎵�鏈夋潯浠�   婊¤冻鍏朵腑涓�涓潯浠�
+
+
+            #region  -------婊¤冻鎵�鏈夋潯浠�
+
+
+            var andFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = timetype.Bottom + Application.GetRealHeight(20),
+            };
+            framelayout.AddChidren(andFrameLayout);
+
+
+            var androw = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            andFrameLayout.AddChidren(androw);
+            var andbtn = new Button
+            {
+
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.Allconditions,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+
+            };
+            androw.AddChidren(andbtn);
+
+            var andSelected = new SelectedButton();
+            androw.AddChidren(andSelected);
+            #endregion
+            #region  -------婊¤冻鍏朵腑涓�涓潯浠�
+
+            var orFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = andFrameLayout.Bottom,
+
+            };
+            framelayout.AddChidren(orFrameLayout);
+
+
+
+            var orrow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+            };
+            orFrameLayout.AddChidren(orrow);
+            var orbtn = new Button
+            {
+
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.anycondition,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            orrow.AddChidren(orbtn);
+
+            var orSelected = new SelectedButton();
+            orrow.AddChidren(orSelected);
+            #endregion
+            ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> andclick = (sedner14, e14) =>
+            {
+                andSelected.Visible = true;
+                orSelected.Visible = false;
+                andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+            };
+            androw.MouseUpEventHandler += andclick;
+            andbtn.MouseUpEventHandler += andclick;
+            andSelected.MouseUpEventHandler += andclick;
+            andFrameLayout.MouseUpEventHandler += andclick;
+
+
+            ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
+            EventHandler<MouseEventArgs> orclick = (sedner15, e15) =>
+            {
+                andSelected.Visible = false;
+                orSelected.Visible = true;
+                andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+            };
+            orrow.MouseUpEventHandler += orclick;
+            orbtn.MouseUpEventHandler += orclick;
+            orSelected.MouseUpEventHandler += orclick;
+            orFrameLayout.MouseUpEventHandler += orclick;
+
+            #endregion
+            #endregion
+
+            if (edit)
+            {
+                if (Common.Logic.CurrentLogic.Relationship == 0)
+                {
+                    andSelected.Visible = true;
+                    orSelected.Visible = false;
+                    andbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                    orbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                }
+                else
+                {
+                    andSelected.Visible = false;
+                    orSelected.Visible = true;
+                    andbtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                    orbtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                }
+            }
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+                if (!andSelected.Visible && !orSelected.Visible)
+                {
+                    ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+                    return;
+                }
+                flMain.RemoveFromParent();
+
+                if (andSelected.Visible)
+                {
+                    Common.Logic.CurrentLogic.Relationship = 0;
+
+                }
+                if (orSelected.Visible)
+                {
+                    Common.Logic.CurrentLogic.Relationship = 1;
+
+                }
+                var templateDeviceCondition = new TemplateDeviceCondition();
+                UserView.HomePage.Instance.AddChidren(templateDeviceCondition);
+                UserView.HomePage.Instance.PageIndex += 1;
+                templateDeviceCondition.Show();
+            };
+
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 444f69b..f38c40f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -14,183 +14,256 @@
         {
             Tag = "Logic";
         }
-        public bool IsDeviceEditor1;
+        public bool IsEditor;
         public string str1;
 
         Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
         public void Show()
         {
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            this.AddChidren(new Button
-            {
-                Height = Application.GetRealHeight(80),
-            });
 
-            var topFrameLayout = new FrameLayout
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                Text = Language.StringByID(MyInternationalizationString.addtime),
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addtime,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
 
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
-            {
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
                 RemoveFromParent();
-                IsDeviceEditor1 = false;
             };
+            #endregion
 
-   
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920- 220 - 200);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+            
+
+            #region  鏈�涓嬮潰鐨勫竷灞�浠g爜
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184-260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
-
-            #region   -----绔嬪嵆鎵ц
-            var row = new RowLayout
+            var fra = new FrameLayout
             {
-                Height = Application.GetRealHeight(250),
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            middle.AddChidren(row);
-
-            var btnTextTitle = new Button
+            this.AddChidren(fra);
+            var btnsave = new Button
             {
-                Height = Application.GetRealHeight(50),
-                Width = Application.GetRealWidth(800),
-                Y = Application.GetRealHeight(20),
-                X = Application.GetRealWidth(40),
-               // Text = "璇烽�夋嫨鏃堕棿绫诲瀷",
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID = MyInternationalizationString.Selectedtimetype,
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
             };
-            row.AddChidren(btnTextTitle);
+            fra.AddChidren(btnsave);
+            #endregion
+
+            #region   -----鏃堕棿鑼冨洿  寮�濮嬫椂闂�  缁撴潫鏃堕棿
+            #region   -----鏃堕棿鑼冨洿
+
+
+            var typeFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            middle.AddChidren(typeFramelayout);
+
+
+            var typeRowlayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            typeFramelayout.AddChidren(typeRowlayout);
 
             var btnTypeTextTitle = new Button
             {
-                Y = Application.GetRealHeight(20 + 50),
-               // Text = "绫诲瀷",
-                X = Application.GetRealWidth(40),
+                Text = Language.StringByID(MyInternationalizationString.type),
                 TextAlignment = TextAlignment.CenterLeft,
-                Height = Application.GetRealHeight(180),
-                Width = Application.GetRealWidth(400),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID = MyInternationalizationString.type,
+                Width = Application.GetRealWidth(265)
             };
-            row.AddChidren(btnTypeTextTitle);
-
-            var btnTypeText = new Button
+            typeRowlayout.AddChidren(btnTypeTextTitle);
+            
+            
+            var btnimmediateexecution = new Button
             {
-                Y = Application.GetRealHeight(20 + 50),
-                X = Application.GetRealWidth(1080 - 500 - 40),
-                //Text = "鏃堕棿鑼冨洿",
+                X = btnTypeTextTitle.Right,
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(630),
                 TextAlignment = TextAlignment.CenterRight,
-                Height = Application.GetRealHeight(180),
-                Width = Application.GetRealWidth(500),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextID = MyInternationalizationString.timeframe,
             };
-            row.AddChidren(btnTypeText);
+            typeRowlayout.AddChidren(btnimmediateexecution);
+
+
+            var btnimmediateexecutionBack = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = btnimmediateexecution.Right + Application.GetRealWidth(12),
+                Gravity = Gravity.CenterVertical,
+            };
+            typeRowlayout.AddChidren(btnimmediateexecutionBack);
+
+
             #endregion
+
+            #region  -----寮�濮嬫椂闂�
+            var timestarFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y= typeFramelayout.Bottom,
+            };
+            middle.AddChidren(timestarFramelayout);
 
             var timestartrow = new RowLayout
             {
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            middle.AddChidren(timestartrow);
+            timestarFramelayout.AddChidren(timestartrow);
 
             var btnstarttimetext = new Button
             {
+                Text = Language.StringByID(MyInternationalizationString.starttime),
                 TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(300),
-                X = Application.GetRealWidth(30),
-                TextID = MyInternationalizationString.starttime,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(265)
+
             };
             timestartrow.AddChidren(btnstarttimetext);
 
             var btnstarttime = new Button
             {
-                X = Application.GetRealWidth(330),
+                X = btnstarttimetext.Right,
                 Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(600),
-                TextAlignment = TextAlignment.CenterLeft,
-                Tag = "0",
+                Width = Application.GetRealWidth(630),
+                TextAlignment = TextAlignment.CenterRight,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Tag = "0",
             };
             timestartrow.AddChidren(btnstarttime);
 
             var btnstartback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080-140),
+                X = btnstarttime.Right + Application.GetRealWidth(12),
                 Gravity = Gravity.CenterVertical,
             };
             timestartrow.AddChidren(btnstartback);
 
+            #endregion
+
+            #region  -----缁撴潫鏃堕棿
+            var timeendFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y = timestarFramelayout.Bottom,
+            };
+            middle.AddChidren(timeendFramelayout);
+
             var timeendrow = new RowLayout
             {
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            middle.AddChidren(timeendrow);
+            timeendFramelayout.AddChidren(timeendrow);
             var btnendtimetext = new Button
             {
+                Text = Language.StringByID(MyInternationalizationString.endtime),
                 TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(300),
-                X = Application.GetRealWidth(30),
-                TextID = MyInternationalizationString.endtime,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(265),
+
             };
             timeendrow.AddChidren(btnendtimetext);
 
             var btnendtime = new Button
             {
-                X = Application.GetRealWidth(330),
+                X = btnendtimetext.Right,
                 Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(600),
-                TextAlignment = TextAlignment.CenterLeft,
-                Tag = "0",
+                Width = Application.GetRealWidth(630),
+                TextAlignment = TextAlignment.CenterRight,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Tag = "0",
             };
             timeendrow.AddChidren(btnendtime);
 
             var btnendtimeback = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080-140),
+                X = btnendtime.Right + Application.GetRealWidth(12),
                 Gravity = Gravity.CenterVertical,
             };
             timeendrow.AddChidren(btnendtimeback);
 
+            #endregion
+            #endregion
 
-            if (IsDeviceEditor1)
+            if (IsEditor)
             {
                 if (str1 != null)
                 {
@@ -245,11 +318,10 @@
                 }
 
             }
-
             EventHandler<MouseEventArgs> stattimeclick = (sender, e) =>
             {
 
-                var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
                 AddChidren(flMain);
                 flMain.MouseUpEventHandler += (sender11, e11) =>
                 {
@@ -319,11 +391,11 @@
             btnstarttimetext.MouseUpEventHandler += stattimeclick;
             btnstarttime.MouseUpEventHandler += stattimeclick;
             btnstartback.MouseUpEventHandler += stattimeclick;
-
+            timestarFramelayout.MouseUpEventHandler += stattimeclick;
             EventHandler<MouseEventArgs> endtimeclick = (sender, e) =>
             {
 
-                var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
                 AddChidren(flMain);
                 flMain.MouseUpEventHandler += (sender11, e11) =>
                 {
@@ -394,30 +466,14 @@
             btnendtimetext.MouseUpEventHandler += endtimeclick;
             btnendtime.MouseUpEventHandler += endtimeclick;
             btnendtimeback.MouseUpEventHandler += endtimeclick;
+            timeendFramelayout.MouseUpEventHandler += endtimeclick;
 
-            var fra = new FrameLayout
-            {
-                Y = middle.Bottom,
-                Height = Application.GetRealHeight(200),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            this.AddChidren(fra);
-            var btncomplete = new Button
-            {
-                X = Application.GetRealWidth(290),
-                Height = Application.GetRealHeight(150),//194
-                Width = Application.GetRealWidth(500),
-                Radius = (uint)Application.GetRealHeight(50),
-                BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
-                TextID = MyInternationalizationString.Save,
-            };
-            fra.AddChidren(btncomplete);
-
-            timeBucketConditionsInfo.Add("Type","5");
-            timeBucketConditionsInfo.Add("IsValid", "1");
             ///瀹屾垚鐐瑰嚮浜嬩欢
             EventHandler<MouseEventArgs>completeclick=(sender, e) =>
             {
+
+                timeBucketConditionsInfo.Add("Type", "5");
+                timeBucketConditionsInfo.Add("IsValid", "1");
 
                 if (string.IsNullOrEmpty(btnstarttime.Text) || string.IsNullOrEmpty(btnendtime.Text))
                 {
@@ -436,7 +492,7 @@
                     return;
                 }
 
-                if (IsDeviceEditor1)
+                if (IsEditor)
                 {
                     for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
                     {
@@ -466,9 +522,8 @@
                 UserView.HomePage.Instance.PageIndex += 1;
                 logicCommunalPage.Show(() => { });
             };
-
             fra.MouseUpEventHandler += completeclick;
-            btncomplete.MouseUpEventHandler += completeclick;
+            btnsave.MouseUpEventHandler += completeclick;
         }
 
     }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
index ce9932e..dc7cbca 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
@@ -13,7 +13,7 @@
         {
             Tag = "Logic";
         }
-        public bool IsDeviceEditor;
+       
         Dictionary<string, string> timeifon=new Dictionary<string, string>();
         Button beforeClickButton = new Button();
         TimeView timeview = new TimeView
@@ -22,9 +22,25 @@
             BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
             Width = Application.GetRealWidth(1080),
         };
+        /// <summary>
+        /// 鏍囪(鏂板姞/杩涙潵缂栬緫)
+        /// </summary>
+        public bool IsEditor;
+        /// <summary>
+        /// 璁板綍杩涙潵涔嬪墠鐨勫垎閽�
+        /// </summary>
         public string StartMin;
+        /// <summary>
+        /// 璁板綍杩涙潵涔嬪墠鐨勫皬鏃�
+        /// </summary>
         public string StartHour;
+        /// <summary>
+        /// 璁板綍杩涙潵涔嬪墠鐨勬椂闂�(寤舵椂/鎻愬墠)
+        /// </summary>
         public string AdjustTime;
+        /// <summary>
+        /// 璁板綍鏃跺埢鐨勭被鍨�(鏃ュ嚭/鏃ヨ惤/姝e父)
+        /// </summary>
         public string DateType;
         public void Show(Dictionary<string, string> dictionary)
         {
@@ -50,51 +66,65 @@
                 timeifon.Add("AdjustTime", dictionary["AdjustTime"]);
                 AdjustTime = dictionary["AdjustTime"];
 
-            }  
-                   
-                      
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            this.AddChidren(new Button
-            {
-                Height = Application.GetRealHeight(80),
-            });
+            }
 
-            var topFrameLayout = new FrameLayout
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                Text = Language.StringByID(MyInternationalizationString.addtime),
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(150),
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                TextID = MyInternationalizationString.addtime,
             };
-            topFrameLayout.AddChidren(titleName);
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
+            };
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
 
             var back = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
-                X = Application.GetRealWidth(20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            topFrameLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) =>
-            {
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
                 RemoveFromParent();
-                IsDeviceEditor = false;
             };
+            #endregion
 
-            var middle = new VerticalScrolViewLayout();
-            middle.Y = topFrameLayout.Bottom;
-            middle.Height = Application.GetRealHeight(1920 - 220 - 200);
-            middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+            var middle = new FrameLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184-260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
             this.AddChidren(middle);
 
             SelectedTimeTypeView(middle,TypeValue);
@@ -106,96 +136,122 @@
         /// </summary>
         /// <param name="middle">Middle.</param>
         /// <param name="TypeValue">Type value.</param>
-        void SelectedTimeTypeView(VerticalScrolViewLayout middle, int TypeValue)
+        void SelectedTimeTypeView(FrameLayout middle, int TypeValue)
         {
             middle.RemoveAll();
             #region   -----绔嬪嵆鎵ц
-            var row = new RowLayout
-            {
-                Height = Application.GetRealHeight(250),
-            };
-            middle.AddChidren(row);
+            
 
-            var btnTextTitle = new Button
+            var typeFramelayout = new FrameLayout
             {
-                Height = Application.GetRealHeight(50),
-                Width = Application.GetRealWidth(800),
-                Y = Application.GetRealHeight(20),
-                X = Application.GetRealWidth(40),
-                //Text = "璇烽�夋嫨鏃堕棿绫诲瀷",
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID=MyInternationalizationString.Selectedtimetype,
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
-            row.AddChidren(btnTextTitle);
+            middle.AddChidren(typeFramelayout);
+
+
+            var typeRowlayout = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            typeFramelayout.AddChidren(typeRowlayout);
 
             var btnTypeTextTitle = new Button
             {
-                Y = Application.GetRealHeight(20 + 50),
-                //Text = "绫诲瀷",
-                TextID = MyInternationalizationString.type,
-                X = Application.GetRealWidth(40),
+                Text = Language.StringByID(MyInternationalizationString.type),
                 TextAlignment = TextAlignment.CenterLeft,
-                Height = Application.GetRealHeight(180),
-                Width = Application.GetRealWidth(400),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width = Application.GetRealWidth(265)
             };
-            row.AddChidren(btnTypeTextTitle);
+            typeRowlayout.AddChidren(btnTypeTextTitle);
 
-            var btnTypeText = new Button
+
+            ///鏄剧ず鏃堕棿绫诲瀷鐨勬帶浠�
+            var btnimmediateexecution = new Button
             {
-                Y = Application.GetRealHeight(20 + 50),
-                X = Application.GetRealWidth(1080 - 500 - 40),
-                //Text = "绔嬪嵆鎵ц",
-                TextID = MyInternationalizationString.immediateexecution,
+                X = btnTypeTextTitle.Right,
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(630),
                 TextAlignment = TextAlignment.CenterRight,
-                Height = Application.GetRealHeight(180),
-                Width = Application.GetRealWidth(500),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextID=MyInternationalizationString.immediateexecution,
             };
-            row.AddChidren(btnTypeText);
+            typeRowlayout.AddChidren(btnimmediateexecution);
+
+
+            var btnimmediateexecutionBack = new Button
+            {
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
+                UnSelectedImagePath = "ZigeeLogic/next.png",
+                X = btnimmediateexecution.Right + Application.GetRealWidth(12),
+                Gravity = Gravity.CenterVertical,
+            };
+            typeRowlayout.AddChidren(btnimmediateexecutionBack);
+                                  
             #endregion
 
             #region   -----鏃跺埢
+            
+
+            var timetypeFramelayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                Y= typeFramelayout.Bottom,
+            };
+            middle.AddChidren(timetypeFramelayout);
+                       
+
             var rowSelectedTimeType = new RowLayout
             {
-                Height = Application.GetRealHeight(180),
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(965),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(58),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
             };
-            middle.AddChidren(rowSelectedTimeType);
+            timetypeFramelayout.AddChidren(rowSelectedTimeType);
 
             var btnTimeText = new Button
             {
-                //Text = "鏃跺埢",
-                TextID = MyInternationalizationString.moment,
+                Text = Language.StringByID(MyInternationalizationString.moment),
                 TextAlignment = TextAlignment.CenterLeft,
-                Width = Application.GetRealWidth(150),
-                X = Application.GetRealWidth(40),
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                Width=Application.GetRealWidth(265)
             };
             rowSelectedTimeType.AddChidren(btnTimeText);
-
+            
 
             ///鏄剧ず鏃堕棿绫诲瀷鐨勬帶浠�
             var btnTimeTpye = new Button
             {
-                X = Application.GetRealWidth(300),
+                X = btnTimeText.Right,
                 Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(600),
+                Width = Application.GetRealWidth(630),
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
             };
             rowSelectedTimeType.AddChidren(btnTimeTpye);
 
+
             var btnTimeTpyeBack = new Button
             {
-                Width = Application.GetRealWidth(110),
-                Height = Application.GetRealHeight(110),
+                Width = Application.GetRealWidth(58),
+                Height = Application.GetRealHeight(58),
                 UnSelectedImagePath = "ZigeeLogic/next.png",
-                SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                X = Application.GetRealWidth(1080 - 140),
+                X = btnTimeTpye.Right+ Application.GetRealWidth(12),
                 Gravity = Gravity.CenterVertical,
             };
             rowSelectedTimeType.AddChidren(btnTimeTpyeBack);
+                      
+                       
+
             EventHandler<MouseEventArgs> timetpyeclick = (sedner, e) =>
             {
                 TimeTypeView(middle, TypeValue);
@@ -204,6 +260,7 @@
             btnTimeText.MouseUpEventHandler += timetpyeclick;
             btnTimeTpye.MouseUpEventHandler += timetpyeclick;
             btnTimeTpyeBack.MouseUpEventHandler += timetpyeclick;
+            timetypeFramelayout.MouseUpEventHandler += timetpyeclick;
 
             #endregion
 
@@ -273,8 +330,20 @@
             {
 
                 #region   -----鑷畾涔夋椂闂�
+                rowSelectedTimeType.LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+                btnTimeTpyeBack.UnSelectedImagePath = "ZigeeLogic/dropdown.png";
+                var linebtn = new Button
+                {
+                    Y = timetypeFramelayout.Bottom,
+                    Height = Application.GetRealHeight(5),
+                    BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                    X=Application.GetRealWidth(58),
+                    Width = Application.GetRealWidth(965),
+                };
+                middle.AddChidren(linebtn);
                 var rowTimeView = new RowLayout
                 {
+                    Y = linebtn.Bottom,
                     Height = Application.GetRealHeight(600),
                 };
                 middle.AddChidren(rowTimeView);
@@ -286,49 +355,143 @@
             {
 
                 #region   -----鎻愬墠/寤舵椂
+                                
+                var delayFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                    Y = timetypeFramelayout.Bottom,
+                };
+                middle.AddChidren(delayFramelayout);
+
+
                 var rowDelayType = new RowLayout
                 {
-                    Height = Application.GetRealHeight(180),
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(965),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(58),
+                    LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                 };
-                middle.AddChidren(rowDelayType);
+                delayFramelayout.AddChidren(rowDelayType);
 
                 var btnDelayTimeText = new Button
                 {
-                    //Text = "鎻愬墠/寤舵椂",
-                    TextID = MyInternationalizationString.Advancedelay,
+                    Text = Language.StringByID(MyInternationalizationString.Advancedelay),
                     TextAlignment = TextAlignment.CenterLeft,
-                    Width = Application.GetRealWidth(250),
-                    X = Application.GetRealWidth(40),
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    Width = Application.GetRealWidth(265)
                 };
                 rowDelayType.AddChidren(btnDelayTimeText);
+
+
                 ///鏄剧ず鏃堕棿绫诲瀷鐨勬帶浠�
                 var btnDelayTime = new Button
                 {
-                    X = Application.GetRealWidth(300),
+                    X = btnTimeText.Right,
                     Gravity = Gravity.CenterVertical,
-                    Width = Application.GetRealWidth(600),
+                    Width = Application.GetRealWidth(630),
                     TextAlignment = TextAlignment.CenterRight,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     Text = textvalue,
                 };
                 rowDelayType.AddChidren(btnDelayTime);
 
+
                 var btnDelayTimeBack = new Button
                 {
-                    Width = Application.GetRealWidth(110),
-                    Height = Application.GetRealHeight(110),
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealHeight(58),
                     UnSelectedImagePath = "ZigeeLogic/next.png",
-                    SelectedImagePath = "ZigeeLogic/NextSelecte.png",
-                    X = Application.GetRealWidth(1080 - 140),
+                    X = btnTimeTpye.Right + Application.GetRealWidth(12),
                     Gravity = Gravity.CenterVertical,
                 };
                 rowDelayType.AddChidren(btnDelayTimeBack);
 
+
+
                 EventHandler<MouseEventArgs> timeclick = (sedner, e) =>
                 {
-                    DelayView(middle, textvalue, TypeValue);
+
+                    var mList = new List<string>();
+                    mList.Add(Language.StringByID(MyInternationalizationString.advance));
+                    mList.Add(Language.StringByID(MyInternationalizationString.nothing));
+                    mList.Add(Language.StringByID(MyInternationalizationString.delayed));
+                    var listValues = new List<string>();
+                    for (int i = 1; i < 61; i++)
+                    {
+                        if (i < 10)
+                        {
+                            var a = "0" + i.ToString();
+                            listValues.Add(a + " " + Language.StringByID(MyInternationalizationString.minute));
+                        }
+                        else
+                        {
+                            listValues.Add(i.ToString() + " " + Language.StringByID(MyInternationalizationString.minute));
+                        }
+
+                    }
+                    var mList2 = new List<List<string>>();
+                    mList2.Add(listValues);
+                    mList2.Add(new List<string> { "0" });
+                    mList2.Add(listValues);
+                    int timevalue = 0;
+                    int selectIndex = 1;
+                    if (int.Parse(timeifon["AdjustTime"]) > 0)
+                    {
+                        selectIndex = 2;
+                        timevalue = Math.Abs(int.Parse(timeifon["AdjustTime"]));
+                    }
+                    else if (int.Parse(timeifon["AdjustTime"]) < 0)
+                    {
+                        selectIndex = 0;
+                        timevalue = Math.Abs(int.Parse(timeifon["AdjustTime"]));
+                    }
+                    else
+                    {
+                        selectIndex = 1;
+                        timevalue = 1;
+                    }
+                    PickerView.ShowSecondary(mList, mList2, (selectIndex1, selectIndex2) =>
+                    {
+
+                        switch (selectIndex1)
+                        {
+                            case 0:
+                            case 2:
+                                {
+                                    timevalue = int.Parse(listValues[selectIndex2].Split(' ')[0]);
+                                    if (selectIndex1 == 0)
+                                    {
+                                        timevalue = timevalue * -1;
+                                    }
+                                }
+                                break;
+                            case 1:
+                                timevalue = 0;
+                                break;
+
+                        }
+
+                        if (timeifon.ContainsKey("StartHour"))
+                        {
+                            timeifon.Remove("StartHour");
+                        }
+                        if (timeifon.ContainsKey("StartMin"))
+                        {
+                            timeifon.Remove("StartMin");
+                        }
+                        if (timeifon.ContainsKey("AdjustTime"))
+                        {
+                            timeifon.Remove("AdjustTime");
+                        }
+                        timeifon.Add("AdjustTime", timevalue.ToString());
+                        UserView.HomePage.Instance.ScrollEnabled = false;
+                        SelectedTimeTypeView(middle, TypeValue);
+                    }, selectIndex, timevalue - 1, Language.StringByID(MyInternationalizationString.Advancedelay));
+
                 };
+                delayFramelayout.MouseUpEventHandler += timeclick;
                 rowDelayType.MouseUpEventHandler += timeclick;
                 btnDelayTimeText.MouseUpEventHandler += timeclick;
                 btnDelayTime.MouseUpEventHandler += timeclick;
@@ -341,18 +504,19 @@
             var fra = new FrameLayout
             {
                 Y = middle.Bottom,
-                Height = Application.GetRealHeight(200),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
-            this.AddChidren(fra);
+           this.AddChidren(fra);
             var btnsave = new Button
             {
-                X = Application.GetRealWidth(290),
-                Height = Application.GetRealHeight(150),//194
-                Width = Application.GetRealWidth(500),
-                Radius = (uint)Application.GetRealHeight(50),
-                BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor =ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                 TextID = MyInternationalizationString.Save,
+                TextColor= ZigbeeColor.Current.LogicBtnSaveTextColor,
             };
             fra.AddChidren(btnsave);
             btnsave.MouseUpEventHandler += (sender, e) =>
@@ -375,7 +539,7 @@
                     timeifon.Add("StartMin", timeview.Minute.ToString());
                 }
 
-                if (IsDeviceEditor)
+                if (IsEditor)
                 {
                     for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
                     {
@@ -400,7 +564,7 @@
                             }
                         }
                     }
-                    IsDeviceEditor = false;
+                    IsEditor = false;
                 }
                 else
                 {
@@ -418,10 +582,10 @@
         /// 澶勭悊閫変腑鏃堕棿绫诲瀷鐨勬柟娉�
         /// </summary>
         /// <param name="middle">Middle.</param>
-        void TimeTypeView(VerticalScrolViewLayout middle,int TypeValue)
+        void TimeTypeView(FrameLayout middle, int TypeValue)
         {
             UserView.HomePage.Instance.ScrollEnabled = false;
-            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
             this.AddChidren(flMain);
             flMain.MouseUpEventHandler += (sender12, e12) =>
             {
@@ -429,269 +593,267 @@
                 flMain.RemoveFromParent();
             };
 
-            var fraview = new FrameLayout {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(160*6),
-                Y = Application.GetRealHeight(1920 - 50 - 960),
-                X = Application.GetRealWidth(40),
+            var fraview1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(100),
+                Y = Application.GetRealHeight(1920 - 100),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(40),
+            };
+            flMain.AddChidren(fraview1);
+
+            var fraview = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080),
+                Height = Application.GetRealHeight(850),
+                Y = Application.GetRealHeight(1920 - 850),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(fraview);
 
-            var textBtn = new Button {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(120),
-                TextAlignment=TextAlignment.Center,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID=MyInternationalizationString.selectcommontimetype,
-            };
-            fraview.AddChidren(textBtn);
-
-            var timetypeframelayout = new VerticalScrolViewLayout
+            #region  -------鍙栨秷   瀹屾垚
+            var timetype = new RowLayout
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(160*4),
-                Y = textBtn.Bottom,
+                Height = Application.GetRealHeight(140),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
-            fraview.AddChidren(timetypeframelayout);
-
-
-            var cancelBtn = new Button
+            fraview.AddChidren(timetype);
+            var Btncancel = new Button
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(160),
-                TextAlignment = TextAlignment.Center,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextID = MyInternationalizationString.cancel,
-                Y = timetypeframelayout.Bottom+Application.GetRealHeight(40),
-                BackgroundColor= ZigbeeColor.Current.LogicTopViewBackgroundColor,
-            };
-            fraview.AddChidren(cancelBtn);
-            cancelBtn.MouseUpEventHandler += (sender,e) => {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-            };
-
-            List<string> timetypelist = new List<string> {
-                Language.StringByID(MyInternationalizationString.sunrise),
-                Language.StringByID(MyInternationalizationString.sunset),
-                Language.StringByID(MyInternationalizationString.noon),
-                Language.StringByID(MyInternationalizationString.logiccustom),
-               };
-
-            foreach (var typename in timetypelist)
-            {
-
-                var timerowlayout = new RowLayout
-                {
-                    Height = Application.GetRealHeight(160),
-                };
-                timetypeframelayout.AddChidren(timerowlayout);
-
-                var btntimetext = new Button
-                {
-                    Text = typename,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    TextAlignment=TextAlignment.CenterLeft,
-                    X=Application.GetRealWidth(40),
-                };
-                timerowlayout.AddChidren(btntimetext);
-
-
-                EventHandler<MouseEventArgs> timesclick = (sender, e) =>
-                {
-                    UserView.HomePage.Instance.ScrollEnabled = true;
-                    flMain.RemoveFromParent();
-                    int a = 0;
-                    if(btntimetext.Text==Language.StringByID(MyInternationalizationString.logiccustom)){
-                        a = 0;
-                    }
-                    else if(btntimetext.Text == Language.StringByID(MyInternationalizationString.sunrise)){
-                        a = 1;
-                    }
-                    else if (btntimetext.Text == Language.StringByID(MyInternationalizationString.sunset)) {
-                        a = 2;
-                    }
-                    else if (btntimetext.Text == Language.StringByID(MyInternationalizationString.noon)) { 
-                        a = 3;
-                        
-                    }
-                    if (a == TypeValue)
-                    {
-                        UserView.HomePage.Instance.ScrollEnabled = true;
-                        flMain.RemoveFromParent();
-                        return;
-                    }
-
-                   if (timeifon.ContainsKey("StartHour"))
-                    {
-                        timeifon.Remove("StartHour");
-                    }
-                    if (timeifon.ContainsKey("StartMin"))
-                    {
-                        timeifon.Remove("StartMin");
-                    }
-                    if (timeifon.ContainsKey("AdjustTime"))
-                    {
-                        timeifon.Remove("AdjustTime");
-                    }
-                    if (timeifon.ContainsKey("DateType"))
-                    {
-                        timeifon.Remove("DateType");
-                    }
-                    timeifon.Add("DateType", a.ToString());
-                    if (a == 0)
-                    {
-                        timeifon.Add("StartHour", "12");
-                        timeifon.Add("StartMin", "0");
-                    }
-                    else
-                    {
-                        timeifon.Add("AdjustTime", "0");
-                    }
-
-                    SelectedTimeTypeView(middle, a);
-
-                };
-                timerowlayout.MouseUpEventHandler += timesclick;
-                btntimetext.MouseUpEventHandler += timesclick;
-
-            }
-        }
-        /// <summary>
-        /// 閫変腑寤舵椂鏃堕棿鐨勫鐞嗘柟娉�
-        /// </summary>
-        /// <param name="middle">Middle.</param>
-        void DelayView(VerticalScrolViewLayout middle,string timename,int TypeValue)
-        {
-           UserView.HomePage.Instance.ScrollEnabled = false;
-            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-            this.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender12, e12) =>
-            {
-                UserView.HomePage.Instance.ScrollEnabled = true;
-                flMain.RemoveFromParent();
-            };
-
-            var fraDelay = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080 - 80),
-                X = Application.GetRealWidth(40),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(50),
-                Height=Application.GetRealHeight(1260-250),
-                Y=Application.GetRealHeight(1920-1260+250),
-            };
-            flMain.AddChidren(fraDelay);
-
-            var titleTextfra = new FrameLayout
-            {
-                Height = Application.GetRealHeight(180),
-            };
-            fraDelay.AddChidren(titleTextfra);
-
-
-            var btnTxet = new Button
-            {
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Height = Application.GetRealHeight(180),
-                Width = Application.GetRealWidth(400),
-                //Text = "璇烽�夋嫨鏃堕棿",
-                TextID=MyInternationalizationString.selectedtime,
-                X = Application.GetRealWidth(300),
-            };
-            titleTextfra.AddChidren(btnTxet);
-                   
-
-            var btnSave = new Button
-            {
+                TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                Height = Application.GetRealHeight(140),
                 Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(180),
-                Text = Language.StringByID(MyInternationalizationString.complete),
-                TextColor = ZigbeeColor.Current.LogicTextBlueColor,
-                X = Application.GetRealWidth(1000 - 200),
+                X = Application.GetRealWidth(80),
+                TextAlignment = TextAlignment.CenterLeft,
             };
-            titleTextfra.AddChidren(btnSave);
-
-
-            var timetypeframelayout = new VerticalScrolViewLayout
+            timetype.AddChidren(Btncancel);
+            Btncancel.MouseUpEventHandler += (sender16, e16) =>
             {
-                Width = Application.GetRealWidth(1080 - 80),
-                Height = Application.GetRealHeight(900-250+20),
-                Y =titleTextfra.Bottom,
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                flMain.RemoveFromParent();
+                UserView.HomePage.Instance.ScrollEnabled = true;
             };
-            fraDelay.AddChidren(timetypeframelayout);
 
-            var cancel = new Button
+            var Btntitle = new Button
+            {
+                TextID = MyInternationalizationString.type,
+                TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(320),
+                TextAlignment = TextAlignment.Center,
+                X = Btncancel.Right + Application.GetRealWidth(100),
+                TextSize = 16,
+            };
+            timetype.AddChidren(Btntitle);
+            var Btncomplete = new Button
+            {
+                TextID = MyInternationalizationString.complete,
+                TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
+                Height = Application.GetRealHeight(140),
+                Width = Application.GetRealWidth(200),
+                TextAlignment = TextAlignment.CenterRight,
+                X = Btntitle.Right + Application.GetRealWidth(100),
+
+            };
+            timetype.AddChidren(Btncomplete);
+            #endregion
+            #region  -------鏃ュ嚭锛屾棩钀斤紝姝e崍锛岃嚜瀹氫箟
+            #region 鏃ュ嚭
+
+
+            var sunriseFrameLayout = new FrameLayout
             {
                 Height = Application.GetRealHeight(160),
-                TextID = MyInternationalizationString.cancel,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextSize = 16,
-                BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                Y =fraDelay.Height- Application.GetRealHeight(160),
-
+                Y = timetype.Bottom + Application.GetRealHeight(50),
             };
-            fraDelay.AddChidren(cancel);
-            cancel.MouseUpEventHandler += (sender, e) =>
+            fraview.AddChidren(sunriseFrameLayout);
+
+            var sunriseRow = new RowLayout
             {
-                flMain.RemoveFromParent();
-                UserView.HomePage.Instance.ScrollEnabled = true;
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
             };
+            sunriseFrameLayout.AddChidren(sunriseRow);
 
-            List<string> timevaluelist = new List<string> {
-                Language.StringByID(MyInternationalizationString.advance)+"10"+ Language.StringByID(MyInternationalizationString.logicminute),
-                Language.StringByID(MyInternationalizationString.advance)+"5"+ Language.StringByID(MyInternationalizationString.logicminute),
-                Language.StringByID(MyInternationalizationString.advance)+"1"+ Language.StringByID(MyInternationalizationString.logicminute),
-                Language.StringByID(MyInternationalizationString.nothing),
-                Language.StringByID(MyInternationalizationString.delayed)+"1"+ Language.StringByID(MyInternationalizationString.logicminute),
-                Language.StringByID(MyInternationalizationString.delayed)+"5"+ Language.StringByID(MyInternationalizationString.logicminute),
-                Language.StringByID(MyInternationalizationString.delayed)+"10"+ Language.StringByID(MyInternationalizationString.logicminute),
-               };
-            string strvalue = "";
-            foreach (var typename in timevaluelist)
+            var btnsunrisetext = new Button
             {
-                var timerowlayout = new RowLayout
-                {
-                    Height = Application.GetRealHeight(130),
-                    LineColor=ZigbeeColor.Current.LogicBackgroundColor,
-                };
-                timetypeframelayout.AddChidren(timerowlayout);
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.sunrise,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            sunriseRow.AddChidren(btnsunrisetext);
 
-                var btntimetext = new Button
-                {
-                    Text = typename,
-                    Gravity = Gravity.Center,
-                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                    SelectedBackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor,
-                };
-                timerowlayout.AddChidren(btntimetext);
-                if (timename == typename)
-                {
-                    beforeClickButton.IsSelected = false;
-                    beforeClickButton = btntimetext;
-                    btntimetext.IsSelected = true;
-                    strvalue = btntimetext.Text;
-                }
+            var sunriseSelected = new SelectedButton();
+            sunriseRow.AddChidren(sunriseSelected);
+            #endregion
+            #region 鏃ヨ惤
 
-                EventHandler<MouseEventArgs> timesclick = (sender, e) =>
-                {
-                    strvalue = btntimetext.Text;
-                    beforeClickButton.IsSelected = false;
-                    beforeClickButton = btntimetext;
-                    btntimetext.IsSelected = true;
-                };
-                timerowlayout.MouseUpEventHandler += timesclick;
-                btntimetext.MouseUpEventHandler += timesclick;
 
-            }
 
-            btnSave.MouseUpEventHandler += (sender2, e2) =>
+            var sunsetFrameLayout = new FrameLayout
             {
-                flMain.RemoveFromParent();
+                Height = Application.GetRealHeight(160),
+                Y = sunriseFrameLayout.Bottom,
+            };
+            fraview.AddChidren(sunsetFrameLayout);
+
+            var sunsetRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            sunsetFrameLayout.AddChidren(sunsetRow);
+
+            var btnsunsettext = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.sunset,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            sunsetRow.AddChidren(btnsunsettext);
+
+            var sunsetSelected = new SelectedButton();
+            sunsetRow.AddChidren(sunsetSelected);
+            #endregion
+
+            #region 姝e崍
+            //姝e崍
+
+
+
+            var noonFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = sunsetFrameLayout.Bottom,
+            };
+            fraview.AddChidren(noonFrameLayout);
+
+            var noonRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+            };
+            noonFrameLayout.AddChidren(noonRow);
+
+            var btnnoontext = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.noon,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            noonRow.AddChidren(btnnoontext);
+
+            var noonSelected = new SelectedButton();
+            noonRow.AddChidren(noonSelected);
+
+            #endregion
+            #region 鑷畾涔�
+
+            var logiccustomFrameLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(160),
+                Y = noonFrameLayout.Bottom,
+            };
+            fraview.AddChidren(logiccustomFrameLayout);
+
+            var logiccustomRow = new RowLayout
+            {
+                Y = Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(920),
+                Height = Application.GetRealHeight(130),
+                X = Application.GetRealWidth(80),
+                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+            };
+            logiccustomFrameLayout.AddChidren(logiccustomRow);
+
+            var btnlogiccustomtext = new Button
+            {
+                Width = Application.GetRealWidth(600),
+                TextID = MyInternationalizationString.logiccustom,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+            };
+            logiccustomRow.AddChidren(btnlogiccustomtext);
+
+            var logiccustomSelected = new SelectedButton();
+            logiccustomRow.AddChidren(logiccustomSelected);
+            #endregion
+            int value = -1;
+            EventHandler<MouseEventArgs> sunriseclick = (sender,e) => {
+                btnsunrisetext.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnsunsettext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnnoontext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnlogiccustomtext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                sunriseSelected.Visible = true;
+                sunsetSelected.Visible = false;
+                noonSelected.Visible = false;
+                logiccustomSelected.Visible = false;
+                value = 1;
+            };
+            sunriseFrameLayout.MouseUpEventHandler += sunriseclick;
+            sunriseRow.MouseUpEventHandler += sunriseclick;
+            btnsunrisetext.MouseUpEventHandler += sunriseclick;
+            sunriseSelected.MouseUpEventHandler += sunriseclick;
+
+            EventHandler<MouseEventArgs> sunsetclick = (sender, e) => {
+                btnsunrisetext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnsunsettext.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnnoontext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnlogiccustomtext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                sunriseSelected.Visible = false;
+                sunsetSelected.Visible = true;
+                noonSelected.Visible = false;
+                logiccustomSelected.Visible = false;
+                value = 2;
+            };
+            sunsetFrameLayout.MouseUpEventHandler += sunsetclick;
+            sunsetRow.MouseUpEventHandler += sunsetclick;
+            btnsunsettext.MouseUpEventHandler += sunsetclick;
+            sunsetSelected.MouseUpEventHandler += sunsetclick;
+
+            EventHandler<MouseEventArgs> noonclick = (sender, e) =>
+            {
+                btnsunrisetext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnsunsettext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnnoontext.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                btnlogiccustomtext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                sunriseSelected.Visible = false;
+                sunsetSelected.Visible = false;
+                noonSelected.Visible = true;
+                logiccustomSelected.Visible = false;
+                value = 3;
+            };
+            noonFrameLayout.MouseUpEventHandler += sunsetclick;
+            noonRow.MouseUpEventHandler += noonclick;
+            btnnoontext.MouseUpEventHandler += noonclick;
+            noonSelected.MouseUpEventHandler += noonclick;
+
+            EventHandler<MouseEventArgs> ogiccustomclick = (sender, e) =>
+            {
+                btnsunrisetext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnsunsettext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnnoontext.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                btnlogiccustomtext.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                sunriseSelected.Visible = false;
+                sunsetSelected.Visible = false;
+                noonSelected.Visible = false;
+                logiccustomSelected.Visible = true;
                 UserView.HomePage.Instance.ScrollEnabled = true;
+                flMain.RemoveFromParent();
+
                 if (timeifon.ContainsKey("StartHour"))
                 {
                     timeifon.Remove("StartHour");
@@ -704,47 +866,51 @@
                 {
                     timeifon.Remove("AdjustTime");
                 }
-                switch (strvalue)
+                if (timeifon.ContainsKey("DateType"))
                 {
-                    case "鎻愬墠10鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "-10");
-                        }
-                        break;
-                    case "鎻愬墠5鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "-5");
-                        }
-                        break;
-                    case "鎻愬墠1鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "-1");
-                        }
-                        break;
-                    case "鏃�":
-                        {
-                            timeifon.Add("AdjustTime", "0");
-                        }
-                        break;
-                    case "寤舵椂1鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "1");
-                        }
-                        break;
-                    case "寤舵椂5鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "5");
-                        }
-                        break;
-                    case "寤舵椂10鍒嗛挓":
-                        {
-                            timeifon.Add("AdjustTime", "10");
-                        }
-                        break;
-
+                    timeifon.Remove("DateType");
                 }
-                SelectedTimeTypeView(middle, TypeValue);
+                timeifon.Add("DateType", "0");
+                timeifon.Add("StartHour", "12");
+                timeifon.Add("StartMin", "0");
+                SelectedTimeTypeView(middle, 0);
             };
+            logiccustomFrameLayout.MouseUpEventHandler += ogiccustomclick;
+            logiccustomRow.MouseUpEventHandler += ogiccustomclick;
+            btnlogiccustomtext.MouseUpEventHandler += ogiccustomclick;
+            logiccustomSelected.MouseUpEventHandler += ogiccustomclick;
+
+            #endregion
+            Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+                if (value == -1)
+                {
+                    return;
+                }
+                UserView.HomePage.Instance.ScrollEnabled = true;
+                flMain.RemoveFromParent();
+                if (timeifon.ContainsKey("StartHour"))
+                {
+                    timeifon.Remove("StartHour");
+                }
+                if (timeifon.ContainsKey("StartMin"))
+                {
+                    timeifon.Remove("StartMin");
+                }
+                if (timeifon.ContainsKey("AdjustTime"))
+                {
+                    timeifon.Remove("AdjustTime");
+                }
+                if (timeifon.ContainsKey("DateType"))
+                {
+                    timeifon.Remove("DateType");
+                }
+                timeifon.Add("DateType", value.ToString());
+                timeifon.Add("AdjustTime", "0");
+                SelectedTimeTypeView(middle, value);
+            };
+
         }
+       
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index b654589..e23911d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -13,61 +13,87 @@
             Tag = "Logic";
         }
   
-        public void Show ()
+        public void Show (string titlename)
         {
             var weeklist = new List<string> ();
 
-            this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
-            var topFrameLayout = new FrameLayout
+
+            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
+            var topRowLayout = new RowLayout
             {
-                Height = Application.GetRealHeight(140),
-                Y = Application.GetRealHeight(80),
+                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
+                Height = Application.GetRealHeight(184),
+                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
             };
-            AddChidren(topFrameLayout);
+            this.AddChidren(topRowLayout);
 
             var titleName = new Button
             {
-                TextID = MyInternationalizationString.cycle,
-                TextSize = 17,
+                TextSize = 16,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                X = Application.GetRealWidth(176),
+                Width = Application.GetRealWidth(400),
+                Height = Application.GetRealHeight(69),
+                Y = Application.GetRealHeight(92),
+                Text = titlename,
             };
-            topFrameLayout.AddChidren (titleName);
-                       
-            var back = new Button {
-                Width = Application.GetRealWidth (110),
-                Height = Application.GetRealHeight (110),
-                X = Application.GetRealWidth (20),
-                Gravity = Gravity.CenterVertical,
-                UnSelectedImagePath = "ZigeeLogic/Back.png",
+            topRowLayout.AddChidren(titleName);
+
+            var clickBtn = new Button
+            {
+                Width = Application.GetRealWidth(81 + 51),
+                Height = Application.GetRealHeight(58 + 40),
+                Y = Application.GetRealHeight(98 - 40),
             };
-            topFrameLayout.AddChidren (back);
-            back.MouseDownEventHandler += (sender, e) =>
+            topRowLayout.AddChidren(clickBtn);
+            clickBtn.MouseDownEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
             };
 
-            var titlerl = new RowLayout {
-                Height = Application.GetRealHeight (180),
-                Y = Application.GetRealHeight (220),
+            var back = new Button
+            {
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(51),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(98),
+                //Gravity = Gravity.CenterVertical;
+                UnSelectedImagePath = "ZigeeLogic/back.png",
             };
-            AddChidren (titlerl);
+            topRowLayout.AddChidren(back);
+            back.MouseDownEventHandler += (sender, e) => {
+                RemoveFromParent();
+            };
+            #endregion
 
-            titlerl.AddChidren (
-             new Button {
-                 X = Application.GetRealWidth (40),
-                 //Text = "璇烽�夋嫨閲嶅鎵ц鍛ㄦ湡",
-                 TextID = MyInternationalizationString.repeat,
-                 TextSize = 17,
-                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-             }
-            );
 
-            var middle = new VerticalScrolViewLayout ();
-            middle.Y = titlerl.Bottom;
-            middle.Height = Application.GetRealHeight (1920 - 220 - 180);
-            middle.BackgroundColor =ZigbeeColor.Current.LogicBackgroundColor;
-            this.AddChidren (middle);
+            var middle = new VerticalScrolViewLayout
+            {
+                Y = topRowLayout.Bottom,
+                Height = Application.GetRealHeight(1920 - 184-260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            var saveFramelayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(260),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFramelayout);
+            var saveBtn= new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+            };
+            saveFramelayout.AddChidren(saveBtn);
 
             if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 5)
             {
@@ -127,41 +153,70 @@
                         Language.StringByID(MyInternationalizationString.sat),
                         Language.StringByID(MyInternationalizationString.sun),
             });
-            foreach (var name in cyclelist) {
-                var cyclerwLayout = new RowLayout {
-                    Height = Application.GetRealHeight (180),
-                };
-                middle.AddChidren (cyclerwLayout);
+            foreach (var name in cyclelist)
+            {
 
-                var btnname = new Button {
-                    X = Application.GetRealWidth (40),
-                    Width = Application.GetRealWidth (600),
-                    Gravity = Gravity.CenterVertical,
+                var weekFramelayout = new FrameLayout
+                {
+                    Height = Application.GetRealHeight(160),
+                    BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+                };
+                middle.AddChidren(weekFramelayout);
+
+                var weekIconBtn = new Button
+                {
+                    Width = Application.GetRealWidth(81),
+                    Height = Application.GetRealHeight(81),
+                    UnSelectedImagePath = "ZigeeLogic/point.png",
+                    X = Application.GetRealWidth(58),
+                    Y = Application.GetRealHeight(55),
+                };
+                weekFramelayout.AddChidren(weekIconBtn);
+
+                var weekRow = new RowLayout
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(850),
+                    Height = Application.GetRealHeight(130),
+                    X = Application.GetRealWidth(176),
+                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+                };
+                weekFramelayout.AddChidren(weekRow);
+
+
+                var weekTextBtn = new Button
+                {
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = name,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 };
-                cyclerwLayout.AddChidren (btnname);
+                weekRow.AddChidren(weekTextBtn);
 
-                var btnCheck = new Button {
-                    Width = Application.GetRealWidth (115),
-                    Height = Application.GetRealHeight (110),
+                var selectedBtn = new Button
+                {
+                    X = Application.GetRealWidth(789),
+                    Width = Application.GetMinRealAverage(60),
+                    Height = Application.GetMinRealAverage(60),
+                    UnSelectedImagePath = "ZigeeLogic/selected.png",
                     Gravity = Gravity.CenterVertical,
-                    X = Application.GetRealWidth (1080-140),
-                    SelectedImagePath = "ZigeeLogic/CheckOn.png",
-                    UnSelectedImagePath = "ZigeeLogic/Check.png",
+                    Visible = false,
                 };
-                cyclerwLayout.AddChidren (btnCheck);
+                weekRow.AddChidren(selectedBtn);
 
-                var str = weeklist.Find ((o) => { return o == name; });
-                if (str != null) {
-                    btnCheck.IsSelected = true;
+                if (Language.StringByID(MyInternationalizationString.sun) == name)
+                {
+                    weekRow.LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
                 }
-                ///閫変腑鏃堕棿 
+
+                var str = weeklist.Find((o) => { return o == name; });
+                if (str != null)
+                {
+                    selectedBtn.Visible = true;
+                }
                 EventHandler<MouseEventArgs> weekclick = (sender, e) =>
                 {
-                    btnCheck.IsSelected = !btnCheck.IsSelected;
-                    if (btnCheck.IsSelected)
+                    selectedBtn.Visible = !selectedBtn.Visible;
+                    if (selectedBtn.Visible)
                     {
                         var d = weeklist.Find((o) => { return o == name; });
                         if (d == null)
@@ -171,54 +226,74 @@
                     }
                     else
                     {
-                        weeklist.RemoveAll((o) => {
+                        weeklist.RemoveAll((o) =>
+                        {
                             return o == name;
                         });
                     }
-                    int weekvalue = 0;
-                    foreach (var strname in weeklist)
-                    {
-                        if (Language.StringByID(MyInternationalizationString.mon) == strname)
-                        {
-                            weekvalue += 1;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.tue) == strname)
-                        {
-                            weekvalue += 2;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.wed) == strname)
-                        {
-                            weekvalue += 4;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.thu) == strname)
-                        {
-                            weekvalue += 8;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.frl) == strname)
-                        {
-                            weekvalue += 16;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.sat) == strname)
-                        {
-                            weekvalue += 32;
-                        }
-                        else if (Language.StringByID(MyInternationalizationString.sun) == strname)
-                        {
-                            weekvalue += 64;
-                        }
-                    }
 
-                    Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5;
-                    Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue;
                 };
-                cyclerwLayout.MouseUpEventHandler += weekclick;
-                btnname.MouseUpEventHandler += weekclick;
-                btnCheck.MouseUpEventHandler += weekclick;
-               
+                weekFramelayout.MouseUpEventHandler += weekclick;
+                weekTextBtn.MouseUpEventHandler += weekclick;
+                selectedBtn.MouseUpEventHandler += weekclick;
+                weekIconBtn.MouseUpEventHandler += weekclick;
+                weekRow.MouseUpEventHandler += weekclick;
+
             }
 
 
-           
+            saveBtn.MouseUpEventHandler += (sender, e) =>
+            {
+
+                int weekvalue = 0;
+                foreach (var strname in weeklist)
+                {
+                    if (Language.StringByID(MyInternationalizationString.mon) == strname)
+                    {
+                        weekvalue += 1;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.tue) == strname)
+                    {
+                        weekvalue += 2;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.wed) == strname)
+                    {
+                        weekvalue += 4;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.thu) == strname)
+                    {
+                        weekvalue += 8;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.frl) == strname)
+                    {
+                        weekvalue += 16;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.sat) == strname)
+                    {
+                        weekvalue += 32;
+                    }
+                    else if (Language.StringByID(MyInternationalizationString.sun) == strname)
+                    {
+                        weekvalue += 64;
+                    }
+                }
+                if (weekvalue == 0)
+                {
+                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+                                                      Language.StringByID(MyInternationalizationString.selectweek),
+                                                  Language.StringByID(MyInternationalizationString.complete));
+
+                    alert.Show();
+                    return;
+                }
+                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5;
+                Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue;
+
+                var logicCommunalPage = new LogicCommunalPage { };
+                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                UserView.HomePage.Instance.PageIndex += 1;
+                logicCommunalPage.Show(() => { });
+            };
 
 
 
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index c166a4d..e50d6ac 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -333,7 +333,7 @@
         public readonly static int Sunrisesunset = 5134;
         public readonly static int cycle = 5135;
         public readonly static int completeNext = 5136;
-        public readonly static int Selectedtimetype= 5137;
+        public readonly static int Selectedtimetype = 5137;
         public readonly static int Timecondition = 5138;
         public readonly static int condition = 5139;
         public readonly static int pushset = 5140;
@@ -391,7 +391,7 @@
         public readonly static int addtime = 5192;
         public readonly static int selectcommontimetype = 5193;
         public readonly static int newautomation = 5194;
-        public readonly static int editautomation= 5195;
+        public readonly static int editautomation = 5195;
         public readonly static int open1 = 5196;
         public readonly static int disable = 5197;
         public readonly static int selectsavedautomationstate = 5198;
@@ -501,15 +501,47 @@
         public readonly static int button3 = 5302;
         public readonly static int button4 = 5303;
         public readonly static int doyouwanttodelete = 5304;
+        public readonly static int onoff = 5305;
+        public readonly static int unattendedtime = 5306;
+        public readonly static int unattendedtime1 = 5307;
+        public readonly static int closetimeout = 5308;
+        public readonly static int closetime = 5309;
+        public readonly static int weekly = 5340;
+        public readonly static int selectweek = 5341;
+        public readonly static int doorLock = 5342;
+        public readonly static int userlist = 5343;
+        public readonly static int lockpassword = 5344;
+        public readonly static int fingerprint = 5345;
+        public readonly static int ic = 5346;
+        public readonly static int Airswitch = 5347;
+        public readonly static int createtimetext = 5348;
+        public readonly static int adddelay = 5349;
+        public readonly static int logiccool = 5350;
+        public readonly static int logicheat = 5351;
+        public readonly static int logicauto = 5352;
+        public readonly static int logicdry = 5353;
+        public readonly static int logicfanonly = 5354;
+        public readonly static int logiclow = 5355;
+        public readonly static int logicmedium = 5356;
+        public readonly static int logichigh = 5357;
+        public readonly static int logictemplate = 5358;
+        public readonly static int onlight = 5359;
+        public readonly static int offlight = 5360;
+        public readonly static int OnOffSwitch = 5361;
+        public readonly static int addlinkageevent = 5362;
+        public readonly static int editlinkageevent = 5363;
+        public readonly static int selectunlockingmode = 5364;
+        public readonly static int lockaddaction = 5365;
+        public readonly static int linkageevent = 5366;
 
 
 
 
-		#region 鐧诲綍娉ㄥ唽
-		/// <summary>
-		/// HDL Home
-		/// </summary>
-		public const int AppName = 10000;
+        #region 鐧诲綍娉ㄥ唽
+        /// <summary>
+        /// HDL Home
+        /// </summary>
+        public const int AppName = 10000;
 
 
 		/// <summary>
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 7669b7d..effdd59 100644
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -428,18 +428,19 @@
     <Folder Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\" />
   </ItemGroup>
   <ItemGroup>
-    <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\Shared.Droid.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Shared.Droid.TBL.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Shared.Droid.TCL.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Shared.Droid.TouchID.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Elian.iOS.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Shared.IOS.TBL.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\Xamarin.Essentials.dll" />
-    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\Shared.IOS.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Shared.Droid.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Shared.Droid.HDLWidget.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Newtonsoft.Json.dll" />
     <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\Xamarin.Essentials.dll" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.xml" />
+    <None Include="$(MSBuildThisFileDirectory)DLL\M2Mqtt.Net.dll" />
   </ItemGroup>
 </Project>

--
Gitblit v1.8.0