合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -36,7 +36,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
                Width = Application.GetRealWidth(400),
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
@@ -359,7 +359,7 @@
                                            //    {
                                            //        if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
                                            //        {
                                            //            devicestatus.Text = conditions["Account"];
                                            //            devicestatus.Text = Common.Logic.CurrentLogic.Accounts["Account"];
                                            //            break;
                                            //        }
                                            //    }
@@ -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;
@@ -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();