From 119546866c36b8cd0af33a3e9c41fb0da40bf5fc Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 16 Mar 2023 20:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81bug=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nnbc123/app/avroom/adapter/RoomVPAdapter.java  |  5 +++++
 app/src/main/res/layout/fragment_newbie_list.xml   |  3 +--
 .../community/publish/view/PublishActivity.java    | 14 ++++++--------
 .../res/layout/activity_publish.xml                |  2 +-
 .../app/shipantics/RadishRankingActivity.java      |  3 ++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java
index daf1288b1..f3ab647bb 100644
--- a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java
+++ b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomVPAdapter.java
@@ -19,6 +19,11 @@ public class RoomVPAdapter extends FragmentPagerAdapter {
         this.fragmentList = fragmentList;
     }
 
+    public RoomVPAdapter(FragmentManager fm, List<Fragment> fragmentList,int behavior) {
+        super(fm,behavior);
+        this.fragmentList = fragmentList;
+    }
+
     public RoomVPAdapter(FragmentManager fm) {
         super(fm,FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
     }
diff --git a/app/src/main/res/layout/fragment_newbie_list.xml b/app/src/main/res/layout/fragment_newbie_list.xml
index a6cabb407..7bcb630c1 100644
--- a/app/src/main/res/layout/fragment_newbie_list.xml
+++ b/app/src/main/res/layout/fragment_newbie_list.xml
@@ -1,8 +1,7 @@
 <com.nnbc123.app.common.widget.StatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.nnbc123.app.home.fragment.HomeOtherTabFragment">
+    android:layout_height="match_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
diff --git a/app/src/module_community/java/com/nnbc123/app/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/nnbc123/app/community/publish/view/PublishActivity.java
index 611aa983c..cc3deb599 100644
--- a/app/src/module_community/java/com/nnbc123/app/community/publish/view/PublishActivity.java
+++ b/app/src/module_community/java/com/nnbc123/app/community/publish/view/PublishActivity.java
@@ -112,6 +112,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
 
     // 话题客态页进入（话题进入不让修改话题标签）
     private boolean fromWorld;
+    private List<MiniWorldChooseInfo> miniWorldChooseInfoList;
 
     public static void start(DialogManager manager, long worldId) {
         if (beforeStart(manager)) {
@@ -143,7 +144,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
 
         } else if (!userInfo.isBindPhone()) {
             manager.showOkCancelWithTitleDialog("为了营造更安全的网络环境发布动态需先绑定手机号",
-                    () ->  BindPhoneActivity.start(manager.getContext()));
+                    () -> BindPhoneActivity.start(manager.getContext()));
             return true;
 
         } else {
@@ -191,7 +192,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
             PublishItem item = imageShowList.get(position);
             if (item.isAddItem()) {
                 checkPermission(() -> {
-                    CaptureStrategy captureStrategy = new CaptureStrategy(true, context.getPackageName()+".fileprovider",
+                    CaptureStrategy captureStrategy = new CaptureStrategy(true, context.getPackageName() + ".fileprovider",
                             BasicConfig.INSTANCE.getImageDir().getAbsolutePath());
                     int maxCanSelect = 9 - uploadList.size();
                     Matisse.from(PublishActivity.this)
@@ -264,9 +265,6 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
             public void afterTextChanged(Editable s) {
                 tvInputLimit.setText(s.length() + "/500");
                 updatePublishStatus();
-                String inputText = s.toString().trim();
-                tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE) : getResources().getColor(R.color.color_999999));
-                tvPublish.setEnabled(!TextUtils.isEmpty(inputText));
             }
         });
     }
@@ -304,7 +302,9 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
     }
 
     private void updatePublishStatus() {
-        tvPublish.setEnabled(uploadList.size() > 0);
+        boolean isEnabled = uploadList.size() > 0;
+        tvPublish.setEnabled(isEnabled);
+        tvPublish.setTextColor(isEnabled ? getResources().getColor(R.color.color_7154EE) : getResources().getColor(R.color.color_999999));
     }
 
     private void initOtherView() {
@@ -476,8 +476,6 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
         llMiniWorld.setVisibility(View.VISIBLE);
     }
 
-    private List<MiniWorldChooseInfo> miniWorldChooseInfoList;
-
     private void addMiniWorldList(List<MiniWorldChooseInfo> list) {
         miniWorldChooseInfoList = list;
         flGroup.removeAllViews();
diff --git a/app/src/module_community/res/layout/activity_publish.xml b/app/src/module_community/res/layout/activity_publish.xml
index 05f8d2c08..c6b36deb4 100644
--- a/app/src/module_community/res/layout/activity_publish.xml
+++ b/app/src/module_community/res/layout/activity_publish.xml
@@ -10,7 +10,7 @@
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="35dp"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
diff --git a/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishRankingActivity.java b/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishRankingActivity.java
index 47b21aeb7..56628ed24 100644
--- a/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishRankingActivity.java
+++ b/app/src/module_treasure_box/java/com/nnbc123/app/shipantics/RadishRankingActivity.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.nnbc123.app.R;
@@ -34,7 +35,7 @@ public class RadishRankingActivity extends BaseViewBindingActivity<ActivityRadis
     public void init() {
         EventBus.getDefault().register(this);
         getBinding().viewpager.setOffscreenPageLimit(2);
-        getBinding().viewpager.setAdapter(new RoomVPAdapter(getSupportFragmentManager(), getFragment()));
+        getBinding().viewpager.setAdapter(new RoomVPAdapter(getSupportFragmentManager(), getFragment(), FragmentPagerAdapter.BEHAVIOR_SET_USER_VISIBLE_HINT));
         getBinding().viewpager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
             @Override
             public void onPageSelected(int position) {