2020-04-02-1

WJC

2020-04-02 01766e8a9461f412012eac532f5e60693b3ef7ad

 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs

@@ -101,7 +101,7 @@
            addconditionview.iconBtn.Visible = true;
            addconditionview.titleBtn.TextID = MyInternationalizationString.ifcondition;
            middle.AddChidren(addconditionview.AddDeviceView());

         
            ///添加条件的点击事件
            addconditionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
            {
@@ -162,6 +162,7 @@
                    LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
                    addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
                    middle.AddChidren(addflview.AddFl());
               
                    addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
                    {
                        if (Common.Logic.CurrentLogic.Conditions.Count == 1)
@@ -681,6 +682,7 @@
            addactionview.iconBtn.Visible = true;
            addactionview.titleBtn.TextID = MyInternationalizationString.execute;
            middle.AddChidren(addactionview.AddDeviceView());
           

            addactionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
            {
@@ -693,6 +695,8 @@
            ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
            ListActions.Add(new Dictionary<string, object>());

         

            for (int i = 0; i < ListActions.Count; i++)
            {
                if (i == (ListActions.Count - 1))
@@ -701,6 +705,8 @@
                    LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
                    addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
                    middle.AddChidren(addflview.AddFl());


                    addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
                    {
                        Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();