From c3e001e70bec5c43cbb0cfbda0e1c52226ff766a Mon Sep 17 00:00:00 2001 From: wzq Date: Wed, 27 Sep 2023 16:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=88=90=20=E6=80=A7=E5=88=AB+=E5=B9=B4?= =?UTF-8?q?=E9=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/im/friend/FriendListAdapter.java | 10 ++--- .../ui/im/recent/RecentListFragment.java | 45 +++++++++---------- .../recent/holder/CommonRecentViewHolder.java | 9 ++-- .../ui/im/recent/holder/RecentViewHolder.java | 3 +- .../adapter/AttentionListAdapter.java | 10 ++--- .../ui/relation/adapter/FansViewAdapter.java | 10 ++--- .../erban/ui/widget/UserInfoDialog.java | 9 ++-- .../main/res/layout/attention_item_new.xml | 12 ++--- app/src/main/res/layout/dialog_user_info.xml | 33 +++++++------- .../main/res/layout/fans_list_item_new.xml | 15 +++---- .../main/res/layout/list_item_friend_new.xml | 14 +++--- .../nim_recent_contact_list_item_new.xml | 16 +++---- .../widget/DynamicNickDetailWidget.java | 16 +++---- .../res/layout/layout_dy_nick_detail.xml | 40 +++-------------- .../user/bean/AttentionInfo.java | 1 + .../user/bean/FansInfo.java | 1 + 16 files changed, 98 insertions(+), 146 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java index 97c80a8c6..a28f593fb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java @@ -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 attentionItems = adapter.getData(); - if (attentionItems.size() > position) { - AttentionItem attentionItem = attentionItems.get(position); - switch (attentionItem.getItemType()) { - case AttentionItem.TYPE_ATTENTION: - try { - AttentionInfo attentionInfo = (AttentionInfo) attentionItem.getData(); - if (attentionInfo != null && attentionInfo.getUserInRoom() != null && mContext != null) { - AVRoomActivity.startForFromType(mContext, attentionInfo.getUserInRoom().getUid(), - AVRoomActivity.FROM_TYPE_USER, attentionInfo.getNick(), String.valueOf(attentionInfo.getUid())); - } - - } catch (Exception ex) { - ex.printStackTrace(); + mAttentionInRoomAdapter.setOnItemChildClickListener((adapter, view, position) -> { + List attentionItems = adapter.getData(); + if (attentionItems.size() > position) { + AttentionItem attentionItem = attentionItems.get(position); + switch (attentionItem.getItemType()) { + case AttentionItem.TYPE_ATTENTION: + try { + AttentionInfo attentionInfo = (AttentionInfo) attentionItem.getData(); + if (attentionInfo != null && attentionInfo.getUserInRoom() != null && mContext != null) { + AVRoomActivity.startForFromType(mContext, attentionInfo.getUserInRoom().getUid(), + AVRoomActivity.FROM_TYPE_USER, attentionInfo.getNick(), String.valueOf(attentionInfo.getUid())); } - break; - case AttentionItem.TYPE_ATTENTION_MORE: - if (mContext != null) { - AttentionListActivity.start(mContext); - } - break; - } + } catch (Exception ex) { + ex.printStackTrace(); + } + break; + + case AttentionItem.TYPE_ATTENTION_MORE: + if (mContext != null) { + AttentionListActivity.start(mContext); + } + break; } } }); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java index 21f8edb1e..20dc61476 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java @@ -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"); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java index 821e00848..0ebf80dc4 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/RecentViewHolder.java @@ -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 { @@ -41,7 +42,7 @@ public abstract class RecentViewHolder extends RecyclerViewHolder 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"); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index bf8c57068..002c74a29 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -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)); diff --git a/app/src/main/res/layout/attention_item_new.xml b/app/src/main/res/layout/attention_item_new.xml index 9e4a1df75..cbbf2cdd2 100644 --- a/app/src/main/res/layout/attention_item_new.xml +++ b/app/src/main/res/layout/attention_item_new.xml @@ -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" /> - + android:layout_marginStart="@dimen/dp_10" + android:paddingTop="@dimen/dp_10"> + android:orientation="vertical" + android:paddingTop="@dimen/dp_10"> - + android:textSize="@dimen/sp_11" /> + + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_4" + android:src="@drawable/ic_room_user_copy" /> @@ -338,14 +338,13 @@ android:orientation="vertical"> + android:layout_marginRight="12dp" + android:layout_marginBottom="@dimen/dp_8" /> - - @@ -75,15 +75,13 @@ tools:ignore="SpUsage" tools:text="@string/layout_nim_recent_contact_list_item_new_01" /> - + android:textSize="@dimen/sp_11" + android:visibility="visible" /> - - - - - - - -