Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -1,4 +1,5 @@
using System;
using Shared.Common;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
@@ -20,6 +21,27 @@
        Shared.Phone.UserCenter.MemberInfoRes accountObj;
        #endregion

        void ReadDoorLockUserInfo()
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetLocaDoorLocklist(doorLock, accountObj);
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        MidFrameLayoutContent();
                        CommonPage.Loading.Hide();
                    });
                }
            });
        }

        /// <summary>

        /// UI显示 

        /// </summary>
@@ -35,7 +57,8 @@
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            MidFrameLayoutContent();
            ReadDoorLockUserInfo();

        }

        public void MidFrameLayoutContent()
@@ -107,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;