moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

性别图标 更换成 性别+年龄

Browse Source
This commit is contained in:
wzq
2023-09-27 16:00:32 +08:00
parent 6528ac407a
commit 9cdb0eef53
16 changed files with 98 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
View File

@@ -16,6 +16,7 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
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.view.GenderAgeTextView;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -68,12 +69,9 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
}
});
AppCompatImageView ivGender = helper.getView(R.id.iv_gender);
if (item.getGender() == 1) {
ivGender.setImageResource(R.drawable.ic_gender_male);
} else {
ivGender.setImageResource(R.drawable.ic_gender_female);
}
GenderAgeTextView tvGenderAge = helper.getView(R.id.tv_gender_age);
tvGenderAge.setGender(item.getGender());
tvGenderAge.setBirthDay(item.getBirth());
// 官字 icon
helper.getView(R.id.iv_user_official).setVisibility(item.isOfficial() ? View.VISIBLE : View.GONE);

5
app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java
View File

@@ -119,9 +119,7 @@ public class RecentListFragment extends BaseFragment {
mAttentionInRoomAdapter = new AttentionInRoomAdapter();
rvAttentionOnline.setAdapter(mAttentionInRoomAdapter);
rvAttentionOnline.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
mAttentionInRoomAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
mAttentionInRoomAdapter.setOnItemChildClickListener((adapter, view, position) -> {
List<AttentionItem> attentionItems = adapter.getData();
if (attentionItems.size() > position) {
AttentionItem attentionItem = attentionItems.get(position);
@@ -146,7 +144,6 @@ public class RecentListFragment extends BaseFragment {
break;
}
}
}
});
recentContactsFragment = RecentContactsFragment.newInstance(isInRoom);

9
app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
View File

@@ -59,7 +59,7 @@ public class CommonRecentViewHolder extends RecentViewHolder {
this.imgMsgStatus = holder.getView(R.id.img_msg_status);
this.tvOnlineState = holder.getView(R.id.tv_online_state);
this.ivCharmLevel = holder.getView(R.id.iv_charm_level);
this.ivUserGender = holder.getView(R.id.iv_user_gender);
this.tvGenderAge = holder.getView(R.id.tv_gender_age);
mIvNobleHeadWear = holder.getView(R.id.noble_head_wear);
mIvNobleLevel = holder.getView(R.id.iv_noble_level);
mIvNobleBadge = holder.getView(R.id.iv_user_badge);
@@ -156,11 +156,8 @@ public class CommonRecentViewHolder extends RecentViewHolder {
ivCharmLevel.setVisibility(VISIBLE);
ImageLoadUtils.loadImage(ivCharmLevel.getContext(), userLevelVo.getCharmUrl(), ivCharmLevel);
}
if (userInfo.getGender() == 1) {
ivUserGender.setImageResource(R.drawable.ic_gender_male);
} else {
ivUserGender.setImageResource(R.drawable.ic_gender_female);
}
tvGenderAge.setBirthDay(userInfo.getBirth());
tvGenderAge.setGender(userInfo.getGender());
VipHelper.loadVipIcon(ivVipIcon,userInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(tvNickname, userInfo.getUserVipInfoVO(),"#FF333333");

3
app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java
View File

@@ -26,6 +26,7 @@ import com.netease.nimlib.sdk.team.model.Team;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.im.recent.RecentContactsFragment;
import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter;
import com.yizhuan.erban.view.GenderAgeTextView;
import com.yizhuan.xchat_android_core.helper.ImHelperUtils;
public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapter, BaseViewHolder, RecentContact> {
@@ -41,7 +42,7 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
protected AppCompatImageView mIvNobleLevel;
protected AppCompatImageView mIvNobleBadge;
protected AppCompatImageView ivCharmLevel;
protected AppCompatImageView ivUserGender;
protected GenderAgeTextView tvGenderAge;
protected ImageView ivVipIcon;
protected TextView tvNickname;

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

@@ -11,6 +11,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.view.GenderAgeTextView;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -69,12 +70,9 @@ public class AttentionListAdapter extends BaseQuickAdapter<AttentionInfo, BaseVi
}
});
AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender);
if (attentionInfo.getGender() == 1) {
ivGender.setImageResource(R.drawable.ic_gender_male);
} else {
ivGender.setImageResource(R.drawable.ic_gender_female);
}
GenderAgeTextView tvGenderAge = baseViewHolder.getView(R.id.tv_gender_age);
tvGenderAge.setGender(attentionInfo.getGender());
tvGenderAge.setBirthDay(attentionInfo.getBirth());
VipHelper.loadVipIcon(baseViewHolder.getView(R.id.iv_vip_icon), attentionInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(baseViewHolder.getView(R.id.tv_userName), attentionInfo.getUserVipInfoVO(), "#FF333333");

10
app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
View File

@@ -12,6 +12,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.view.GenderAgeTextView;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -89,12 +90,9 @@ public class FansViewAdapter extends BaseQuickAdapter<FansInfo, BaseViewHolder>
tvAttention.setBackgroundResource(R.drawable.selector_common_confirm);
}
AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender);
if (fansInfo.getGender() == 1) {
ivGender.setImageResource(R.drawable.ic_gender_male);
} else {
ivGender.setImageResource(R.drawable.ic_gender_female);
}
GenderAgeTextView tvGenderAge = baseViewHolder.getView(R.id.tv_gender_age);
tvGenderAge.setGender(fansInfo.getGender());
tvGenderAge.setBirthDay(fansInfo.getBirth());
VipHelper.loadVipIcon(baseViewHolder.getView(R.id.iv_vip_icon), fansInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(baseViewHolder.getView(R.id.tv_userName), fansInfo.getUserVipInfoVO(), "#FF333333");

9
app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
View File

@@ -45,6 +45,7 @@ import com.yizhuan.erban.ui.user.adapter.SkillPicsAdapter;
import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.view.GenderAgeTextView;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
@@ -127,7 +128,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
private ImageView ivBadge;
private ImageView ivVipIcon;
private TextView nick;
private ImageView ivGender;
private GenderAgeTextView mTvGenderAge;
private TextView erbanId;
private ImageView ivCopy;
@@ -236,7 +237,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
nick = findViewById(R.id.nick);
erbanId = findViewById(R.id.tv_erban_id);
ivCopy = findViewById(R.id.iv_copy);
ivGender = findViewById(R.id.iv_gender);
mTvGenderAge = findViewById(R.id.tv_gender_age);
ivVipIcon = findViewById(R.id.iv_vip_icon);
fansNumber = findViewById(R.id.fans_number);
flexbox = findViewById(R.id.flexbox);
@@ -543,8 +544,8 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
return true;
});
ivCopy.setOnClickListener(view -> copyName());
ivGender.setImageResource(
userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
mTvGenderAge.setBirthDay(userInfo.getBirth());
mTvGenderAge.setGender(userInfo.getGender());
VipHelper.loadVipIcon(ivVipIcon, userInfo.getUserVipInfoVO());
// 设置粉丝数量
fansNumber.setText(userInfo.getFansNum() + getString(R.string.ui_widget_userinfodialog_07));

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

@@ -48,15 +48,15 @@
android:textColor="@color/text_title_color"
android:textSize="15sp"
app:layout_flexShrink="1"
tools:maxLength="8"
tools:text="@string/layout_attention_item_new_01" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_gender"
android:layout_width="21dp"
android:layout_height="14dp"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
app:layout_flexShrink="0"
tools:src="@drawable/ic_gender_female"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView

33
app/src/main/res/layout/dialog_user_info.xml
View File

@@ -57,8 +57,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingTop="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10">
android:layout_marginStart="@dimen/dp_10"
android:paddingTop="@dimen/dp_10">
<ImageView
android:id="@+id/avatar"
@@ -79,9 +79,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="2dp"
android:paddingTop="@dimen/dp_10"
android:layout_toEndOf="@id/fl_avatar_layout"
android:orientation="vertical">
android:orientation="vertical"
android:paddingTop="@dimen/dp_10">
<LinearLayout
android:layout_width="wrap_content"
@@ -113,13 +113,13 @@
android:textSize="@dimen/sp_14"
tools:text="@string/layout_dialog_user_info_03" />
<ImageView
android:id="@+id/iv_gender"
android:layout_width="@dimen/dp_21"
android:layout_height="@dimen/dp_14"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_3"
android:scaleType="fitCenter"
android:src="@drawable/ic_gender_female" />
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
@@ -250,10 +250,10 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_copy"
android:src="@drawable/ic_room_user_copy"
android:layout_marginStart="@dimen/dp_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/ic_room_user_copy" />
</LinearLayout>
@@ -338,14 +338,13 @@
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview_skill_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:id="@+id/recyclerview_skill_card"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
/>
android:layout_marginRight="12dp"
android:layout_marginBottom="@dimen/dp_8" />
<LinearLayout
android:id="@+id/layout_grid_button"

15
app/src/main/res/layout/fans_list_item_new.xml
View File

@@ -3,9 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rly"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="70dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<com.yizhuan.erban.ui.widget.NobleAvatarView
@@ -42,22 +42,21 @@
<TextView
android:id="@+id/tv_userName"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:layout_weight="1"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_fans_list_item_new_01" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_gender"
android:layout_width="21dp"
android:layout_height="14dp"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
app:layout_flexShrink="0"
tools:src="@drawable/ic_gender_female"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView

14
app/src/main/res/layout/list_item_friend_new.xml
View File

@@ -44,18 +44,18 @@
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:lines="1"
android:maxLength="8"
android:maxLines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_list_item_friend_new_01" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_gender"
android:layout_width="21dp"
android:layout_height="14dp"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
app:layout_flexShrink="0"
tools:src="@drawable/ic_gender_female"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView

16
app/src/main/res/layout/nim_recent_contact_list_item_new.xml
View File

@@ -54,9 +54,9 @@
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginEnd="3dp"
android:adjustViewBounds="true"
android:visibility="gone"
android:layout_marginEnd="3dp"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
@@ -75,15 +75,13 @@
tools:ignore="SpUsage"
tools:text="@string/layout_nim_recent_contact_list_item_new_01" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_gender"
android:layout_width="21dp"
android:layout_height="14dp"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:scaleType="centerInside"
android:visibility="visible"
tools:src="@drawable/ic_gender_female"
tools:visibility="visible" />
android:textSize="@dimen/sp_11"
android:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_badge"

16
app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
View File

@@ -16,6 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.erban.utils.TimeUiUtils;
import com.yizhuan.erban.view.GenderAgeTextView;
import com.yizhuan.erban.vip.util.VipHelper;
import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout;
@@ -26,10 +27,8 @@ import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout;
public class DynamicNickDetailWidget extends ShapeConstrainLayout {
private TextView tvNick;
private ImageView ivGender;
private GenderAgeTextView tvGenderAge;
private ImageView ivVipIcon;
private TextView tvAge;
private LinearLayout llGenderAge;
private ImageView ivUserWealthLevel;
private ImageView ivUserCharmLevel;
@@ -58,10 +57,8 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout {
inflate(context, R.layout.layout_dy_nick_detail, this);
tvNick = findViewById(R.id.tv_nick);
ivGender = findViewById(R.id.iv_gender);
tvGenderAge = findViewById(R.id.tv_gender_age);
ivVipIcon = findViewById(R.id.iv_vip_icon);
tvAge = findViewById(R.id.tv_age);
llGenderAge = findViewById(R.id.ll_gender_age);
ivUserWealthLevel = findViewById(R.id.iv_user_wealth_level);
ivUserCharmLevel = findViewById(R.id.iv_user_charm_level);
inOfficialMask = findViewById(R.id.in_official_mask);
@@ -82,11 +79,8 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout {
public void setData(BaseUserInfo info) {
tvNick.setText(RegexUtil.getPrintableString(info.getNick()));
tvAge.setVisibility(GONE);
llGenderAge.setVisibility(GONE);
ivGender.setVisibility(VISIBLE);
ivGender.setImageResource(info.getGender() == 1 ?
R.drawable.ic_gender_male : R.drawable.ic_gender_female);
tvGenderAge.setText(String.valueOf(info.getAge()));
tvGenderAge.setGender(info.getGender());
//财富等级
ImageLoadUtils.loadImage(context, info.getExperLevelPic(), ivUserWealthLevel);
//魅力等级

40
app/src/module_community/res/layout/layout_dy_nick_detail.xml
View File

@@ -21,54 +21,24 @@
android:id="@+id/tv_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:drawablePadding="@dimen/dp_5"
android:ellipsize="end"
android:maxWidth="100dp"
android:singleLine="true"
android:layout_marginStart="3dp"
app:layout_goneMarginStart="0dp"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_15"
app:layout_constraintStart_toEndOf="@id/iv_vip_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="0dp"
tools:text="@string/layout_layout_dy_nick_detail_01" />
<LinearLayout
android:id="@+id/ll_gender_age"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_14"
android:layout_marginStart="3.5dp"
android:background="@drawable/ic_female_age_community_notice"
android:gravity="center"
android:minWidth="@dimen/dp_14"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_5"
android:paddingEnd="@dimen/dp_5"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/tv_nick"
app:layout_constraintTop_toTopOf="@id/tv_nick">
<TextView
android:id="@+id/tv_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="1.5dp"
android:gravity="center"
android:paddingLeft="5dp"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:visibility="gone"
tools:text="20" />
</LinearLayout>
<ImageView
android:id="@+id/iv_gender"
<com.yizhuan.erban.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:textSize="@dimen/sp_11"
app:layout_constraintBottom_toBottomOf="@id/tv_nick"
app:layout_constraintStart_toEndOf="@id/tv_nick"
app:layout_constraintTop_toTopOf="@id/tv_nick"

1
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java
View File

@@ -50,6 +50,7 @@ public class AttentionInfo implements Serializable {
public boolean newUser;
//性别 1:男 2：女 0 ：未知
private int gender;
private long birth;
//个人简介
private String userDesc;

1
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java
View File

@@ -25,6 +25,7 @@ public class FansInfo implements Serializable {
private boolean newUser;
//性别 1:男 2：女 0 ：未知
private int gender;
private long birth;
//个人简介
private String userDesc;
//1普通账号，2官方账号，3机器账号