From c9e43aff77eecae3df9b277e3539325c3d1eef1f Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Wed, 25 Dec 2024 11:51:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E5=85=85=E4=BF=A1=E8=AA=89?= =?UTF-8?q?=E5=80=BC=20=E5=88=9D=E6=AC=A1=E6=8F=90=E4=BA=A4=20,=20?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=95=8C=E9=9D=A2UI=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/adapter/ExitRoomAdapter.kt | 2 + .../chwl/app/avroom/adapter/UpMicAdapter.java | 4 +- .../avroom/fragment/HomePartyFragment.java | 4 + .../chwl/app/home/adapter/HomeRoomAdapter.kt | 3 + .../java/com/chwl/app/pay/GiveGoldModel.kt | 2 +- .../chwl/app/pay/activity/GiveGoldActivity.kt | 47 ++- .../app/ui/im/friend/FriendListAdapter.java | 43 +-- .../recent/holder/CommonRecentViewHolder.java | 22 +- .../ui/im/recent/holder/RecentViewHolder.java | 58 ++-- .../adapter/AttentionListAdapter.java | 38 ++- .../ui/relation/adapter/FansViewAdapter.java | 32 +- .../java/com/chwl/app/vip/util/VipHelper.java | 9 + .../main/res/layout/activity_give_gold.xml | 179 +++++++---- .../main/res/layout/attention_item_new.xml | 214 +++++++------ .../main/res/layout/fans_list_item_new.xml | 248 ++++++++------- .../layout/fragment_chatroom_game_main.xml | 40 ++- app/src/main/res/layout/fragment_me.xml | 12 +- app/src/main/res/layout/home_item_room.xml | 14 +- .../main/res/layout/list_item_friend_new.xml | 300 +++++++++--------- .../nim_recent_contact_list_item_new.xml | 131 ++++---- app/src/main/res/values/colors.xml | 1 + .../com/chwl/core/home/bean/HomeRoomInfo.java | 3 + .../com/chwl/core/room/bean/RoomInfo.java | 2 + .../res/drawable/base_shape_f7f7f7_10dp.xml | 6 + .../res/drawable/base_shape_f7f7f7_25dp.xml | 6 + 25 files changed, 793 insertions(+), 627 deletions(-) create mode 100644 modules/module_base/src/main/res/drawable/base_shape_f7f7f7_10dp.xml create mode 100644 modules/module_base/src/main/res/drawable/base_shape_f7f7f7_25dp.xml diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt index 345bf9e53..3761842f6 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt @@ -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(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()) } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java index 710a7c816..92893cc7d 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java @@ -91,13 +91,13 @@ public class UpMicAdapter extends BaseQuickAdapter { } 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)); } } } diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index 8ea0beda1..1b49ef71a 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -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()); } diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt index 3e99e4bfb..e513d75cb 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeRoomAdapter.kt @@ -171,6 +171,9 @@ class HomeRoomAdapter : BaseMultiItemQuickAdapter } + helper.getView(R.id.roomLevelIcon).load(item.roomLevelIcon) + helper.setVisible(R.id.roomLevelIcon,item.roomLevelIcon.isVerify()) + } else { if (item.bannerVoList.isVerify()){ diff --git a/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt b/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt index 4e135c846..b8ce64151 100644 --- a/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt +++ b/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt @@ -37,7 +37,7 @@ class GiveGoldModel : BaseViewModel() { fun getSearchUserInfo(erbanNo: Long) { safeLaunch( - true, + false, block = { _searchUserLiveData.value = HomeModel.getSearchUser(erbanNo) } diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt index 3057a0f2f..828425bbb 100644 --- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt @@ -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() { } 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() @@ -101,6 +100,36 @@ class GiveGoldActivity : BaseViewBindingActivity() { 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() { diff --git a/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java index 2c1945681..458733c15 100644 --- a/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java @@ -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 { if (type == AbstractSelectFriendAction.TYPE_NORMAL @@ -69,25 +67,28 @@ public class FriendListAdapter extends BaseQuickAdapter { @@ -109,21 +109,23 @@ public abstract class RecentViewHolder extends RecyclerViewHolder 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 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); +// } +// } } } diff --git a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java index cdbf5d584..7f9e7e50e 100644 --- a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java +++ b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java @@ -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())) { diff --git a/app/src/main/res/layout/activity_give_gold.xml b/app/src/main/res/layout/activity_give_gold.xml index bfe5a49df..532aaaf14 100644 --- a/app/src/main/res/layout/activity_give_gold.xml +++ b/app/src/main/res/layout/activity_give_gold.xml @@ -1,9 +1,11 @@ + android:background="@color/white" + tools:background="@color/white"> - + + + + + + + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/userInfo"> - + - + - + android:layout_marginBottom="10dp" + app:layout_constraintBottom_toTopOf="@+id/tv_tip" + app:layout_constraintTop_toBottomOf="@+id/llSearch"> + android:layout_height="match_parent" + android:overScrollMode="never" + android:scrollbars="none" /> - + + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/attention_item_new.xml b/app/src/main/res/layout/attention_item_new.xml index 268983431..05603b07f 100644 --- a/app/src/main/res/layout/attention_item_new.xml +++ b/app/src/main/res/layout/attention_item_new.xml @@ -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"> + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - + + android:layout_width="0dp" + android:layout_height="47dp" + android:layout_marginStart="5dp" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + android:textColor="#7b7b7d" + android:textSize="13sp" + tools:text="1234568940" /> - - - - + android:layout_height="wrap_content" + android:orientation="horizontal" + tools:background="@color/black"> + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - + + android:layout_width="0dp" + android:layout_height="47dp" + android:layout_gravity="center_vertical" + android:layout_marginStart="5dp" + android:layout_weight="1" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + android:textColor="#7b7b7d" + android:textSize="13sp" + 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" /> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index 34ed61f62..b783c1cad 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -93,6 +93,31 @@ app:layout_constraintVertical_chainStyle="packed" tools:text="@string/layout_fragment_chatroom_game_main_02" /> + + + + + - - - + + + + + + diff --git a/app/src/main/res/layout/home_item_room.xml b/app/src/main/res/layout/home_item_room.xml index b6f067ed1..39f0864c2 100644 --- a/app/src/main/res/layout/home_item_room.xml +++ b/app/src/main/res/layout/home_item_room.xml @@ -32,6 +32,16 @@ app:layout_constraintTop_toTopOf="parent" app:shapeAppearance="@style/shape_home_recommend_item" /> + + + android:layout_height="wrap_content" + android:orientation="horizontal" + tools:background="@color/black"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - + + android:layout_width="0dp" + android:layout_height="47dp" + android:layout_marginStart="5dp" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + android:layout_marginTop="6dp" + android:layout_gravity="bottom" + android:layout_marginBottom="1dp" + android:lines="1" + android:textColor="#7b7b7d" + android:textSize="13sp" + tools:text="1234568940" /> - + android:layout_gravity="center" + android:layout_marginStart="10dp" + android:layout_marginEnd="15dp"> - + - - - - - + - + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml index 7b125c99a..d43c28230 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml @@ -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 @@ + android:layout_marginStart="12dp"> - - - + tools:text="12111111111111111" /> @@ -107,8 +94,9 @@ @@ -116,47 +104,40 @@ + + + + + - - @@ -176,18 +157,18 @@ + android:layout_height="47dp" + android:layout_marginEnd="12dp" + android:layout_gravity="center_vertical"> @@ -204,21 +185,15 @@ - - - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index cb28047f1..8cc8eb6b1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -763,6 +763,7 @@ #FCF4DF #313131 + #7b7b7d #e29030 #08151a #fff664 diff --git a/core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java b/core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java index 284049b68..2ddba1e6f 100644 --- a/core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java +++ b/core/src/main/java/com/chwl/core/home/bean/HomeRoomInfo.java @@ -70,6 +70,9 @@ public class HomeRoomInfo implements MultiItemEntity, Serializable { */ private int homeRoomType; + //房间等级icon + private String roomLevelIcon; + @Override public int getItemType() { diff --git a/core/src/main/java/com/chwl/core/room/bean/RoomInfo.java b/core/src/main/java/com/chwl/core/room/bean/RoomInfo.java index 42869aa0c..ea05f0ef4 100644 --- a/core/src/main/java/com/chwl/core/room/bean/RoomInfo.java +++ b/core/src/main/java/com/chwl/core/room/bean/RoomInfo.java @@ -162,6 +162,8 @@ public class RoomInfo implements Parcelable,Serializable { // 总流水 private double serialValue; + private String roomLevelIcon; + public RightBottomIconConfig rightBottomIconConfig; protected RoomInfo(Parcel in) { diff --git a/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_10dp.xml b/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_10dp.xml new file mode 100644 index 000000000..481b57121 --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_10dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_25dp.xml b/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_25dp.xml new file mode 100644 index 000000000..b18ae7eab --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_f7f7f7_25dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file