From a6a39a57f54e230d47f015b258d318c8597d0923 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 26 Nov 2021 17:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4HomePartyRoomFragment?= =?UTF-8?q?=E5=AF=B9HomePartyFragment=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/fragment/HomePartyFragment.java | 49 +++++++------------ .../fragment/HomePartyRoomFragment.java | 25 ++-------- .../erban/avroom/widget/MessageView.java | 1 - .../layout/fragment_chatroom_game_main.xml | 15 +----- .../home/event/ShareRoomEvent.java | 4 ++ 5 files changed, 25 insertions(+), 69 deletions(-) create mode 100644 core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 8e774d59f..013f096be 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -15,6 +15,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatImageView; import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; @@ -43,6 +44,7 @@ import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; +import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent; import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; @@ -83,7 +85,7 @@ import io.reactivex.functions.Action; */ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickListener, ShareDialog.OnShareDialogItemClick { - private HomePartyRoomFragment roomFragment; + private Fragment roomFragment; private TextView roomTitle; private TextView roomId; @@ -126,8 +128,10 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi roomTitle.setText(""); setRoomId(0, 0); updateOnlineNumberView(0); - if (roomFragment != null) - roomFragment.onNewIntent(intent); + if (roomFragment instanceof HomePartyRoomFragment) { + ((HomePartyRoomFragment) roomFragment).onNewIntent(intent); + } + } @Override @@ -158,7 +162,6 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi @Override public void onFindViews() { gameMainBinding = DataBindingUtil.bind(mView); - gameMainBinding.ivKtvTreasureBox.setVisibility(View.GONE); roomTitle = mView.findViewById(R.id.room_title); setupRoomTitleMarquee(); roomMore = mView.findViewById(R.id.room_more); @@ -211,7 +214,6 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi @Override public void initiate() { roomFragment = HomePartyRoomFragment.newInstance(isRoomMin); - roomFragment.setParent(this); getChildFragmentManager().beginTransaction().replace(R.id.container, roomFragment).commitAllowingStateLoss(); if (!AvRoomDataManager.get().haveSelfChange && AvRoomDataManager.get().mCurrentRoomInfo != null) { @@ -383,8 +385,8 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi } public void dismissSendRedPackageDialog() { - if (roomFragment != null) { - roomFragment.clearDialog(); + if (roomFragment instanceof HomePartyRoomFragment) { + ((HomePartyRoomFragment) roomFragment).clearDialog(); } } @@ -422,6 +424,10 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi tvFollowRoom.setBackgroundResource(AvRoomDataManager.get().isRoomFans ? R.drawable.bg_room_follow_room_collected : R.drawable.bg_room_follow_room); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onShareRoomEvent(ShareRoomEvent event) { + shareRoom(); + } /** * 分享房间 @@ -549,8 +555,8 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi @Override public void onShowActivity(List dialogInfos) { - if (roomFragment != null && roomFragment.isAdded()) { - roomFragment.showActivity(dialogInfos); + if (roomFragment instanceof HomePartyRoomFragment && roomFragment.isAdded()) { + ((HomePartyRoomFragment) roomFragment).showActivity(dialogInfos); } } @@ -627,30 +633,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi giftView.onReceiveMultiMagicMsg(multiMagicReceivedInfo); } - @SuppressLint("CheckResult") - public void showKtvBox() { - GoldBoxHelper.isHideBox().subscribe(hide -> { - if (hide != null && !hide) { - gameMainBinding.ivKtvTreasureBox.setVisibility(View.VISIBLE); - gameMainBinding.ivKtvTreasureBox.setOnClickListener(v -> { - if (roomFragment != null) { - roomFragment.onClickBox(); - } - }); - } else { - gameMainBinding.ivKtvTreasureBox.setVisibility(View.GONE); - } - }, throwable -> gameMainBinding.ivKtvTreasureBox.setVisibility(View.GONE)); - - } - - public void hideKtvBox() { - gameMainBinding.ivKtvTreasureBox.setVisibility(View.GONE); - } - public void dismissGiftDialog() { - if (roomFragment != null) { - roomFragment.dismissGiftDialog(); + if (roomFragment instanceof HomePartyRoomFragment) { + ((HomePartyRoomFragment) roomFragment).dismissGiftDialog(); } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index cb3ebd772..a5403f1ac 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -122,6 +122,7 @@ import com.yizhuan.xchat_android_core.gift.GiftModel; import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent; import com.yizhuan.xchat_android_core.im.custom.bean.JoinMiniWorldAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2; @@ -213,7 +214,6 @@ public class HomePartyRoomFragment extends BaseMvpFragment @@ -118,8 +117,8 @@ - + - - -