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 | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 354f6bd..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;
@@ -719,9 +719,16 @@
/// <param name="CurrentLogic">褰撳墠閫昏緫</param>
public async static void SaveLogic(string if_logic, string name, bool tag, Common.Logic CurrentLogic)
{
- //璁板綍閫昏緫绫诲瀷
- //鍙槸瀵硅烦杞晫闈㈡湁鐢紝鍩烘湰娌″暐鐢�
- int Type = CurrentLogic.LogicType;
+
+ if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.addnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
+
if (string.IsNullOrEmpty(name))
{
var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
@@ -750,7 +757,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);
@@ -779,15 +796,14 @@
if (LogicView.IfString._Logic == if_logic)
{
- if (Type == 0)
+ UserView.HomePage.Instance.RemoveViewByTag("Logic");
+ if (CurrentLogic.LogicType == 0)
{
-
- UserView.HomePage.Instance.RemoveViewByTag("Logic");
//鍙埛鏂板垎绫讳笂涓嬫粦鍔╲iew锛�
Phone.Category.CategoryMainForm.instance?.RefreshBodyView();
// Category.Category.instance?.RefreshBodyView();
}
- else if (Type == 2)
+ else if (CurrentLogic.LogicType == 2)
{
//鍒锋柊鏁翠釜鍒嗙被锛�
//闂ㄩ攣甯稿紑妯″紡鐗规畩;
@@ -797,7 +813,8 @@
}
else if (LogicView.IfString._LockLogic == if_logic)
{
- UserView.HomePage.Instance.RemoveViewByTag("Logic");
+ UserView.HomePage.Instance.RemoveViewByTag("Logic");//绉婚櫎鎵�鏈夋爣璁癓ogic鐣岄潰
+ UserView.HomePage.Instance.RemoveViewByTag("LockListView");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
var doorLockLogicList = new DoorLockLogic.LockLogicList();
UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
@@ -818,6 +835,7 @@
deviceTarget.Show(str1, str2);
}
-
+
+
}
}
--
Gitblit v1.8.0