From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index fe9cf05..fed922d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -14,7 +14,7 @@
/// <param name="stateText">涔嬪墠鐘舵�佹枃鏈�</param>
/// <param name="action">杩斿洖鍊�</param>
/// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
- public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText,Action<string> action, int textSize=LogicView.TextSize.text14)
+ public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText, Action<string> action, int textSize = LogicView.TextSize.text14)
{
LogicView.DateView view = new LogicView.DateView();
view.btnTitle.Text = titleText;
@@ -69,6 +69,7 @@
};
}
+
/// <summary>
/// 澶氶�夋嫨
/// </summary>
@@ -149,7 +150,7 @@
/// </summary>
/// <param name="frameLayout">鐖舵帶浠�</param>
/// <param name="action">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
- public void MonSelectShow(FrameLayout frameLayout,Logic logic, Action<List<string>> action)
+ public void MonSelectShow(FrameLayout frameLayout, Logic logic, Action<List<string>> action)
{
LogicView.MonView monView = new LogicView.MonView();
monView.btnTitle.TextID = StringId.monthly;
@@ -237,12 +238,14 @@
//鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
return;
}
-
+
action(monList);
frameLayout.RemoveFromParent();
};
}
+
+
}
}
--
Gitblit v1.8.0