From 91a29d4a5e82032fff094dd6070c12d2c13e7024 Mon Sep 17 00:00:00 2001 From: huangjian Date: Sat, 8 Oct 2022 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=88=BF=E9=97=B4=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/dialog/ExitRoomPopupWindow.kt | 19 +- .../avroom/fragment/HomePartyFragment.java | 11 - .../main/res/drawable-xhdpi/ic_room_exit.png | Bin 3055 -> 3019 bytes .../main/res/drawable-xhdpi/ic_room_mini.png | Bin 2917 -> 2392 bytes .../res/drawable-xhdpi/ic_room_report.png | Bin 3392 -> 2875 bytes .../main/res/drawable-xhdpi/ic_room_share.png | Bin 0 -> 2951 bytes app/src/main/res/layout/dialog_exit_room.xml | 216 +++++++++--------- .../layout/fragment_chatroom_game_main.xml | 8 - 8 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_room_share.png diff --git a/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt b/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt index a08118af8..f47a66fcf 100644 --- a/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt +++ b/app/src/main/java/com/mango/moshen/avroom/dialog/ExitRoomPopupWindow.kt @@ -12,7 +12,10 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.netease.nim.uikit.common.util.sys.ScreenUtil +import com.mango.core.home.bean.HomeRoomInfo +import com.mango.core.home.event.ShareRoomEvent +import com.mango.core.manager.AvRoomDataManager +import com.mango.core.room.model.AvRoomModel import com.mango.moshen.R import com.mango.moshen.UIHelper import com.mango.moshen.avroom.activity.AVRoomActivity @@ -22,14 +25,11 @@ import com.mango.moshen.common.widget.dialog.DialogManager.LambdaOkDialogListene import com.mango.moshen.common.widget.dialog.DialogManager.OkCancelDialogListener import com.mango.moshen.ui.utils.RVDelegate import com.mango.xchat_android_constants.XChatConstants -import com.mango.core.home.bean.HomeRoomInfo -import com.mango.core.manager.AvRoomDataManager -import com.mango.core.room.model.AvRoomModel -import com.mango.xchat_android_library.annatation.ActLayoutRes +import com.netease.nim.uikit.common.util.sys.ScreenUtil import io.reactivex.disposables.Disposable +import org.greenrobot.eventbus.EventBus -@ActLayoutRes(R.layout.dialog_exit_room) class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity) : PopupWindow() { companion object { @@ -46,6 +46,7 @@ class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity) : PopupWindow() { private val tvReport: TextView private val tvMiniRoom: TextView private val tvExitRoom: TextView + private val tvShareRoom: TextView private var disposable: Disposable? = null @@ -62,6 +63,7 @@ class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity) : PopupWindow() { tvReport = contentView.findViewById(R.id.tv_report) tvMiniRoom = contentView.findViewById(R.id.tv_mini_room) tvExitRoom = contentView.findViewById(R.id.tv_exit_room) + tvShareRoom = contentView.findViewById(R.id.tv_share_room) initView() isClippingEnabled = false } @@ -81,6 +83,11 @@ class ExitRoomPopupWindow(val avRoomActivity: AVRoomActivity) : PopupWindow() { dismiss() } + tvShareRoom.setOnClickListener { + EventBus.getDefault().post(ShareRoomEvent()) + dismiss() + } + tvMiniRoom.setOnClickListener { if (AvRoomDataManager.get().isSelfGamePlaying) { avRoomActivity.dialogManager.showOkCancelDialog( diff --git a/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java index d920b5cee..31c90bf79 100644 --- a/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/mango/moshen/avroom/fragment/HomePartyFragment.java @@ -91,7 +91,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe private AppCompatImageView mIvGoodNumber; private ImageView roomMore; - private ImageView ivRoomShare; private GiftV2View giftView; private ViewStub mVsGift2View; @@ -150,12 +149,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe roomTitle = mView.findViewById(R.id.room_title); setupRoomTitleMarquee(); roomMore = mView.findViewById(R.id.room_more); - ivRoomShare = mView.findViewById(R.id.iv_room_share); - if (SuperAdminUtil.isSuperAdmin()) { - ivRoomShare.setVisibility(View.INVISIBLE); - } else { - ivRoomShare.setVisibility(View.VISIBLE); - } roomId = mView.findViewById(R.id.room_id); mVsGift2View = mView.findViewById(R.id.vs_gift_view); mIvGoodNumber = mView.findViewById(R.id.iv_good_number); @@ -189,7 +182,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe public void onSetListener() { roomMore.setOnClickListener(this); ivFollowRoom.setOnClickListener(this); - ivRoomShare.setOnClickListener(this); gameMainBinding.llRoomInfo.setOnClickListener(this); gameMainBinding.ivBack.setOnClickListener(this); } @@ -483,9 +475,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe case R.id.ll_room_info: RoomOnlineUserActivity.start(getActivity()); break; - case R.id.iv_room_share: - shareRoom(); - break; case R.id.iv_follow_room: followRoom(); break; diff --git a/app/src/main/res/drawable-xhdpi/ic_room_exit.png b/app/src/main/res/drawable-xhdpi/ic_room_exit.png index 3d8461a2ce81efd781b96b8d6f53ed95b2c2ccc4..1e1621180ff814f7b17957e7d839c4ab8e9de4bd 100644 GIT binary patch literal 3019 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 diff --git a/app/src/main/res/drawable-xhdpi/ic_room_mini.png b/app/src/main/res/drawable-xhdpi/ic_room_mini.png index 72d81c320a095fa1bdb0a58636a9b6c19b5063c8..3e17428be1aa53ac978fbc143419e604a6ad77d2 100644 GIT binary patch literal 2392 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 KMNUMnLSTYwcwepn literal 2917 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 P00000NkvXXu0mjf#Q~BQ diff --git a/app/src/main/res/drawable-xhdpi/ic_room_report.png b/app/src/main/res/drawable-xhdpi/ic_room_report.png index 8699fe22daa4a4e3fe007e6687a49723da3384d8..523e2ee1c7979215eea72f78f36a97de78532e59 100644 GIT binary patch literal 2875 zcmV-B3&iw^P)Px<^+`lQRCr$PooT2gM-|8a6?fwnq)wyq#H=Oz9fEMSJHLtbBrWs-SLwCE9qMMTqEgfNrxm|CF!7Z zj^DGVrbDx9sQ3Oxl8&_xe*;EN0<Yde(k0G00IN>b z0rKA8Legz)p|9TI5f4PcxY#*&=?EUZZ>9l0f$p19?-_2Pb5b+5=sGx zZ~=j~h4PO8fj`0(owO1l3%1>35pDUAF^-73b5{lZ)&YbYXU+~#avN~c;zcLdp%KG~ z4{`_g;It%{px6+PXH1IM`CV)}0kRx|yNrK+Rt~86kC*f?Ne_`k#5RTYO8UK|-$?qY zBtimnq6@lm9998zuNip@9wX^l2F%#pIYIyc^>s4o}|x8`hE%KJ$XiLqb`8%J+UM7zLMS|>A^iaIrQ>BN_w}XvxYLraNi;4++RaJ zM*(CRpDesn(F-KKIx&oK5L*KO7MV4c3{SgJ7FeI~8#4Q-idaW@nm;b-OY1Hy_4G`;nxdOFGlaN>*J@naTr=?~_dHTXj9_(wi)iz91G+ z)>k;^c;ODy5dc{tJ9bZPB1ikvlJ2+S!N0b*o9{97a7oNkzPsozl3qbh_Lv6^ycfIZ za4Ad(&=lTk!1;=#E|vZqN$-{P+kqYKy6r?sZiJA1G%Hj?);H<_+*9PdOwy2gEh%TO= zlJw}vKPmZmgQQ%m=8i+F2aA9)y7KJp(0 zpe8*)5-&_FAo(FlU#{4gOPzBUh5#YnYLy-GEG&66tTr)oUN`|bO&b6Su^NU}P{E%m z>Fi1%UE`eFvdOk)&;;5WN2ygS>BFdX?OP?C65RVuN$(oS?{zkl!`rcs zYPp3ja?b5-0K(!%NvJ{Jjri73rJpuJTf;UA!y;tRtg>}h^%YV7?T8AF5qWZrL6UU9 zIk&3;sMh-PSW}zBKE8OQos%0N+J~L=g$Njk;Tm4>t#!y*mgs#dy%nF4^vK{@4DL%u zK0mjJYnt=9$Sh=yeEG=srrv%w0M)X8P+tj_g@!QTjCJ4SR1(^Qhlm8EHepB-G^`Qy z+XX0M*jqeiq3gc#fn$B{p`d%dpq5+uB6z>2VbrbO3+|FO*J7B>Uzk zL5B#oJt85VlR6HprBAkte~6lzdgGew@OJzv67+jQg>0cK0jNfJ`=OCYC7$AEWEw=k z!EU*u@xzbx^o$^VOVa&=wm#o7g)(&^%H|LN5hN=eV!#FSo}dXokaSw6-eKgvE#UP| z11-lRaF#wXU_>nGdpVe|;BhSg;UHX_0z9%I&$cjfo6T1xy?-R%=6387Jm77@pGK56 z2k|1YUbYE$)z@+`U%|rz5b^rb^b$$02_AxdL6SxeDh&`pz0jCO`;2)Sa`fjgj|HH# z;fw+FF-f0KyM6doi-=1byGcddCMXG|MckxH!X~KMr2&em*@WzWmo@L$2)N&+;wtEZN;G$zM$IZI0dG`X{M6T%H80h&DAun7UXQUJ{& zV8r+{V3uQ=ULynMlSMoffm(=2ElIIPerTk>(~?MIa+Q>SLJaM+IZTfrDeHNxPlK(4)+67{ES zrc}$$iS<2gGbICva{M`L!Mtoo*7X{D?>BivKNJo;88u27QKpbo5~tMXg|xg%;RTB7l(1%G8;(C#^&V! z8n>~z0fdigIT|28NO_J1Fpwy7Uk=yE2U5PnHJUcfXshOY!!#YIyvNhDK$^naJ>4*t zd2*Qpo?7eCazxs2;L0A6W*|{;yc{yvAEfe!47Nla*{I7go#`OeJEpS*5}Ms|(CvDV z>K}9)fV3PH-3`)oM@0wXZaHlIXpp8qY`p~%iUU#DIiJ?GUKr)O0&R`xC>c7VDBBJr zwsSp4mF@I{aM|c@&$`ncQ&GzXP~dUEpgktF5gT$H?wj4I2iT_eIXgft-yI^a^fqUy z{VaVQj!#4yNX0 zR*Z@R)B=he2XfU?a@2}-I0ItyYc>7h?Z-wzRPg}}-2N=|XkiDPbNrq? Z{ST-ada6utXbAuS002ovPDHLkV1jI{QV{?E literal 3392 zcmV-G4ZrePx>`bk7VRCr$PooB2aM-|8aL+_#Y-g}2H^eTF9LZTzOK=dkl50HosqJt1!bP&CM zp@xJ2aU91^2x$Z-c1(#0gMQa%p60FZ-fgop``+6lUEOQHo!Qy*-#K&YjMD}p@4b_B zen}UKJ{Od9UP)^`=6w9?Gt|gN7BEe&wl5e-zaQ=0h1*I=%SJ?ZXbRFOiBXC zeUkRtXWx_ooE%`@`}0Y-XX{VSm$mD?SPM^=beeN+f7iyTt}g)JjmU^b(!Y@#pgy}L4|#r23wMCIRd&bTa0vo(s@ zbd?Pt`dVPM?h-`hNzA$&YuxC7dGArhuP*5#T{*GAuK%Z`6P$CH2&2(xfZ42KMzL0H zB|4QEH`Z($1u#=8t}Th#wH1k3wqp#XBspN-dko%dZo;*y>x;+Qw$nL>0iKMK0_MF( z1YR-O=r%`3r#R&#-XGgzSk z;_QG%+#L)XE^6}c5U7nuvvBQ%HoyRcUJj30cJ)qqHv~k96&U-Hm+L( z=DjD`&XpYCUQ9{}RcGWHDbsr6#nvRKJ z|F!9+jeuD^>xNAo&3{kAfxk4x(^djzq7bk)d+;#{w-a7m?g~IWY!AvAr)zjN7p6xtOAU135hc^<>vqiJ-e3Ob}3*M;=k#HGH~;= ztn3|G!~VF;Hmd{dYL<~Z=CD&1H4y2>zlr&AiAYIe5#J*Tbs4{1ipcMvcvc67l3{#e z_4CTew(jhJ36iGjo^fO7nvofR(JX~Cw3o!1(EL)cr zz6`Kjc^Q2GBSP?0N%yw$qpr-3uV?0cPtr#%gSTy8xd3B42RVn=0cLjBEi!3_T>v9p z?s1YHYlVDmncL<%iu*n*>C;vx*3>2^VE7sT5Zh%{z(`Tc<&AF(*aIXz*XqUUn29g$ zI4e@XhM`yiLd(ULkxNbX!~VSo`WsmM=&;Y{mMP8?ZB-bG(cTS_8}yYHprUm0txIn%dxaSdQi;EfNy{B5Ah;mM<0`>$+&#nyM zCk7VkZ4N@w0kpeTZuUM&pS1rg0T{O?B7JrM>`Ia-Wz9)3V2C7aAs7}25%3h-043+R z*t7*>nk6C-FAO#yBDoY`l;)ls03(B!%}a7p3>fRjouZrXmc)$1mDH60AJK|=Lch$? zu0#b6Gm8B}0{z_9(Ncizbenhf0AK)ub%zf zQPR6AZJ%a7$evveYIa~9vrx*-26ff1aR3bQ6W{;0lAhVG%SEd$l%yy1?JPmNqW}!;D3;d=`fb$(fB_VM1;R+gCi-)$9+qFkMlCNfk%+SJ`vHBC zhl%YMdxQWC;7ZW30LBAWjno{20Wh>e)~Y~1mh{pbH}7zdw@JENbUgsRw?q4sm!1e< zB-!BQ$V~wDMMqQ zzb^?lR-lJd0$X5^djO2Q!xGyw5Z`)U^w4O9Xoo3?5?`&voFx&mP{eLg|o50vyOQxv`-=?w|`e6-nMp(|o$j6XO13&7CS zaJuHEk5|-rG`l`VZgt!rw0sZ#pUo*T$cMVNa8$eZ0I(5Bqe<;>hokt%;em3E`X7J)L0ZT!pMGDsgZ^O?9()q#sG}{ zvUtG);X%2_(1G@7?@I!Pl7R*m2=zI|PH1BQhEf)r8)&kz64HbBy_zflD*vA79z2f((%YL?u}ad*4|+aG+-wZM?rBLu;XY((JtM(byLPcq>q{BV0E8F}^nP=+ zc72HI^7iro+J0d;mvT)#RMIP>5g%!3*j*nY2VftOL<(RaLO6)@ z+_Z2_m2&>#aQ=2=QV^iKpQL{bWj~`CBr)QhjsZBtzER`aF zIF3UsJj76+VoJcOK19ZcqI5zZZYOB7ND;s-l{<-)v4=H*9D3B|K*X6ypYH3hO$8YK zRno%a04rw4%MviYPZtN0aA@hhFPY|s7lDcqj-d)PB-Fw>7`zbV#iPjdp=wA4&p(wk zrDoTGG&cjRbRy}CB|S3YD$K#|>Ernzr;tKWgLNqB$IXpD88PT7qJ@qIXM81v;f9b3b1vl+9lSpYHmH=?{`!RGPau* zIn*|53m`TZ8BuIJ9SDG46eYHn0Bn6Rgo(x69*=lhw5=`IdtS#n&e~Z$ zD<&?4pz9KVtuHq+z@}2r_c}@UtuUSV6FC$=>Ip_uv%6dWaeR(8-;wm1O5+lMEiLF{ zft^ChEOy~rYXXGieDKDnN-;xaCz-WcUIa!2SW)4t=>@p~TV672vur9w>8z=EKuCqF z6872GO)((1q7PA8h4_6?O+L$~?8R8N4PI`*mKUWPU{l-n0nvy@zb>omm}qC4rZtW= zD(sw7SG>qassw`V-=faQ{B1^EiO4>J`nf`zFl>T5fk$e)df7j{UYlH^8vV=7R?EfjaD<0RxRffcYqoJfICb z$|H=?dp{qRGd^Hx4$Fx|<9r;|c%Y>{jw-UvD4Zx!tvMd6%J-c9z_&;==Je*5XJwud zjB})71X?cVa2|G*z00_VmPVk>#{v%rI?u7dkrFZ=yxkwPya#U^XoNcEqwTwcmj7t` zNHh|UB8RWU)<@l0RlWsaZ4Z0U_ZiOM{W-k%%rv6Fhx8f17HWeS+~J%X6f7MKShS`Q zjv;qqrh_>^uF0-8=QKAlF9~3?%D6}X%=}r!q zfyQQ#Y)8ITl@XMSKCOVtS+ho#Ks?Qmj|Y7%>`P(YnSg zqn3HIpSDi$k!W#>4bEy`+R*`vW*f&$G2=Gd+QwSN>9r)z)E-HnN^E2SESha3sZxl5 z`k(dQsTdaZ130Mbl(IIR4w&rrMVMw=O|Z5x>za;MO!lyeI>PWJf1e2P(49^@52*-X zl^MrQJY;80T~s3aD6$|UH`|P=B3cx%2sp-pYYS1y_aw%}ju>{}4x;a@9BWk5l$#1; z*2Zavr&7U>0nV-hxkV--k6i;Wcy|wR)HX4{&)+8pSo{#SOAlrNg%5oAof<#@LKUYt zg3rDw%%nOnCkPx=K}keGRCr$PooR?BM;XWe<$Y_6_Z@HXLcH+60}l+Mq5qb>KBcIC?2SY zcwdPU&!8ei5JeFo`XQc(sASc|Y!Y`j>t+*Ob8Qk^e(yZ*SW{E|zTI8bT{ScPz_2rH zS9MkWyQ==rRpqopq-mNPOS+k)n@YNgB>ujUq#N4L4J0}1P9y2RlCHO(>m*$(>A0k8 zBwg*CVbl5T7N<_2Wl z-~-ryB>jtjopa2>;!+$Sn<*z4Ff3O!2umYCT~>N#6$7Yg8fMCgl5SB0A}iW(rKC%p za{xBEOb$@fG`Ev8%cLI7S_9=6%~L5UgDhl z_Y`d!9iXOZpv8B!jem+hP4x~4#X;vBfQ=@j0c5P~4wCLD2_0oO3cA)mB^?=y^^F2h z(=;fO_mqVGvKIs$>LTYH`&3rR4v>+6yY1px(*^*u=|FB0kqsbQ(%5TmpY;>kd6gZt zy(x>Ln+2ezX;3g((y#=~vSE>6$wT2yl4O9)hYO{!wUW*N znT6mUT`QiSTR8$3ceOZl0>~KK{r8~xW~}cFv(VqVFuSz?*}elQ*eiz5u|Nsy#lQ+_ zSZNaK0ub&39Bs4Y9|0VHxGP#^B|zqEyWhODK$vl61L$b@EGj0% z>w>mdv;t%?1os-ZZFB850vEQ$IIIHb0kgGWvJdDQ=iFaoZ;Jvn>pYVIa&dMF%~8rE~6lzvLExERY?&XSd1ek{&m(Q=gXfg@I*<6hklC zOoa&n+6mTb(o!C71O6aMxIf5_AcFOfqz_8^Z7?$5ko1Tlqb2E^l0G!B?2uwxtlgUc zna%CNmaR6V;<3xH^u9#W$p%Q<`-qu-rX^=BpLvd?4-d46d`;3v#_pU~KaoJ^E^Tx^ zK&;PvjkO6bjA9AZx~eaL!~OzjtE2=#mpkV!4gq3$n>y{VZD2_5Vp(}&hp&ay#Ur+) zF>5{Dr`K;9MfkJ(JuO@(K&prSut^WYZcOy&BezSw6BM5VH^Ca; zVFxlLG-q(pqX1Nr!I2^H{h;|VTUwtUqAq-WAUMnSps=INrYx_0+T8Z+F#tj#EESXp zwS}Si!k+Q*gx+DzeqN;fFD1QMQVQWnXx5;jR{>B-_cmZWHfZ`OlD4^idvq`6`vDw2 zgekqFJ(}G5=y3pgNI@6FuY%c2hV)Ytd-g&}@AK+7ThiNiAUJg4dH})}>f5c>N08y`&x0h}j$FaEQ6a7(mh^PMG^xTi?^OwfC*$qZBp z`Jp5~L5*3&GFeg4p!o6wGxHQ^&gLr@ifTzy&-Vf!4e5YSPxSo^ z8PHcrdRtHsYX*vRNm-bBN*YUJPC96I_%)9`NHK%$OC|kj>=&=8e_<>w>27#}In(@h z;-`7hgaZRf`gZU>Tjfrk%C=W6+zllib_60~P2iYjUog!;7^V>PuF$-cYOu}K z?uEmS&AOz^8<+E&f*uiLjbCPLbIa2rekVe>ASxH-8s&s~_SFzH!VJbS#<|+Qj7_<* z1+ujHx)1L^%N%wI-DM$iaV6=rfY0r&PhBi;IvMSy1Mu~!Kn1tDHxln*zdFms9U zDJ@&Vu1XRG1_E7(;EY(bC$Vgw$T(UY2K9MKkb_Wg_I)ekyHcv!61a$&y>#N%-EGMU zmpVGha`zs)J|?BpWZDs-!|BAK{LDPADfQ#9up3! zD0o@h@@~<)2*JXeTZ=@~PfF@T;lN<&X5Wb|cmA_bVFnml4kc&iajhD$aO^Sb;?2pD zfZ{Kbr7DtW0vC*~rW8m_P~-@)Z{!wIScsb=_AdGG@yv~jr$E{=SJEyQ>nF?9i|s34 zH=DYS6T$fJufWdM*4}s$u>n*An~OD^ydHoe`(a2P6QqLW3=_`JyCPZWx%M=C1F7bN zELeuwpCA%2J`~Niv`t*rg!vK^2cf`2TDz=1$ie_3KXj)Y1%raST$VW}fxQK?0BNX+ zm393v)*l69AeC~1ckRe-e6HJJN(K;V81oU#(|!isk0UdX<^%nv1E}ADeg+Vg4Ir4&d@S>LAf+A4Y#_}Cn~w)j+QH@q5X#|vH9&rl@>~sI zAYuBSFW1NiQohSImTj7kYR-p_q`cSDcp%kg?an%C6IC|O1yA07G+&W69LaI7NHdTy zP|lYO_6KSFO9s8A4%hO0O=owIrn{!o0|{m~Uv#@3r0FlZ4M3W&if#v~+*Q%RayMVL zz8$3Um#upsK^*YH&bM`K3<_)w?`U$wP_`3B?BsevYWMm@xVYL6uDjiF{noYdL^gl| zivtR6*HhxVwzc->Fy9>LdVy`%&SVG3v)!@el{)6EYyWdShvAbY4N{O*MghpPI*`_a zyJEM_CT0!ypdQJ!q=o2?29USp;q+r~+HC{^BEVh)TN_PA2gn187zfS}1+bkg0D_}! zlH)Qb11KO7WOcWtm(&U#`^(|nBw$@ird^XG$Bo)dCa&3?CHdy1@b=82k-rEQ|c0 xYc2c3*N=|EQpFEoVD@LDhlO43oa686<$ue_C#u*L9HamM002ovPDHLkV1o8haQ6TJ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/dialog_exit_room.xml b/app/src/main/res/layout/dialog_exit_room.xml index 83b6f7350..97cd6adfe 100644 --- a/app/src/main/res/layout/dialog_exit_room.xml +++ b/app/src/main/res/layout/dialog_exit_room.xml @@ -1,123 +1,135 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:background="@color/blue"> - - - - - + app:realtimeBlurRadius="20dp" + app:realtimeDownsampleFactor="3" + app:realtimeOverlayColor="#B3020023" /> - + - - + - + - - + - + + + + + + + + + + + + + + + android:textSize="12sp" /> - - - + android:text="查看更多" + android:textColor="@color/white" + android:textSize="15sp" + android:visibility="gone" /> - + - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index 91c646bad..26693a57e 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -203,14 +203,6 @@ android:scaleType="center" android:src="@drawable/icon_room_like" /> - -