diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/RoomNewFriendsAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/RoomNewFriendsAdapter.kt index 068961e74..d385026f2 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/RoomNewFriendsAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/RoomNewFriendsAdapter.kt @@ -7,10 +7,13 @@ import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.nnbc123.app.R +import com.nnbc123.app.avroom.activity.AVRoomActivity import com.nnbc123.app.ui.utils.loadAvatar import com.nnbc123.app.ui.utils.loadFromAssets import com.nnbc123.app.vip.VipHelper import com.nnbc123.core.user.bean.UserInfo +import com.nnbc123.core.utils.CurrentTimeUtils +import com.nnbc123.core.utils.ifNullOrEmpty import com.opensource.svgaplayer.SVGAImageView @@ -20,22 +23,38 @@ class RoomNewFriendsAdapter : override fun convert(helper: BaseViewHolder, item: UserInfo) { helper.getView(R.id.iv_avatar).loadAvatar(item.avatar) - helper.setText(R.id.tv_desc, item.userDesc) + helper.setText(R.id.tv_desc, item.userDesc.ifNullOrEmpty { "我是个默认签名" }) + .setText( + R.id.tv_age, + ((CurrentTimeUtils.getCurrentTime() - item.birth) / 1000 / 60 / 60 / 24 / 365).toString() + ) + helper.setBackgroundRes( + R.id.ll_gender_age, + if (item.gender == 1) R.drawable.shape_ff9cce_corner else R.drawable.shape_65d3f7_corner + ) + helper.setBackgroundRes( + R.id.iv_gender, + if (item.gender == 1) R.drawable.ic_home_woman else R.drawable.ic_home_man + ) val tvOnlineText = helper.getView(R.id.tv_online_text) val svgaLiving = helper.getView(R.id.svga_living) val llOnline = helper.getView(R.id.ll_online) val viewOnline = helper.getView(R.id.view_online) - if (item.isBanAccount) { + if (item.inRoomUid != 0L) { viewOnline.isVisible = true + svgaLiving.isVisible = true + tvOnlineText.isVisible = true tvOnlineText.text = "直播中" - svgaLiving.loadFromAssets("svag/home_living.svga") + svgaLiving.loadFromAssets("svga/home_living.svga") llOnline.setOnClickListener { - + AVRoomActivity.start(mContext, item.inRoomUid) } } else { viewOnline.isVisible = false + svgaLiving.isVisible = false + tvOnlineText.isVisible = false svgaLiving.setImageResource(R.drawable.ic_new_friends_msg) tvOnlineText.text = "和TA聊" llOnline.setOnClickListener { diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt index 52f2af8a2..7a28a5940 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/RecommendFragment.kt @@ -6,6 +6,7 @@ import android.view.View import android.widget.LinearLayout import android.widget.TextView import androidx.core.view.isGone +import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels @@ -89,6 +90,11 @@ class RecommendFragment : BaseFragment(), initTitleTab() //initSingleAnchor() giftServiceAdapter = GiftServiceAdapter() + giftServiceAdapter.setOnItemClickListener { _, _, position -> + giftServiceAdapter.getItem(position)?.let { + AVRoomActivity.start(mContext, it.roomUid) + } + } rvDelegate = RVDelegate.Builder() .setAdapter(giftServiceAdapter) .setRecyclerView(mBinding.rvGiftService) @@ -177,6 +183,9 @@ class RecommendFragment : BaseFragment(), mBinding.rvGiftService.smoothScrollToPosition(index) } } + mBinding.tvNewRefresh.setOnClickListener { + homeViewModel.getNewFriendList() + } } private fun initRefreshView() { @@ -237,6 +246,8 @@ class RecommendFragment : BaseFragment(), if (mFragmentsBottom.isEmpty()) { return } + mBinding.tvNewRefresh.isVisible = position == 0 + mBinding.tvNewFilter.isVisible = position == 0 mBinding.viewPager.currentItem = position StatisticManager.Instance() .onEvent(StatisticsProtocol.EVENT_TJ_TABEXCHANGE, "用户切换tab次数,热门房间or组队开黑") diff --git a/app/src/main/java/com/nnbc123/app/ui/pay/ChargeActivity.java b/app/src/main/java/com/nnbc123/app/ui/pay/ChargeActivity.java index 951ca5e13..6195fb9d9 100644 --- a/app/src/main/java/com/nnbc123/app/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/pay/ChargeActivity.java @@ -585,8 +585,8 @@ public class ChargeActivity extends BaseActivity { } private void setWxPayFirst(int defaultType) { - iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay)); - iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat)); + iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat)); + iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay)); tv_type_first.setText("微信"); tv_type_second.setText("支付宝"); ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX, defaultType)); diff --git a/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png b/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png new file mode 100644 index 000000000..7aaa45ada Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_arrow_new.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png b/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png new file mode 100644 index 000000000..b45795a18 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_home_refresh_new.png differ diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml index 13ab51412..16878c282 100644 --- a/app/src/main/res/layout/fragment_recommend.xml +++ b/app/src/main/res/layout/fragment_recommend.xml @@ -266,11 +266,39 @@ android:paddingLeft="13dp" android:paddingRight="10dp" /> + + + + - + android:layout_marginTop="10dp" + app:layout_constraintStart_toEndOf="@id/iv_room_tag" + app:layout_constraintTop_toBottomOf="@id/tv_room_title"> + android:layout_height="20dp" + android:layout_gravity="center_horizontal" /> toMap(@Nullable Map map, UserInfo userInfo) { if (map == null) { map = new HashMap<>();