diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java deleted file mode 100644 index ce1689b3c..000000000 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomFreeGiftDialog.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chwl.app.avroom.dialog; - -import android.content.Context; -import android.os.Bundle; -import android.util.DisplayMetrics; -import android.view.Display; -import android.view.View; -import android.view.WindowManager; - -import androidx.databinding.DataBindingUtil; - -import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.chwl.app.R; -import com.chwl.app.databinding.DialogRoomFreeGiftBinding; -import com.chwl.app.ui.utils.ImageLoadUtilsV2; -import com.chwl.core.gift.bean.GiftFreeInfo; -import com.chwl.library.utils.TimeUtils; - -/** - * 房间免费礼物弹窗 - * Created by wushaocheng on 2022/12/14. - */ -public class RoomFreeGiftDialog extends BottomSheetDialog implements View.OnClickListener { - private Context context; - private GiftFreeInfo giftFreeInfo; - private DialogRoomFreeGiftBinding binding; - - public RoomFreeGiftDialog(Context context, GiftFreeInfo giftFreeInfo) { - super(context, R.style.ErbanBottomSheetDialog); - this.context = context; - this.giftFreeInfo = giftFreeInfo; - } - - @SuppressWarnings("ConstantConditions") - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setCanceledOnTouchOutside(true); - setContentView(R.layout.dialog_room_free_gift); - binding = DataBindingUtil.bind(findViewById(R.id.dialog_container)); - binding.setClick(this); - - WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); - Display d = windowManager.getDefaultDisplay(); - DisplayMetrics realDisplayMetrics = new DisplayMetrics(); - d.getRealMetrics(realDisplayMetrics); - WindowManager.LayoutParams params = getWindow().getAttributes(); - params.width = WindowManager.LayoutParams.MATCH_PARENT; - params.height = WindowManager.LayoutParams.MATCH_PARENT; - params.dimAmount = 0f; - getWindow().setAttributes(params); - - binding.tvTop.setText(context.getString(R.string.dialog_free_gift_top, TimeUtils.secondsToTime(giftFreeInfo.getFirstSecond()))); - binding.tvBottom.setText(String.format(context.getString(R.string.dialog_free_gift_bottom_text), giftFreeInfo.getGiftName(), giftFreeInfo.getMaxStage())); - ImageLoadUtilsV2.loadImage(binding.ivGiftIcon, giftFreeInfo.getGiftUrl()); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_delete: - case R.id.tv_know: - dismiss(); - break; - } - } - -} diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt index dd35645e2..81d967aa2 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt @@ -40,7 +40,6 @@ import com.chwl.app.avroom.activity.RoomTitleEditActivity import com.chwl.app.avroom.adapter.OnMicroItemClickListener import com.chwl.app.avroom.dialog.AttentionHintDialog import com.chwl.app.avroom.dialog.DatingVipRuleDialog -import com.chwl.app.avroom.dialog.RoomFreeGiftDialog import com.chwl.app.avroom.firstcharge.FirstChargeDialog import com.chwl.app.avroom.presenter.BaseRoomPresenter import com.chwl.app.avroom.room_album.RoomAlbumModel @@ -102,7 +101,6 @@ import com.chwl.core.user.bean.BaseInfo import com.chwl.core.user.bean.UserInfo import com.chwl.core.utils.net.VipLevelNotEnoughException import com.chwl.library.common.util.LimitClickUtils -import com.chwl.library.common.util.SPUtils import com.chwl.library.net.rxnet.utils.RxNetWorkUtils import com.chwl.library.rxbus.RxBus import com.chwl.library.utils.* @@ -138,8 +136,6 @@ open class BaseRoomFragment?> : private var isCloseScreen = false private var isOpenRedPackage = false - private var roomFreeGiftDialog: RoomFreeGiftDialog? = null - private val mClickLimit by lazy { LimitClickUtils() } @JvmField @@ -503,7 +499,6 @@ open class BaseRoomFragment?> : } private fun releaseView() { - roomFreeGiftDialog?.dismiss() messageView.release() microView.release() musicPlayerView?.release() @@ -1135,16 +1130,6 @@ open class BaseRoomFragment?> : @Subscribe(threadMode = ThreadMode.MAIN) fun onRoomFreeGiftEvent(event: RoomFreeGiftEvent) { - event.giftFreeInfo?.let { - if (UIUtils.isTopActivity(context as Activity?) && isResumed) { - if (roomFreeGiftDialog?.isShowing == true) { - roomFreeGiftDialog?.dismiss() - } - roomFreeGiftDialog = RoomFreeGiftDialog(context, it) - roomFreeGiftDialog?.show() - SPUtils.putBoolean(Constants.IS_SHOW_FREE_GIFT, true) - } - } } diff --git a/app/src/main/res/layout/dialog_room_free_gift.xml b/app/src/main/res/layout/dialog_room_free_gift.xml deleted file mode 100644 index dd9d0a127..000000000 --- a/app/src/main/res/layout/dialog_room_free_gift.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file