合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -13,7 +13,7 @@
    {
        public LockAddDevice()
        {
            Tag = "Logic";
            Tag = "LockLogic";
        }
        Button roombjButton = new Button();
        Button roomTextButton = new Button();
@@ -621,8 +621,6 @@
            UserView.HomePage.Instance.ScrollEnabled = false;
            Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
            List<Dictionary<string, string>> taskListInfo = new List<Dictionary<string, string>>();
            //var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
            //this.AddChidren(flMain);
            flMain.MouseUpEventHandler += (sender, e) =>
            {
                flMain.RemoveFromParent();
@@ -2017,10 +2015,10 @@

                }
                flMain.RemoveFromParent();
                var logicCommunalPage = new LogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                var lockLogicCommunalPage = new LockLogicCommunalPage();
                UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
                lockLogicCommunalPage.Show(() => { });

            };