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

feat: 代充信誉值 初次提交 , 消息界面UI提交

Browse Source
This commit is contained in:
eggmanQQQ
2024-12-25 11:51:50 +08:00
parent 73cf388e17
commit c9e43aff77
25 changed files with 793 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt
View File

@@ -6,6 +6,7 @@ import com.chwl.app.R
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.core.home.bean.HomeRoomInfo
import com.chwl.core.utils.extension.subAndReplaceDot
import com.chwl.library.common.util.isVerify
class ExitRoomAdapter :
BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_exit_room) {
@@ -16,5 +17,6 @@ class ExitRoomAdapter :
ImageLoadUtils.loadImage(mContext, item.tagPict, helper.getView(R.id.iv_tag))
helper.setText(R.id.tv_online_num, item.onlineNum.toString())
.setText(R.id.tv_title, item.title.subAndReplaceDot(8))
helper.setVisible(R.id.iv_tag, item.tagPict.isVerify())
}
}

4
app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java
View File

@@ -91,13 +91,13 @@ public class UpMicAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
} else if (AvRoomDataManager.get().isDatingMode()) {
textView.setText(ResUtil.getString(R.string.avroom_adapter_upmicadapter_01));
} else {
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position));
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position+1));
}
} else {
if (AvRoomDataManager.get().isDatingMode()) {
textView.setText(position + (Constants.maleIndex.contains(position - 1) ? ResUtil.getString(R.string.avroom_adapter_upmicadapter_03) : ResUtil.getString(R.string.avroom_adapter_upmicadapter_04)));
} else {
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position));
textView.setText(String.format(Locale.US,context.getResources().getString(R.string.which_mic_position), position+1));
}
}
}

4
app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
View File

@@ -31,6 +31,7 @@ import com.chwl.app.avroom.widget.RoomEffectView;
import com.chwl.app.base.BaseFragment;
import com.chwl.app.databinding.FragmentChatroomGameMainBinding;
import com.chwl.app.databinding.LayoutRoomNotifyLuckyGiftTipBinding;
import com.chwl.app.ui.utils.ImageLoadKt;
import com.chwl.app.ui.utils.ImageLoadUtilsV2;
import com.chwl.app.ui.widget.BonsellaJoinAttackButtonView;
import com.chwl.app.ui.widget.GiftDialog;
@@ -72,6 +73,7 @@ import com.chwl.core.user.bean.UserInfo;
import com.chwl.core.utils.ComboUtil;
import com.chwl.core.utils.CoreLogger;
import com.chwl.core.utils.LogUtils;
import com.chwl.library.common.util.OtherExtKt;
import com.chwl.library.utils.JavaUtil;
import com.chwl.library.utils.ListUtils;
import com.chwl.library.utils.ResUtil;
@@ -247,6 +249,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
public void setRoomBg(RoomInfo roomInfo) {
if (svgaRoomBg == null) return;
AVRoomActivity.setBackBg(mContext, roomInfo, svgaRoomBg, bgPicture);
OtherExtKt.setVis(gameMainBinding.roomLevelIcon,OtherExtKt.isVerify(roomInfo.getRoomLevelIcon()),false);
ImageLoadKt.loadImage(gameMainBinding.roomLevelIcon,roomInfo.getRoomLevelIcon());
}

3
app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt
View File

@@ -171,6 +171,9 @@ class HomeRoomAdapter : BaseMultiItemQuickAdapter<HomeRoomInfo, BaseViewHolder>
}
helper.getView<ImageView>(R.id.roomLevelIcon).load(item.roomLevelIcon)
helper.setVisible(R.id.roomLevelIcon,item.roomLevelIcon.isVerify())
} else {
if (item.bannerVoList.isVerify()){

2
app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt
View File

@@ -37,7 +37,7 @@ class GiveGoldModel : BaseViewModel() {
fun getSearchUserInfo(erbanNo: Long) {
safeLaunch(
true,
false,
block = {
_searchUserLiveData.value = HomeModel.getSearchUser(erbanNo)
}

47
app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
View File

@@ -6,10 +6,11 @@ import android.content.Intent
import android.text.TextUtils
import android.view.KeyEvent
import android.view.inputmethod.EditorInfo
import android.widget.ImageView
import android.widget.TextView.OnEditorActionListener
import androidx.activity.viewModels
import androidx.core.widget.doOnTextChanged
import androidx.recyclerview.widget.LinearLayoutManager
import com.netease.nim.uikit.StatusBarUtil
import com.chwl.app.R
import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.common.EmptyViewHelper
@@ -17,9 +18,15 @@ import com.chwl.app.databinding.ActivityGiveGoldBinding
import com.chwl.app.pay.GiveGoldModel
import com.chwl.app.pay.adapter.LatelyGiveAdapter
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.app.ui.utils.load
import com.chwl.app.ui.utils.loadAvatar
import com.chwl.core.gift.GiftModel
import com.chwl.core.user.UserModel
import com.chwl.core.user.bean.DiamondGiveHistoryInfo
import com.chwl.library.common.util.setViewWH
import com.chwl.library.utils.ResUtil
import com.example.lib_utils.ktx.getString
import com.netease.nim.uikit.StatusBarUtil
/**
* 轉贈鉆石頁面
@@ -57,14 +64,6 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
}
false
})
binding.mTvSearch.setOnClickListener {
val newStr: String = binding.etSearch.text.toString().trim { it <= ' ' }
if (!TextUtils.isEmpty(newStr)) {
giveGoldModel.getSearchUserInfo(newStr.toLong())
} else {
toast(getString(R.string.password_input_user_id))
}
}
mAdapter = LatelyGiveAdapter()
rvDelegate = RVDelegate.Builder<DiamondGiveHistoryInfo>()
@@ -101,6 +100,36 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
if (it) dialogManager.showProgressDialog(this)
else dialogManager.dismissDialog()
}
binding.etSearch.doOnTextChanged { text, start, before, count ->
val newStr: String = binding.etSearch.text.toString().trim { it <= ' ' }
if (!TextUtils.isEmpty(newStr)) {
giveGoldModel.getSearchUserInfo(newStr.toLong())
} else {
toast(getString(R.string.password_input_user_id))
}
}
UserModel.get().cacheLoginUserInfo?.let { user->
binding.enbanNo.text = R.string.text_user_id.getString(user.erbanNo)
binding.charmLevel.load(user.userLevelVo?.charmUrl?:"")
binding.userLevel.load(user.userLevelVo?.experUrl?:"")
binding.nick.text = user.nick
binding.avatar.loadAvatar(user.avatar)
binding.starLayout.removeAllViews()
for (i in 0 until 5) {
val star = ImageView(context)
star.setViewWH(15, 15)
star.setImageResource( if (true) R.drawable.c_draw_un else R.drawable.c_draw_un)
binding.starLayout.addView(star)
}
}
}
override fun onResume() {

43
app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java
View File

@@ -12,14 +12,12 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.chwl.app.R;
import com.chwl.app.friend.action.AbstractSelectFriendAction;
import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
import com.chwl.app.ui.im.avtivity.NimP2PMessageActivity;
import com.chwl.app.ui.user.activity.UserInfoActivity;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.NobleAvatarView;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.user.bean.UserInfo;
import com.chwl.core.utils.extension.StringExtensionKt;
import com.chwl.library.utils.ResUtil;
@@ -56,10 +54,10 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
.setText(R.id.tv_user_desc, item.getUserDesc() != null ?
item.getUserDesc()
: helper.itemView.getContext().getResources().getString(R.string.msg_no_user_desc));
VipHelper.loadVipIcon(helper.getView(R.id.iv_vip_icon), item.getUserVipInfoVO());
VipHelper.loadVipNameplate(helper.getView(R.id.iv_vip_icon), item.getUserVipInfoVO());
VipHelper.loadVipNickColor(helper.getView(R.id.tv_userName), item.getUserVipInfoVO(), "#FF333333");
NobleAvatarView nobleAvatarView = helper.getView(R.id.noble_avatar_view);
nobleAvatarView.setSize(55, 75, 15);
nobleAvatarView.setSize(47, 65, 15);
nobleAvatarView.setData(item.getAvatar(), item.getNobleUsers());
nobleAvatarView.setOnClickListener(v -> {
if (type == AbstractSelectFriendAction.TYPE_NORMAL
@@ -69,25 +67,28 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
}
});
GenderAgeTextView tvGenderAge = helper.getView(R.id.tv_gender_age);
tvGenderAge.setGender(item.getGender());
tvGenderAge.setBirthDay(item.getBirth());
// 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);
// helper.getView(R.id.iv_user_official).setVisibility(item.isOfficial() ? View.VISIBLE : View.GONE);
// AppCompatImageView ivNobleLevel = helper.getView(R.id.iv_noble_level);
// if (ivNobleLevel != null) {
// if (item.getNobleUsers() != null) {
// ivNobleLevel.setVisibility(View.VISIBLE);
// String badgeByLevel = NobleUtil.getBadgeByLevel(item.getNobleUsers().getLevel());
// if (!TextUtils.isEmpty(badgeByLevel)) {
// NobleUtil.loadResource(badgeByLevel, ivNobleLevel);
// } else {
// ivNobleLevel.setVisibility(View.GONE);
// }
// } else {
// ivNobleLevel.setVisibility(View.GONE);
// }
// }
AppCompatImageView ivNobleLevel = helper.getView(R.id.iv_noble_level);
if (item.getNobleUsers() != null) {
ivNobleLevel.setVisibility(View.VISIBLE);
String badgeByLevel = NobleUtil.getBadgeByLevel(item.getNobleUsers().getLevel());
if (!TextUtils.isEmpty(badgeByLevel)) {
NobleUtil.loadResource(badgeByLevel, ivNobleLevel);
} else {
ivNobleLevel.setVisibility(View.GONE);
}
} else {
ivNobleLevel.setVisibility(View.GONE);
}
AppCompatImageView ivUserLevel = helper.getView(R.id.iv_user_level);
ivUserLevel.setVisibility(View.GONE);

22
app/src/main/java/com/chwl/app/ui/im/recent/holder/CommonRecentViewHolder.java
View File

@@ -10,6 +10,12 @@ import android.os.Handler;
import android.text.TextUtils;
import android.view.View;
import com.chwl.app.R;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.core.level.UserLevelVo;
import com.chwl.core.user.UserModel;
import com.chwl.core.utils.SystemUidUtil;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleMessageTouchListener;
import com.netease.nim.uikit.common.ui.draggablebubbles.MessageBubbleView;
@@ -18,12 +24,6 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter;
import com.netease.nim.uikit.common.ui.recyclerview.holder.NIMBaseViewHolder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.chwl.app.R;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.core.level.UserLevelVo;
import com.chwl.core.user.UserModel;
import com.chwl.core.utils.SystemUidUtil;
/**
* @author Administrator
@@ -156,10 +156,14 @@ public class CommonRecentViewHolder extends RecentViewHolder {
ivCharmLevel.setVisibility(VISIBLE);
ImageLoadUtils.loadImage(ivCharmLevel.getContext(), userLevelVo.getCharmUrl(), ivCharmLevel);
}
tvGenderAge.setBirthDay(userInfo.getBirth());
tvGenderAge.setGender(userInfo.getGender());
VipHelper.loadVipIcon(ivVipIcon,userInfo.getUserVipInfoVO());
if (tvGenderAge != null) {
tvGenderAge.setBirthDay(userInfo.getBirth());
tvGenderAge.setGender(userInfo.getGender());
}
VipHelper.loadVipNameplate(ivVipIcon,userInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(tvNickname, userInfo.getUserVipInfoVO(),"#FF333333");
});
}

58
app/src/main/java/com/chwl/app/ui/im/recent/holder/RecentViewHolder.java
View File

@@ -9,6 +9,11 @@ import android.widget.TextView;
import androidx.appcompat.widget.AppCompatImageView;
import com.chwl.app.R;
import com.chwl.app.ui.im.recent.RecentContactsFragment;
import com.chwl.app.ui.im.recent.adapter.RecentContactAdapter;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.core.helper.ImHelperUtils;
import com.netease.nim.uikit.business.recent.RecentContactsCallback;
import com.netease.nim.uikit.business.session.emoji.MoonUtil;
import com.netease.nim.uikit.business.uinfo.UserInfoHelper;
@@ -23,11 +28,6 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.model.Team;
import com.chwl.app.R;
import com.chwl.app.ui.im.recent.RecentContactsFragment;
import com.chwl.app.ui.im.recent.adapter.RecentContactAdapter;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.core.helper.ImHelperUtils;
public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapter, NIMBaseViewHolder, RecentContact> {
@@ -109,21 +109,23 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
}
protected void updateMsgLabel(NIMBaseViewHolder holder, RecentContact recent) {
// 显示消息具体内容
MoonUtil.identifyRecentVHFaceExpressionAndTags(holder.getContext(), tvMessage, getContent(recent), -1, 0.45f);
MsgStatusEnum status = recent.getMsgStatus();
switch (status) {
case fail:
imgMsgStatus.setImageResource(R.drawable.nim_g_ic_failed_small);
imgMsgStatus.setVisibility(VISIBLE);
break;
case sending:
imgMsgStatus.setImageResource(R.drawable.nim_recent_contact_ic_sending);
imgMsgStatus.setVisibility(VISIBLE);
break;
default:
imgMsgStatus.setVisibility(GONE);
break;
if (imgMsgStatus != null) {
// 显示消息具体内容
MoonUtil.identifyRecentVHFaceExpressionAndTags(holder.getContext(), tvMessage, getContent(recent), -1, 0.45f);
MsgStatusEnum status = recent.getMsgStatus();
switch (status) {
case fail:
imgMsgStatus.setImageResource(R.drawable.nim_g_ic_failed_small);
imgMsgStatus.setVisibility(VISIBLE);
break;
case sending:
imgMsgStatus.setImageResource(R.drawable.nim_recent_contact_ic_sending);
imgMsgStatus.setVisibility(VISIBLE);
break;
default:
imgMsgStatus.setVisibility(GONE);
break;
}
}
String timeString = TimeUtil.getTimeShowString(recent.getTime(), true);
@@ -135,15 +137,17 @@ public abstract class RecentViewHolder extends RecyclerViewHolder<BaseQuickAdapt
}
protected void updateOnlineState(RecentContact recent) {
if (recent.getSessionType() == SessionTypeEnum.Team) {
tvOnlineState.setVisibility(GONE);
} else {
String onlineStateContent = getOnlineStateContent(recent);
if (TextUtils.isEmpty(onlineStateContent)) {
if (tvOnlineState != null) {
if (recent.getSessionType() == SessionTypeEnum.Team) {
tvOnlineState.setVisibility(GONE);
} else {
tvOnlineState.setVisibility(VISIBLE);
tvOnlineState.setText(getOnlineStateContent(recent));
String onlineStateContent = getOnlineStateContent(recent);
if (TextUtils.isEmpty(onlineStateContent)) {
tvOnlineState.setVisibility(GONE);
} else {
tvOnlineState.setVisibility(VISIBLE);
tvOnlineState.setText(getOnlineStateContent(recent));
}
}
}
}

38
app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java
View File

@@ -11,10 +11,8 @@ import com.chwl.app.R;
import com.chwl.app.friend.action.AbstractSelectFriendAction;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.NobleAvatarView;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.core.Constants;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.user.bean.AttentionInfo;
import com.chwl.core.utils.extension.StringExtensionKt;
@@ -70,30 +68,30 @@ public class AttentionListAdapter extends BaseQuickAdapter<AttentionInfo, BaseVi
}
});
GenderAgeTextView tvGenderAge = baseViewHolder.getView(R.id.tv_gender_age);
tvGenderAge.setGender(attentionInfo.getGender());
tvGenderAge.setBirthDay(attentionInfo.getBirth());
// 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.loadVipNameplate(baseViewHolder.getView(R.id.iv_vip_icon), attentionInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(baseViewHolder.getView(R.id.tv_userName), attentionInfo.getUserVipInfoVO(), "#FF333333");
baseViewHolder.getView(R.id.iv_user_official).setVisibility(attentionInfo.isOfficial() ? View.VISIBLE : View.GONE);
// baseViewHolder.getView(R.id.iv_user_official).setVisibility(attentionInfo.isOfficial() ? View.VISIBLE : View.GONE);
AppCompatImageView ivNobleLevel = baseViewHolder.getView(R.id.iv_noble_level);
if (attentionInfo.nobleUsers != null) {
ivNobleLevel.setVisibility(View.VISIBLE);
String badgeByLevel = NobleUtil.getBadgeByLevel(attentionInfo.nobleUsers.getLevel());
if (!TextUtils.isEmpty(badgeByLevel)) {
NobleUtil.loadResource(badgeByLevel, ivNobleLevel);
} else {
ivNobleLevel.setVisibility(View.GONE);
}
} else {
ivNobleLevel.setVisibility(View.GONE);
}
// AppCompatImageView ivNobleLevel = baseViewHolder.getView(R.id.iv_noble_level);
// if (attentionInfo.nobleUsers != null) {
// ivNobleLevel.setVisibility(View.VISIBLE);
// String badgeByLevel = NobleUtil.getBadgeByLevel(attentionInfo.nobleUsers.getLevel());
// if (!TextUtils.isEmpty(badgeByLevel)) {
// NobleUtil.loadResource(badgeByLevel, ivNobleLevel);
// } else {
// ivNobleLevel.setVisibility(View.GONE);
// }
// } else {
// ivNobleLevel.setVisibility(View.GONE);
// }
NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
nobleAvatarView.setSize(55, 75, 15);
nobleAvatarView.setSize(47, 65, 15);
nobleAvatarView.setData(attentionInfo.avatar, attentionInfo.nobleUsers);
AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level);

32
app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java
View File

@@ -12,10 +12,8 @@ import com.chwl.app.R;
import com.chwl.app.friend.action.AbstractSelectFriendAction;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.NobleAvatarView;
import com.chwl.app.view.GenderAgeTextView;
import com.chwl.app.vip.util.VipHelper;
import com.chwl.core.im.friend.IMFriendModel;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.user.bean.FansInfo;
import com.chwl.core.utils.extension.StringExtensionKt;
import com.chwl.library.utils.ResUtil;
@@ -90,18 +88,18 @@ public class FansViewAdapter extends BaseQuickAdapter<FansInfo, BaseViewHolder>
tvAttention.setBackgroundResource(R.drawable.base_selector_theme_30dp);
}
GenderAgeTextView tvGenderAge = baseViewHolder.getView(R.id.tv_gender_age);
tvGenderAge.setGender(fansInfo.getGender());
tvGenderAge.setBirthDay(fansInfo.getBirth());
// 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.loadVipNameplate(baseViewHolder.getView(R.id.iv_vip_icon), fansInfo.getUserVipInfoVO());
VipHelper.loadVipNickColor(baseViewHolder.getView(R.id.tv_userName), fansInfo.getUserVipInfoVO(), "#FF333333");
// 官字
baseViewHolder.getView(R.id.iv_user_official).setVisibility(fansInfo.isOfficial() ? View.VISIBLE : View.GONE);
// baseViewHolder.getView(R.id.iv_user_official).setVisibility(fansInfo.isOfficial() ? View.VISIBLE : View.GONE);
NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
nobleAvatarView.setSize(55, 75, 15);
nobleAvatarView.setSize(47, 65, 15);
nobleAvatarView.setData(fansInfo.getAvatar(), fansInfo.getNobleUsers());
AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level);
@@ -118,14 +116,14 @@ public class FansViewAdapter extends BaseQuickAdapter<FansInfo, BaseViewHolder>
ImageLoadUtils.loadImage(mContext, fansInfo.getUserLevelVo().getCharmUrl(), ivCharmLevel);
}
AppCompatImageView ivBadge = baseViewHolder.getView(R.id.iv_noble_level);
ivBadge.setVisibility(View.GONE);
if (fansInfo.getNobleUsers() != null) {
String badgeByLevel = NobleUtil.getBadgeByLevel(fansInfo.getNobleUsers().getLevel());
if (!TextUtils.isEmpty(badgeByLevel)) {
ivBadge.setVisibility(View.VISIBLE);
NobleUtil.loadResource(badgeByLevel, ivBadge);
}
}
// AppCompatImageView ivBadge = baseViewHolder.getView(R.id.iv_noble_level);
// ivBadge.setVisibility(View.GONE);
// if (fansInfo.getNobleUsers() != null) {
// String badgeByLevel = NobleUtil.getBadgeByLevel(fansInfo.getNobleUsers().getLevel());
// if (!TextUtils.isEmpty(badgeByLevel)) {
// ivBadge.setVisibility(View.VISIBLE);
// NobleUtil.loadResource(badgeByLevel, ivBadge);
// }
// }
}
}

9
app/src/main/java/com/chwl/app/vip/util/VipHelper.java
View File

@@ -25,6 +25,15 @@ public class VipHelper {
}
}
public static void loadVipNameplate(@NonNull ImageView ivVipIcon, @Nullable UserVipInfo vipInfo) {
if (vipInfo == null || CoreTextUtils.isEmptyText(vipInfo.getNameplateUrl())) {
ivVipIcon.setVisibility(View.GONE);
} else {
ivVipIcon.setVisibility(View.VISIBLE);
ImageLoadUtils.loadImage(ivVipIcon.getContext(), vipInfo.getNameplateUrl(), ivVipIcon);
}
}
public static void loadVipNickColor(@NonNull TextView tvNick, @Nullable UserVipInfo vipInfo, String defaultColor) {
try {
if (vipInfo == null || CoreTextUtils.isEmptyText(vipInfo.getFriendNickColour())) {

179
app/src/main/res/layout/activity_give_gold.xml
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/white"
tools:background="@color/white">
<com.chwl.app.base.TitleBar
android:id="@+id/title_bar"
@@ -12,97 +14,168 @@
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/userInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp"
android:layout_marginTop="6dp"
android:background="@drawable/base_shape_f7f7f7_10dp"
app:layout_constraintTop_toBottomOf="@id/title_bar">
<ImageView
android:id="@+id/avatar"
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/default_avatar"
android:layout_marginVertical="12dp"
android:layout_marginStart="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textColor="@color/color_313131"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar"
tools:text="11111" />
<ImageView
android:id="@+id/userLevel"
android:layout_width="38dp"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintStart_toEndOf="@id/nick"
app:layout_constraintTop_toTopOf="@id/nick"
tools:src="@drawable/ic_charm_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/charmLevel"
android:layout_width="38dp"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintStart_toEndOf="@id/userLevel"
app:layout_constraintTop_toTopOf="@id/nick"
tools:src="@drawable/ic_charm_level"
tools:visibility="visible" />
<TextView
android:id="@+id/enbanNo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_7b7b7d"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@id/starLayout"
app:layout_constraintStart_toStartOf="@id/nick"
app:layout_constraintTop_toBottomOf="@id/nick"
tools:text="1111" />
<LinearLayout
android:id="@+id/starLayout"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintStart_toStartOf="@id/nick"
tools:layout_width="100dp" />
<ImageView
android:id="@+id/more"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_cp_list_more"
app:tint="@color/color_7b7b7d"
android:layout_marginStart="5dp"
app:layout_constraintBottom_toBottomOf="@id/starLayout"
app:layout_constraintStart_toEndOf="@id/starLayout"
app:layout_constraintTop_toTopOf="@id/starLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:id="@+id/llSearch"
android:layout_width="0dp"
android:layout_height="32dp"
android:layout_height="34dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_search_user"
android:gravity="center_vertical"
android:background="@drawable/base_shape_f7f7f7_25dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar">
app:layout_constraintTop_toBottomOf="@id/userInfo">
<EditText
android:id="@+id/etSearch"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="30dp"
android:layout_width="match_parent"
android:layout_height="34dp"
android:background="@android:color/transparent"
android:gravity="center_vertical"
android:inputType="number"
android:imeOptions="actionSearch"
android:singleLine="true"
android:hint="@string/search_user_id"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:imeOptions="actionSearch"
android:inputType="number"
android:paddingHorizontal="37dp"
android:singleLine="true"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/text_color_secondary"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/mTvSearch"
android:text="@string/search"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_white"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:paddingTop="@dimen/dp_3"
android:paddingBottom="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_3"
android:background="@drawable/base_selector_theme_30dp"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginBottom="@dimen/dp_3"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>
<ImageView
android:src="@drawable/ic_send_search"
app:tint="@color/color_7b7b7d"
android:layout_width="20dp"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="12dp"
android:layout_height="20dp"/>
</LinearLayout>
</FrameLayout>
<TextView
android:id="@+id/tvLately"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_25"
android:text="@string/donation_record"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/llSearch" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_marginTop="15dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@+id/tvLately"
app:layout_constraintBottom_toTopOf="@+id/tv_tip">
android:layout_marginBottom="10dp"
app:layout_constraintBottom_toTopOf="@+id/tv_tip"
app:layout_constraintTop_toBottomOf="@+id/llSearch">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:overScrollMode="never"
android:scrollbars="none"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:overScrollMode="never"
android:scrollbars="none" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout >
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<TextView
android:id="@+id/tv_tip"
android:text="@string/displayed_three_month"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_B3B3C3"
android:layout_width="wrap_content"
android:paddingTop="@dimen/dp_20"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginBottom="@dimen/dp_40"
app:layout_constraintStart_toStartOf="parent"
android:text="@string/displayed_three_month"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,128 +4,134 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rly"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_84"
tools:background="@color/black"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:background="@color/black">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_71"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintStart_toStartOf="parent"
android:layout_height="80dp"
android:layout_marginBottom="12dp"
android:layout_marginHorizontal="15dp"
android:background="@drawable/shape_white_10dp_round"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_gravity="start|center_vertical"
android:orientation="horizontal"
android:background="@drawable/shape_white_10dp_round">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:orientation="vertical">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="65dp"
android:gravity="center"
android:layout_height="65dp"
android:layout_marginStart="5dp"
android:layout_gravity="center_vertical"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_marginStart="5dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
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"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_userName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:maxLength="8"
android:maxLines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_list_item_friend_new_01" />
<!-- <com.chwl.app.view.GenderAgeTextView-->
<!-- android:id="@+id/tv_gender_age"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:textSize="@dimen/sp_11"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_user_official"-->
<!-- android:layout_width="13dp"-->
<!-- android:layout_height="13dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:src="@mipmap/ic_user_official_13dp"-->
<!-- android:visibility="visible"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_noble_level"-->
<!-- android:layout_width="17dp"-->
<!-- android:layout_height="17dp"-->
<!-- android:visibility="gone"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:src="@mipmap/ic_user_level_king"-->
<!-- tools:visibility="visible" />-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
android:layout_marginStart="4dp"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_userName"
android:id="@+id/tv_user_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:layout_marginTop="6dp"
android:layout_gravity="bottom"
android:layout_marginBottom="1dp"
android:lines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
app:layout_flexShrink="1"
tools:maxLength="8"
tools:text="@string/layout_attention_item_new_01" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_marginEnd="2dp"
android:src="@mipmap/ic_user_official_13dp"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_marginEnd="4dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
android:textColor="#7b7b7d"
android:textSize="13sp"
tools:text="1234568940" />
</LinearLayout>
<TextView
android:id="@+id/tv_user_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
tools:text="1234568940" />
</LinearLayout>
<FrameLayout
android:id="@+id/rl_opt"
android:layout_width="wrap_content"

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

@@ -4,142 +4,152 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rly"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="@dimen/dp_84"
tools:background="@color/black"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:background="@color/black">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_71"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintStart_toStartOf="parent"
android:layout_height="80dp"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="12dp"
android:background="@drawable/shape_white_10dp_round"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_gravity="start|center_vertical"
android:orientation="horizontal"
android:background="@drawable/shape_white_10dp_round">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_15"
android:gravity="center_vertical" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:orientation="vertical">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:gravity="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
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"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_userName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:maxLength="8"
android:maxLines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_list_item_friend_new_01" />
<!-- <com.chwl.app.view.GenderAgeTextView-->
<!-- android:id="@+id/tv_gender_age"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:textSize="@dimen/sp_11"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_user_official"-->
<!-- android:layout_width="13dp"-->
<!-- android:layout_height="13dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:src="@mipmap/ic_user_official_13dp"-->
<!-- android:visibility="visible"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_noble_level"-->
<!-- android:layout_width="17dp"-->
<!-- android:layout_height="17dp"-->
<!-- android:visibility="gone"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:src="@mipmap/ic_user_level_king"-->
<!-- tools:visibility="visible" />-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_userName"
android:layout_width="0dp"
android:id="@+id/tv_user_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:layout_weight="1"
android:layout_gravity="bottom"
android:layout_marginTop="6dp"
android:layout_marginBottom="1dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_fans_list_item_new_01" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_marginEnd="2dp"
android:src="@mipmap/ic_user_official_13dp"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_marginEnd="2dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
android:textColor="#7b7b7d"
android:textSize="13sp"
tools:text="1234568940" />
</LinearLayout>
<TextView
android:id="@+id/tv_user_desc"
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/attention_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="1234568940" />
android:layout_height="26dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="center"
android:paddingHorizontal="@dimen/dp_10"
android:scaleType="centerCrop"
android:text="@string/add_attention"
android:textColor="#ff8c03"
android:textSize="14sp"
android:textStyle="bold"
android:visibility="visible"
app:dt_drawableType="shape"
app:dt_radius="47dp"
app:dt_strikeColor="#ff8c03"
app:dt_strikeWidth="1dp" />
</LinearLayout>
<TextView
android:id="@+id/attention_img"
android:layout_width="wrap_content"
android:paddingHorizontal="@dimen/dp_10"
android:layout_height="30dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/base_selector_theme_30dp"
android:gravity="center"
android:scaleType="centerCrop"
android:text="@string/add_attention"
android:textColor="@color/base_selector_color_theme_btn"
android:textSize="13sp"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>

40
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -93,6 +93,31 @@
app:layout_constraintVertical_chainStyle="packed"
tools:text="@string/layout_fragment_chatroom_game_main_02" />
<ImageView
android:id="@+id/roomLevelIcon"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_4"
android:scaleType="fitXY"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/room_title"
app:layout_constraintStart_toEndOf="@+id/room_title"
app:layout_constraintTop_toTopOf="@+id/room_title"
tools:src="@drawable/ic_charm_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_close_gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/ic_close_gift"
android:visibility="@{hasAnimationEffect?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="@id/room_title"
app:layout_constraintStart_toEndOf="@id/roomLevelIcon"
app:layout_constraintTop_toTopOf="@id/room_title" />
<com.chwl.app.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_id"
android:layout_width="wrap_content"
@@ -105,17 +130,6 @@
app:layout_constraintTop_toBottomOf="@id/room_title"
tools:text="ID:8888" />
<ImageView
android:id="@+id/iv_close_gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/ic_close_gift"
android:visibility="@{hasAnimationEffect?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="@id/room_title"
app:layout_constraintStart_toEndOf="@id/room_title"
app:layout_constraintTop_toTopOf="@id/room_title" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_title_bar_right_menu_start"
android:layout_width="wrap_content"
@@ -182,12 +196,12 @@
android:layout_gravity="bottom|start"
android:layout_marginTop="120dp"
android:layout_marginEnd="15dp"
android:paddingStart="16dp"
android:paddingBottom="@dimen/dp_10"
android:visibility="gone"
tools:background="#333333"
tools:layout_height="50dp"
tools:layout_width="100dp"
android:paddingStart="16dp"
android:paddingBottom="@dimen/dp_10"
tools:visibility="visible" />
<com.chwl.app.ui.widget.BonsellaJoinAttackButtonView

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

@@ -353,12 +353,12 @@
<!-- -->
<FrameLayout
android:id="@+id/test"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="200dp"
android:layout_width="match_parent"
android:layout_height="300dp"/>
<!-- <FrameLayout-->
<!-- android:id="@+id/test"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- android:layout_marginTop="200dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="300dp"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -32,6 +32,16 @@
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearance="@style/shape_home_recommend_item" />
<ImageView
android:id="@+id/roomLevelIcon"
android:layout_width="38dp"
android:layout_height="15dp"
android:visibility="gone"
tools:visibility="gone"
app:layout_constraintStart_toStartOf="@id/iv_room_image"
app:layout_constraintTop_toTopOf="@id/iv_room_image"
tools:src="@drawable/ic_charm_level" />
<View
android:id="@+id/div"
android:layout_width="8dp"
@@ -151,13 +161,13 @@
android:id="@+id/tv_online_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lines="1"
android:layout_marginEnd="11dp"
android:layout_marginBottom="15dp"
android:drawableStart="@drawable/home_ic_hot"
android:drawablePadding="3dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:layout_marginEnd="11dp"
android:lines="1"
android:textColor="#84868A"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -4,175 +4,183 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_84"
tools:background="@color/black"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:background="@color/black">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_71"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_6"
app:layout_constraintStart_toStartOf="parent"
android:layout_height="80dp"
android:layout_marginBottom="12dp"
android:layout_marginHorizontal="15dp"
android:background="@drawable/shape_white_10dp_round"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_gravity="start|center_vertical"
android:orientation="horizontal"
android:background="@drawable/shape_white_10dp_round">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:layout_marginStart="5dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:orientation="vertical">
<com.chwl.app.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="65dp"
android:gravity="center"
android:layout_height="65dp"
android:layout_marginStart="5dp"
android:layout_gravity="center_vertical"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_width="0dp"
android:layout_height="47dp"
android:layout_marginStart="5dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
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"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_userName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:maxLength="8"
android:maxLines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_list_item_friend_new_01" />
<!-- <com.chwl.app.view.GenderAgeTextView-->
<!-- android:id="@+id/tv_gender_age"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:textSize="@dimen/sp_11"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_user_official"-->
<!-- android:layout_width="13dp"-->
<!-- android:layout_height="13dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:src="@mipmap/ic_user_official_13dp"-->
<!-- android:visibility="visible"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:visibility="visible" />-->
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_noble_level"-->
<!-- android:layout_width="17dp"-->
<!-- android:layout_height="17dp"-->
<!-- android:visibility="gone"-->
<!-- app:layout_flexShrink="0"-->
<!-- tools:src="@mipmap/ic_user_level_king"-->
<!-- tools:visibility="visible" />-->
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
android:layout_marginStart="4dp"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_userName"
android:id="@+id/tv_user_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:ellipsize="end"
android:maxLength="8"
android:maxLines="1"
android:textColor="@color/text_title_color"
android:textSize="15sp"
tools:text="@string/layout_list_item_friend_new_01" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:textSize="@dimen/sp_11"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/ic_user_official_13dp"
android:visibility="visible"
app:layout_flexShrink="0"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="17dp"
android:layout_height="17dp"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:adjustViewBounds="true"
android:visibility="gone"
app:layout_flexShrink="0"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
android:layout_marginTop="6dp"
android:layout_gravity="bottom"
android:layout_marginBottom="1dp"
android:lines="1"
android:textColor="#7b7b7d"
android:textSize="13sp"
tools:text="1234568940" />
</LinearLayout>
<TextView
android:id="@+id/tv_user_desc"
<FrameLayout
android:id="@+id/rl_opt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="1234568940" />
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:layout_marginEnd="15dp">
</LinearLayout>
<TextView
android:id="@+id/tv_find_him"
android:layout_width="65dp"
android:layout_height="30dp"
android:background="@drawable/shape_stroke_appcolor_15dp"
android:text="@string/find_ta"
android:layout_gravity="center"
android:textColor="@color/appColor"
android:gravity="center"
android:textSize="12sp"
android:visibility="gone"
tools:visibility="visible" />
<FrameLayout
android:id="@+id/rl_opt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:layout_marginEnd="15dp">
<TextView
android:id="@+id/tv_find_him"
android:layout_width="65dp"
android:layout_height="30dp"
android:background="@drawable/shape_stroke_appcolor_15dp"
android:gravity="center"
android:text="@string/find_ta"
android:textColor="@color/appColor"
android:textSize="12sp"
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" />
<TextView
android:id="@+id/tv_send"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:paddingHorizontal="5dp"
android:background="@drawable/bg_car_item_buy"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/send_gift"
android:textColor="@color/color_FFFFFF"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="gone" />
<TextView
android:id="@+id/tv_invite_cp"
android:layout_width="60dp"
android:layout_height="25dp"
android:background="@drawable/bg_button_relation_invite"
android:gravity="center"
android:text="@string/layout_list_item_friend_new_02"
android:textColor="@color/color_FFFFFF"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_invite_cp"
android:layout_width="60dp"
android:layout_height="25dp"
android:background="@drawable/bg_button_relation_invite"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/layout_list_item_friend_new_02"
android:textColor="@color/color_FFFFFF"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="gone" />
</FrameLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>

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

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_92"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
@@ -12,11 +12,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_80"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_6"
android:layout_height="80dp"
android:layout_marginHorizontal="15dp"
android:layout_marginBottom="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -30,76 +28,65 @@
<RelativeLayout
android:id="@+id/rl_user_avatar"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_marginStart="11dp">
android:layout_marginStart="12dp">
<com.netease.nim.uikit.common.ui.imageview.HeadImageView
android:id="@+id/img_head"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="47dp"
android:layout_height="47dp"
android:layout_centerInParent="true"
tools:src="@drawable/default_avatar" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/noble_head_wear"
android:layout_width="65.5dp"
android:layout_height="65.5dp"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_centerInParent="true"
tools:src="@mipmap/ic_user_avatar_level_king" />
</RelativeLayout>
<LinearLayout
android:id="@+id/contentLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="47dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:id="@+id/layout_user"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<ImageView
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"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxWidth="95dp"
android:layout_marginTop="2dp"
android:singleLine="true"
android:text=""
android:textStyle="bold"
android:textColor="@color/text_title_color"
android:textSize="14dp"
android:textSize="15sp"
tools:ignore="SpUsage"
tools:text="@string/layout_nim_recent_contact_list_item_new_01" />
<com.chwl.app.view.GenderAgeTextView
android:id="@+id/tv_gender_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:textSize="@dimen/sp_11"
android:visibility="visible" />
tools:text="12111111111111111" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_badge"
android:layout_width="16dp"
android:layout_height="16dp"
android:scaleType="fitCenter"
android:layout_marginStart="4dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
@@ -107,8 +94,9 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_height="18dp"
android:adjustViewBounds="true"
android:layout_marginStart="4dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
@@ -116,47 +104,40 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_vip_icon"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_marginStart="4dp"
android:adjustViewBounds="true"
android:visibility="gone"
tools:src="@drawable/ic_user_charm_level"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_online_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:gravity="center_vertical"
android:lines="1"
android:text=""
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="@string/layout_nim_recent_contact_list_item_new_02" />
<ImageView
android:id="@+id/img_msg_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="6dp"
android:contentDescription="@string/empty"
android:visibility="visible"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:autoLink="none"
@@ -165,8 +146,8 @@
android:lines="1"
android:scrollHorizontally="true"
android:text=""
android:textColor="#84868A"
android:textSize="13dp"
android:textColor="#7b7b7d"
android:textSize="13sp"
tools:ignore="SpUsage"
tools:text="@string/layout_nim_recent_contact_list_item_new_03" />
@@ -176,18 +157,18 @@
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="20dp"
android:gravity="end"
android:orientation="vertical">
android:layout_height="47dp"
android:layout_marginEnd="12dp"
android:layout_gravity="center_vertical">
<com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView
android:id="@+id/unread_number_tip"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_height="18dp"
android:layout_gravity="end|bottom"
android:layout_marginBottom="19dp"
android:layout_marginBottom="2dp"
android:singleLine="true"
android:textSize="10sp"
android:visibility="gone"
tools:text="123"
tools:visibility="visible" />
@@ -204,21 +185,15 @@
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_marginTop="4dp"
android:layout_gravity="top"
android:layout_height="wrap_content"
android:layout_marginTop="19dp"
android:textColor="@color/text_secondary_4f516a"
android:textSize="11dp"
android:textColor="#999999"
android:textSize="12sp"
tools:text="just now" />
</FrameLayout>
</LinearLayout>
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1px"-->
<!-- android:layout_marginStart="85dp"-->
<!-- android:layout_marginEnd="15dp"-->
<!-- android:background="@color/line_353548" />-->
</LinearLayout>

1
app/src/main/res/values/colors.xml
View File

@@ -763,6 +763,7 @@
<color name="color_FCF4DF">#FCF4DF</color>
<color name="color_313131">#313131</color>
<color name="color_7b7b7d">#7b7b7d</color>
<color name="color_e29030">#e29030</color>
<color name="color_08151a">#08151a</color>
<color name="color_fff664">#fff664</color>

3
core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java
View File

@@ -70,6 +70,9 @@ public class HomeRoomInfo implements MultiItemEntity, Serializable {
*/
private int homeRoomType;
//房间等级icon
private String roomLevelIcon;
@Override
public int getItemType() {

2
core/src/main/java/com/chwl/core/room/bean/RoomInfo.java
View File

@@ -162,6 +162,8 @@ public class RoomInfo implements Parcelable,Serializable {
// 总流水
private double serialValue;
private String roomLevelIcon;
public RightBottomIconConfig rightBottomIconConfig;
protected RoomInfo(Parcel in) {

6
modules/module_base/src/main/res/drawable/base_shape_f7f7f7_10dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#F7F7F7" />
<corners android:radius="10dp" />
</shape>

6
modules/module_base/src/main/res/drawable/base_shape_f7f7f7_25dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#F7F7F7" />
<corners android:radius="25dp" />
</shape>