Merge branch 'WJC' into NewFilePath

wxr

2020-12-17 1b42f39e34492ba8d4ce6336cc913877b9e064cb

 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();
            };

        }

      
    }
}