黄学彪
2020-04-02 9904031f5291daaf56985146bb671f25e18ebbdf
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -215,7 +215,7 @@
                            {
                                var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
                                selecteddevice.deviceNameBtn.Visible = true;
                                selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
                                selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
                                selecteddevice.regionNameBtn.Visible = true;
                                Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
                                selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -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();
                        };
                    };
                }
@@ -356,7 +357,7 @@
                            {
                                var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
                                actiondevice.deviceNameBtn.Visible = true;
                                actiondevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
                                actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
                                actiondevice.regionNameBtn.Visible = true;
                                Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
                                switch (deviceinof.Type)
@@ -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();