2020-03-31-1

WJC

2020-03-31 3a662a08e1c54c9a5687a43a8133c8e42981f474

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

@@ -289,10 +289,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            var templatePage = new TemplatePage();
                            UserView.HomePage.Instance.AddChidren(templatePage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            templatePage.Show();
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();
                            //var templatePage = new TemplatePage();
                            //UserView.HomePage.Instance.AddChidren(templatePage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //templatePage.Show();
                        };
                    };
                }
@@ -418,10 +419,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Actions.Remove(actions);
                            var templatePage = new TemplatePage();
                            UserView.HomePage.Instance.AddChidren(templatePage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            templatePage.Show();
                            actiondevice.selecetdFrameLayout.RemoveFromParent();
                            //var templatePage = new TemplatePage();
                            //UserView.HomePage.Instance.AddChidren(templatePage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //templatePage.Show();
                        };
                    };

@@ -432,11 +434,11 @@

            #region -----每天 设置周期-----

            var fraline1 = new FrameLayout
            var fraHeight = new FrameLayout
            {
                Height = Application.GetRealHeight(30),
            };
            middle.AddChidren(fraline1);
            middle.AddChidren(fraHeight);


            LogicView.Addview weekview = new LogicView.Addview();