代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -41,7 +41,6 @@
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                //Application.RunOnMainThread(() => {; });
                try
                {
                    var localAccountListTemp = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.LocalAccountList();
@@ -86,6 +85,7 @@
                    {
                        MidFrameLayoutContent();
                        CommonPage.Loading.Hide();
                        midVerticalScrolViewLayout.EndHeaderRefreshing();
                    });
                }
            });
@@ -151,14 +151,15 @@
            {
            };
            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);

            CommonPage.Loading.Start("Loading...");
            ReadAccountDoorLockInfoList();

            midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
            {
                midVerticalScrolViewLayout.BeginHeaderRefreshing();

                midVerticalScrolViewLayout.EndHeaderRefreshing();
                ReadAccountDoorLockInfoList();
            };
            CommonPage.Loading.Start("Loading...");
            ReadAccountDoorLockInfoList();
        }

        /// <summary>
@@ -221,7 +222,7 @@
                    line2.Visible = false;
                }

                if (currentAccount.UserName != null)
                if (!string.IsNullOrEmpty(currentAccount.UserName))
                {
                    btnText.Text = currentAccount.UserName;
                }