2020-12-23-1

陈嘉乐

2020-12-23 d9894fc2e45d2521c78ad4c11dd9b549ec4f75ca

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

@@ -153,12 +153,7 @@
            ///或和与点击事件
            titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                FrameLayout fLayout = new FrameLayout
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                AndOrMethod(fLayout, titleCondition.btnText);
                AndOrMethod(titleCondition.btnText);
            };
            ///条件添加点击事件
            addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
@@ -284,7 +279,7 @@
                        try
                        {
                            //发送修改逻辑命令；
                            responsePackNew = Send.updateLogic(Logic.currlogic);
                            responsePackNew = Send.UpdateLogic(Logic.currlogic);

                        }
                        catch { }
@@ -512,9 +507,8 @@
        /// <summary>
        /// 满足条件
        /// </summary>
        /// <param name="fLayout">弹框主控件</param>
        /// <param name="button">显示文本</param>
        public void AndOrMethod(FrameLayout fLayout, Button button)
        public void AndOrMethod(Button button)
        {
            List<string> strList = new List<string> {
             Language.StringByID(StringId.andCondition),
@@ -524,9 +518,11 @@
            string currCondition = button.Text;

            PublicInterface conditionView = new PublicInterface();
            conditionView.SingleSelectionShow(fLayout, strList, Language.StringByID(StringId.meetTheCondition), currCondition
            conditionView.SingleSelectionShow(this, strList, Language.StringByID(StringId.meetTheCondition), currCondition
               , (stateValue) =>
               {
                   //界面显示选中值
                   button.Text = stateValue;
                   if (stateValue == Language.StringByID(StringId.orCondition))
                   {
                       Logic.currlogic.relation = "or";
@@ -535,7 +531,6 @@
                   {
                       Logic.currlogic.relation = "and";
                   }
                   button.Text = stateValue;

               });