diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/models/Profile.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/models/Profile.kt index 0266a27d..73538ba4 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/models/Profile.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/models/Profile.kt @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName @Keep data class Profile( - val anti: Anti, + val anti: Anti?, @SerializedName("anti_stat") val antiStat: AntiStat, @SerializedName("block_info") @@ -21,7 +21,7 @@ data class Profile( ) { @Keep data class Anti( - val tbs: String + val tbs: String? ) @Keep @@ -91,6 +91,8 @@ data class Profile( val friendNum: String, @SerializedName("gift_num") val giftNum: String, + @SerializedName("has_concerned") + val hasConcerned: String, val id: String, var intro: String?, @SerializedName("ip_address") diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MyInfoFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MyInfoFragment.kt index f280bf0d..00aa2db5 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MyInfoFragment.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MyInfoFragment.kt @@ -205,7 +205,9 @@ class MyInfoFragment : BaseFragment(), View.OnClickListener, CompoundButton.OnCh private fun updateAccount(profile: Profile) { AccountUtil.getLoginInfo()?.apply { - tbs = profile.anti.tbs + profile.anti?.tbs?.let { + tbs = it + } portrait = profile.user.portrait intro = profile.user.intro sex = profile.user.sex diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserViewModel.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserViewModel.kt index de303ef9..b1b1d409 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserViewModel.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/user/UserViewModel.kt @@ -41,7 +41,9 @@ class UserViewModel @Inject constructor() : BaseViewModel { profile -> account.apply { - tbs = profile.anti.tbs + profile.anti?.tbs?.let { + tbs = it + } portrait = profile.user.portrait intro = profile.user.intro sex = profile.user.sex @@ -62,10 +64,18 @@ class UserViewModel @Inject constructor() : BaseViewModel