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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -85,6 +85,7 @@
                    {
                        MidFrameLayoutContent();
                        CommonPage.Loading.Hide();
                        midVerticalScrolViewLayout.EndHeaderRefreshing();
                    });
                }
            });
@@ -124,12 +125,14 @@
            var btnUndistributeText = new Button
            {
                Height = Application.GetRealHeight(72),
                Width = Application.GetRealWidth(121),
                Width = Application.GetRealWidth(150),
                TextID = R.MyInternationalizationString.Undistributed,
                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                X = btnUndistributeIcon.Right,
                TextAlignment = TextAlignment.CenterLeft,
            };
                IsBold =true,
                TextSize =13,
                TextAlignment = TextAlignment.CenterLeft, 
             };
            btnAddFrameLayout.AddChidren(btnUndistributeText);
            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
            {
@@ -150,14 +153,15 @@
            {
            };
            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);

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

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

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

        /// <summary>
@@ -181,7 +185,7 @@
                    X = Application.GetRealWidth(58),
                    Width = Application.GetRealWidth(300),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                    TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                    Gravity = Gravity.CenterVertical,
                    TextSize = 14,
                };
@@ -220,7 +224,7 @@
                    line2.Visible = false;
                }

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