Merge branch 'Dev-Branch' into hxb

hxb

2022-09-22 39cf2411b59772d56ee731f229f09ff472889bad

 HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs

@@ -261,9 +261,10 @@
        /// </summary>
        /// <param name="frame">显示在哪个界面的父控件</param>
        /// <param name="list">显示数据源</param>
        /// <param name="stateList">之前状态数据源</param>
        /// <param name="titleText">标题</param>
        /// <param name="action">返回值索引值</param>
        public void FrameOrVv(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<int> action)
        public void FrameOrVv(FrameLayout frame, List<string> list, List<string> stateList, string titleText, Action<int> action,bool isIcon=true)
        {

            int line = 0;
@@ -284,7 +285,7 @@
            frame.AddChidren(frameLayout);

            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.TextID = titleText;
            view.btnTitle.Text = titleText;
            view.FLayoutView(frameLayout, line);
            view.btnCancel.MouseUpEventHandler += (sender, e) =>
            {
@@ -310,7 +311,7 @@
                verticalRefresh.EndHeaderRefreshing();
            };

            if (list.Count == 0)
            if (list.Count == 0&&isIcon)
            {
                Button btnTipNot = new Button
                {
@@ -367,12 +368,18 @@
                    verticalRefresh.AddChidren(checkView.FLayoutView());
                }

                if (stateList.Contains(strName))
                {
                    checkView.btnCheckIcon.IsSelected = true;
                }
                checkView.btnText.Text = strName;
                checkView.btnClick.Tag = i;//标记

                if (stateList.Contains(strName))
                {
                    //checkView.btnCheckIcon.IsSelected = true;

                    checkBtn.IsSelected = false;
                    checkView.btnCheckIcon.IsSelected = true;
                    checkBtn = checkView.btnCheckIcon;
                    checkBtn.Tag = checkView.btnClick.Tag.ToString();
                }
                //点击事件
                checkView.btnClick.MouseUpEventHandler += (sender1, e1) =>
                {