From f943d9edc63c1458289e88fc60c2c798cfe631d2 Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 12 May 2022 18:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E9=AB=98=E6=96=AF=E6=A8=A1=E7=B3=8A=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=AC=AC=E4=B8=89=E6=96=B9SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 + .../avroom/dialog/ExitRoomPopupWindow.kt | 48 ++++-------------- .../avroom/dialog/RoomOperationDialog.java | 6 +-- .../avroom/fragment/HomePartyFragment.java | 3 +- .../dialog/AllServiceVipLevelUPDialog.java | 2 +- .../main/res/drawable-xhdpi/icon_face_btn.png | Bin 1872 -> 798 bytes .../res/drawable-xhdpi/icon_send_magic.png | Bin 1724 -> 941 bytes app/src/main/res/layout/dialog_exit_room.xml | 11 +++- 8 files changed, 27 insertions(+), 45 deletions(-) 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 830af1265c6411345e3296fa6a3fc1a31441b978..ee537d2b876cc99d2504425c2cbc960e8f645521 100644 GIT binary patch delta 639 zcmV-_0)YL{4xR>(BnyyGOjJex|Nj600FjZ3f7DJNrT_o{FLY8)Q%wLnrZFQ2=SUL+ ze)*wRoA%(aU{X(uYt+!Wk%DJjL^l@}ab)xH!Ipb>S*q8_z~Pci0006GNklZv~7>41mF^PZ+icoMxth=_k|GVqY3{#VkC{CXf4&;@r_;8ALg0nIJf|7Bui`;Ly ze_|;ZEKJBwakz!kHhdX}3|=gJ8cU9+xb(+WfER+w7YlSCoN>g_36I*bWax-VJB}DS zW04heyn&msz*~eKS9nwPh^1qHvr96c9*6znwA?uMTQ;$4!n4IeJrpa)w3|4DWqcnh zQ}G2$*u)H`yst<<8RWNge~st$KMiA;e^?#2KfIdI%imZ0*(7zoNL!z#*t)+LdUNs# z!@i*UWZmyNmN2XjG~yhVY(e!121&7iE}c@lL0dxgz&a_gmMf+)=Wxj8N=-9!$q<>F zbX4jLryI>@30;I8bR!ychT3>J8feevH)tp|r%W?$7JAU@^=8@=NNH5YSrOpIf2pL? zkoscKir=B(V9=bE`T;z{#)_5<8ivx^j~HHK+6ib%1kjx7Df`j69qacJ2HMLj{OH20 zq4`(r8}|CQ^fJ}~5CmfAB^?bim@tV83>yFc|8yY6r7VvxAa`x=^(V8|&9~javhL53 zI?ce`s&-v5-lD~<%86uC8q(;}Y2ifT<(XQ%uO(e!8#$8 z(=b?TUngOJVh9BwiCz@?|0_&tE(1OCN5iez^ Z4nAEBM9+S0>9zm>002ovPDHLkV1j4TGZ6p) delta 1428 zcmV;F1#9}A2G9RaRG6Sz26PUtnQmW@l(=YHMt5Zf|gLb98lf zcY1q#eSUv{fr5jChlq)bjE<0zl9QH~n3s;jK6u(Py(w!XmA z)YaD4+}+;a;Nj%u=I8G3@bU8V^!51p{QdqAHjEko00dV_L_t(Y$E8>6U)wem4U|VA z4K2`;Sh6KcrVWo~T^W$Eg|&n*y7jpfLe{Z$E6rF-64vrswvd#u(v3by^cPRI^ROHP z>Cg9z;#kM$=-#V)C6CA1+B&;`FI);B6u5MuyR*&HytQ=r`XoXLQMnQRL+bN&v@``h z9HGowkRKxw=Gp9p+evPUQMm4|hWOz&0fJW3~jA#R0Cx~zFrBpq^DD7=O4tv(G zsi&CcKkJP3Vyd2M6nmYP+e3)jgb~uyxbPmWDXi|d9y|6NX%ee*pR@UYN^Kg;(W>CJ z_5f8s!f3z}vDRLP7-0Yu%m)Pk+z_$e)*860kyi$z^Qo;|p^)23&5r=t&fQhZ=K=eI z5e%>Ims!Qi``Jl|#AOdu^W0|_4MXd1O<7kPFVeb?F`$V9 z#y-S>mAYSdcn1>P1!J6dHzEn)!P0b*vBRi^o1hNeT>`NZdd0EVpgnZpI!70-T6|7* zm-Pu?xXv|4Kx58;={JmJEFYzPyv9ma)$$}4y%;d05^C_E$|x;=ap4n6U3Z|((@E^a zJDR>;{K?Ytm;47B`~Feb_(RKaYKtb)>G4`sqtSm@`Hnduo>_Z3gjJHrto?l15Pq-B z{vNJ7l6pPot<2z7iS1r7-!G(}r-m`6$@JQj%lcm^SY$_E*H=x>doBv#Um1H5Fhz_# z`sJoBdwltE#QdCpw87X)T{pSt@e6_4;_j-vMw-FL$H7W~K!UMN%l`6vgx!L3tUObF zjj=eYa*VNU%X}n))gmiRD#sNN`SUW%V=GvYtrl1*Y=V{gH?V9n$WtQNFFH(@9W`W= z*+_L79=i1@a*)j(CWNZyFg&!nQVE$V&;0(40Rc;b!+5BFgd_ne#$HOsn`Am-&ch^` z`9g6B6;Bc&J;D4DD+F~$C6ay|lJz(%vGk8dhN0jqb~FdA>Dd;rpwY-aE8jJA(}&rg z!h6GHG(l-p7Nu}Rse0K7tV6w#c6v1yuq>m%~-0C*6mdEVVsxVgCz~r zSP;;Xynwxb02+(Fz1_g?^j?#@7vx2s8<2+X^8&JX zY!vmUzpR=qjjo}^!mF9XN`tJl%ER<1bZ)VY%^kss%wDaS zHn;Qn?ae21!$3LySmAh}!4N12W269xPdw1LJ4(4b#JM{@x;nVJJTkjGth>7=xVxaZ iyc)S1yp(;!b?|>)Gw#iDE-oMd0000Jwg3PEnMp)JR7l6A zm+6+WFbszCl>#E7f}@TLBICYJ?*Hn(pd6*_syqS=1vaJUfWYzeTjJmwtb7MA#eoC0IKfk~cHt?mt`|>Q@PgK)PVB)Ocy_T1Z{b?R z+JQH5bVW?sx7AYY!Uwoq?7>HPrg#D$GWip0TYkHp)%JYeuGW29zV%IPcR0TO;Ddwm z?QR$100iNBfQMYEfA0O0qY>9e=JqJNQRUQDQ1aWvm)W;8TTmMb>f(shINJ~8e_wY zXsFhqSzw8149)i-N@Z@g=%2RRmOGJ_n?XumM_?h`hsr?7n8|HOZh##m zx1);PLVE;;wrsr@dhP6s>62n*LEpAbKU@@ByfTbOyJ8HaVmX0*-0aA2cAPDS@y+Py zGC)GfaZ@+wvZS1E^WQe!_#J^Ds2{PXIT{S8R0QtR;l5W%`(`~^Eknz2e|fBk`gsgi zCQS}BO^#Ac4snf+j|~p4O^(b>4(m;>2~963&96qyFJ+CcgZ}~6&_eTcH0i_u0000< KMNUMnLSTYqjC{rb delta 1327 zcmV+~1}2SXo+LU}0uwXlZI|Zf|jPb#`}ndV73*fPsR8 zgolWUi;j?ylA4>Got~edp`xXxsH&^1t+TYYzQEJe)z;VC-QM5e;pFA!f9LM+@bU8V z^!51p{QdswxgCrE00aj~L_t(Y$E8>MTN+0cU5$?@!9-1jo!Q;loe_)@^H6IHgjn0= zQ6uIh&=SuL@Qqth!-(Fx zF+A9(bZsmSuujfAEJo79Qy73VJ0pP8e+fTV_#4#zR*whlV4Jnm$HZBz!Tv zXJ~?1W(Tv_#Lxxg`$s7?FEC0+`#WK;MwoetvB*__Y=}_vQlli~cia)nGP^L#8u1={ zgms0r<2K^PUbDKy+P<&3Vr6!X1+*zetv^c5uP_=FGS)lllOuwVe@@^_M~HYbHrm?; z4|)A+D6x{?D^)6`z5L1y(%im>+Vwo)KCpoowvX$)Y4zi+d2GnXo@mv1*i9PGZht<< z)oSP8pSNbQOg!9j>|%}56&q0gu$G!%NUeQ5w4V+iOK9439dbFwFaL#?55AA9NYix< zsZ&o6Z0D;Inl;L_e|Ma^uwOX;bB#JNCWvNEIRCPWMAzeXzy}N|TsRGW4w&Nmf4CMnS%XSQWNjq=;PoHc zFOXQaxG~v6qi1#g`?T}JG^AV?J)`ex{4nn1D4u(tZG(-eDnI+yIkk0Nxha8v;{1bf zVhL=jJDg`7-quYeA|+}M!qxmYA;gFQm>HxAM;Xp{h5m{tQn!#2uP3$UdE@a|0>IO; zcONL|tG-g3|tM@!;bRXoYoG@Gh=#pOi7>HMw+yeLru>T|l6=K7FqK{WW zdQa9Fe`~;Px1WOm@zWRBXWV!O9ZHq$0aMw@ zq!$;{nVqWr^qa_87<8Tyi|=fnHV0&LRGt - + android:scaleType="fitXY" />--> + +