回显用户名

app/src/main/java/cn/yunliyunwai/beyondclouds/data/model/UserInfo.java

@@ -2,9 +2,6 @@ package cn.yunliyunwai.beyondclouds.data.model;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
-import lombok.Data;
-
-@Data
 public class UserInfo {
 public class UserInfo {
 
 
     private String userId;
     private String userId;
@@ -24,4 +21,76 @@ public class UserInfo {
     private Date updateTime;
     private Date updateTime;
 
 
     private UserStatistics statistics;
     private UserStatistics statistics;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getUserAvatar() {
+        return userAvatar;
+    }
+
+    public void setUserAvatar(String userAvatar) {
+        this.userAvatar = userAvatar;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public UserStatistics getStatistics() {
+        return statistics;
+    }
+
+    public void setStatistics(UserStatistics statistics) {
+        this.statistics = statistics;
+    }
 }
 }

app/src/main/java/cn/yunliyunwai/beyondclouds/data/model/UserStatistics.java

 package cn.yunliyunwai.beyondclouds.data.model;
 package cn.yunliyunwai.beyondclouds.data.model;
 
 
-import lombok.Data;
-
-@Data
 public class UserStatistics {
 public class UserStatistics {
 
 
     private String userId;
     private String userId;
@@ -27,4 +24,91 @@ public class UserStatistics {
 
 
     private Integer visitedNum;
     private Integer visitedNum;
 
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Integer getFollowedNum() {
+        return followedNum;
+    }
+
+    public void setFollowedNum(Integer followedNum) {
+        this.followedNum = followedNum;
+    }
+
+    public Integer getFansNum() {
+        return fansNum;
+    }
+
+    public void setFansNum(Integer fansNum) {
+        this.fansNum = fansNum;
+    }
+
+    public Integer getBlogNum() {
+        return blogNum;
+    }
+
+    public void setBlogNum(Integer blogNum) {
+        this.blogNum = blogNum;
+    }
+
+    public Integer getBlogViewNum() {
+        return blogViewNum;
+    }
+
+    public void setBlogViewNum(Integer blogViewNum) {
+        this.blogViewNum = blogViewNum;
+    }
+
+    public Integer getProjectNum() {
+        return projectNum;
+    }
+
+    public void setProjectNum(Integer projectNum) {
+        this.projectNum = projectNum;
+    }
+
+    public Integer getPostNum() {
+        return postNum;
+    }
+
+    public void setPostNum(Integer postNum) {
+        this.postNum = postNum;
+    }
+
+    public Integer getQuestionNum() {
+        return questionNum;
+    }
+
+    public void setQuestionNum(Integer questionNum) {
+        this.questionNum = questionNum;
+    }
+
+    public Integer getQuestionReplyNum() {
+        return questionReplyNum;
+    }
+
+    public void setQuestionReplyNum(Integer questionReplyNum) {
+        this.questionReplyNum = questionReplyNum;
+    }
+
+    public Integer getReplyAcceptedNum() {
+        return replyAcceptedNum;
+    }
+
+    public void setReplyAcceptedNum(Integer replyAcceptedNum) {
+        this.replyAcceptedNum = replyAcceptedNum;
+    }
+
+    public Integer getVisitedNum() {
+        return visitedNum;
+    }
+
+    public void setVisitedNum(Integer visitedNum) {
+        this.visitedNum = visitedNum;
+    }
 }
 }

app/src/main/java/cn/yunliyunwai/beyondclouds/viewmodel/AuthenticationViewModel.java

@@ -106,6 +106,10 @@ public class AuthenticationViewModel extends ViewModel {
      */
      */
     private MutableLiveData<Boolean> passwordVisibility = new MutableLiveData<>();
     private MutableLiveData<Boolean> passwordVisibility = new MutableLiveData<>();
 
 
+    /**
+     * 当前登录的用户信息
+     */
+    private UserInfo mUserInfo;
 
 
 
 
     @Inject
     @Inject
@@ -156,6 +160,10 @@ public class AuthenticationViewModel extends ViewModel {
         return mAuthErrorMsg;
         return mAuthErrorMsg;
     }
     }
 
 
+    public UserInfo getUserInfo() {
+        return mUserInfo;
+    }
+
     /**
     /**
      * 切换登录方式
      * 切换登录方式
      * @param way
      * @param way
@@ -228,6 +236,8 @@ public class AuthenticationViewModel extends ViewModel {
             @Override
             @Override
             public void onChanged(Result<UserInfo> userInfoResult) {
             public void onChanged(Result<UserInfo> userInfoResult) {
                 if (userInfoResult.getCode() == 0) {
                 if (userInfoResult.getCode() == 0) {
+                    // 保存用户信息
+                    mUserInfo = userInfoResult.getData();
                     authenticationState.setValue(AuthenticationState.AUTHENTICATED);
                     authenticationState.setValue(AuthenticationState.AUTHENTICATED);
                 } else {
                 } else {
                     mAuthErrorMsg = userInfoResult.getMsg();
                     mAuthErrorMsg = userInfoResult.getMsg();

app/src/main/res/layout/fragment_my.xml

@@ -50,7 +50,7 @@
                         app:layout_constraintStart_toEndOf="@id/img_user_avatar"
                         app:layout_constraintStart_toEndOf="@id/img_user_avatar"
                         android:layout_marginStart="12dp"
                         android:layout_marginStart="12dp"
                         android:layout_marginLeft="12dp"
                         android:layout_marginLeft="12dp"
-                        android:text='@{authViewModel.authenticationState == AuthenticationState.AUTHENTICATED ? "登录啦～" : @string/click_to_login}'
+                        android:text='@{authViewModel.authenticationState == AuthenticationState.AUTHENTICATED ? authViewModel.userInfo.nickName : @string/click_to_login}'
                         android:onClick="@{authViewModel.authenticationState == AuthenticationState.AUTHENTICATED ? null : NavHandlers::toLogin}"
                         android:onClick="@{authViewModel.authenticationState == AuthenticationState.AUTHENTICATED ? null : NavHandlers::toLogin}"
                         android:textColor="#333333"
                         android:textColor="#333333"
                         android:textSize="18sp"
                         android:textSize="18sp"