2020-05-18-2

陈嘉乐

2020-05-18 5da99fed2eb0d08b6338064da5f998891252c7b8

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

old mode 100644
new mode 100755
@@ -41,7 +41,7 @@
            var middle = new VerticalScrolViewLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184 - 180),
                Height = Application.GetRealHeight(Method.H - 184 - 180),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
@@ -139,7 +139,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.edit.Tag = i;
@@ -183,10 +183,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                            var lockLogicCommunalPage = new LockLogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            lockLogicCommunalPage.Show(() => { });
                            selecteddevice.selecetdFrameLayout.RemoveFromParent();
                            //var lockLogicCommunalPage = new LockLogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //lockLogicCommunalPage.Show(() => { });
                        };
                    };

@@ -245,7 +246,7 @@
                            {

                                var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
                                name = deviceinof.DeviceEpointName;
                                name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
                                actiondevice.regionNameBtn.Visible = true;
                                Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);

@@ -587,10 +588,11 @@
                        alert.ConfirmClickEvent += () =>
                        {
                            Common.Logic.CurrentLogic.Actions.Remove(actions);
                            var lockLogicCommunalPage = new LockLogicCommunalPage();
                            UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            UserView.HomePage.Instance.PageIndex += 1;
                            lockLogicCommunalPage.Show(() => { });
                            actiondevice.selecetdFrameLayout.RemoveFromParent();
                            //var lockLogicCommunalPage = new LockLogicCommunalPage();
                            //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                            //UserView.HomePage.Instance.PageIndex += 1;
                            //lockLogicCommunalPage.Show(() => { });
                        };
                    };

@@ -612,6 +614,7 @@
        }
        public  void AddCondition(int value)
        {
            Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
            var addCondition = new AddCondition();
            addCondition.conditionsIndex = value;
            UserView.HomePage.Instance.AddChidren(addCondition);