From 7922860a7a32c4220f01eb5941e54cb43ffbc176 Mon Sep 17 00:00:00 2001 From: Aunix <724861798@qq.com> Date: Wed, 20 Dec 2023 22:00:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=B8=AD=E5=B1=82=E4=B8=BB=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/adapters/RecyclerFloorAdapter.java | 6 +++--- .../tieba/post/api/caster/ForumBeanCaster.java | 2 +- .../post/api/interfaces/impls/MixedTiebaApiImpl.kt | 2 +- .../post/api/retrofit/interfaces/OfficialTiebaApi.kt | 10 ++++++++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerFloorAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerFloorAdapter.java index 08376389..8669ce33 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerFloorAdapter.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerFloorAdapter.java @@ -379,10 +379,10 @@ private List getContentViews(SubFloorListBean.PostInfo postListItemBean) { ImageView imageView = new ImageView(getContext()); imageView.setLayoutParams(getLayoutParams(contentBean)); imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); - ImageUtil.load(imageView, ImageUtil.LOAD_TYPE_SMALL_PIC, contentBean.getSrc()); + ImageUtil.load(imageView, ImageUtil.LOAD_TYPE_SMALL_PIC, ImageUtil.getNonNullString(contentBean.getCdnSrc(), contentBean.getOriginSrc())); List photoViewBeans = new ArrayList<>(); - photoViewBeans.add(new PhotoViewBean(ImageUtil.getNonNullString(contentBean.getSrc(), contentBean.getOriginSrc()), - ImageUtil.getNonNullString(contentBean.getOriginSrc(), contentBean.getSrc()), + photoViewBeans.add(new PhotoViewBean(ImageUtil.getNonNullString(contentBean.getCdnSrc(), contentBean.getOriginSrc()), + ImageUtil.getNonNullString(contentBean.getOriginSrc(), contentBean.getCdnSrc()), "1".equals(contentBean.isLongPic()))); ImageUtil.initImageView(imageView, photoViewBeans, 0); views.add(imageView); diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/caster/ForumBeanCaster.java b/app/src/main/java/com/huanchengfly/tieba/post/api/caster/ForumBeanCaster.java index d415c3fe..965f48e6 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/caster/ForumBeanCaster.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/caster/ForumBeanCaster.java @@ -145,7 +145,7 @@ public ForumPageBean.MediaInfoBean cast(ForumBean.MediaBean mediaBean) { if (mediaBean.getBigPic().contains(".hiphotos.baidu.com") || mediaBean.getBigPic().contains("imgsrc.baidu.com")) { origin = "http://imgsrc.baidu.com/forum/pic/item/" + fileName; } else { - origin = "http://tiebapic.baidu.com/forum/pic/item/" + fileName; + origin = "http://imgsa.baidu.com/forum/pic/item/" + fileName; } mediaInfoBean.setBigPic(mediaBean.getBigPic()) .setShowOriginalBtn(mediaBean.isGif() ? "0" : "1") diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/impls/MixedTiebaApiImpl.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/impls/MixedTiebaApiImpl.kt index 3a1d97c0..1f209466 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/impls/MixedTiebaApiImpl.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/impls/MixedTiebaApiImpl.kt @@ -236,7 +236,7 @@ object MixedTiebaApiImpl : ITiebaApi { override fun floor( threadId: String, page: Int, postId: String?, subPostId: String? ): Call = - RetrofitTiebaApi.MINI_TIEBA_API.floor(threadId, page, postId, subPostId) + RetrofitTiebaApi.OFFICIAL_TIEBA_API.floor(threadId, page, postId, subPostId) override fun forumHomeAsync(sortType: Int, page: Int): Deferred> { return RetrofitTiebaApi.WEB_TIEBA_API.getForumHomeAsync( diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt index 22f217a0..5826110c 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt @@ -534,4 +534,14 @@ interface OfficialTiebaApi { @Field("friend_uid") friendUid: String?, @Field("is_guest") is_guest: String?, ): Flow + + @POST("/c/f/pb/floor") + @FormUrlEncoded + fun floor( + @Field("kz") threadId: String, + @Field("pn") page: Int = 1, + @Field("pid") postId: String?, + @Field("spid") subPostId: String?, + @Field("rn") rn: Int = 20 + ): Call } \ No newline at end of file