From 323876bfe85fc2684871d5d95c213c6e2713f3f4 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 16:07:32 +0800
Subject: [PATCH] 2020-04-15-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 559e42f..ad57cad 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -84,6 +84,16 @@
//杩囨护鎺変笉鏀寔鐨勮澶�
continue;
}
+ if (device.Type == DeviceType.DoorLock)
+ {
+ var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ {
+ //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
+ //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
+ continue;
+ }
+ }
deviceUIlist.Add(device);
}
return deviceUIlist;
@@ -341,7 +351,7 @@
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
///闂ㄩ攣鐗规畩
- deviceTypeList.Add(DeviceType.DoorLock);
+ // deviceTypeList.Add(DeviceType.DoorLock);
}
break;
case "condition_mould":
@@ -363,7 +373,7 @@
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
///闂ㄩ攣鐗规畩
- deviceTypeList.Add(DeviceType.DoorLock);
+ // deviceTypeList.Add(DeviceType.DoorLock);
}
break;
@@ -757,7 +767,17 @@
{
succeed = true;
CurrentLogic.LogicId = logicifon.LogicId;
- Common.Logic.LogicList.Add(CurrentLogic);
+ if (LogicView.IfString._LockLogic == if_logic)
+ {
+ //闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+ Common.Logic.LockLogicList.Add(CurrentLogic);
+ }
+ else
+ {
+ //鑷姩鍖栭�昏緫鍒楄〃
+ Common.Logic.LogicList.Add(CurrentLogic);
+
+ }
if (tag)
{
Send.Zj(tag, CurrentLogic);
@@ -786,10 +806,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();
@@ -826,6 +845,9 @@
deviceTarget.Show(str1, str2);
}
-
+ /// <summary>
+ /// 鐣岄潰楂樺害
+ /// </summary>
+ public static int H = 1922;
}
}
--
Gitblit v1.8.0