diff --git a/app/build.gradle b/app/build.gradle index 911a35803..7b077b75a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -270,6 +270,8 @@ dependencies { api 'com.tencent.vasdolly:helper:3.0.3' implementation "io.github.tencent:vap:2.0.24" + + implementation 'com.github.mmin18:realtimeblurview:1.2.1' } String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com" diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt b/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt index 960863a4d..4af560179 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/ExitRoomPopupWindow.kt @@ -1,17 +1,13 @@ package com.yizhuan.erban.avroom.dialog import android.annotation.SuppressLint -import android.content.Context -import android.graphics.Bitmap import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.LayoutInflater import android.view.View import android.view.WindowManager -import android.widget.ImageView import android.widget.PopupWindow import android.widget.TextView -import androidx.core.view.drawToBitmap import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager @@ -25,7 +21,6 @@ import com.yizhuan.erban.avroom.presenter.HomePartyPresenter import com.yizhuan.erban.common.widget.dialog.DialogManager.LambdaOkDialogListener import com.yizhuan.erban.common.widget.dialog.DialogManager.OkCancelDialogListener import com.yizhuan.erban.ui.utils.RVDelegate -import com.yizhuan.erban.utils.FastBlur import com.yizhuan.xchat_android_constants.XChatConstants import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo import com.yizhuan.xchat_android_core.manager.AvRoomDataManager @@ -35,14 +30,15 @@ import io.reactivex.disposables.Disposable @ActLayoutRes(R.layout.dialog_exit_room) -class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity, val rootView: View) : PopupWindow() { +class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity) : PopupWindow() { companion object { @JvmStatic - fun newInstance(avRoomActivity: AVRoomActivity, rootView: View): ExitRoomPopupWindow { - return ExitRoomPopupWindow(avRoomActivity, rootView) + fun newInstance(avRoomActivity: AVRoomActivity): ExitRoomPopupWindow { + return ExitRoomPopupWindow(avRoomActivity) } + } private val recyclerView: RecyclerView @@ -74,11 +70,6 @@ class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity, val rootView: View animationStyle = R.style.style_anim_right_in_out setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - - contentView.findViewById(R.id.tv_more).setOnClickListener { - //HomeMoreRoomActivity.start(context) - } - tvReport.setOnClickListener { val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo ?: return@setOnClickListener UIHelper.showReportPage(avRoomActivity, roomInfo.uid, XChatConstants.REPORT_TYPE_ROOM) @@ -135,37 +126,20 @@ class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity, val rootView: View disposable?.dispose() } - val bitmap = rootView.drawToBitmap() - val bitmapX = bitmap.width - val bitmapY = bitmap.height - val bitmap1 = Bitmap.createBitmap( - bitmap, - bitmapX - ScreenUtil.dip2px(250f), - 0, - ScreenUtil.dip2px(250f), - bitmapY - ) - blur(bitmap1, contentView.findViewById(R.id.iv_blur)) - } - - private fun blur(bkg: Bitmap, view: ImageView) { - val scaleFactor = 8 - var overlay = - Bitmap.createScaledBitmap(bkg, bkg.width / scaleFactor, bkg.height / scaleFactor, false) - overlay = FastBlur.blur(overlay, 5, true) //高斯模糊 - view.setImageBitmap(overlay) } private fun handleExitRoom() { if (AvRoomDataManager.get().isSelfGamePlaying) { - avRoomActivity.dialogManager.showOkCancelDialog("游戏中退出房间默认逃跑,确定进行此操作?", false, - OkCancelDialogListener { avRoomActivity.toBack() }) + avRoomActivity.dialogManager.showOkCancelDialog( + "游戏中退出房间默认逃跑,确定进行此操作?", false + ) { avRoomActivity.toBack() } return } if (AvRoomDataManager.get().isOpenKTV && AvRoomDataManager.get().isOwnerOnMic) { - avRoomActivity.dialogManager.showOkCancelDialog("KTV模式下退出房间会移除您已点的所有歌曲,确定进行此操作?", - false, - OkCancelDialogListener { avRoomActivity.toBack() }) + avRoomActivity.dialogManager.showOkCancelDialog( + "KTV模式下退出房间会移除您已点的所有歌曲,确定进行此操作?", + false + ) { avRoomActivity.toBack() } return } if ((AvRoomDataManager.get().isQueuingMicro || AvRoomDataManager.get().isOpenPKMode) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index e96d430cc..2ad84a5fa 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -110,16 +110,16 @@ public class RoomOperationDialog extends BottomSheetDialog { addPKAction(optAdapter); addRoomPKAction(optAdapter); addSingleRoomPKAction(optAdapter); - addInviteFansOptAdapter(); addSendBroadcastAction(optAdapter); + addInviteFansOptAdapter(); addVipSendBroadcastAction(optAdapter); addRedPacketAction(optAdapter); - addRoomLimit(optAdapter); - addGiftEffectAction(optAdapter); addRoomSettingAction(optAdapter); + addGiftEffectAction(optAdapter); addOpenOrClosePublicScreenAction(optAdapter); addRedPackageSwitch(); addCleanScreenAction(optAdapter); + addRoomLimit(optAdapter); addGiftValueAction(optAdapter); addSuperAdminAction(optAdapter); rvOPtList.setAdapter(optAdapter); 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 02a303bd8..58a87fbe3 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 @@ -495,8 +495,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe public void onClick(View v) { switch (v.getId()) { case R.id.room_more: - View view = requireActivity().findViewById(android.R.id.content); - ExitRoomPopupWindow.newInstance((AVRoomActivity) requireActivity(), view) + ExitRoomPopupWindow.newInstance((AVRoomActivity) requireActivity()) .showAtLocation(gameMainBinding.getRoot(), Gravity.END, 0, 0); break; case R.id.ll_room_info: diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java index bc4269e8f..e317673b3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -74,7 +74,7 @@ public class AllServiceVipLevelUPDialog extends BaseDialog { private void showVipNotifyBySVGA() { SpannableBuilder text = new SpannableBuilder() - .append("引爆全场！恭喜", new ForegroundColorSpan(Color.WHITE)) + .append("引爆全场！恭喜 ", new ForegroundColorSpan(Color.WHITE)) .append("-", new CircleImageSpan(new ColorDrawable(Color.TRANSPARENT), vipMessageInfo.getAvatar(), 50, 50)) .append(" " + StringExtensionKt.sub(vipMessageInfo.getNick(), 6) + " ", new ForegroundColorSpan(getContext().getResources().getColor(R.color.notice_nick))) .append("贵族身份升级为" + vipMessageInfo.getCurrVipName(), new ForegroundColorSpan(Color.WHITE)+"!"); diff --git a/app/src/main/res/drawable-xhdpi/icon_face_btn.png b/app/src/main/res/drawable-xhdpi/icon_face_btn.png index 830af1265..ee537d2b8 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_face_btn.png and b/app/src/main/res/drawable-xhdpi/icon_face_btn.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic.png b/app/src/main/res/drawable-xhdpi/icon_send_magic.png index 7b6920cde..2e1b226b4 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_send_magic.png and b/app/src/main/res/drawable-xhdpi/icon_send_magic.png differ diff --git a/app/src/main/res/layout/dialog_exit_room.xml b/app/src/main/res/layout/dialog_exit_room.xml index 49ed0fa70..83b6f7350 100644 --- a/app/src/main/res/layout/dialog_exit_room.xml +++ b/app/src/main/res/layout/dialog_exit_room.xml @@ -12,11 +12,18 @@ android:layout_height="match_parent" tools:background="@color/blue"> - + android:scaleType="fitXY" />--> + +