From bbc5a21f4aab93e3f12aa951becca48d189a9157 Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 15 Dec 2021 19:25:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E9=BA=A6=E9=80=80=E5=87=BA=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/avroom/fragment/GameRoomFragment.kt | 1 + .../java/com/yizhuan/erban/avroom/game/GameDelegate.kt | 3 ++- .../yizhuan/erban/home/adapter/HomeConcernsAdapter.java | 9 +++++++-- .../com/yizhuan/erban/home/fragment/RoomLikeFragment.kt | 3 ++- app/src/main/res/layout/item_home_concerns.xml | 4 +--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt index 2d0995943..e27eef709 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt @@ -377,6 +377,7 @@ class GameRoomFragment() : BaseMvpFragment() RoomEvent.DOWN_MIC -> { if (AvRoomDataManager.get().isOwner(roomEvent.account)) { //自己的消息 + gameDelegate.notifySelfPlayingState(false) gameDelegate.notifySelfInState(false) } onDownMicro(roomEvent.micPosition) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt index 5d3d97f2c..93150b9d1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt @@ -555,7 +555,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } - private fun notifySelfPlayingState(isPlaying: Boolean) { + fun notifySelfPlayingState(isPlaying: Boolean) { try { //状态名称 val state = SudMGPAPPState.APP_COMMON_SELF_PLAYING @@ -639,6 +639,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } fun onDestroy() { + notifySelfPlayingState(false) notifySelfInState(false) updateMyMicQueue(GameStatus.STATUS_NOT_JOIN) iSudFSTAPP?.destroyMG() 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 c4afe450e..22408c305 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 @@ -12,6 +12,7 @@ import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.ui.user.UserInfoActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; +import com.yizhuan.xchat_android_core.utils.StringExtensionKt; public class HomeConcernsAdapter extends BaseQuickAdapter { @@ -26,7 +27,7 @@ public class HomeConcernsAdapter extends BaseQuickAdapter 0) { helper.setVisible(R.id.view_avatar_bg, true); @@ -34,7 +35,11 @@ public class HomeConcernsAdapter extends BaseQuickAdapter AVRoomActivity.start(mContext, item.getRoomUid())); + helper.itemView.setOnClickListener(v -> AVRoomActivity.startForFromType(mContext, + item.getRoomUid(), + AVRoomActivity.FROM_TYPE_USER, + item.getNick(), + String.valueOf(item.getUid()))); } else { helper.setVisible(R.id.view_avatar_bg, false); helper.setVisible(R.id.view_living, false); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt index 367e9afb3..1bcbe1c85 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.activityViewModels +import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.appbar.AppBarLayout import com.yizhuan.erban.base.BaseViewBindingFragment @@ -51,7 +52,7 @@ class RoomLikeFragment : BaseViewBindingFragment() { likeRvDelegate = RVDelegate.Builder() .setAdapter(concernsAdapter) .setRecyclerView(binding.rvLike) - .setLayoutManager(LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)) + .setLayoutManager(GridLayoutManager(mContext,5, GridLayoutManager.VERTICAL, false)) .build() homeViewModel.concernsLiveData.observe(this) { diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml index 674c08c69..c8e22cc9e 100644 --- a/app/src/main/res/layout/item_home_concerns.xml +++ b/app/src/main/res/layout/item_home_concerns.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/container_item_room_history" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" @@ -44,9 +44,7 @@ android:id="@+id/tv_room_name" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" android:gravity="center" - android:maxLines="1" android:layout_marginTop="4dp" android:textColor="@color/color_333333" android:textSize="12dp"