全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -28,9 +28,7 @@
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    CommonDevice.DebugPrintLog($"11111111111111F");
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
                    CommonDevice.DebugPrintLog($"11111111111111G");
                }
                catch { }
                finally
@@ -38,7 +36,6 @@
                    Application.RunOnMainThread(() =>
                    {
                        MidFrameLayoutContent();
                        CommonDevice.DebugPrintLog($"11111111111111E");
                        CommonPage.Loading.Hide();
                    });
                }
@@ -50,8 +47,16 @@
        /// </summary>
        public void Show()
        {
            CommonDevice.DebugPrintLog($"11111111111111A");
            this.TopFrameLayout(this, accountObj.Account);
            string accountTitle = "";
            if (accountObj.UserName != null)
            {
                accountTitle = accountObj.UserName;
            }
            else
            {
                accountTitle = accountObj.Account;
            }
            this.TopFrameLayout(this, accountTitle);

            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
            {
@@ -60,14 +65,11 @@
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);
            CommonDevice.DebugPrintLog($"11111111111111B");
            ReadDoorLockUserInfo();
            CommonDevice.DebugPrintLog($"11111111111111C");
        }

        public void MidFrameLayoutContent()
        {
            CommonDevice.DebugPrintLog($"11111111111111D");
            var bodyView = new VerticalScrolViewLayout()
            {
            };
@@ -134,7 +136,7 @@
                        unLockMethod.Show();
                    }
                    else
                    {
                    {

                        ///备注：WJC的

                        ///记录当前用户信息

                        Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;