From 993b09b85340631fdc4de969b305ab91c384ec1d Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 19 Oct 2023 09:45:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.gradle b/config.gradle index b236d3a94..cdd39002a 100644 --- a/config.gradle +++ b/config.gradle @@ -4,7 +4,7 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 33, - versionCode : 451, + versionCode : 453, versionName : "6.6.0" ] manifestPlaceholders = [ @@ -22,10 +22,10 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 isUploadLog : true, //是否打包成插件包模式 - isPluginModel : true, + isPluginModel : false, ] } From 926de0463c8ca570deec61b624ad3f4a24ca68c1 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 24 Oct 2023 15:46:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E9=81=8A=E6=88=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/event/HideShowEvent.java | 16 +++ .../yunbao/common/event/ShowHideEvent.java | 7 + .../yunbao/common/manager/IMLoginManager.java | 8 ++ .../yunbao/common/views/LiveSudGamePopup.java | 45 ++++++ .../main/res/layout/dialog_live_sud_game.xml | 7 +- .../background_sud_game_float.png | Bin 0 -> 8191 bytes .../main/res/mipmap-xxhdpi/icon_min_game.png | Bin 0 -> 6092 bytes .../res/mipmap-xxhdpi/icon_sud_game_min.png | Bin 0 -> 5414 bytes common/src/main/res/values-en-rUS/string.xml | 4 + common/src/main/res/values-zh-rHK/strings.xml | 4 + common/src/main/res/values-zh-rTW/strings.xml | 4 + common/src/main/res/values-zh/strings.xml | 4 + common/src/main/res/values/strings.xml | 4 + config.gradle | 2 +- .../live/activity/LiveAudienceActivity.java | 135 +++++++++++++----- .../yunbao/live/views/LiveRoomViewHolder.java | 40 ++++++ .../live/views/PortraitLiveManager.java | 10 ++ live/src/main/res/layout/view_live_room.xml | 35 ++++- 18 files changed, 279 insertions(+), 46 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/event/HideShowEvent.java create mode 100644 common/src/main/java/com/yunbao/common/event/ShowHideEvent.java create mode 100644 common/src/main/res/mipmap-xxhdpi/background_sud_game_float.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_min_game.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_sud_game_min.png diff --git a/common/src/main/java/com/yunbao/common/event/HideShowEvent.java b/common/src/main/java/com/yunbao/common/event/HideShowEvent.java new file mode 100644 index 000000000..d4cc47921 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/HideShowEvent.java @@ -0,0 +1,16 @@ +package com.yunbao.common.event; + +import com.yunbao.common.bean.BaseModel; + +public class HideShowEvent extends BaseModel { +private boolean isClose = false; + + public boolean isClose() { + return isClose; + } + + public HideShowEvent setClose(boolean close) { + isClose = close; + return this; + } +} diff --git a/common/src/main/java/com/yunbao/common/event/ShowHideEvent.java b/common/src/main/java/com/yunbao/common/event/ShowHideEvent.java new file mode 100644 index 000000000..ce281c008 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/ShowHideEvent.java @@ -0,0 +1,7 @@ +package com.yunbao.common.event; + +import com.yunbao.common.bean.BaseModel; + +public class ShowHideEvent extends BaseModel { + +} diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 430117466..6de7f1981 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -61,6 +61,14 @@ public class IMLoginManager extends BaseCacheManager { return !TextUtils.isEmpty(getString("RedPoint")) && !TextUtils.equals(getString("RedPoint"), "1"); } + public void setSudGameMin() { + put("SudGameMin", "1"); + } + + public boolean getSudGameMin() { + return !TextUtils.isEmpty(getString("SudGameMin")) && !TextUtils.equals(getString("SudGameMin"), "1"); + } + public void setSudGame(String sudGameJson) { put(KEY_GAME, sudGameJson); } diff --git a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java index c71307dca..e3663c012 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java @@ -9,12 +9,15 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.lifecycle.Observer; +import com.lxj.xpopup.XPopup; import com.lxj.xpopup.core.BottomPopupView; import com.makeramen.roundedimageview.RoundedImageView; import com.yunbao.common.R; import com.yunbao.common.bean.CheckRemainingBalance; import com.yunbao.common.bean.CreateSudRoomModel; import com.yunbao.common.event.CheckRemainingBalanceEvent; +import com.yunbao.common.event.HideShowEvent; +import com.yunbao.common.event.ShowHideEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; @@ -92,6 +95,38 @@ public class LiveSudGamePopup extends BottomPopupView { dialog.dismiss(); } }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.min_game), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + if (IMLoginManager.get(getContext()).getSudGameMin()) { + dialog.hide(); + Bus.get().post(new ShowHideEvent()); + } else { + new XPopup.Builder(getContext()) + .asCustom(new HintCustomPopup(getContext(), + getContext().getString(R.string.dialog_tip), + getContext().getString(R.string.currently_in_the_game)) + .setLiveOpenOk(getContext().getString(R.string.sud_in_game_minimize)) + .setLiveOpenCancel(getContext().getString(R.string.cancel)) + .setCallBack(new HintCustomPopup.HintCustomCallBack() { + @Override + public void onSure() { + IMLoginManager.get(getContext()).setSudGameMin(); + dialog.hide(); + Bus.get().post(new ShowHideEvent()); + } + + @Override + public void onCancel() { + + + } + })).show(); + } + + + } + }); gameViewModel.gameViewLiveData.observe(this, new Observer() { @Override public void onChanged(View view) { @@ -126,6 +161,16 @@ public class LiveSudGamePopup extends BottomPopupView { super.onDismiss(); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onHideShow(HideShowEvent event) { + if (event.isClose()){ + dialog.dismiss(); + }else { + dialog.show(); + } + + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onCheckRemainingBalanceEvent(CheckRemainingBalanceEvent event) { if (event.getResults().size() > 0) { diff --git a/common/src/main/res/layout/dialog_live_sud_game.xml b/common/src/main/res/layout/dialog_live_sud_game.xml index 8db6f7ac0..15e79b6aa 100644 --- a/common/src/main/res/layout/dialog_live_sud_game.xml +++ b/common/src/main/res/layout/dialog_live_sud_game.xml @@ -28,11 +28,12 @@ android:layout_weight="1" /> + android:src="@mipmap/icon_min_game" + android:visibility="visible" /> s00001b5ch_0Itp) z=>Py9xk*GpRCr$PUCobW$5pSow|i#%F?M1LFu{;<)YC81o_;gkubok(APf>B2nl(C z`A{Gbj1{A7u*F}%0#*bO5F>=8Ah96=6h%lx!5i2UMam}GU`5Iz5(`j*P_RkAi{7n| zd(NqIs!rW^@9Q4hBg@m%uU_4%Q>V`PozH8{#r|my4(>hrurZIV_trnrtk*|f(;b`}y74x_%nB=FQ)3mHub4e7F_(sQ9zBrt3D}-AwO(-u&%W??$1Y{rrA- zPpXu*VQt2Afu7tKINAzi!<1Ljw#1+4?1nXOHZ&z|9er}NbqkH80&G&EZH6;TyC47g za&fje@6PWvjeX8`%||-Zowe;=<5;G1Oc5^+{RuwTok0J8bf)xHF}DPc_jjYXqn^S+ z0+eo^zxQ$c@Id@ca0HYuOACTBCQvL~^xStVo%Z1_>|XPlZS1eXML5XBF~4V?u)zwo zj=99mKLA*Ab419*eULIdhP#5aW%y!%Np5W_$OIHm4vx+Nnfjekc#oidX75l_7cUFE z;n0*Q(H7qXM^8fAeh7j3o;6r{LS;;aJO}SNAzxuS&87*TU7UWrG3FD-G{4j|_S%LB z(PrBaz!^pU4YFzpOfuOZ^cesF;(c2ttL##x43Xsb_ zi6%TbI63-3YyYUR?JsuS8bFuJw9E)ObSSbmJz}n{d5W(#-X`n zABBxo?mG`f1#b!~PQ4bR-sW&Ql+f705;&M1Z1@Ze((D;c2?&jjMVJWwT5*iwQ4Wqm z)2X1dA|m3)C6w@?q^&gJ^6=zWjcNYWSo_0Kj!vf5dCAOrL^nQ77(oy{qAr9uz*h+- z4W2RNYLuuY!BHWqiDHM)fg@cG!6S-ejzQ`UAsacwr-b(?<_P8w$V7}e^7E&Gv;rIr zm%zEg;o+x)(Bx(vcE{#=Ai1U{*P z$N=gVZG?P8!At#g6f`FbpH*Va0-}S5Q=i8=zVZA;tk*xnb z^)eMOfw(dNnG$#+Ih=vCEovPwDGXHh2dKa?0^G&lBrvRcO+7^&P2-;e3=7ZjjF>w# z4l!W7R}>3oKQ2iNc_xqoXVB z`9oi^#ypR|2&hCf6dUL)!9~u?R2!i8OTx>!=m3395ILNZ>^>H0%kEu(_rPPhf%-kf zEqR;SrOiRxxxCF1fhZgmv>xki4ho{)+pNBX8wmRL_sl;xZS(xb0W%IV%@ClE&J(3a zG)Tq)Hy0oi6R_r}#v!j>x(hjtToBo714*Y-sE-pKphq;&*~|EfHRe(O^>-za|*b72X1sr9RF`I?u>8XaJ%O6=jVjkc7JKMBB zk367-D=e#Zz-9u36Q>TVcH$Zg6W}5oA4aQo4mhhHuYjX*{shzs-~$*CC2>fm9B4~7 zLugxEy0F&VrIUnE_IE9_ zS@KmxP_2tu1O+dXTCE2OTkvpHL8dJN^pQZClBLTLpzlc|$1}<(Ktwabt>}L}5(Nai zb%t`VvbWj8QI#iOR}NOxgtre)f4$vn{-#^|+gGdB;}sWf07XKX6*)!$=37s(f=9IS ze)h{nv8LjNNo+;|L&w5nF!d|}dZa8AB}>_}WCyJGCBlp@@#B3?c_rt%OWa4i&=^ z6P7GRg);|j=kSOEX{@ynB7mycJ zC@801JBP@)O5`yC`hr>y@J|~=PDBp}nUo$;&eZVh$p?`GeRdF_->Mu8s%=J-K~91a zP^_H<5VQnGg<}bq#jU1L4wf^WrYu>4+hQ(et{hC%gtr%`zucPU3!&~W@|vV}8HknU z-4&o+0iLjGozK;xsgh5w`SS4eZ;iFT5-wmdD9@>N)EH-)0KHp1imF0atgQVcH*Nx%AZ}B_QAAC= zHg%P^zwDBWi9&rjKtGYUIhGXFRJbE1;8jvjs}T*dz`2(jWNqnfj+sK<3+i)Fdk$84 zL<{9$G4?u~b|UMK4)1(y&+NU?neJNX0>%|U=Mcnf0eWO}FnXOsDJ7{Jz5`2^g7hiC zz2$lOXe z3NHh7Vk8VAdqj58qBP-}xKNei? z$ulP({J~!HP1~5hCrqyiDf-ivEFrZ%#v@u%>nda|_IXNCxhGEocfp3a!$lfrzLKT> zzFyXzqTwhaeW=A#;Sr_UhQyr8a1Hs|?zbaDTzmPEx(23qzoVg;FETe#Q_DVca{4Eu@&?=`2nRZMI)jEO|VI@ zbajNE)Y}~FK4tQQWI9njv^-e-u5ImK^c51m(QEWoY^~OXvKp>pCN6A;0eaRYu2lU* z8&n7AIe1_6HghfR>mifBQN&|8lSdSKTys5Z5R%1$PVH^>8dvRY&Ur++y4Q-HqSzbE z(>8M2@^JNaW6iOup9&+zWwp*kB>}`Ld0tt_R0^OAh!ER>obeG#OcY54#b7wN#Qi1| z(OJPBQdN0VGfaf|n-Aatka93BTn^Au9M1@`3?$1~B&2Cn2GeTh2Le~+5v2?$%I1Vq z2dP-V_5GB`A3pi0T{mAb)?6=M!dkVStDq-Z&yg3G*r=+!{r+bQ(8t47dPHG}qv#O@ zCsd^E1(bs!^zC8Th4vJMP9B2uk_$42=@j37q6p9{%fU9=c=qt_XByLd&KT1mkEq|2 zTCL~oJNSNt3NI6eOaW&oE9eLNdvKZM0`&d(%IX2Otj5iQ-?CH_L@t$sRlrf!9+|MG z=#WW}575uuQxvjBj&F<2#}xfqnW#%316vNpcti>4d9gh{{P+9T+LuSyccI2O6cZ2_ zR)ld-GY~ZzKN2vI3X&1c6VREqi4#S0S$M+W5RIuxAyb@&ep%28BK#>=c^8nAhgbq` zMqegyTs1LJyZw*UNmwAB29APtsNg8KRYBwOrc+_#8^yKy(CYEG_qsQ%vCrk(29P*f zFL~0qn7$JEVtR_gH##MaN+o(paJ06kC@VWg1n61#4QphTUb_dar>HtW4{sySx7E4L z3U71L`9YifuvnaY;7Vt|wMo`a0`#?NeWCz;Pr_mnZ$>JL5|OG(azM3kG>+F)(9cn_ zy(?c^pM(CPTdQ@+iUbAV4E0u!z>gF6k%V`Kz^VWjxul> zD>wqfs^E8!dKD#0YIr;#N#q-yBS6n-tlW7dXO{rGeA-g+tnuwud7CK=4gW@m4fqkU zCRmWpbsP4e=xPJ>h+*83X5V0y zflU5JjSJ8xKtv#V|7*C2ngoCu0`wQyQ?%G7bHm=pho@g|Z1eG?f?naxnyq9hLaYE4 z!!K00Bcss;S64r6MU)!kGh#APC<+*{L{Eai)ICLuaF>I2BLei0^dhO4^9hev9^E^w zr>J=B5L_-7tFKyPPqUY>7(`a2rR7SNa{Wamway}rOqKULxu@uqX z95`7-JDhMWl`MIuRxX)jPLF6$XHVPPho|3YZ1ds1e@O{~=5iX7dcBFNyaS|!4NnCx z6W?xzJ2?nJJ;W_3LdJL~m(|n+=w0ok+b-9^Oc6w`&1sAt%fjX<2_yZra8y|i28^XL zZR@?wn6{ipG~;a+1RXY=m}F>0^D%pTxcauW=IIhzLbe17&U1DeW0Ztpr3X=FkK@M& z=n)_rQ?eA{F;L5B9|VRL$1_9#i>#`k&(hUPTHMcQ=&PE8h!n-5u>!=UUeVH7BLx;7 zfM2sG+7>E!oGu`3K2}&{0Zu2B7~yT+T*B{LYp$hBfuJ>Y8$n4mOMqS*=tN5^^%Q0D zjifV(#8;Fo(UdHWo%TSy^z)*7iVFE*tl)vSWugFml({pPgWbNl`hL^6OIU=XY~CIB zCZGv}$N`Qj)H?55QNq!Z)J76Wm(-e#uBY0i9rKq^4-zI&PbAm-oZ z0`yvM^9%ucgb*tN^pIEW@nZEIYs^#qWQxFIpyvbMQ?x(hk|F3%ckTdvKmUjTeGX2t zLdAcf0I`yTyYt|0Aj;b9B`VbtLtS$JH6GrN81r|KR-avd*LZ(3uXsez-D1?Yn_ zC*+_;N#&S7(P91<>XM}(v6D2adPjlxm}DviB6fjEu{?KNMsIUiK85$HE*mvnmKhv@epoT?0WDoD1-&2%>qn5PIj|tqH zchGZil*_w&@1>tQuU#qmVTvm6%&QpQkuUv(mP!ul(}V|9J6V%0lh(cV;v`o;R^`dJ zppk4Beanje02OXKY75fFNd43d3>z?- zE`Jp~M^#> zOW`+U&rMP9RnvUS7_*Q3k<3l6_AtE9=_#s&qq7I-YlFx^t3`(3R3wupIrU3FdsC>w zBg*AAhp<=TZ7$?CGntpL6JYM8pBbOdfRF%ftudQMPjBA0*1VjcQ0EMD?@^3iFX#yZ z*LFYw!`K3RVAZ-9C}FmS<`+DIur|hf_p(?qT4yECKvQ*q{vu!cnG-sf(c2u(NRfY=Y5{`7YWLoc7mU!XZAuNd zDNB}S=qU0jX7SN ze%0FM)MatwPD__AKwp5lQIkh>RuMp_5Qs$@bO9CfkL@X1gopF?6vZq-U}!W|6ajje zRdU$^^sEqZJLgTO3=E};KKwhmmB2W=h6IG50q!c3w}Z{HX@CVnEde}WIJ)C1@5GD0!=9ql z(N*$@Qe**q_v!{&&{9#rQ6%tVU1~%mA6?kIV4&^b`Q@gng@g-3VJ1uUM`l; z7`y*X)0r!2i+gOSI%$L2WP&bt1TtM@PthV|^4r%yCe#{(_<c_LdRcm5^UdnBbzX!~-TCMiq`XBRp zW9%nG_qE>K7i-FZaD<1R33NJBAso_2tJTphH$B0#T!4U$@~>iJp1eL;Lek7WfW1Nn^jNnnFL ze=>;*xupS~RzW5e3`GP5CIMKhX6x|m#PQ4lkAY;O2a+M4W`62z9^w`JX(aGiIc*^xqFHRAt5LS@l2-3 zzn#+Cob=fAFl-k+MN#~BaC=1Bsb~uZO+nk};9}q?=gF^XK9;8~wB=a+wOA~!U+EtG zu5Fy&#o02BfY|`OTCIDnHEDo;3y&y(b7ha{dp$+vZrMOAA#J7&(C^sWEC@PmIx)Gj zRUT0&s+2qNK@7nde5?VTffs?<;}8J@6?HbrD~MRVqGZWQ835(z zx(hg43&Z_0sw(KSbPduQrAs<*t7c7sv462?Vz-DyR!bB=~obuOY>?w*F3o=^J zR3Kx9ZfUt(K4RY5|3_o(PeVS<)iTo9io0uEfL{47Z$(bys4DL$owp3ovpDptK1hzjx)0&U8-<5Yz`f z#qdPxwiVTS|8#^`Shmi;Bm~+QFC zh?jnXNGgNJhTLW-@Gpb6Ibm(V=+yw1+l$pJdu@CFJfyR6{48E&0GSZ7p%;&VqY5aB zg(V1k^aN121%+qeZ-UK@T9d;OYL93U9^(UmOX@$-RM1nDi9Cu7WTIUJN~BHr&7*@v zyD?fYFmFL_LPJDFTLD>Pvkt)KgkSwHq`h-r&8oQJLlwF|UYz|&+qS=VzCNEXK<^Ju zU9vP~Ptm}<31q6N@@8?#ZeRK-AiIbaM)edWK7bs@Xd7fzdz)G2U}#&@d@Lx4EqaPh zaj413nHU- zAKdE$+%3wXKhExEzo6MWl-|fRAm`H4N@x=xAtS;l*xT&p&z6JvCGZf`FUJ!LhrPVH z6utUWy&Wte7O$&CkhcXK4Np2gK7PM>`^uM^w*ATe)!JIvfYuK0e8wYM3CV`V0I6M- z0FZz>pi`iFf%6ye5}8u{($BE>0>n?AuBq}CAz3g?C=?}7Jbb?dN9l9e@xlfv6SHI< zh^y);sx~9GCXUD@ZTqp!MZ~F;TdH*lj@I@R&0+Tb zGi6TWyR@fhwt~JOcM{sxmMn>vmG_8lwDaX^KIUv+NJF+S4SB~y)g|<2&>Y`7`v+^x z3+T1vtUbcz-9f06QKwaEeTx8nfMF_+=;a8|_oT_iib^OzCAGl;1UO1N%t@CL%|Bm& zzU*zT@#IhJZBA|$APTWJ##}<hhr2N2oD~z0=8B_2R!YFo}v-* zDPiascnqeVB|wiLpQl0YH0f5+SdI>4vRY07Ik=*?S%k+@h1bA44@OT>9e>r5Hj?ed z7hi0@@%1-fZrbL4XiFCZrd#LTc`HxIX{-*=Gm_cawDiVWg29m7~0NW4i@r7IXGI8+YF(;v#0{E4vrvI*Y`#`sU{+ex?S6#oF;XQ~V9IXw|XYGiZ06lECT!LgHN|soNNE|Zpv4!M^sw(dQ zgLybw?QM4I!V#pWPOa}MKws|>bqF^c5ZA=%0)xopPUPPQQG)`~n^1S zE4xFyG58ANzr&;`UrvFOsJ((p>Eoosl9i@F`~n>BfBC@o6iqIxLe6dzpckhfh+7?? zhbl(n;hdqTXv$QngKwvrkfF0ZIJkHHVPhWa_PQUp?fJ8vu}7w}w>oQ{vc^1Sy6(EM z_Q~OmQB1&>J3!6}<24l9EfOcf;vtogX^tvyR4E{Nn_0L!4P;^wOQ5IN#HqAU;pRO^ l-e$2KD1_6|#$eqd{|}~_7Py1hDk(0RCr$HT?>>H)tUbOd#k$Vg*=9rC=gg(1Xt0S0TxJsEE$>c>p?Jlmw^aHi?0uCDs(zu*1-*DXSgY?tj&_Mt;)XtYqTY&5&dZ6#2vAUYYO z#*)Ga5Sj#GG(Z5I#$Bai~n{lhlO)xst684ug`(aq`O zEwW}QPtCHVm`R{n1aGF@ARC|nM1bIb5)k}<31qvxE=lwP zpmxKtcrm=#Om5wOd4A0kBYjk|e0k2Tw7g3dFxigP4CE0?qIF zKN@}h9DhdSU+Wtp1nMRy247z zi5?GV<@%8M;PQ_)S^qU#X=ud(mKu1yyM7&@6?+{!4qJP8e71T4X#-B$ds7f@&Nz{DZBZmYMo<^njq(^b1HfZ|10eGj8dz}vBL7tci1NPrCTMVD zuM5ETcMC>GxLZsvDu)yCu;Qf0F2mh#K?5Gys=W0CuP>V!T{TBU(j-ljG3Ph;Il1>P#t0sV)#*zHAQNHxOX= z8|X71SB*sO_w7dcaW`d5a;63I&?rFplvCmt-fIe%3 zI!;OFC(^Q7JjcmTW~O!c6JYQyrqqh7h+3nONa0AE;APbgm7oijok}nD73n?$-M(JU zu!Osfq#UXBa9r1Fc~&gT^18X!X~d9|JW;x?I-Ia*!A&i+yDwn(3FyTe)LatolcZFG zb|Q=!T+5|EQkB-e<(-k*QzLn0qA#Tzf);L3K2TP@gC0e#xzYO;X4N06xZ>7sD>mjV0Fibfc0SEVeQ zX5Q37uT*N;6$8y6L%BN$YJ3#Hi9D~o1M-(bBZ~g0B<3t@qy3eDT@ldpSE+hygtJjd zIUnrl6;eWM(ksxvf37s5J;|-Yp))G+A}a!V;d&lHRPkSD+U>>Re(q$UD6>>*Qh;G2Arb$D8wE)&7Q9gUFwM%y@{kFg9X3 zHQ8=_a@kzEt0%B~1bWU-vvVv-n*^c3R~KbeM9e`MA{ycEOnJbxCPKyq4rKvpe0Q}W zRvwHA2^?Kd*x#ujIa}j{9U510NFeao`BxW7TJXJA+EothvOu@4JJ4W@aSxNA4|3)s z3jFAhqYrLT_%Wc4Ay6Y}SK)Ir1WucvBP%yPudwHE7!fSU&Qy@8X|M@jnFWlmBfQ!L zEPFx0@j`zf%I3r}K8DAupq`Ku=^vL)E*j^is3N%{Uh8X0p{mw%jr?C91s*FY$!X^v&#wmp6q=qBs0k^-Xug}cda3y><{XvD)G){s>wzm~l7HjEE#m>#?NWFnt@D@VGBqJ}gjpNqd2c6^V(NEh zQ&%C_C4p{Rmt84s`(NNVfr^Mii1C<44>U4}Y9s{un+DJax`E5Ld8m_>hgcgWaP{ms z$UG8m-VHqWE?}`W8#%{vnVJw2VG~@(TY1Y|`LDeKJ?GKvDe&kQAT=VNS_+e)e8e6T zqeDX@JaMr_U)Lh@7R^9^mMz-SA%UJUHT?MzHgL@;gt2vzt$9je>28Hx?*eu(8EUIF z>8MvV(qWNUuyigxZ-O1SXr-v-G3Q%C(SQ4?|4?NFGl1sZ%4wu%|8g^UMRXK`r+1#* zNVu*gq7EPEZ7%A9S`S^4P@M4P8^AR2l@rNV7~#es-?m3#$J_7~hiOpyIJz975*h)~ zb<5jurBCqTwV9}&^fNU&;knO1V6v|)dabW8L!(1SBYd?}8rY&EpkMbb+C#l8toH~q z-@%3Q*bwZ$_a{6 z;xl-4^%a9hBMjw~M&NpbI$lo!pV?AC9Y(^J;Td58-)f1|g{u^9cuwJY=Hy^B^tEmz zbZQb!0@*HHeCs^Ar!>%yWcCYbP4<ST~( zH0VevwqW3EC&ew9L0)EX+g6hp z9UK}7XLNIJ;JZAzf$;6tIMA1EVd^NZ8)>u%-)tdFGB}y(;+wk^b{`Jtq5`L;xcsa< zjac;rFO5@{&!cBT8R&z4(j(a)3u#>lPv`#htZmk|)eepDn3~!Me4DAm);7b`@#$X& z)DeVgdA|`B;l?(?I73}HO5yrl3eO!@u!Fh|QxoT@qgRzxUX2J#z{|NSZkumiln0t8 zLAbd+1dIzN*eD0+&$cDv9K%Q>48)Ws;D%O1-lc#`w?x$8J0o?3ub)gfrXf-n4D!Z4d3x^eC2}|x>W%X3WT9QUm1UmoLdGs^?EM`8EyHXOa zfgeOM1b?hdt9EE4q>dZeqC@KF20pdLMN+_j?>nsmM;BP~H=a@0{jSpLVkoLuxt_&S zSKT^aUQ5S4rjp65vjRjPC2-|;IBN$y9Se=t295AJvPFNV0O(78?c#k+gsV=DTQbuH zNB4Fd)Zx!azLj=rstvK0qY)_tlycWv&GG^|VQojVpt|i4G+kGF8d(w__S&NnHpZ!q zStr~FL#KzsWniMe##gX&mYy07}yTr#F% zT6S%y5zeYiZ4y4v9JAo` zU;86j-vF);QQtC2X zBNA7l#yNizLhouAoEnCp+adh*NMNL`n`=YB^S=wPBQPI*eNom`7cA)B#%>4LdqknZ zj{=5CfZ|L|rD}w@y%*k_G<{7rMFMqZwl}oo=!9#VM*JIJ!Z=EWSoM3M@(9#OK~Ig} zKU371+efFy9~3H0)7E5CL=*%On3&|A0X+pQal#I}^PQ z?`A$`U|1;c^;TNp^)C3uGDRvVIJu%`(3mq47>rTxp^syFx~4%5oKxddhv&UX?^~VO zM^a7$_XLLgY!r=DLnE9Tx@E3J+gK6PuvO1g1s`w}@SB4k{^w~A2|uq_*a_Qv6>CWv ziA5?4>9IId6J=Pcpb?ID@MJi3b!G=itCc*xUW2}fNT}!2>!l_|!|J&@;pEYT|65?? z%e49nu=)8TIpDIb4i2QWb-q_)(a)tU9uN}LULSoDaAS+-eT)sq@wP&ml` zaJz*h&)5UJbvnQox4U@hh=L#6&)1w3%ptLYm*PZio}Pw?Mi^)}=Wd|MYqGZp+x{H8 z;H5aS6epHbBTOCV94qkonZhp=3}v8+d6DKdbeX4s<|HsCC^j@d$3XwbHrJP49FK@K z(N|f1Hk33XZ2^_@Zlx)!vX@bveLJ$bs0lr!jy})`0UWaXA*_a7-IQz#l zH6D~-=ge8{gpTACZ5-_R{Pw`2L+7Mu_}3nd*i91I?%aHuv??`4T6M3$%?8DMh6F1i zkzxUqe#S-^QpW?@#u2_hPx^(0;r544<FA1mcI8(W0R8WQMHhRkrK62CKqFmb z%YRt8fHwL-Pg_ff`}y_rasd&-GabT`A>_Dnf9KWuO zy7T0C^vd)d!cKe&PEN;Ri(1(FMj#d({VF1So9nj5%xa7}we z9X`-cxrkAR$Qn5}xP%X!Ysx(wO5mer0yHth1k{EX%xtyA`hJWkloj zK9$8r*yEc&j&OGgy14Kcnl56cXaLe4;lV``GYyNr{3*wuB=gjvC3+8w4Gw%Ud}Se4 z0w-lNsoW_KEl$MCb{V#bD>JWq!B)7 zc*ps`>~Oq)0^zO#x;W6S@R287bT|QBgpEB$-3W8^+IA~u(VyKKP)FJN3S&|nKs91s zmpNCJTeisN=FSu@dgydoQ4;7;52;bfOy;*F#54}r7Y`F7`_K!G@QQb*`yj{F#mk)v zAKUEso?aOLF6GpuUBW}{aq9T&RtGOKb%ZNHn$%G%G@{dBFME(J54V?T7Gm_r|0MIj z1YA|V_`G*D!mVTAaL&o3h3g9!bdkbeyFqOSvyh@OdXFbj#I~{w?xztt@LO(O~csX%hx3=3D?Qp zvF?n-r%jM!@-Fs=+m$_TRCb>r>sTnKpn<)#8sW>GHA-h#xCJfTUOuAmsVxp(=_=?M z3F8%I915Nc*DbbU4hvJq3vAIf)>FeY%OJybU+WNZ+NO5mM$On3Qyu1CMm>;Qlt@@l zQZ9^B8$B9fJj75V+{?G*Si z5&jPDN#Q)=_Jb-YH82vcHPV^~;B6)3!VQZlHUXMw_XsraIA%rWJZnT^6{osNMZ-#| z5uFK)EIIGe2QNymS*lN~P>txSI=ys5-0e3TP7Sww2x)}RE72t39C6NCf2RFJDN7FD z>lJ9;vHAY&cSXYfB01R@H-_9(ibk|EQhBDPCmM;BLBt9x14(669Sx-#k+uad=X~$+ zGwm<+1ai+DZGQ4Gl^olVd4fou#^t@0&`2~{RTmp6)Tid8mw!EsRjm3P_!%&QpStnn zzT6-Fe(#dwOY(A6)DiAH{(d#VrOY#eXhI~~;}%tsQxhC8UjS1=-bGYXt5vN28NQ{2 zoW1ey=&jzYxpIpRjx=h8nrcyY7g^#cUcbMTwG9M~RO-}3L7k{_)r_nS28{?Ixt6X& zS@PtcpD_rFz=n5i+ymKDJ*bUBiqZOE2_@7>S!d)uP9yxBDCNH6k#)wVGwJC{EV-)5 zu<(G*tFm*+RU3)W1msi{_t)B=rgt1&$9?R1@W%C>fTty+-#1vGzn%mch|cji8_lc%%v`*Tzy z(z2i&ce7CPqD@Qs26DfF_V4U6m24iHxluMHzfg@+qbu}FCwwD1(zX+hl%b{(*D^1t?$ajh%0?us0iN)9&W{>=G;aHkN|SZQpeS{fNLr$+1aE~V&`Pn~0Ny-UBh z0Rx)PWbBG;D+%vfQJ*~9uifS60F(`Bn$}tyYJ`M@NC>F3v%#~}mD|or)ZQbU!drgq zDpj9RZad)J%Zte7TQ&;g7=1|i4knEVpNpM$gs?86PHftGehojAEH=JwR}JHj%H07{ z=Md3RI$qJggs<6oH6Ut)m*UYQu0ttreN$87;!W-SdsI_7ju}wuDD@?yS7!bu0bB@D z9~X7WV~}-%r@{?P-AJEeBP1Z}CA@Cu0119@q_tw_IrMD5iMWRY3_8&McPm9B@5iWQ zB6q&<)QuvU7{L|j1%)Xxp^8{fw6t#&)dkk^BivKZxa@xjErA5EPz>yDP0I2`eDAg$h9RctTl-frm_CU}cPdU4kN*+ns=sYk;&ycP5hW$SW$snV* SKJe@S000071`>EP)Px};7LS5RA@u(nt8BhXIKSr$t1V$m{ zh82tj3Y1eYU8!@O-nxBn-?Myw%lG&F{!R=2A3Ma08E^0K(qbt@|MaDrP++D$|4?Og} z?(yya{(=A>dG*iVSlNE&f5&^4LRA$6L5$Efl#FpQ0v%(*CZaLx^w#|*+WOK&O>S#R z89rvRl}`+p4?Yz~gMl0N@`4~#qA_DsaglAGx?*_rAFgtR-W^}Ivmx{45ZgnbD3ZOX zVMtip3=R^pN^R$U&=IaM&>1ed54@;)MYJo`4^FL-U$wF8EN~5Z8s3 z84*{fkzoacMo!d`jVcrhI{>r-A)!)7&P}3S}}V61djL`q4VwG>H* z54m)67Ll+ z|BdeV0{vY9Kl}#vZJn9CC#qL2)AdQ><}@OR5Gum~x@0Fd4Jgj#NGp*l03k3+ zq3Z@Y(ZSZXAZsr{iV0ki;EEBh*udng*nAC@br7zFkB7@b(tlbd-gzBjY8OH%pI}UP z0UP&;cJ2dR#d_*WKq`SVc_Cf;?(n*Ie((nd{KdCUPR`WaofDz>Ii)9LZGIjRRm+kR zGC(8+sqRs^Y9GQ?unPuK5ZVLwnGSGTAR9yEM2-mO5yUtOoTs!h)E4EynLajKz@-b= zBqaa(GV#8j#5T8LR7N;6RR*$XFOv7x&|wpqIoL9XoY;(ThN3$-BL?|TRIY#f$?pdG zc{BXAUvK>KbVGiKzKf@4cc7*xA*kYHjF7r~;!*1?)ob^n>$A9p0z0y}AV35jum-0= zLohwW)#pKM2I)_AU>(ZkI9ov8L1gDB79YW=D&}a4-t$VR&4X$YU3fWG1vn`Xy%g6T zkuMxXU9<~1zaN1`X9Zbn@y^OsxBTk&4fu<%BA&Zy^08*a?#`D3CU)*X#&xJyk?NTo0_=v0-%Xd8`yM)FfgS39y-{B zu=g=K_8Ii_UeXg8V$&X?>5IsF$EaL>9WI{336R4SyV0judjgxDA$;j;5b+cu&vCuA zgxb+xi1vQ??&kyjoEiSs%@gmfZ&JS}l))~AG`8&|GYYXepz)HOSSJxw0EJl_Vm3w$ zhaF~KwjUSO%f9p3&0AoT02v49dBN~lk05$IQaw&`Zkpzv8oi^Bpk^*dPke#V$-AlV zx{lH5f}&ec+jl)C=}_o(^rj1tQ5BH^l?F=J$QF-cH_i~u%px1RkRpcq$%nJ(?2YwZ zA6?RP}2lqm#p7K*b@}}6{7j8$y-%M zkNgAiWj~Id+KaV)ilSeR!!+NZviAx^Jc*xIuHVPBMhIO+$OKti%T;CdH`Rq7xcvnI zKK?t~eo_R zDnO_ZLWSNuiwqK+`39yKluRy-=U;)d5|Mk+l;Xq$f+oYS9m1L_wToYgtxkaqQCRvL zhpFz~gPynu;Z;ikMQc!wI9x(7UEt)x6FPtD)#Bp2&V487XJz=4H=wTCKl9tVn%~-( zivt2ddIHF%i8gJ4xC$ypsxedhdt}{HG_T%|i<_8sfNNWv9s|aIbcoOzJwFYRLb#-y ztIx6l&Xd>(TXbZpQ3D|buD3##pQQR@SC?5fNs8-8q;q7Z zPc%1yl1qrcg{aM9M=|-j@xu}6ncRc*YAh5)^Rp1jQZ@O?5!T_HDZlq@B&@}`AJl4%hLyDx0+DgS8wK5gwrv^zI46Rb>y9GMDA?_^byo>DTd37= zG$7jqQkU9SC_lm!t}3X^&Eb>>?6YYxy(&)6pqy_FA3Ov46izOIEpW~uv6xne^r@2+ z?M^9U)$|s0V+OQDINxLz$m~K?wN}nqp(_aA%RW1PMrvL5tWx??< zIAy8K&J%CFh;U|WDT;*jL*C$A3T7GUjvbca#_PrQkDq-`z)$`6E&nBqi@Q8W=thW( zD=4Kwg(wp;S`5guEojw1YJpX%1Shly8G=$sA<7_N6P)c)*?lR&)OMWpi8@scKnz#ULVY2bht-n-+;e z2wy0!{3C@zRb%v~Erj#C(6vcyG9v4&pfZOonxHDET8ymuVCLiVtq)XAcIG&ASCDEO zB7Zq@ejl#l@1Nn+3Nk){&;>$?vCfvV6eP}H!&gSxga%i1QQ|a3ar{%!-jCn#oPf{V zcEQnVeQ>dC2B?~kd<7YVI2D2P4DG)*OHC|IfK3e9pkSOdg{oBv>r;rDHyMo*h-)n~ zIPo}v+J)&{O*p$BFo0k5*j@{X zMPC+SYd$;v_X`U97*Zd`4p&L>QB|836#yzs#*-yDQXAERan8dZY0iVM9i_9Msx zsvu;9lMSRd{nAUwT6t3;qS7q*ObCLKh5bxT4?hg&dI-B8-F+Lu-d)&>LqsIUCFxsk z)Wr<$z^*+;|I`1M%I-ZRc}$%ABH@q!G-8iu`f=ubCT)KJ)rU~EyfhT$H1K34Jm~X1 z>d_SYY_Ihf#wn+44NGz6G^!2V!50jAdD(zEY(TjGnxeeEB|- zzh5QZyN9HZ*#7l2ufLh_qAIH9osuUdLAthpnEg9cU6zvq86ib*-ocHXnDag623XfZ z*k!a`T*=Mg`uOq(pDF?S1=_-$*F2=e$)5XJdacZx(#dcyK=A9&q(M z;1E|@L4|Z4nm2CObB#-4p z+jc>9ite}8nb`LmR3`QjZE4`D3YX;M@({trhY@}}YVW*!oB2d|Wmh)(7%)Sy9i&|Y zvDgNW zcRnN@uoo4157RzDe&`S`*}`yPL}l|^(D8MIjgW9t9pOii6ZBi>Ao&34>Q~7YHERAk zbaR6I)Coq*jtbXOukFA!HEc_WFFl5wOK{rT)Cr`lm1@psx@;+5w_e1!6z4if(?W^m zG-vd#=+ZCTUII?;J#f+b%ICfmaC}?ToP_!uDw;>=df9899mV-sH?Bk9H&F?=41jm} zJ}h1?nyeHOu5*g)$PwgvgG9_QI5VO?@t>)tJ5f5ushm8{(0h(E==~*T)WY`ag!4a( z5em~gjwsUdK0(DllOUMs5X}vcQ8?bbs0OGBoUEVcm2ovXKb^g1r|)+|2)kjN>i$8v zCjMIqxO2~YuNih8_*@`Q&BhZmP`eNj&m*;$i~h**Msy6?H zq8_$?7W3p2*t3vUwqvt`WGzLT9Yks~(QF-d8nWywnDiK~uoP(($t%cmNCz!!K0>M? z)tQ3Ec1buJAgduF^oq`du7IlJbQ2}LlJlkQ$-x885T2=Rx75~7^zMj))-5IA_FupI zr}EYpKB?8hWH31g)jha)YbiQ>B|CpIqmu4@!FX#o78|~2d|!`y$1kgFVX=7^J6tAT zIze`_PuBB9H-(Pt$S^=h5t&NUqF8BJx75)>jGVElER?lbHOOpbvz2P6(w1m4C9D_7 zNFk#b75jyP*XaQS-k`(?HGxomio_+kdTEN6u#CWUJ!l7`zlc^gZXN@^@4x=Lfi-eSWJr-Yoi?IIn&44lZetb5 zQGrCq9=P9|dBCDHG16}_y&ClT0N-k!tqsnvHQfMV`__@)9-T_wB|Jm7?!Wa-MeA?= zJdjHjJ-HiEy%H*OUK)d6w0SX37vTmasM6V#hPKpn<4KZ~D%kcklo8w`SeW2i@@0q;sp~fdU%}zPB!5Go&3Bmh}Dc_22x167a@Dx7}oy?*6cpE3uxu7*)R#70;D}+<2?y zhDh7TIo}U{7wg@Y&-~M4+yl1=S76K#mv>9RrrROw4s*LDT5A@DOZA9T zfIAQ0{!97NCqAUbxmZtKhOA$UjAqI}8UISb19tuM1mIsWGi*n= z%$M{4+aHo_WM5ueS$plJ2YgTbU`Ok|U%tW)JO4}cPhXYgiy$*ppa`M><(CS9IB!`c z();gHTYG0_vA)f6_f*pb*NFdgWTOP!{>n#x(Jp@CcIl2+^wgDz#>)}W1k$?>>j$_O z;=R)DIoB)M&x0OsEIg6MvD(u&$@BKr~;03jM0YyN;wRWnnyE&v^c|h|h9bF409P)N_O#8*dL-BnkN-O|xP4 zp3QGt{U1Lp*r(6$KJYU$qs7)cWU}^~nBGKAhEf(4nX=5iM;Csp^0bjCoXK+gN1NWX z^zNsxF=pw1`r>QM(r51${Rbw4sY{WKS0KZw@m%#Uaa^yIY1XuHwq1TNoj3S7!ZUdJ zDX>L`%`+ILWPS5M((Ao(`^~-ee=ETLI$u2SD*e(6y4Po;(T9q>dxdlvQWd47_cPQ3 zFWW4WS!#;gx;^px``@$HdlumIFo;Jg!1zA5|afy5L>`e;~{9A(k_G>NOHCHq3+8grW=ylE%dz~w) z0&A6&tA){D*RJ@ho$qfw{GIoI+B{ST-}sxa6ld>vsV|G5aV;jAMfrVInLS_5tubkt z4vucw*BCF~{I1!rREqL-hZz*)!~9({Z(I4Je=o4#e%&JnE(s&nC-Wq&7MV1K-RQmS zk7+;Oy`Qm%=H#QdCZ|98zM}s%RP|-J$~IJK=Kb3~Pgb2VVB1Fe68GcDW;l~z%NJt) z?O{$ju=n&#{FYsBJL#kGqC1`e?3|k&9J=$6S^emCDQBTFKbC8LWn#vC>`Pk|zMTC` z_JF<6$o%ZWrG|8nem!reKfm=Iy`wKWq~{;#S!>$CH$HV!y84+rWO`I->^u=4Y-n{yy7c1Cj#?sRd=#GDKqSre8$7cQhU(jY% zNLdknk?!TBrNH|6>wDUlu*sqD64i-pV2>18ddvK;bsl^%gZ)>4{SVxkBh!PmhyE~K z`TQGH_CzemOJ6jerrd^wQti@$T*uFLtoc3Ha%U?j5@0hJ5|Y zZ!*ItU!s%Nv|y->aaI&|X!3NaDD)NA}nL8SB*rh02e^ Qa{vGU07*qoM6N<$g6+k#6#xJL literal 0 HcmV?d00001 diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 0cd68dd9c..f1400cc91 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1363,5 +1363,9 @@ Limited ride And limited avatar frame Choose a prank gift Enter the prank content... Input quantity + IN GAME + You are currently in the game, please return in a timely manner.\\nFailure to return for a long time will be considered a surrender. + Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue + minimize diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index a186192f5..9174341da 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1360,4 +1360,8 @@ 選擇整蠱禮物 輸入整蠱內容... 输入数量 + 遊戲中 + 您正在遊戲中，請及時返回 長時間未返回將會視爲認輸哦 + 退出直播間將會同步退出遊戲房間 是否继续 + 最小化 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 88080a047..1e0f295ea 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1359,4 +1359,8 @@ 選擇整蠱禮物 輸入整蠱內容... 输入数量 + 遊戲中 + 您正在遊戲中，請及時返回 長時間未返回將會視爲認輸哦 + 退出直播間將會同步退出遊戲房間 是否继续 + 最小化 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index a8195214d..4aba76458 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1359,5 +1359,9 @@ 選擇整蠱禮物 輸入整蠱內容... 输入数量 + 遊戲中 + 您正在遊戲中，請及時返回\n長時間未返回將會視爲認輸哦 + 退出直播間將會同步退出遊戲房間\n是否继续 + 最小化 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 1529f8164..21e449365 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1366,4 +1366,8 @@ Limited ride And limited avatar frame Choose a prank gift Enter the prank content... Input quantity + You are currently in the game, please return in a timely manner.\\nFailure to return for a long time will be considered a surrender. + Exiting the live room will synchronize with exiting the game room.\\nDo you want to continue + IN GAME + minimize diff --git a/config.gradle b/config.gradle index cdd39002a..a4c1d2a21 100644 --- a/config.gradle +++ b/config.gradle @@ -5,7 +5,7 @@ ext { minSdkVersion : 21, targetSdkVersion : 33, versionCode : 453, - versionName : "6.6.0" + versionName : "6.6.6" ] manifestPlaceholders = [ //正式、 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 8182d4448..ba2bc9010 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -64,11 +64,13 @@ import com.yunbao.common.dialog.YoursystemisolderDialog; import com.yunbao.common.event.CustomDrawerPopupEvent; import com.yunbao.common.event.FollowEvent; import com.yunbao.common.event.GiftWallIlluminateEvent; +import com.yunbao.common.event.HideShowEvent; import com.yunbao.common.event.JavascriptInterfaceEvent; import com.yunbao.common.event.LiveErrorEvent; import com.yunbao.common.event.LiveOpenSudRoomEvent; import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent; +import com.yunbao.common.event.ShowHideEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.CommonHttpConsts; import com.yunbao.common.http.CommonHttpUtil; @@ -95,6 +97,7 @@ import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CustomDrawerPopupView; +import com.yunbao.common.views.HintCustomPopup; import com.yunbao.common.views.floatingview.APPEasyFloat; import com.yunbao.common.views.weight.VerticalViewPager; import com.yunbao.live.R; @@ -562,22 +565,59 @@ public class LiveAudienceActivity extends LiveActivity { @Override public void onBackPressed() { - MobclickAgent.onEvent(mContext, "live_room_close", "退出直播间"); - OpenAdManager.getInstance().dismiss(); - try { - manager.onBackPressed(); - if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_REQUEST) { - manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal); - } else if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_OPEN) { - manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal); - } else { - manager.onRemove(true); + if (manager != null && manager.getsudGameMin()) { + new XPopup.Builder(mContext) + .asCustom(new HintCustomPopup(mContext, + mContext.getString(com.yunbao.common.R.string.dialog_tip), + mContext.getString(com.yunbao.common.R.string.the_live_room)) + .setLiveOpenOk(mContext.getString(com.yunbao.common.R.string.confirm)) + .setLiveOpenCancel(mContext.getString(com.yunbao.common.R.string.cancel)) + .setCallBack(new HintCustomPopup.HintCustomCallBack() { + @Override + public void onSure() { + MobclickAgent.onEvent(mContext, "live_room_close", "退出直播间"); + OpenAdManager.getInstance().dismiss(); + try { + manager.onBackPressed(); + if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_REQUEST) { + manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal); + } else if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_OPEN) { + manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal); + } else { + manager.onRemove(true); + } + Bus.get().post(new HideShowEvent().setClose(true)); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void onCancel() { + + + } + })).show(); + } else { + MobclickAgent.onEvent(mContext, "live_room_close", "退出直播间"); + OpenAdManager.getInstance().dismiss(); + try { + manager.onBackPressed(); + if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_REQUEST) { + manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal); + } else if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_OPEN) { + manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal); + } else { + manager.onRemove(true); + + } + } catch (Exception e) { + e.printStackTrace(); } - } catch (Exception e) { - e.printStackTrace(); } + } public void end() { @@ -737,33 +777,38 @@ public class LiveAudienceActivity extends LiveActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) { - LiveBean liveBean = e.getLiveBean(); - if (TextUtils.equals(mLiveUid, liveBean.getUid())) { - ToastUtil.show(mContext.getString(R.string.current_live_room)); - } else { - if (e.isLiveEnd()) { - manager.removeLiveEnd(); - } - if (LiveRoomViewHolder.mHandler != null) { - LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null); - } - if (liveBean != null) { - LiveHttpUtil.cancel(LiveHttpConsts.CHECK_LIVE); - LiveHttpUtil.cancel(LiveHttpConsts.ENTER_ROOM); - LiveHttpUtil.cancel(LiveHttpConsts.ROOM_CHARGE); - manager.onRemove(false); - mLiveType = e.getLiveType(); - mLiveTypeVal = e.getLiveTypeVal(); - mLiveBean = liveBean; - mLiveUid = liveBean.getUid(); - mStream = liveBean.getStream(); - mAncherName = liveBean.getUserNiceName(); - mAncherIcon = liveBean.getAvatar(); - manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK); + if (manager!=null&&manager.getsudGameMin()){ + ToastUtil.show(WordUtil.isNewZh()?"小遊戲進行中，無法切換直播間":"Game in progress, unable to switch to live room"); + }else { + LiveBean liveBean = e.getLiveBean(); + if (TextUtils.equals(mLiveUid, liveBean.getUid())) { + ToastUtil.show(mContext.getString(R.string.current_live_room)); + } else { + if (e.isLiveEnd()) { + manager.removeLiveEnd(); + } + if (LiveRoomViewHolder.mHandler != null) { + LiveRoomViewHolder.mHandler.removeCallbacksAndMessages(null); + } + if (liveBean != null) { + LiveHttpUtil.cancel(LiveHttpConsts.CHECK_LIVE); + LiveHttpUtil.cancel(LiveHttpConsts.ENTER_ROOM); + LiveHttpUtil.cancel(LiveHttpConsts.ROOM_CHARGE); + manager.onRemove(false); + mLiveType = e.getLiveType(); + mLiveTypeVal = e.getLiveTypeVal(); + mLiveBean = liveBean; + mLiveUid = liveBean.getUid(); + mStream = liveBean.getStream(); + mAncherName = liveBean.getUserNiceName(); + mAncherIcon = liveBean.getAvatar(); + manager.onAdd(liveBean, mLiveType, mLiveTypeVal, mLiveSDK); + } } } + } @Override @@ -1124,7 +1169,8 @@ public class LiveAudienceActivity extends LiveActivity { break; case GUARD: if (event.getObject() == null) { - openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity); } else { + openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity); + } else { openNewBuyGuardWindow(true); } break; @@ -1593,7 +1639,7 @@ public class LiveAudienceActivity extends LiveActivity { @Override public void onError(String error) { - ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred"); + ToastUtil.show(WordUtil.isNewZh() ? "抱歉！出錯了！" : "i \\'m sorry! An error occurred"); } }); @@ -1647,6 +1693,19 @@ public class LiveAudienceActivity extends LiveActivity { }); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onShowHideEvent(ShowHideEvent event) { + if (manager != null) { + manager.onShowHideEvent(); + verticalViewPager.setEnableScroll(false); + } + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onHideShow(HideShowEvent event) { + verticalViewPager.setEnableScroll(true); + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveOpenSudRoomEvent(LiveOpenSudRoomEvent liveOpenSudRoomEvent) { if (manager != null) { @@ -1734,7 +1793,7 @@ public class LiveAudienceActivity extends LiveActivity { } else { if (IMLoginManager.get(mContext).getRedPoint()) { manager.mLiveAudienceViewHolder.mRedPointPrivilege.setVisibility(View.VISIBLE); - }else { + } else { manager.mLiveAudienceViewHolder.mRedPointPrivilege.setVisibility(View.GONE); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index c2d80a7b2..569ca21f7 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -97,6 +97,7 @@ import com.yunbao.common.bean.XydCompleteModel; import com.yunbao.common.event.AllServerNotifyEvent; import com.yunbao.common.event.AnchorInfoEvent; import com.yunbao.common.event.CustomFullServiceNotifyEvent; +import com.yunbao.common.event.HideShowEvent; import com.yunbao.common.event.LiveRoomChangeEvent; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.API; @@ -666,6 +667,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis return R.layout.view_live_room; } + private View sudGameMin; + + public void onShowHideEvent() { + sudGameMin = findViewById(R.id.sud_game_min); + sudGameMin.setVisibility(View.VISIBLE); + ViewClicksAntiShake.clicksAntiShake(sudGameMin, new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + Bus.get().post(new HideShowEvent().setClose(false)); + sudGameMin.setVisibility(View.GONE); + } + }); + } /** * 获取下一秒钟的时间 @@ -3050,7 +3064,29 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis MobclickAgent.onEvent(mContext, "live_room_noble", "贵族按钮"); ((LiveActivity) mContext).openUserMoreListWindow(1, false, true, mContext instanceof LiveRyAnchorActivity); } else if (i == R.id.btn_close) { +// if (sudGameMin!=null&&sudGameMin.getVisibility()==View.VISIBLE) { +// new XPopup.Builder(mContext) +// .asCustom(new HintCustomPopup(mContext, +// mContext.getString(com.yunbao.common.R.string.dialog_tip), +// mContext.getString(com.yunbao.common.R.string.the_live_room)) +// .setLiveOpenOk( mContext.getString(com.yunbao.common.R.string.confirm)) +// .setLiveOpenCancel( mContext.getString(com.yunbao.common.R.string.cancel)) +// .setCallBack(new HintCustomPopup.HintCustomCallBack() { +// @Override +// public void onSure() { +// close(); +// } +// +// @Override +// public void onCancel() { +// +// +// } +// })).show(); +// } else { close(); +// } + //小屏 } else if (i == R.id.btn_noble) { ((LiveActivity) mContext).openLuckGiftTip(); @@ -3067,6 +3103,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } + public boolean getsudGameMin() { + return sudGameMin != null && sudGameMin.getVisibility() == View.VISIBLE; + } + /** * 私信的切换动画 * diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index fd1d2677e..67d42ffbf 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -216,6 +216,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe this.createSudRoomModel = createSudRoomModel; } + public void onShowHideEvent() { + if (mLiveRoomViewHolder != null) { + mLiveRoomViewHolder.onShowHideEvent(); + } + } + public PortraitLiveManager(Activity context, Intent intent) { this.mContext = context; this.mIntent = intent; @@ -1630,6 +1636,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } } + public boolean getsudGameMin() { + return mLiveRoomViewHolder != null && mLiveRoomViewHolder.getsudGameMin(); + } + @Override public void onHourRank(LiveChatBean bean, JSONObject ranks) { if (mLiveRoomViewHolder != null && !TextUtils.isEmpty(liveID) && ranks != null) { diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index bc52b669c..2995e1eb0 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1059,11 +1059,11 @@ android:id="@+id/iv_look" android:layout_width="52dp" android:layout_height="24dp" - android:singleLine="true" - android:ellipsize="end" android:layout_marginRight="12dp" android:background="@drawable/bg_all_server_icon" + android:ellipsize="end" android:gravity="center" + android:singleLine="true" android:text="@string/live_onlookers" android:textColor="@color/white" android:textSize="12sp" /> @@ -2239,6 +2239,33 @@ android:gravity="bottom" android:orientation="vertical"> + + + + + + + + android:textSize="14sp" + android:visibility="gone" />