diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt index 0d109fe7..4c0c1243 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadMainPostAdapter.kt @@ -22,7 +22,6 @@ import com.huanchengfly.tieba.post.fragments.MenuDialogFragment import com.huanchengfly.tieba.post.models.ReplyInfoBean import com.huanchengfly.tieba.post.plugins.PluginManager import com.huanchengfly.tieba.post.utils.* -import com.huanchengfly.tieba.post.utils.NavigationHelper import com.huanchengfly.tieba.post.utils.TiebaUtil.reportPost import com.huanchengfly.tieba.post.widgets.MyLinearLayout @@ -163,8 +162,9 @@ class ThreadMainPostAdapter( holder.setText( R.id.thread_list_item_user_time, context.getString( - R.string.tip_thread_item_thread, - DateTimeUtils.getRelativeTimeString(context, threadBean.createTime!!) + R.string.tip_thread_item_thread, + DateTimeUtils.getRelativeTimeString(context, threadBean.createTime!!), + user.ipAddress ) ) holder.setText(R.id.thread_list_item_content_title, title) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt index 4a4af36c..f61f9527 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/ThreadReplyAdapter.kt @@ -46,7 +46,6 @@ import com.huanchengfly.tieba.post.widgets.theme.TintTextView import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.util.* class ThreadReplyAdapter(context: Context) : BaseSingleTypeDelegateAdapter(context, LinearLayoutHelper()) { private var userInfoBeanMap: MutableMap = HashMap() @@ -418,27 +417,60 @@ class ThreadReplyAdapter(context: Context) : BaseSingleTypeDelegateAdapter NavigationHelper.toUserSpaceWithAnim(context, userInfoBean.id, StringUtil.getAvatarUrl(userInfoBean.portrait), view) } - ImageUtil.load(viewHolder.getView(R.id.thread_list_item_user_avatar), ImageUtil.LOAD_TYPE_AVATAR, userInfoBean.portrait) + viewHolder.setOnClickListener(R.id.thread_list_item_user_avatar) { view: View? -> + NavigationHelper.toUserSpaceWithAnim( + context, + userInfoBean.id, + StringUtil.getAvatarUrl(userInfoBean.portrait), + view + ) + } + ImageUtil.load( + viewHolder.getView(R.id.thread_list_item_user_avatar), + ImageUtil.LOAD_TYPE_AVATAR, + userInfoBean.portrait + ) } initContentView(viewHolder, item) - viewHolder.setText(R.id.thread_list_item_user_time, context.getString(R.string.tip_thread_item, item.floor, getRelativeTimeString(context, item.time!!))) + viewHolder.setText( + R.id.thread_list_item_user_time, + context.getString( + R.string.tip_thread_item, + item.floor, + getRelativeTimeString(context, item.time!!), + userInfoBean?.ipAddress + ) + ) initFloorView(viewHolder, item) if (isPureRead) { - viewHolder.getView(R.id.thread_list_item_content).setPadding(DisplayUtil.dp2px(context, 4f), 0, DisplayUtil.dp2px(context, 4f), 0) + viewHolder.getView(R.id.thread_list_item_content) + .setPadding(DisplayUtil.dp2px(context, 4f), 0, DisplayUtil.dp2px(context, 4f), 0) viewHolder.setVisibility(R.id.thread_list_item_user, View.GONE) viewHolder.setVisibility(R.id.thread_list_item_content_floor_card, View.GONE) } else { if (viewHolder.getView(R.id.thread_list_item_content).layoutDirection == View.LAYOUT_DIRECTION_LTR) { - viewHolder.getView(R.id.thread_list_item_content).setPadding(DisplayUtil.dp2px(context, 38f), 0, DisplayUtil.dp2px(context, 4f), 0) + viewHolder.getView(R.id.thread_list_item_content).setPadding( + DisplayUtil.dp2px(context, 38f), + 0, + DisplayUtil.dp2px(context, 4f), + 0 + ) } else { - viewHolder.getView(R.id.thread_list_item_content).setPadding(DisplayUtil.dp2px(context, 4f), 0, DisplayUtil.dp2px(context, 38f), 0) + viewHolder.getView(R.id.thread_list_item_content).setPadding( + DisplayUtil.dp2px(context, 4f), + 0, + DisplayUtil.dp2px(context, 38f), + 0 + ) } viewHolder.setVisibility(R.id.thread_list_item_user, View.VISIBLE) } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/models/ThreadContentBean.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/models/ThreadContentBean.kt index fdf1c605..e917859c 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/models/ThreadContentBean.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/models/ThreadContentBean.kt @@ -113,8 +113,14 @@ class ThreadContentBean : BaseBean() { @SerializedName("is_like") val isLike: String? = null - @SerializedName("is_manager") - val isManager: String? = null + @SerializedName("is_bawu") + val isBawu: String? = null + + @SerializedName("bawu_type") + val bawuType: String? = null + + @SerializedName("ip_address") + val ipAddress: String? = null } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt index 3910184d..2a3345d4 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt @@ -95,7 +95,7 @@ object RetrofitTiebaApi { createAPI("http://c.tieba.baidu.com/", defaultCommonHeaderInterceptor, CommonHeaderInterceptor( - Header.USER_AGENT to { "bdtb for Android 9.9.8.32" }, + Header.USER_AGENT to { "bdtb for Android 12.25.1.0" }, Header.CUID to { UIDUtil.getNewCUID() }, Header.CUID_GALAXY2 to { UIDUtil.getFinalCUID() }, Header.CUID_GID to { "" } @@ -107,7 +107,7 @@ object RetrofitTiebaApi { Param.CUID_GALAXY2 to { UIDUtil.getFinalCUID() }, Param.CUID_GID to { "" }, Param.FROM to { "tieba" }, - Param.CLIENT_VERSION to { "9.9.8.32" } + Param.CLIENT_VERSION to { "12.25.1.0" } )) } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt index 7177a6dc..f07b106a 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt @@ -25,11 +25,10 @@ object DateTimeUtils { } val currentCalendar = Calendar.getInstance() return if (currentCalendar.after(calendar)) { - if (calendar.get(Calendar.YEAR) == currentCalendar.get(Calendar.YEAR) && calendar.get( - Calendar.MONTH - ) == currentCalendar.get(Calendar.MONTH) - ) { - if (calendar.get(Calendar.DAY_OF_MONTH) == currentCalendar.get(Calendar.DAY_OF_MONTH)) { + if (calendar.get(Calendar.YEAR) == currentCalendar.get(Calendar.YEAR)) { + if (calendar.get(Calendar.DAY_OF_MONTH) == currentCalendar.get(Calendar.DAY_OF_MONTH) && + calendar.get(Calendar.MONTH) == currentCalendar.get(Calendar.MONTH) + ) { if (calendar.get(Calendar.HOUR_OF_DAY) == currentCalendar.get(Calendar.HOUR_OF_DAY)) { if (calendar.get(Calendar.MINUTE) == currentCalendar.get(Calendar.MINUTE)) { context.getString( diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5cb5123c..82b910e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -172,7 +172,7 @@ 保存图片 播放失败 抱歉,当前暂时无法浏览本吧 - 第 %1$s 楼 · %2$s + 第 %1$s 楼 %2$s 来自%3$s 查看更多回复(%1$s) 发现新版本 %1$s(%2$s) 更新 · %1$s @@ -409,7 +409,7 @@ 贴吧 贴子记录 经过贴吧 - %1$s 来自 %2$s + %1$s 来自%2$s 全部 回复 %1$s %1$s 赞