From 5b40f1da1d28616de3880857b38357eef7859b64 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 26 十一月 2020 17:51:35 +0800
Subject: [PATCH] 2020-11-26-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 6f1dfe2..3a0bfcb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -7,8 +7,21 @@
public class LogicMethod
{
+ /// <summary>
+ /// 琛ㄧず鏄潯浠�
+ /// </summary>
public const string condition_if = "鏉′欢";
+ /// <summary>
+ /// 琛ㄧず鏄洰鏍�
+ /// </summary>
public const string target_if = "鐩爣";
+ /// <summary>
+ /// 绉婚櫎鎵�鏈夌晫闈�
+ /// </summary>
+ public static void RemoveAllView()
+ {
+ MainPage.BasePageView.RemoveViewByTag("Logic");
+ }
/// <summary>
/// 鐢熸垚閫昏緫sid鏂规硶
/// </summary>
@@ -246,24 +259,25 @@
}
/// <summary>
- /// 鏉′欢鏀寔璁惧
+ /// 鏉′欢/鐩爣鏀寔璁惧
/// </summary>
/// <returns></returns>
- public static List<FunctionType> GetConditionFunctionTypeDevice()
+ public static List<FunctionType> GetSupportEquipment(string if_type)
{
List<FunctionType> deviceTypeList = new List<FunctionType>();
- deviceTypeList.Add(FunctionType.Relay);
+ switch (if_type) {
+ case condition_if: {
+ deviceTypeList.Add(FunctionType.Relay);
+ }
+ break;
+ case target_if:
+ {
+ deviceTypeList.Add(FunctionType.Relay);
+ }
+ break;
+ }
return deviceTypeList;
}
- /// <summary>
- /// 鐩爣鏀寔璁惧
- /// </summary>
- /// <returns></returns>
- public static List<FunctionType> GetTargetFunctionTypeDevice()
- {
- List<FunctionType> deviceTypeList = new List<FunctionType>();
- return deviceTypeList;
- }
/// <summary>
/// 鏄剧ず鐨勮澶囧垪琛�
/// </summary>
@@ -283,36 +297,20 @@
}
return devList;
}
-
/// <summary>
/// 杩斿洖鏈�缁堟敮鎸佹樉绀哄嚭鏉ョ殑璁惧鍒楄〃
/// </summary>
/// <param name="room">褰撳墠鎴块棿</param>
/// <param name="str">鍒ゆ柇绗︼紙琛ㄧず=杈撳叆璁惧鍜岃緭鍑鸿澶囷級</param>
/// <returns></returns>
- public static List<Entity.Function> GetFunctionDeviceList(Entity.Room room,string str)
+ public static List<Entity.Function> GetFunctionDeviceList(Entity.Room room, string str)
{
- List<FunctionType> functionTypeList=new List<FunctionType>();
- switch (str) {
- case condition_if: {
- //杩斿洖鏉′欢鏀寔璁惧鍒楄〃
- functionTypeList = GetConditionFunctionTypeDevice();
- }
- break;
- case target_if:
- {
- //杩斿洖鐩爣鏀寔璁惧鍒楄〃
- functionTypeList = GetTargetFunctionTypeDevice();
- }
- break;
- }
+ List<FunctionType> functionTypeList = GetSupportEquipment(str);
//杩斿洖鎴块棿璁惧鍒楄〃
var roomDeviceList = GetRoomDevice(room);
//杩斿洖鏈�缁堟敮鎸佹樉绀哄嚭鏉ョ殑璁惧鍒楄〃
- var list= GetShowDeviceList(functionTypeList, roomDeviceList);
+ var list = GetShowDeviceList(functionTypeList, roomDeviceList);
return list;
}
-
-
}
}
--
Gitblit v1.8.0