合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

old mode 100755
new mode 100644
@@ -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;
@@ -213,12 +213,8 @@
                var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
                UserView.HomePage.Instance.AddChidren(cycle);
                UserView.HomePage.Instance.PageIndex += 1;
                cycle.Show();
                cycle.Show(LogicView.IfString._Logic,false);

                //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;