Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs

@@ -56,7 +56,9 @@
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            ReadDoorLockUserInfo();

        }

        public void MidFrameLayoutContent()
@@ -128,7 +130,10 @@
                    }
                    else
                    {

                        var userDoorLockPage = new UserDoorLockPage(doorLock, accountObj);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                };
                btnRight.MouseUpEventHandler += eHandler;