Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

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

            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -56,13 +60,14 @@
            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()
            {
            };