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

Merge remote-tracking branch 'origin/develop_new' into develop_new

Browse Source
This commit is contained in:
huangjian
2020-05-07 17:31:33 +08:00
parent 7514a6458f bcd9e7d9aa
commit 412b24e3a5
15 changed files with 130 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
View File

@@ -60,7 +60,7 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
livingIconView.setColor(Color.WHITE);
livingIconView.start();
helper.setText(R.id.tv_online_number,item.getOnlineNum()+"")
.setText(R.id.tv_title, item.getRoomTitle());
.setText(R.id.tv_title, item.getTitle());
// helper.getView(R.id.lock_bg).setVisibility(!TextUtils.isEmpty(homeRoom.getRoomPwd()) ? View.VISIBLE : View.GONE);
helper.setGone(R.id.iv_tab_label, mIsHome);

16
app/src/main/java/com/yizhuan/erban/home/bean/HomeTabMapInfo.java
View File

@@ -17,7 +17,7 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
private int onlineNum;
private int roomUid;
private String roomTitle;
private String title;
private String avatar;
private int seq;
private boolean isTop;
@@ -59,15 +59,15 @@ public class HomeTabMapInfo implements MultiItemEntity, Serializable {
this.roomUid = roomUid;
}
public String getRoomTitle() {
return roomTitle;
}
public String getTitle() {
return title;
}
public void setRoomTitle(String roomTitle) {
this.roomTitle = roomTitle;
}
public void setTitle(String title) {
this.title = title;
}
public String getAvatar() {
public String getAvatar() {
return avatar;
}

11
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -8,14 +8,12 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Bundle;
import android.os.Handler;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -23,7 +21,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.content.ContextCompat;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
@@ -37,8 +34,6 @@ import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.coorchice.library.utils.LogUtils;
import com.google.android.material.appbar.AppBarLayout;
import com.jude.rollviewpager.Util;
import com.jude.rollviewpager.hintview.ColorPointHintView;
import com.netease.nim.uikit.common.util.log.LogUtil;
@@ -49,9 +44,7 @@ import com.yizhuan.erban.MainActivity;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
import com.yizhuan.erban.avroom.game.MatchActivity;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.FragmentGameHomeBinding;
import com.yizhuan.erban.home.activity.HomeMoreRoomActivity;
@@ -59,7 +52,6 @@ import com.yizhuan.erban.home.adapter.BannerAdapter;
import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.dialog.CreateRoomDialog;
import com.yizhuan.erban.home.event.RefreshHomeDataEvent;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
@@ -74,7 +66,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.certification.CertificationModel;
@@ -84,7 +75,6 @@ import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.game.GameInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.settings.SettingsModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
@@ -248,7 +238,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
}
private void initRefreshView() {
// scrollToTop();
mBinding.appBar.addOnOffsetChangedListener((appBarLayout, i) -> {
if (i >= 0) {
mBinding.refreshLayout.setEnabled(true); //当滑动到顶部的时候开启

5
app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java
View File

@@ -42,15 +42,10 @@ public class AttentionListAdapter extends BaseQuickAdapter<AttentionInfo, BaseVi
attentionInfo.getUserDesc()
: baseViewHolder.itemView.getContext().getResources().getString(R.string.msg_no_user_desc))
.setGone(R.id.tv_find_him, attentionInfo.getUserInRoom() != null && type == AbstractSelectFriendAction.TYPE_NORMAL)
.setGone(R.id.tv_send, isSend)
.setOnClickListener(R.id.tv_find_him, v -> {
if (rylListener != null)
rylListener.findHimListeners(attentionInfo);
})
.setOnClickListener(R.id.tv_send, v -> {
if (rylListener != null)
rylListener.sendListener(attentionInfo);
})
.setOnClickListener(R.id.rly, v -> {
if (rylListener != null)
switch (type) {

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

@@ -111,6 +111,9 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
private RoomHistoryAdapter mRoomHistoryAdapter;
private List<String> mSearchHistoryList = new ArrayList<>(20);
private SearchDetailFragment roomFrg;
private SearchDetailFragment userFrg ;
public static void start(Context context, CarInfo carInfo) {
Intent intent = new Intent(context, SearchActivity.class);
intent.putExtra(AbstractSelectFriendAction.KEY_TYPE, AbstractSelectFriendAction.TYPE_CAR);
@@ -150,6 +153,7 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search);
initView();
initSearchDetail();
}
private void initView() {
@@ -215,14 +219,15 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
viewPager = findViewById(R.id.viewpager);
}
private void initSearchDetail(String str){
private void initSearchDetail(){
// llSearchDetail.setVisibility(View.GONE);
List<String> mTabInfoList = new ArrayList<>();
mTabInfoList.add(getString(R.string.search_room_tab));
mTabInfoList.add(getString(R.string.search_user_tab));
List<Fragment> mTabs = new ArrayList<>();
SearchDetailFragment roomFrg = new SearchDetailFragment(str,SearchDetailFragment.TYPE_SEARCH_ROOM);
SearchDetailFragment userFrg = new SearchDetailFragment(str,SearchDetailFragment.TYPE_SEARCH_USER);
roomFrg = SearchDetailFragment.newInstance(SearchDetailFragment.TYPE_SEARCH_ROOM);
userFrg = SearchDetailFragment.newInstance(SearchDetailFragment.TYPE_SEARCH_USER);
mTabs.add(roomFrg);
mTabs.add(userFrg);
ContactsIndicatorAdapter topMagicIndicatorAdapter = new ContactsIndicatorAdapter(this, mTabInfoList,0);
@@ -237,7 +242,6 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
viewPager.setAdapter(new ViewPagerAdapter(getSupportFragmentManager(), mTabs,null));
ViewPagerHelper.bind(indicator, viewPager);
llSearchDetail.setVisibility(View.VISIBLE);
}
@@ -444,7 +448,22 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
}
addHistory(str);
ImeUtil.hideIME(this, tvSearch);
initSearchDetail(str);
starSearch(str);
}
private void starSearch(String str){
if (roomFrg == null || userFrg == null){
initSearchDetail();
}
roomFrg.search(str,SearchDetailFragment.TYPE_SEARCH_ROOM);
userFrg.search(str,SearchDetailFragment.TYPE_SEARCH_USER);
llSearchDetail.setVisibility(View.VISIBLE);
}
private void clearSearch(){
llSearchDetail.setVisibility(View.GONE);
roomFrg.clear();
userFrg.clear();
}
private void clearSearchHistory() {
@@ -559,10 +578,9 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
}
private void showHistory() {
hideStatus();
llSearchDetail.setVisibility(View.GONE);
viewPager.setAdapter(null);
// hideStatus();
if (mShowHistory) {
clearSearch();
clSearchHistoryContainer.setVisibility(mSearchHistoryList != null && mSearchHistoryList.size() > 0 ?
View.VISIBLE : View.GONE);

43
app/src/main/java/com/yizhuan/erban/ui/search/SearchDetailFragment.java
View File

@@ -6,20 +6,14 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.coorchice.library.utils.LogUtils;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.ui.search.event.SearchEvent;
import com.yizhuan.erban.ui.search.presenter.SearchPresenter;
import com.yizhuan.erban.ui.search.view.ISearchView;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
@CreatePresenter(SearchPresenter.class)
@@ -27,34 +21,17 @@ public class SearchDetailFragment extends BaseMvpFragment<ISearchView, SearchPre
public static final int TYPE_SEARCH_ROOM = 1;
public static final int TYPE_SEARCH_USER = 2;
private String mInPutText;
private int mType;
private RecyclerView recyclerView;
private SearchAdapter searchAdapter;
// public static SearchDetailFragment newInstance(String inPutText,int type) {
//
// Bundle args = new Bundle();
//// args.putString("str", inPutText);
// args.putInt("type", type);
// SearchDetailFragment fragment = new SearchDetailFragment(inPutText,type);
// fragment.setArguments(args);
// return fragment;
// }
public SearchDetailFragment(String inPutText,int type){
this.mInPutText = inPutText;
this.mType = type;
public static SearchDetailFragment newInstance(int type) {
SearchDetailFragment fragment = new SearchDetailFragment();
return fragment;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
// mInPutText = getArguments().getString("str");
mType = getArguments().getInt("type");
}
}
@Override
@@ -65,7 +42,8 @@ public class SearchDetailFragment extends BaseMvpFragment<ISearchView, SearchPre
@Override
public void onFindViews() {
recyclerView = mView.findViewById(R.id.recycler_view);
initData();
// initData();
}
@Override
@@ -75,14 +53,21 @@ public class SearchDetailFragment extends BaseMvpFragment<ISearchView, SearchPre
@Override
public void initiate() {
initData();
}
private void initData(){
recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
searchAdapter = new SearchAdapter(mContext, null);
recyclerView.setAdapter(searchAdapter);
getMvpPresenter().searchRooms(mInPutText,mType);
}
public void search(String str,int type){
getMvpPresenter().searchRooms(str,type);
}
public void clear(){
searchAdapter.setNewData(null);
}
@Override

61
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
View File

@@ -6,21 +6,17 @@ import android.content.Intent;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.core.widget.NestedScrollView;
import android.graphics.drawable.GradientDrawable;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.jude.rollviewpager.Util;
import com.jude.rollviewpager.hintview.ColorPointHintView;
import androidx.core.content.ContextCompat;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.jude.rollviewpager.hintview.TextHintView;
import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -36,8 +32,6 @@ import com.yizhuan.erban.databinding.ActivityUserInfoBinding;
import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity;
import com.yizhuan.erban.family.view.activity.FamilyMemberSearchActivity;
import com.yizhuan.erban.community.user_dynamic.UserDynamicFrg;
import com.yizhuan.erban.home.adapter.BannerAdapter;
import com.yizhuan.erban.ui.im.avtivity.NimFriendModel;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.adapter.GiftAdapter;
@@ -53,7 +47,6 @@ import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.praise.PraiseModel;
import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent;
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;
@@ -121,6 +114,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
private ImageView ivOfficialMask;
private TextView tvOfficialMask;
private String mRoomUid;
@SuppressLint("CheckResult")
@Override
protected void init() {
@@ -154,7 +149,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (AuthModel.get().getCurrentUid() == userId) {
identityState = IdentityState.OWN;
mBinding.tvFansCount.setOnClickListener(this);
setWhereVisible(false);
mBinding.ivWhere.setVisibility(View.GONE);
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
@@ -163,7 +158,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
} else {
identityState = IdentityState.OTHER;
}
setWhereVisible(true);
if (bottomViewLayout == null) {
View view = mBinding.vsBottomLayout.getViewStub().inflate();
bottomViewLayout = view.findViewById(R.id.bottom_view_layout);
@@ -187,8 +181,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
/**
* 找到TA, 主态不展示
*/
private void setWhereVisible(boolean visible) {
mBinding.ivWhere.setVisibility(visible ? View.VISIBLE : View.GONE);
private void setWhereVisible() {
mBinding.ivWhere.setVisibility(mRoomUid!=null ? View.VISIBLE : View.GONE);
}
private void getUserInfo(){
@@ -226,10 +220,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
});
}
private void setBackBottom(boolean isExpanded) {
mBinding.ivUserBack.setImageResource(isExpanded ? R.drawable.icon_user_back : R.drawable.icon_user_back_black);
}
@@ -238,8 +228,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
mBinding.tvUserInfoTitle.setVisibility(visible ? View.VISIBLE : View.GONE);
}
private void onFindViews() {
mBinding.tbUserInfo.setTitle("");
ivOfficialMask = mBinding.inOfficialMask.findViewById(R.id.iv_official_mask);
@@ -264,7 +252,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
break;
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -311,9 +298,14 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
}
private void initUserDetail(UserDetailInfo.DataBean info) {
initGiftList(info.getUserGiftWall());
initDynamicList(info.getDynamicInfo());
initPhoto(info.getPrivatePhoto());
if (AuthModel.get().getCurrentUid() != userId){
mRoomUid = info.getRoomUid();
setWhereVisible();
}
}
/**
@@ -390,13 +382,6 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
}
}
private void setBgByLevel(boolean isNoble) {
this.isNoble = isNoble;
int nobleTextColor = ContextCompat.getColor(this, R.color.white_op_30);
mBinding.tvConstellation.setTextColor(isNoble ? nobleTextColor : Color.WHITE);
}
@Override
public void onScrollChanged(NestedScrollView view, int x, int y, int oldx, int oldy) {
@@ -556,21 +541,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
break;
case R.id.iv_where:
getDialogManager().showProgressDialog(this, "请稍后...");
AvRoomModel.get()
.getUserRoom(userId)
.compose(bindToLifecycle())
.subscribe((roomResult, throwable) -> {
if (throwable != null) {
onGetUserRoomFail(throwable.getMessage());
} else if (roomResult != null && roomResult.isSuccess()) {
onGetUserRoom(roomResult.getData());
} else if (roomResult != null && !roomResult.isSuccess()) {
onGetUserRoomFail(roomResult.getError());
} else {
onGetUserRoomFail("未知错误");
}
});
AVRoomActivity.start(this, Long.parseLong(mRoomUid));
break;
// /**************** 测试代码 **************/

1
app/src/main/res/layout/activity_fans.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar

1
app/src/main/res/layout/activity_list_attention.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar

1
app/src/main/res/layout/activity_search.xml
View File

@@ -170,6 +170,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FAFAFA"
android:visibility="gone"
android:orientation="vertical">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator

12
app/src/main/res/layout/attention_item_new.xml
View File

@@ -133,17 +133,7 @@
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_send"
android:layout_width="55dp"
android:layout_height="25dp"
android:background="@drawable/bg_car_item_buy"
android:gravity="center"
android:text="@string/send_gift"
android:textColor="@color/color_FFFFFF"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="visible" />
</FrameLayout>

121
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -37,74 +37,62 @@
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
<!-- <androidx.appcompat.widget.Toolbar-->
<!-- android:id="@+id/tool_bar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- app:contentInsetStart="0dp"-->
<!-- app:layout_collapseMode="pin"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- >-->
<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_search_room"
android:layout_width="0dp"
android:layout_height="@dimen/dp_32"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:layout_weight="1"
android:background="@drawable/bg_home_search"
android:drawableStart="@mipmap/ic_home_search"
android:drawablePadding="@dimen/dp_7"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="5dp"
android:text="@string/search_hint"
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
<ImageView
android:id="@+id/iv_ranking"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_32"
android:layout_gravity="center"
android:src="@mipmap/ic_home_ranking"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_13"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:onClick="@{click}"
/>
<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_to_sign_in"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:gravity="center"
android:onClick="@{click}"
android:visibility="gone"
android:scaleType="centerInside"
android:src="@drawable/icon_to_sign_in" />
<TextView
android:id="@+id/tv_search_room"
android:layout_width="0dp"
android:layout_height="@dimen/dp_32"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:layout_weight="1"
android:background="@drawable/bg_home_search"
android:drawableStart="@mipmap/ic_home_search"
android:drawablePadding="@dimen/dp_7"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="5dp"
android:text="@string/search_hint"
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
<ImageView
android:id="@+id/iv_ranking"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_32"
android:layout_gravity="center"
android:src="@mipmap/ic_home_ranking"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_13"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:onClick="@{click}"
/>
<ImageView
android:id="@+id/iv_to_sign_in"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:gravity="center"
android:onClick="@{click}"
android:visibility="gone"
android:scaleType="centerInside"
android:src="@drawable/icon_to_sign_in" />
</LinearLayout>
<!-- </androidx.appcompat.widget.Toolbar>-->
</LinearLayout>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/layout_coordinator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar"
android:visibility="visible">
@@ -112,7 +100,7 @@
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:background="@color/transparent"
android:theme="@style/AppTheme.AppBarOverlay"
app:expanded="false"
tools:expanded="true"
@@ -121,7 +109,7 @@
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -219,12 +207,8 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -241,19 +225,14 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_bottom"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_50"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<com.yizhuan.erban.common.widget.DragLayout
android:id="@+id/activity_image_layout"
android:layout_width="80dp"

2
app/src/main/res/layout/item_attention_in_room.xml
View File

@@ -27,7 +27,7 @@
android:background="@drawable/bg_common_confirm_normal"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:text="嗨聊中"/>
android:text="直播中"/>
<TextView
android:id="@+id/tv_name_attention_in_room"

2
app/src/main/res/layout/item_home_attention.xml
View File

@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="嗨聊中"
android:text="直播中"
android:textColor="@color/color_999999"
android:textSize="11sp" />
</LinearLayout>

9
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java
View File

@@ -60,6 +60,7 @@ public class UserDetailInfo implements Serializable {
private int erbanNo;
private int fansNum;
private long birth;
private String roomUid;
private UserLevelVoBean userLevelVo;
private List<UserGiftWallBean> userGiftWall;
private List<WorldDynamicBean> dynamicInfo;
@@ -67,6 +68,14 @@ public class UserDetailInfo implements Serializable {
private String nameplatePic;
private String nameplateWord;
public String getRoomUid() {
return roomUid;
}
public void setRoomUid(String roomUid) {
this.roomUid = roomUid;
}
public String getNameplatePic() {
return nameplatePic;
}