diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java index adb5bd267..e6185e045 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java @@ -34,6 +34,7 @@ public class HomeConcernsAdapter extends BaseQuickAdapter 0) { helper.setVisible(R.id.view_avatar_bg, true); helper.setVisible(R.id.view_living, true); + helper.setVisible(R.id.tv_live, true); if (helper.getView(R.id.view_living).getBackground() instanceof AnimationDrawable) { ((AnimationDrawable) helper.getView(R.id.view_living).getBackground()).start(); } @@ -48,7 +49,8 @@ public class HomeConcernsAdapter extends BaseQuickAdapter UserInfoActivity.Companion.start(mContext, item.getUid())); } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt index cc72939a5..4231e2544 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt @@ -11,6 +11,7 @@ import com.yizhuan.erban.home.adapter.MoreSingleAnchorAdapter import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -27,22 +28,25 @@ class RoomSingleFragment : BaseViewBindingFragment() } } - private lateinit var adapter : MoreSingleAnchorAdapter + private lateinit var adapter: MoreSingleAnchorAdapter private lateinit var rvDelegate: RVDelegate private val pageSize = Int.MAX_VALUE private val homeViewModel: HomeViewModel by activityViewModels() + private var lastLoadDataTime = 0L + override fun init() { adapter = MoreSingleAnchorAdapter() rvDelegate = RVDelegate.Builder() .setAdapter(adapter) .setRecyclerView(binding.recyclerView) + .setRefreshLayout(binding.refreshLayout) .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无房间")) - .setLayoutManager(GridLayoutManager(mContext,2)) + .setLayoutManager(GridLayoutManager(mContext, 2)) .setPageSize(pageSize) .build() - + binding.refreshLayout.setOnRefreshListener { loadData(true) } homeViewModel.singleAnchorMoreLiveData.observe(this) { rvDelegate.loadData(it) } @@ -50,10 +54,12 @@ class RoomSingleFragment : BaseViewBindingFragment() override fun onResume() { super.onResume() - loadData(true) + loadData(false) } - private fun loadData(isRefresh: Boolean) { + private fun loadData(isForce: Boolean) { + if (!isForce && CurrentTimeUtils.getCurrentTime() - lastLoadDataTime < 15 * 1000) return + lastLoadDataTime = CurrentTimeUtils.getCurrentTime() homeViewModel.getMoreSingleAnchorList() } @@ -69,6 +75,6 @@ class RoomSingleFragment : BaseViewBindingFragment() @Subscribe(threadMode = ThreadMode.MAIN) fun onRefreshHomeDataEvent(event: RefreshHomeDataEvent?) { - if (isResumed) loadData(true) + if (isResumed) loadData(false) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_room_single.xml b/app/src/main/res/layout/fragment_room_single.xml index ee5631f88..0fe7bc871 100644 --- a/app/src/main/res/layout/fragment_room_single.xml +++ b/app/src/main/res/layout/fragment_room_single.xml @@ -1,9 +1,15 @@ - + android:layout_height="match_parent"> + + + diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml index c4b454a35..b3cde5b30 100644 --- a/app/src/main/res/layout/item_home_concerns.xml +++ b/app/src/main/res/layout/item_home_concerns.xml @@ -44,6 +44,7 @@ android:background="@drawable/anim_concerns_living_icon" />