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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -412,7 +412,10 @@
        public override int FormActionAgainEvent()

        {

            //用户头像

            if (btnUserIcon.UnSelectedImagePath != UserCenterResourse.UserInfo.UserIconFile)

            {

            btnUserIcon.UnSelectedImagePath = UserCenterResourse.UserInfo.UserIconFile;

            }

            //用户名字

            btnUserName.Text = UserCenterResourse.UserInfo.UserName;

            if (UserCenterResourse.UserInfo != null)