From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2

---
 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index d3cd0e4..ee8afb3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -341,7 +341,7 @@
                         deviceTypeList.Add(DeviceType.Thermostat);
                         deviceTypeList.Add(DeviceType.AirSwitch);
                         ///闂ㄩ攣鐗规畩
-                        deviceTypeList.Add(DeviceType.DoorLock);
+                       // deviceTypeList.Add(DeviceType.DoorLock);
                     }
                     break;
                 case "condition_mould":
@@ -363,7 +363,7 @@
                         deviceTypeList.Add(DeviceType.Thermostat);
                         deviceTypeList.Add(DeviceType.AirSwitch);
                         ///闂ㄩ攣鐗规畩
-                        deviceTypeList.Add(DeviceType.DoorLock);
+                      // deviceTypeList.Add(DeviceType.DoorLock);
                     }
                     break;
 
@@ -796,10 +796,9 @@
 
             if (LogicView.IfString._Logic == if_logic)
             {
+                UserView.HomePage.Instance.RemoveViewByTag("Logic");
                 if (CurrentLogic.LogicType == 0)
                 {
-                   
-                    UserView.HomePage.Instance.RemoveViewByTag("Logic");
                     //鍙埛鏂板垎绫讳笂涓嬫粦鍔╲iew锛�
                     Phone.Category.CategoryMainForm.instance?.RefreshBodyView();
                     // Category.Category.instance?.RefreshBodyView();
@@ -836,6 +835,7 @@
             deviceTarget.Show(str1, str2);
         }
 
-       
+        
+
     }
 }

--
Gitblit v1.8.0