合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

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

        {

            //用户头像

            btnUserIcon.UnSelectedImagePath = UserCenterResourse.UserInfo.UserIconFile;

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

            {

                btnUserIcon.UnSelectedImagePath = UserCenterResourse.UserInfo.UserIconFile;

            }

            //用户名字

            btnUserName.Text = UserCenterResourse.UserInfo.UserName;

            if (UserCenterResourse.UserInfo != null)