合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

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

@@ -108,7 +108,7 @@
                 Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
                 if (Common.Logic.CurrentLogic.Conditions.Count == 1)
                 {
                     new LogicDveiceStatus { }.ConditionView(false, this);
                     new LogicDveiceStatus { }.ConditionView(false, this,null);
                 }
                 else
                 {
@@ -150,7 +150,7 @@
                EventHandler<MouseEventArgs> editclick = (sender, e) =>
                {
                    Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
                    new LogicDveiceStatus { }.ConditionView(true, this);
                    new LogicDveiceStatus { }.ConditionView(true, this, relationship);
                };
                row.MouseUpEventHandler += editclick;
                relationship.MouseUpEventHandler += editclick;
@@ -215,10 +215,6 @@
                UserView.HomePage.Instance.PageIndex += 1;
                cycle.Show();

                //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
                //UserView.HomePage.Instance.AddChidren(cyclicCycle);
                //UserView.HomePage.Instance.PageIndex += 1;
                //cyclicCycle.Show();
            };
            weekBtn.MouseUpEventHandler += cycleclick;
            weekview.clickBtn.MouseUpEventHandler += cycleclick;