From c877bc16eb02df246e48377101af0fa5ec626c14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 八月 2021 10:00:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 27524ab..14b652c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -263,7 +263,7 @@
/// <param name="list">鏄剧ず鏁版嵁婧�</param>
/// <param name="titleText">鏍囬</param>
/// <param name="action">杩斿洖鍊肩储寮曞��</param>
- public void FrameOrVv(FrameLayout frame, List<string> list, int titleText, Action<int> action)
+ public void FrameOrVv(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<int> action)
{
int line = 0;
@@ -366,6 +366,11 @@
{
verticalRefresh.AddChidren(checkView.FLayoutView());
}
+
+ if (stateList.Contains(strName))
+ {
+ checkView.btnCheckIcon.IsSelected = true;
+ }
checkView.btnText.Text = strName;
checkView.btnClick.Tag = i;//鏍囪
//鐐瑰嚮浜嬩欢
@@ -391,8 +396,7 @@
frameLayout.RemoveFromParent();
};
- }
-
+ }
/// <summary>
/// 瓒呭嚭5涓厓绱犺鐢ㄦ粦鍔ㄦ帶浠�
/// </summary>
@@ -400,7 +404,7 @@
/// <param name="list">鏄剧ず鏁版嵁婧�</param>
/// <param name="stateList">涔嬪墠鐘舵�佹暟鎹簮</param>
/// <param name="titleText">鏍囬</param>
- /// <param name="action">杩斿洖鍊肩储寮曞��</param>
+ /// <param name="action">杩斿洖鍊煎垪琛�</param>
public void FrameOrVvList(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<List<string>> action)
{
@@ -705,6 +709,14 @@
};
}
break;
+ case "security":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.bufang ),
+ Language.StringByID(StringId.chefang),
+ };
+ }
+ break;
}
return list;
--
Gitblit v1.8.0