From f3f4b1a1502cdd466dce56aa58811043968e4231 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 24 Aug 2022 14:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=88=BF=E9=97=B4=E7=BB=99?=
 =?UTF-8?q?=E7=AB=AF=E5=86=85=E5=A5=BD=E5=8F=8B=E7=A7=BB=E9=99=A4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=85=A5=E5=8F=A3=E5=92=8C=E5=85=B3=E6=B3=A8tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/friend/view/SelectFriendActivity.java   | 15 ++++++++++++---
 .../yizhuan/erban/ui/search/SearchActivity.java   |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
index ec1fb5baa..3459692c7 100644
--- a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
@@ -3,7 +3,9 @@ package com.yizhuan.erban.friend.view;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+
 import androidx.fragment.app.Fragment;
+
 import android.view.View;
 
 import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -173,7 +175,12 @@ public class SelectFriendActivity extends BaseBindingActivity<ActivitySelectFrie
 
         List<TabInfo> tabInfoList = new ArrayList<>(2);
         tabInfoList.add(new TabInfo(1, getString(R.string.tab_title_friends)));
-        tabInfoList.add(new TabInfo(2, getString(R.string.tab_title_attentions)));
+
+        if (secondOperator != CODE_REQUEST_TO_SHARE_ROOM) {
+            tabInfoList.add(new TabInfo(2, getString(R.string.tab_title_attentions)));
+        }else {
+            mBinding.titleBar.removeAllActions();
+        }
         tabInfoList.add(new TabInfo(3, getString(R.string.tab_title_fans)));
         if (needShowTeamTab) {
             tabInfoList.add(new TabInfo(4, getString(R.string.tab_title_team)));
@@ -190,7 +197,9 @@ public class SelectFriendActivity extends BaseBindingActivity<ActivitySelectFrie
     private List<Fragment> getFragment() {
         List<Fragment> list = new ArrayList<>();
         list.add(FriendListFragment.newInstance(true, type));
-        list.add(AttentionFragment.newInstance(type));
+        if (secondOperator != CODE_REQUEST_TO_SHARE_ROOM) {
+            list.add(AttentionFragment.newInstance(type));
+        }
         list.add(FansListFragment.newInstanceForSelect(type));
         if (needShowTeamTab) {
             list.add(TeamListFragment.newInstanceForSelect(type));
@@ -266,7 +275,7 @@ public class SelectFriendActivity extends BaseBindingActivity<ActivitySelectFrie
                                     } else {
                                         SingleToastUtil.showToast("分享成功");
                                         DynamicModel.get().reportShare(dynamicImMsg.getPublishUid(),
-                                                dynamicImMsg.getWorldId(), dynamicImMsg.getDynamicId())
+                                                        dynamicImMsg.getWorldId(), dynamicImMsg.getDynamicId())
                                                 .subscribe();
                                     }
                                 }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
index 0e080733c..a400fe696 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
@@ -446,7 +446,7 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
     }
 
     private void goBack() {
-        if (llSearchDetail.getVisibility() == View.VISIBLE) {
+        if (mShowHistory && llSearchDetail.getVisibility() == View.VISIBLE) {
             showHistory();
             return;
         }