From 6d864de25327514b224cae157175bcdb62e4dd13 Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Fri, 28 Aug 2020 18:52:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A5=BC=E4=B8=AD?=
 =?UTF-8?q?=E6=A5=BC=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../post/adapters/RecyclerThreadAdapter.java  | 23 +++++++++++--------
 .../tieba/post/fragments/FloorFragment.kt     |  4 ++--
 application.properties                        |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerThreadAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerThreadAdapter.java
index f634de78..83c099cb 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerThreadAdapter.java
+++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/RecyclerThreadAdapter.java
@@ -79,6 +79,7 @@ public class RecyclerThreadAdapter extends MultiBaseAdapter<ThreadContentBean.Po
     public static final int TYPE_THREAD = 1001;
     private static final int TEXT_VIEW_TYPE_CONTENT = 0;
     private static final int TEXT_VIEW_TYPE_FLOOR = 1;
+    public static final int MAX_SUB_POST_SHOW = 3;
     private Map<String, ThreadContentBean.UserInfoBean> userInfoBeanMap;
     private NavigationHelper navigationHelper;
     private LinearLayout.LayoutParams defaultLayoutParams;
@@ -344,14 +345,15 @@ public class RecyclerThreadAdapter extends MultiBaseAdapter<ThreadContentBean.Po
         TextView more = holder.getView(R.id.thread_list_item_content_floor_more);
         MyLinearLayout myLinearLayout = holder.getView(R.id.thread_list_item_content_floor);
         myLinearLayout.removeAllViews();
-        if (bean.getSubPostList().getSubPostList() != null && bean.getSubPostList().getSubPostList().size() > 0) {
+        if (bean.getSubPostNumber() != null && bean.getSubPostList() != null && bean.getSubPostList().getSubPostList() != null && bean.getSubPostList().getSubPostList().size() > 0) {
             holder.setVisibility(R.id.thread_list_item_content_floor_card, View.VISIBLE);
-            int count = Integer.valueOf(bean.getSubPostNumber());
-            List<ThreadContentBean.PostListItemBean> postListItemBeans = bean.getSubPostList().getSubPostList();
-            List<ThreadContentBean.PostListItemBean> subPostList = postListItemBeans;
+            int count = Integer.parseInt(bean.getSubPostNumber());
+            List<ThreadContentBean.PostListItemBean> subPostList = bean.getSubPostList().getSubPostList();
             List<View> views = new ArrayList<>();
-            if (postListItemBeans.size() > 3) {
-                subPostList = subPostList.subList(0, 3);
+            if (subPostList.size() > MAX_SUB_POST_SHOW) {
+                subPostList = subPostList.subList(0, MAX_SUB_POST_SHOW);
+                holder.setVisibility(R.id.thread_list_item_content_floor_more, View.VISIBLE);
+            } else if (subPostList.size() < count) {
                 holder.setVisibility(R.id.thread_list_item_content_floor_more, View.VISIBLE);
             } else {
                 holder.setVisibility(R.id.thread_list_item_content_floor_more, View.GONE);
@@ -360,14 +362,16 @@ public class RecyclerThreadAdapter extends MultiBaseAdapter<ThreadContentBean.Po
             for (ThreadContentBean.PostListItemBean postListItemBean : subPostList) {
                 views.add(getContentView(postListItemBean, bean));
             }
+            myLinearLayout.addViews(views);
             more.setOnClickListener(view -> {
                 try {
-                    if (postListItemBeans.size() < Integer.parseInt(bean.getSubPostNumber())) {
-                        FloorFragment.newInstance(threadBean.getId(), bean.getSubPostList().getPid(), "", true).show(((BaseActivity) mContext).getSupportFragmentManager(), threadBean.getId() + "_Floor");
+                    if (bean.getSubPostList().getSubPostList().size() < count) {
+                        FloorFragment.newInstance(threadBean.getId(), bean.getSubPostList().getPid(), null, true)
+                                .show(((BaseActivity) mContext).getSupportFragmentManager(), threadBean.getId() + "_Floor");
                     } else {
                         myLinearLayout.removeAllViews();
                         List<View> newViews = new ArrayList<>();
-                        for (ThreadContentBean.PostListItemBean postListItemBean : postListItemBeans) {
+                        for (ThreadContentBean.PostListItemBean postListItemBean : bean.getSubPostList().getSubPostList()) {
                             newViews.add(getContentView(postListItemBean, bean));
                         }
                         myLinearLayout.addViews(newViews);
@@ -377,7 +381,6 @@ public class RecyclerThreadAdapter extends MultiBaseAdapter<ThreadContentBean.Po
                     e.printStackTrace();
                 }
             });
-            myLinearLayout.addViews(views);
         } else {
             holder.setVisibility(R.id.thread_list_item_content_floor_card, View.GONE);
         }
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/FloorFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/FloorFragment.kt
index ab84a474..db161edb 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/FloorFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/FloorFragment.kt
@@ -206,12 +206,12 @@ class FloorFragment : BaseBottomSheetDialogFragment() {
         const val PARAM_JUMP = "jump"
         @JvmStatic
         @JvmOverloads
-        fun newInstance(tid: String?, pid: String?, spid: String? = "", jump: Boolean = false): FloorFragment {
+        fun newInstance(tid: String?, pid: String?, spid: String? = null, jump: Boolean = false): FloorFragment {
             val fragment = FloorFragment()
             val bundle = Bundle()
             bundle.putString(PARAM_TID, tid)
             bundle.putString(PARAM_PID, pid)
-            bundle.putString(PARAM_SUB_POST_ID, spid)
+            bundle.putString(PARAM_SUB_POST_ID, spid ?: "")
             bundle.putBoolean(PARAM_JUMP, jump)
             fragment.arguments = bundle
             return fragment
diff --git a/application.properties b/application.properties
index 7fb27f5b..836d650a 100644
--- a/application.properties
+++ b/application.properties
@@ -1,5 +1,5 @@
-versionCode=38202
+versionCode=38300
 versionName=3.8.3
-isPerRelease=true
+isPerRelease=false
 preReleaseName=beta
 preReleaseVer=2
\ No newline at end of file