2019-10-31-1

WJC

2019-10-31 d7ad5a3953a8cd001659092ebde204b881f94b9d

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

@@ -44,11 +44,11 @@
            topRowLayout.AddChidren(titleName);
            if (Common.Logic.CurrentLogic.LogicId != 0)
            {
                titleName.Text = Language.StringByID(MyInternationalizationString.editautomation);
                titleName.Text = Language.StringByID(MyInternationalizationString.editlinkageevent);
            }
            else
            {
                titleName.Text = Language.StringByID(MyInternationalizationString.newautomation);
                titleName.Text = Language.StringByID(MyInternationalizationString.addlinkageevent);
            }

            var clickBtn = new Button
@@ -232,7 +232,7 @@
                        Width = Application.GetRealWidth(300),
                        Y = Application.GetRealHeight(45 + 30),
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addconditions,
                        TextID = MyInternationalizationString.selectunlockingmode,
                        X = Application.GetRealWidth(390),
                    };
                    addfl.AddChidren(addtextbtn);
@@ -410,6 +410,7 @@
                        {
                            if (e1)
                            {
                                Common.Logic.CurrentLogic.Conditions.Remove(conditions);
                                var lockLogicCommunalPage = new LockLogicCommunalPage();
                                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                                UserView.HomePage.Instance.PageIndex += 1;
@@ -523,7 +524,7 @@
                        Width = Application.GetRealWidth(300),
                        Y = Application.GetRealHeight(45 + 30),
                        TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                        TextID = MyInternationalizationString.addfunction,
                        TextID = MyInternationalizationString.lockaddaction,
                        X = Application.GetRealWidth(390),
                    };
                    addfl.AddChidren(addtextbtn);
@@ -952,7 +953,11 @@
                            if (e1)
                            {
                                Common.Logic.CurrentLogic.Actions.Remove(actions);
                                                          }
                                var lockLogicCommunalPage = new LockLogicCommunalPage();
                                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                                UserView.HomePage.Instance.PageIndex += 1;
                                lockLogicCommunalPage.Show(() => { });
                            }
                        };
                        alert.Show();