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

发现萌新新增筛选功能&UI优化

Browse Source
This commit is contained in:
huangjian
2022-05-31 15:59:54 +08:00
parent 117362d134
commit c19b877200
15 changed files with 431 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java
View File

@@ -14,7 +14,9 @@ import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent;
import com.yizhuan.tutu.room_chat.fragment.NewbieFilterDialog;
import com.yizhuan.tutu.room_chat.fragment.RoomNewbieListFragment;
import com.yizhuan.xchat_android_library.utils.CommonUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -22,12 +24,16 @@ import org.greenrobot.eventbus.ThreadMode;
import butterknife.ButterKnife;
import butterknife.OnClick;
import kotlin.Unit;
import kotlin.jvm.functions.Function2;
public class RoomNewbieActivity extends BaseActivity {
private RoomNewbieListFragment newbieListFragment;
private boolean mIsInRoom;
private ImageView ivBack;
private NewbieFilterDialog newbieFilterDialog;
public static void start(Context context, boolean isInRoom) {
Intent starter = new Intent(context, RoomNewbieActivity.class);
starter.putExtra("isInRoom", isInRoom);
@@ -41,12 +47,20 @@ public class RoomNewbieActivity extends BaseActivity {
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.recent_container, newbieListFragment).commitAllowingStateLoss();
ivBack = findViewById(R.id.iv_back);
ivBack.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
ivBack.setOnClickListener(v -> finish());
findViewById(R.id.iv_filter).setOnClickListener(v -> {
if (CommonUtils.isFastDoubleClick(1000)) return;
if (newbieFilterDialog == null) {
newbieFilterDialog = NewbieFilterDialog.newInstance()
.setOnFilterListener((gender, hello) -> {
newbieListFragment.filter(gender, hello);
return null;
}
);
}
newbieFilterDialog.show(this);
});
}
@Override

43
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java
View File

@@ -10,12 +10,9 @@ import androidx.appcompat.widget.AppCompatImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.xchat_android_core.utils.StarUtils;
import java.util.Date;
import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo;
/**
* @author jack
@@ -27,29 +24,34 @@ public class RoomNewbieListAdapter extends BaseQuickAdapter<RoomNewbieInfo, Base
private RoomNewbieListAdapter.OnItemClickListener onItemClickListener;
public interface OnItemClickListener {
void onAttentionBtnClick(RoomNewbieInfo fansInfo);
public RoomNewbieListAdapter() {
super(R.layout.newbie_list_item);
}
public void setRylListener(RoomNewbieListAdapter.OnItemClickListener onClickListener) {
onItemClickListener = onClickListener;
}
public RoomNewbieListAdapter() {
super(R.layout.newbie_list_item);
}
@Override
protected void convert(BaseViewHolder baseViewHolder, final RoomNewbieInfo newbieInfo) {
if (newbieInfo == null) return;
baseViewHolder.setGone(R.id.view_line,false);
TextView tvAttention = baseViewHolder.getView(R.id.attention_img);
GradientDrawable attentionBg = (GradientDrawable) tvAttention.getBackground();
if (!newbieInfo.isHello()) {
attentionBg.setColor(mContext.getResources().getColor(R.color.color_CCCCCC));
} else {
attentionBg.setColor(mContext.getResources().getColor(R.color.appColor));
}
baseViewHolder.setText(R.id.tv_userName, newbieInfo.getNick())
.setVisible(R.id.view_line, baseViewHolder.getLayoutPosition() != getItemCount() - 1)
.setText(R.id.tv_erban_id, "大鹅号:" + newbieInfo.getErbanNo())
.setOnClickListener(R.id.attention_img, v -> {
if (onItemClickListener != null) {
onItemClickListener.onAttentionBtnClick(newbieInfo);
}
})
.setOnClickListener(R.id.iv_avatar, v -> {
UserInfoActivity.Companion.start(mContext, newbieInfo.getUid());
});
AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender);
if (newbieInfo.getGender() == 1) {
@@ -58,9 +60,7 @@ public class RoomNewbieListAdapter extends BaseQuickAdapter<RoomNewbieInfo, Base
ivGender.setImageResource(R.drawable.ic_gender_female);
}
NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
nobleAvatarView.setSize(55, 75, 15);
nobleAvatarView.setData(newbieInfo.getAvatar(),null);
ImageLoadUtils.loadImage(mContext, newbieInfo.getAvatar(), baseViewHolder.getView(R.id.iv_avatar));
AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level);
ivUserLevel.setVisibility(View.GONE);
@@ -76,14 +76,9 @@ public class RoomNewbieListAdapter extends BaseQuickAdapter<RoomNewbieInfo, Base
ImageLoadUtils.loadImage(mContext, newbieInfo.getCharmUrl(), ivCharmLevel);
}
}
TextView tvConstellation = baseViewHolder.getView(R.id.tv_constellation);
tvConstellation.setVisibility(View.GONE);
String star = StarUtils.getConstellation(new Date(newbieInfo.getBirth()));
if (null != star) {
tvConstellation.setText(star);
tvConstellation.setVisibility(View.VISIBLE);
}
public interface OnItemClickListener {
void onAttentionBtnClick(RoomNewbieInfo fansInfo);
}
}

46
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/NewbieFilterDialog.kt Normal file
View File

@@ -0,0 +1,46 @@
package com.yizhuan.tutu.room_chat.fragment
import android.view.Gravity
import android.view.WindowManager
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogNewbieFilterBinding
class NewbieFilterDialog : BaseDialog<DialogNewbieFilterBinding>() {
companion object {
@JvmStatic
fun newInstance(): NewbieFilterDialog {
return NewbieFilterDialog()
}
}
override var gravity: Int = Gravity.BOTTOM
override var width: Int = WindowManager.LayoutParams.MATCH_PARENT
private var onFilterListener: ((gender: Int, hello: Int) -> Unit)? = null
fun setOnFilterListener(onFilterListener: (gender: Int, hello: Int) -> Unit): NewbieFilterDialog {
this.onFilterListener = onFilterListener
return this
}
override fun init() {
binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
binding.tvConfirm.setOnClickListener {
onFilterListener?.invoke(
when (binding.rgGender.checkedRadioButtonId) {
R.id.rb_gender_male -> 1
R.id.rb_gender_female -> 2
else -> 0
},
when (binding.rgHello.checkedRadioButtonId) {
R.id.rb_hello_already -> 1
R.id.rb_hello_no -> 2
else -> 0
}
)
dismissAllowingStateLoss()
}
}
}

41
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java
View File

@@ -25,6 +25,7 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
/**
@@ -38,10 +39,11 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
private SwipeRefreshLayout swipeRefresh;
private RoomNewbieListAdapter mNewbieListAdapter;
private boolean isInRoom;
private List<RoomNewbieInfo> mData;
public static RoomNewbieListFragment newInstance(boolean isInRoom) {
Bundle args = new Bundle();
args.putBoolean("isInRoom",isInRoom);
args.putBoolean("isInRoom", isInRoom);
RoomNewbieListFragment fragment = new RoomNewbieListFragment();
fragment.setArguments(args);
return fragment;
@@ -100,16 +102,16 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setItemAnimator(null);
mNewbieListAdapter = new RoomNewbieListAdapter();
mNewbieListAdapter.setOnLoadMoreListener(this, recyclerView);
// mNewbieListAdapter.setOnLoadMoreListener(this, recyclerView);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
recyclerView.setLayoutManager(linearLayoutManager);
recyclerView.setAdapter(mNewbieListAdapter);
mNewbieListAdapter.setRylListener(new RoomNewbieListAdapter.OnItemClickListener() {
@Override
public void onAttentionBtnClick(RoomNewbieInfo fansInfo) {
if (fansInfo.isHello()){
RoomNewbieMessageActivity.start(mContext,fansInfo.getUid(),isInRoom);
}else {
if (fansInfo.isHello()) {
RoomNewbieMessageActivity.start(mContext, fansInfo.getUid(), isInRoom);
} else {
SingleToastUtil.showToastShort("该用户被打招呼次数太多了，换一个吧~");
}
}
@@ -119,6 +121,7 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
@Override
public void getRoomNewbieSuccess(List<RoomNewbieInfo> list) {
mData = list;
hideStatus();
if (mNewbieListAdapter != null) {
int page = getMvpPresenter().getPage();
@@ -146,12 +149,13 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
@Override
public void getRoomNewbieLoadMoreSuccess(List<RoomNewbieInfo> list) {
if (ListUtils.isListEmpty(list)){
if (ListUtils.isListEmpty(list)) {
mNewbieListAdapter.loadMoreEnd();
return;
}
mNewbieListAdapter.addData(list);
mNewbieListAdapter.loadMoreComplete();
mData = mNewbieListAdapter.getData();
}
@Override
@@ -171,7 +175,7 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
@Override
public void onLoadMoreRequested() {
loadData(false);
//loadData(false);
}
@Override
@@ -184,4 +188,27 @@ public class RoomNewbieListFragment extends BaseMvpFragment<IRoomNewbieView, Roo
public void onSendHelloSuccess(SendHelloSuccessEvent event) {
loadData(true);
}
public void filter(int gender, int hello) {
if (ListUtils.isListEmpty(mData)) return;
if (gender == 0 && hello == 0) {
hideStatus();
mNewbieListAdapter.setNewData(mData);
return;
}
List<RoomNewbieInfo> filterData = new ArrayList<>();
for (RoomNewbieInfo newbieInfo : mData) {
if ((newbieInfo.getGender() == gender || gender == 0) &&
(hello == 0 || newbieInfo.isHello() == (hello == 2))) {
filterData.add(newbieInfo);
}
}
if (filterData.size() == 0) {
mNewbieListAdapter.setNewData(null);
showNoData(getString(R.string.empty_newbie_list));
} else {
hideStatus();
mNewbieListAdapter.setNewData(filterData);
}
}
}

2
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java
View File

@@ -152,7 +152,7 @@ public class RoomNewbieMessageFragment extends BaseMvpFragment<IRoomNewbieMessag
showNoData();
} else {
for (int i = 0; i < info.getList().size(); i++) {
info.getList().get(i).setCheck(i==0?true:false);
info.getList().get(i).setCheck(i == 0);
}
mNewbieMessageAdapter.setNewData(info.getList());
infoList = info;

BIN
app/src/module_room_chat/res/drawable-xhdpi/ic_close_filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 926 B

BIN
app/src/module_room_chat/res/drawable-xhdpi/ic_find_new_filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

19
app/src/module_room_chat/res/drawable/bg_newbie_filter_rb.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true">
<shape android:shape="rectangle">
<solid android:color="#FFEAE5FC" />
<stroke android:width="1px" android:color="#FF7154EE" />
<corners android:radius="100dp" />
</shape>
</item>
<item android:state_checked="false">
<shape android:shape="rectangle">
<solid android:color="#FFF1F2F4" />
<corners android:radius="100dp" />
</shape>
</item>
</selector>

8
app/src/module_room_chat/res/drawable/color_newbie_rb.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#FF7154EE" android:state_checked="true" />
<item android:color="#FF666666" android:state_pressed="false" />
</selector>

40
app/src/module_room_chat/res/layout/activity_newbie_list.xml
View File

@@ -15,43 +15,55 @@
android:orientation="vertical">
<FrameLayout
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
>
android:orientation="horizontal"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"
android:gravity="center"
android:orientation="vertical">
android:layout_gravity="center_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/find_new"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_18" />
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_15"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每日更新推荐"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_13" />
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_13"
/>
</LinearLayout>
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_15"
android:padding="@dimen/dp_8"
android:src="@drawable/arrow_left" />
android:src="@drawable/arrow_left"
android:layout_marginStart="@dimen/dp_8"
android:layout_gravity="center_vertical"
/>
<ImageView
android:id="@+id/iv_filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_8"
android:src="@drawable/ic_find_new_filter"
android:layout_marginEnd="@dimen/dp_8"
android:layout_gravity="center_vertical|end"
/>
</FrameLayout>

9
app/src/module_room_chat/res/layout/activity_room_newbie_list.xml
View File

@@ -54,6 +54,15 @@
android:layout_gravity="center_vertical"
/>
<ImageView
android:id="@+id/iv_filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_8"
android:src="@drawable/ic_find_new_filter"
android:layout_marginEnd="@dimen/dp_8"
android:layout_gravity="center_vertical|end"
/>
</FrameLayout>

160
app/src/module_room_chat/res/layout/dialog_newbie_filter.xml Normal file
View File

@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_12dp"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="筛选"
android:textColor="#ff333333"
android:textSize="15sp" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="15dp"
android:src="@drawable/ic_close_filter" />
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:text="用户性别"
android:textColor="#ff333333"
android:textSize="15sp" />
<RadioGroup
android:id="@+id/rg_gender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_gender_all"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="15dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="全部"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_gender_male"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:gravity="center"
android:text="男"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_gender_female"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:gravity="center"
android:text="女"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
</RadioGroup>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="24dp"
android:text="是否打招呼"
android:textColor="#ff333333"
android:textSize="15sp" />
<RadioGroup
android:id="@+id/rg_hello"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_hello_all"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="15dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:checked="true"
android:gravity="center"
android:text="全部"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_hello_already"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:gravity="center"
android:text="已打招呼"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb_hello_no"
android:layout_width="72dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:background="@drawable/bg_newbie_filter_rb"
android:button="@null"
android:gravity="center"
android:text="未打招呼"
android:textColor="@drawable/color_newbie_rb"
android:textSize="12sp" />
</RadioGroup>
<TextView
android:id="@+id/tv_confirm"
android:layout_width="250dp"
android:layout_height="38dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="40dp"
android:layout_marginBottom="45dp"
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="确认修改"
android:textColor="#ffffffff"
android:textSize="14sp" />
</LinearLayout>
</layout>