Merge branch 'peko_feature/search' into peko_test/2.4.0

This commit is contained in:
Max
2023-12-08 16:01:34 +08:00
2 changed files with 33 additions and 16 deletions

View File

@@ -1,6 +1,7 @@
package com.yizhuan.erban.ui.search; package com.yizhuan.erban.ui.search;
import android.content.Context; import android.content.Context;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
@@ -15,6 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.user.activity.UserInfoActivity; import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView; import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.utils.RegexUtil; import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo;
@@ -112,16 +114,17 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
holder.mNobleAvatarView.setData(item.getAvatar(), item.nobleUsers); holder.mNobleAvatarView.setData(item.getAvatar(), item.nobleUsers);
holder.erbanNo.setText(context.getString(R.string.me_user_id, item.getErbanNo())); holder.erbanNo.setText(context.getString(R.string.me_user_id, item.getErbanNo()));
if (item.getGender() == 1) { holder.wealthLevelView.setVisibility(View.GONE);
holder.mIvSex.setVisibility(View.VISIBLE); if (item.getUserLevelVo() != null && !TextUtils.isEmpty(item.getUserLevelVo().getExperUrl())) {
holder.mIvSex.setImageResource(R.drawable.ic_gender_male); holder.wealthLevelView.setVisibility(View.VISIBLE);
} else if (item.getGender() == 2) { ImageLoadUtils.loadImage(mContext, item.getUserLevelVo().getExperUrl(), holder.wealthLevelView);
holder.mIvSex.setVisibility(View.VISIBLE);
holder.mIvSex.setImageResource(R.drawable.ic_gender_female);
} else {
holder.mIvSex.setVisibility(View.GONE);
} }
holder.charmLevelView.setVisibility(View.GONE);
if (item.getUserLevelVo() != null && !TextUtils.isEmpty(item.getUserLevelVo().getCharmUrl())) {
holder.charmLevelView.setVisibility(View.VISIBLE);
ImageLoadUtils.loadImage(mContext, item.getUserLevelVo().getCharmUrl(), holder.charmLevelView);
}
} }
static class ViewHolder extends BaseViewHolder { static class ViewHolder extends BaseViewHolder {
@@ -132,7 +135,8 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
private ImageView ivLive; private ImageView ivLive;
RelativeLayout container; RelativeLayout container;
private NobleAvatarView mNobleAvatarView; private NobleAvatarView mNobleAvatarView;
private ImageView mIvSex; private ImageView wealthLevelView;
private ImageView charmLevelView;
private SuperTextView stvOp; private SuperTextView stvOp;
public ViewHolder(View itemView) { public ViewHolder(View itemView) {
@@ -142,7 +146,8 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
erbanNo = itemView.findViewById(R.id.erban_no); erbanNo = itemView.findViewById(R.id.erban_no);
container = itemView.findViewById(R.id.container); container = itemView.findViewById(R.id.container);
mNobleAvatarView = itemView.findViewById(R.id.noble_avatar_view); mNobleAvatarView = itemView.findViewById(R.id.noble_avatar_view);
mIvSex = itemView.findViewById(R.id.sex); wealthLevelView = itemView.findViewById(R.id.iv_user_level);
charmLevelView = itemView.findViewById(R.id.iv_user_charm);
ivLive = itemView.findViewById(R.id.iv_living); ivLive = itemView.findViewById(R.id.iv_living);
tvOnlineNum = itemView.findViewById(R.id.tv_online_num); tvOnlineNum = itemView.findViewById(R.id.tv_online_num);
stvOp = itemView.findViewById(R.id.stv_op); stvOp = itemView.findViewById(R.id.stv_op);

View File

@@ -31,17 +31,29 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:layout_marginEnd="3dp"
android:maxWidth="120dp" android:maxWidth="120dp"
android:textColor="@color/text_title_color" android:textColor="@color/text_title_color"
android:textSize="15sp" android:textSize="15sp"
tools:text="@string/layout_list_item_search_01" /> tools:text="@string/layout_list_item_search_01" />
<ImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sex" android:id="@+id/iv_user_level"
android:layout_width="13dp" android:layout_width="wrap_content"
android:layout_height="13dp" android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_5" android:layout_marginEnd="1dp"
android:src="@drawable/ic_gender_female" /> android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="1dp"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@drawable/ic_user_charm_level" />
</LinearLayout> </LinearLayout>