yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分享房间给端内好友移除搜索入口和关注tab

Browse Source
This commit is contained in:
huangjian
2022-08-24 14:57:15 +08:00
parent 4aa16e280b
commit f3f4b1a150
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
View File

@@ -3,7 +3,9 @@ package com.yizhuan.erban.friend.view;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.View; import android.view.View;
import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -173,7 +175,12 @@ public class SelectFriendActivity extends BaseBindingActivity<ActivitySelectFrie
List<TabInfo> tabInfoList = new ArrayList<>(2); List<TabInfo> tabInfoList = new ArrayList<>(2);
tabInfoList.add(new TabInfo(1, getString(R.string.tab_title_friends))); 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))); tabInfoList.add(new TabInfo(3, getString(R.string.tab_title_fans)));
if (needShowTeamTab) { if (needShowTeamTab) {
tabInfoList.add(new TabInfo(4, getString(R.string.tab_title_team))); 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() { private List<Fragment> getFragment() {
List<Fragment> list = new ArrayList<>(); List<Fragment> list = new ArrayList<>();
list.add(FriendListFragment.newInstance(true, type)); 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)); list.add(FansListFragment.newInstanceForSelect(type));
if (needShowTeamTab) { if (needShowTeamTab) {
list.add(TeamListFragment.newInstanceForSelect(type)); list.add(TeamListFragment.newInstanceForSelect(type));
@@ -266,7 +275,7 @@ public class SelectFriendActivity extends BaseBindingActivity<ActivitySelectFrie
} else { } else {
SingleToastUtil.showToast("分享成功"); SingleToastUtil.showToast("分享成功");
DynamicModel.get().reportShare(dynamicImMsg.getPublishUid(), DynamicModel.get().reportShare(dynamicImMsg.getPublishUid(),
dynamicImMsg.getWorldId(), dynamicImMsg.getDynamicId()) dynamicImMsg.getWorldId(), dynamicImMsg.getDynamicId())
.subscribe(); .subscribe();
} }
} }

2
app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
View File

@@ -446,7 +446,7 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
} }
private void goBack() { private void goBack() {
if (llSearchDetail.getVisibility() == View.VISIBLE) { if (mShowHistory && llSearchDetail.getVisibility() == View.VISIBLE) {
showHistory(); showHistory();
return; return;
} }