2021-10-27-01

温居城

2021-10-27 993ecf49ae04ccea89f6bc4a32cfc0c45def1215

2021-10-27-01

修复s_one门锁设置周期时，点击保存跳错界面。

 ZigbeeApp/Shared/Common/CommonPage.cs

old mode 100755
new mode 100644

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

old mode 100755
new mode 100644
@@ -16,7 +16,7 @@
            this.action = action;
        }

        public void Show()
        public void Show(string if_logic,bool _bool)
        {
            Tag = "Logic";

@@ -123,7 +123,7 @@
                var weekPage = new WeekPage();
                UserView.HomePage.Instance.AddChidren(weekPage);
                UserView.HomePage.Instance.PageIndex += 1;
                weekPage.Show(weekView.funnameBtn.Text);
                weekPage.Show(weekView.funnameBtn.Text, if_logic,_bool);

            };
            monView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -133,7 +133,7 @@
                var everymonthPage = new EverymonthPage();
                UserView.HomePage.Instance.AddChidren(everymonthPage);
                UserView.HomePage.Instance.PageIndex += 1;
                everymonthPage.Show(monView.funnameBtn.Text);
                everymonthPage.Show(monView.funnameBtn.Text, if_logic,_bool);

            };
            if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 0)

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

old mode 100755
new mode 100644
@@ -16,7 +16,7 @@
        {
            Tag = "Logic";
        }
        public void Show(string titlename)
        public void Show(string titlename,string if_logic,bool _bool)
        {
          

@@ -186,10 +186,26 @@
                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
                Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;

                var logicCommunalPage = new LogicCommunalPage();

                if (LogicView.IfString._LockLogic == if_logic)
                {
                    //跳到s_one门锁编辑界面
                    var oneLogic = new OneLogic();
                    UserView.HomePage.Instance.AddChidren(oneLogic);
                    UserView.HomePage.Instance.PageIndex += 1;
                    oneLogic.Show(_bool);
                }
                else
                {

                    var logicCommunalPage = new LogicCommunalPage { };
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
                }


               

            };


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

old mode 100755
new mode 100644
@@ -213,7 +213,7 @@
                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);

            };
            weekBtn.MouseUpEventHandler += cycleclick;

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

old mode 100755
new mode 100644
@@ -300,7 +300,7 @@
                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._LockLogic, Yes);
            };
            weekBtn.MouseUpEventHandler += cycleclick;
            weekview.clickBtn.MouseUpEventHandler += cycleclick;

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

old mode 100755
new mode 100644
@@ -472,7 +472,7 @@
                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);

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

old mode 100755
new mode 100644
@@ -13,7 +13,7 @@
            Tag = "Logic";
        }
  
        public void Show (string titlename)
        public void Show (string titlename,string if_logic,bool _bool)
        {

            #region  界面的布局代码
@@ -181,10 +181,23 @@
                Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5;
                Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue;


                if (LogicView.IfString._LockLogic == if_logic)
                {
                    //跳到s_one门锁编辑界面
                    var oneLogic = new OneLogic();
                    UserView.HomePage.Instance.AddChidren(oneLogic);
                    UserView.HomePage.Instance.PageIndex += 1;
                    oneLogic.Show(_bool);
                }
                else
                {

                var logicCommunalPage = new LogicCommunalPage { };
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
                }
            };