From 1d50f8e4f5987e8543f90ded31cc5ef3662673f1 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 16 Nov 2022 17:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BF=AE=E6=94=B9,?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=85=B3=E6=92=AD=E9=A1=B5=E9=9D=A2BUg?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/utils/RouteUtil.java    |   4 +-
 .../views/DrawerRecommendChildViewHolder.java |   2 +-
 .../views/DrawerRecommendViewHolder.java      |   2 +-
 .../views/DrawerTaskChildViewHolder.java      |  23 +++++++--
 .../common/views/DrawerTaskViewHolder.java    |   2 +-
 .../common/views/FunGamesChildViewHolder.java |   2 +-
 .../common/views/FunGamesViewHolder.java      |   2 +-
 .../src/main/res/mipmap-xxhdpi/icon_012x.png  | Bin 0 -> 1499 bytes
 .../src/main/res/mipmap-xxhdpi/icon_022x.png  | Bin 0 -> 1243 bytes
 .../src/main/res/mipmap-xxhdpi/icon_032x.png  | Bin 0 -> 1195 bytes
 .../src/main/res/mipmap-xxhdpi/icon_042x.png  | Bin 0 -> 1253 bytes
 .../src/main/res/mipmap-xxhdpi/icon_052x.png  | Bin 0 -> 1212 bytes
 config.gradle                                 |   4 +-
 .../live/activity/LiveAudienceActivity.java   |   5 +-
 .../live/activity/WebViewActivityMedal.java   |   3 ++
 .../com/yunbao/live/dialog/VoiceDialog.java   |  43 ++++++++---------
 .../live/event/LiveRoomChangeEvent.java       |  10 ++++
 .../live/views/LiveAudienceViewHolder.java    |  44 +++++++++---------
 .../yunbao/live/views/LiveEndViewHolder.java  |  14 ++----
 .../live/views/PortraitLiveManager.java       |  43 ++++++++++++++---
 live/src/main/res/layout/view_live_end.xml    |   4 +-
 21 files changed, 132 insertions(+), 75 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_012x.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_022x.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_032x.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_042x.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_052x.png

diff --git a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java
index 738227174..9af0bfdd2 100644
--- a/common/src/main/java/com/yunbao/common/utils/RouteUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/RouteUtil.java
@@ -100,6 +100,7 @@ public class RouteUtil {
         }
         Constants.myUrl = url + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&t=" + System.currentTimeMillis();
         ARouter.getInstance().build(PATH_MYWEBVIEWACTIVTITY)
+                .withString(Constants.URL,url)
                 .navigation();
     }
 
@@ -118,7 +119,8 @@ public class RouteUtil {
      */
     public static void forwardZhuangBanActivity(String url, boolean isFull) {
         ARouter.getInstance().build(PATH_ZHUANGBANACTIVITY)
-                .withString("title", "")
+                .withString("url", url)
+                .withBoolean("isFull", isFull)
                 .navigation();
     }
 
diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java
index 165bdcba6..147ec1713 100644
--- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendChildViewHolder.java
@@ -44,7 +44,7 @@ public class DrawerRecommendChildViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")
diff --git a/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java
index b5aecd681..38d2389e4 100644
--- a/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DrawerRecommendViewHolder.java
@@ -52,7 +52,7 @@ public class DrawerRecommendViewHolder extends RecyclerView.ViewHolder {
                     if (TextUtils.equals(model.getSrc(), "recharge")) {
                         htmlUrl.append("recharge");
                     } else if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")
diff --git a/common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
index a41e297c2..f8aa7ee0f 100644
--- a/common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
@@ -38,7 +38,25 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
     }
 
     public void setData(CustomSidebarChildModel model, int index) {
-        ImgLoader.display2(itemView.getContext(), model.getIcon(), icon);
+        int iconImg = R.mipmap.icon_012x;
+        switch (model.getFlag()) {
+            case "send_coin_gift":
+                iconImg = R.mipmap.icon_012x;
+                break;
+            case "send_gold_gift":
+                iconImg = R.mipmap.icon_022x;
+                break;
+            case "attention":
+                iconImg = R.mipmap.icon_032x;
+                break;
+            case "bullet_screen":
+                iconImg = R.mipmap.icon_042x;
+                break;
+            case "illumine":
+                iconImg = R.mipmap.icon_052x;
+                break;
+        }
+        ImgLoader.display(itemView.getContext(), iconImg, icon);
         StringBuffer titleBuffer = new StringBuffer();
         titleBuffer
                 .append(model.getTitle())
@@ -70,7 +88,6 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
             public void onViewClicks() {
 
 
-
                 if (TextUtils.equals(model.getStatus(), "2")) {
                     LiveNetManager.get(itemView.getContext())
                             .sendTaskGift(model.getFlag(), new HttpCallback<String>() {
@@ -86,7 +103,7 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
                                     ToastUtil.show(error);
                                 }
                             });
-                }else {
+                } else {
                     Bus.get().post(new CustomDrawerPopupEvent()
                             .setDisMiss(true));
                 }
diff --git a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
index 72218f3e6..d34fe9c1e 100644
--- a/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
@@ -52,7 +52,7 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")
diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java
index 2848413b3..e7bef052d 100644
--- a/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/FunGamesChildViewHolder.java
@@ -54,7 +54,7 @@ public class FunGamesChildViewHolder extends RecyclerView.ViewHolder {
                         IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                         StringBuffer htmlUrl = new StringBuffer();
                         if (model.getSrc().contains("?")) {
-                            htmlUrl.append(model.getSrc())
+                            htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                     .append("&uid=")
                                     .append(userInfo.getId())
                                     .append("&token=")
diff --git a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
index 5da9ada68..9534274c4 100644
--- a/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/FunGamesViewHolder.java
@@ -62,7 +62,7 @@ public class FunGamesViewHolder extends RecyclerView.ViewHolder {
                     IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
                     StringBuffer htmlUrl = new StringBuffer();
                     if (model.getSrc().contains("?")) {
-                        htmlUrl.append(model.getSrc())
+                        htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
                                 .append("&uid=")
                                 .append(userInfo.getId())
                                 .append("&token=")
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_012x.png b/common/src/main/res/mipmap-xxhdpi/icon_012x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc2d708728980c3e7d2bc91cf5d26c0cbdc608a6
GIT binary patch
literal 1499
zcmV<11tj{3P)<h;3K|Lk000e1NJLTq002?|002-30{{R3y*kpO0002_P)t-s0002K
z)au9M^Tguw#^dzE;PJ=h_QT-u#^v_J;`6}W^2g-$#p3kG<n_ei^Tgrv!{714;qt=X
z@WbEm!s7DB<o3nl^TOZp!rt-3;qt@a@xtHl!r$@3;PArW@WbKo!r<?~-tffX^TFTn
z#NzYC;_|}Z@x|lx!{G74-|)oY^2Oux#p3hB;PJ!Y@WbHp!{PA4-|)lV@WS8l|NsBP
z-|@xc^!EDw#NqP5-tgM&_Wl0<`~CjL<o43&^!fb$@%a4e^!nH8_Qm1x?)LlS@%hi@
z^x*IK#NzYG<MPbp^T*=x=kxj8?f2O0_W1k$^ZES9=J?+3_p=wpEdT%jGjvi;Qvd`J
z^wnSV^3BZ?+q|@`hJtWcJRSS{_$r-vPfkogHX07lEy-r+<>9iYmz9luQ!;2~atD2z
z000DDNkl<ZSi_{1cYCTZ6vn|>s<m3R&f2}_y)h7mpyEI)uJ8Y0?g_5jnz(rXfWY(Q
z_nh&bMA)Xl?PoF}J>+t^2Pu*Kyge3tDUdEchoW-LAs8WyiBprKq32>ca3Jrx@-9Ut
z6Pcj@go#|6L~h<I*ZTvn?&HBpjUbi?P~(5E_5)^8H`xV`L(Sf#GP?th!*|&lMw^9e
z*}L$LMHSPD2m{E1MiOapmk?7iM#{YOW2x<?$`>Ls+Ff#_kl#YA#2te6k&}&AHkPq;
zCu6jquq>5CKJhF>lir&dIum^m*`4Py%SQ(hX`Dx8CNUic;-SoVn&qCCbBqpVl9&9t
z!%u?*9WEz$`rGqjI3^=Ml4IdtExJ4bqCe)zB_nNLBEi!i=TZs$<5%)gNmwcK3f=ZA
zeEynQA?euo7Yyd=o_X_v^dIKi@;<uYR#Ih)Tg{8b?V5~o+TGDyZ7$bcEww(c>B;$B
z{KfI4YSyc4)lHr^zh+3@;C#1r4pMJ_^G3)c26#4aDzMv7s0@!}E!RqOqup;44q~a-
znB{2Ow%PKKtq!bb)oAqDVJ7lkza@6wnnm}HG=yxZfHk(NM%!Nf-q3UL{*e`>+JVTF
zaaAAmpaSsf47_}MgQ`AOXv8d}^Y}-EQnD>%ca7@Eg-6}&w`l&VIi~qS-bUB8;9;|h
z8BIblGX=skP@@MJs|#FXijh4v05r9#W3$)b7zvX?hMtrT$3RL`g}u6E&AZVDkTrr2
zS_+Pl9C~V&CBin4(Zwoqjal1Oke518T~)<hooyr{mBHvwcs*?zkkTFwn{9<UyQK|5
zO$~~=`0qu_Kt6%lQ&C1qplsV^xp;kNG$jbd9HZTB4rTjT=8A&wffzFD%lXsiL%A46
zW8^KkhsOs8iJJc?FQZ)rff$H>ls1HgWI+f7FS0lO|Hs&=HGPoD#(7XeqHMRPvx9b`
zIYeYr!pB8Smt_X}BGaK;{C~TUzeM5RlGOMzQr6xE2PJtC4KB_LM|;ThVCq_|%qIo2
z?zgV_iF;@5afk@)-MHEJy!hCoCE%ZcZV)lloy}f<sns@z-8zb1wVOW+IzyceBxLoi
za<{eFx-psJJE9^3No)i1E=(&bN8JN<H5G=B+lHGP(al(~K7V=-x|{%FZf?Ou^2l0b
z(oNm}S|c<KaCB=Zv*0)=C`#S9!-(Oad7rOgzC0YnaYj(;OAm{9=x6ByA9|d{q03Q%
zaP~kQ+_;)Cd8T&0p<#uS1U@txM1bLXdwCD@34C~fiI~MDupL+6!(&#2L9XeUiI1}|
zSdXkg2?~5_k+mMIH*_2BTMO1C{!^3!pL+bSzofu2=B4_Q^4qJ_{WT{q!d)p6JA9Ue
zJA5?gmQug-O#3cA<pU8^9xk!vkfFh#4jqP`5CdeKln;<$4&#YZK8#2CU?bg!L@6J*
zrF?jqwu9i557nzGkTs#8gl9rwkW72vn4BSO9017D_E8QC8l?aL002ovPDHLkV1gEA
BH;w=R

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/icon_022x.png b/common/src/main/res/mipmap-xxhdpi/icon_022x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5289e73fd14fd6e520e6ffc349a327d696d22d7b
GIT binary patch
literal 1243
zcmV<11SI>3P)<h;3K|Lk000e1NJLTq002?|002-30{{R3y*kpO00027P)t-s0002P
z;PJuV^2Orx!{G74;PAiI>&4^r!r<}5;`74b@WSBn!r$@2-|)iV@WS8m!r$-1;PS)Y
z@x$Qq!{G44;PAuY^1|Tp!{G41-tWcW@WkQr$>{gP-toWH>cimh!rtz};PArV@c;k+
z!Qb$|-tfrg_r&4y$>;gS<MjCa{`~&`$>Z|Y>h;d%^WyOM>-75P^ZD}l{MzjH?)Llj
z`u)=A^xp3G#^LhJ<nqho^3`eB(*OVfB6LztQvjGI_P06+`{?CX>-+NG%EGFpottlI
zWi%Wh>L61LdwY69KlQHw00Xy4L_t(o!_ArJcH%G)g#(z-Tj-D~tJuaB7f9a!!B)b~
z3MZ0n5X;&7BQc!Acdj&=ku-iN)pK((8xIHl{$MzsEt;DLHPySdQ5#^BfRl)cL3>o|
z*01HQm)aI%Y=WFj`qfrjuCD;DY8{LT5Q<>jsjV&qHYW|k1O+mU#-w@46iyok0VN_v
zV_J1mALl&|EQa>xkCiNHJR)T>u~xxow_|_{WOTY^#P^m7E|S@LE1t$0Cg4I5Tq~H+
z*Czv9A>-*)>X8wzW6FHiDDg^WO%fRlt``0f5no#5dL(JR2v&H<1PU@c^<SaU44@=K
z`x&A+28zP-AH&|7sz`I2ANte)$}*<8irXOSNYXg3$rEN$-R6W7SCvdc1hfBAo2$z*
z5!s<1Tb30E4nbvkxo(>kJcgG3t-S-GFzD@dhFszbL{C3gK!i-Z%#a!`Cmv4jJSTCy
zJ$v+pOsr*xo?dBikh|0MT}TiUao7}iNED#nbGm_57<WX8$u|Uj#q^^qwAoGLU5Z3b
zX6xLvFGQv>AC<e@GvpZpdDNy21;`O2ZrWxAlN9mE5zwYKLnK;88<yX#vS{0}&U8R|
z-+?GVEtcmCT#|-18#WDcbZ$J5P3D3kXJ%nqA5U2mg}NS-JTej{(2OF-L=HSU0R>Xp
z(V<4qk-o$w8B^p?UMIXPt$mw?c>iM!ctYfmA_p>$P6phElun<6^N3qK;&}}yvM<f*
zOo3}BEJ6uKAV-!ypwE%QwHTz_-RT+Tr!odY^#udxBilI;rK9Jihp%)G36TR?co4Ja
zpfpB1eP<m&E+2U^iNZ4`lB|y4$q_udiF-u(A@C*iYZ2v_x;UZ`qWr#qJRTh3QeR+6
z$rb!aUfOs<O3DUGsE;r4uOQholSqtgH6_Ij7P$;~RT39BR)S@7Dcvd~ARG5cx>3N0
zCZb>ygn$t(UeLuGMHfqwC-~(Bk$@5TL<+Vu`KB8&CP6uiFo_wFC%bUdWzw*0cZeN;
zAj}pgaQ##5lzRkND>}d+H%=>?O#r1H-7wl^wG+sZ%fe$8vZJ&N?IYihvg%=l!dUZT
zR`FpFf-u%|vOF6VU(!mCtcW<#?k~>|kBD0oA6d%}))0YD#|t7qI3zYeu<T%6?f4H7
zB|-ML+VTJPmlUpgPyH&@tKa^@_fM~-x4%5!{)*4_q0)$WzeBr3y{U7T){}aJOs+SD
zHs1Z3jp{8?^~UX;+so=raP?OG|L{UV{k4Z&n@eBL`~g~rpkepLEvx_l002ovPDHLk
FV1iVwdUF5(

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/icon_032x.png b/common/src/main/res/mipmap-xxhdpi/icon_032x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6ab9a331964da6147fc5b3d60e6be1b129c51f
GIT binary patch
literal 1195
zcmV;c1XTNpP)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th0002AP)t-s0002R
z;`GDe^1|To!{G76;PJxP?ZxBt!r<}5;`71Y@xtKn!r$@2-|)iV@WS8m!r$-1;PS)Y
z@x$Tr!r<}4;PArW^2X)$z~1k|-|)NA>BHdh!Qb%0-tofU@5ABo!r$-2;_%1c@5SNr
z!{G44-|+wc|H0ny!{G7A=J(0x`NiV%{Qm#O<n`F=_Ri+>;P3eC_4~`@^ZES#^!feW
z?f1sw@$dKi)amun=k)3H`sDHXyI@W<0000bbW%=J0QTxSoR|pv=;b7r`|{t)!m6cd
zWi%%t9JmX&S5ta#ZdV|+dls4UZvX%Tfk{L`R9M5TmFZUMFc5%47ooBX0t)VTl1b7)
z7Z%0$f3Hj6$fDC?so$TTIj8+PTT^z9q1*F2t!AUqY<0YzJ7i_Je(~Eilv*PKAZjhK
z*7jenFSCvMV@FD(5spA@q;$spQDNP!A4sWzL`xa?w}o_Wx1u!UpjD;o{=RiyMIoF4
zRmJ;VGq0W;LPsi{r>pb6!5iH=x|wf-bG}KSpa3eE<oh101`1)S|MJ>bHwXnmQ_pPV
z{f$B>462*^jQj{+DP!IGE;H82c}Ro{LHYR8_fSQ+7_2`0*yq4N2~05fHjuG`QmFCi
z@;pl@iF`geUmOi3(a!PN<0&YO@(w<?f>0W)xO-t&!5^Ty`~Sx-!SX5IvK_tx8X*AC
zUWkz3>kAy!G_8YK6wlLn9L+$Sgc(X*8!<~?(!OLJ@*QEkam?a<xK3!J>@&-qBz^BG
zKM+o*;Zc~r3sQJzeM54o#a0lmqD2&^dr!OxSK;;rf?V#Q{Vhq#H?xne6A&Ac&z<ix
zu@NL|Yn)L=Ik7V)D_(KVBO!M7ZMxxfA4Z(>6<M>t5w;CguuVuDH{iHPVN<4xHf_dU
zsihGy=kw)B3r<R0&N+_-wK%WLrB3Q)Y773p;|FZf>5@9RUDh)hBl!@JiTKDEi|H{>
z)A#cvPndA}joM=!%t#<#7-k4Ntc8DBGPYO~fgZ{tPq?6lVrjAlWbAbeIm8*84UPY;
znL!VNFbst+#+x@|MB`1ii!mS@Bk=$KmxOA1_*j&zy^yd_x~=PbeG`X_0E>tvjDFRj
zP8nZJd52T>e+StVm>+f3*Y|9cL2Qbq4Zlgb2$TK|X`_kFS;^_+P@|QDi7iKu=KG)(
zg_S7uGQy)L#UVH8$KVMKkKBZ%IB5A|Bmy3U8jYOgOA9PLMgb2%jiw+AEFb`@@0!{x
zQp+3l2M7R2F-F(E{5RcOhxh<efKkq{i^3dYhcy6<0_ahvf}1T3bv-0ETgX*40eVsq
z=HuuVmuY#7$UjgKkR>Kwa32dyOOhqhIR+WS;w~aQ&^Zv!oXcn1KH-jp^KVKlyZn<9
zo0E3yw!*&gv2V@P_El-~SnaLbTk8hgTq3X+F=&@knZ;fRvX`o8_d+p^cH1iV-E0NP
z>&aR&H5PS^WoKhy+)}!)j^~ogh1sWEF3jFaE*JFrW4Gn{;|*hb*su=BU7-K~002ov
JPDHLkV1gE<cJ%-N

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/icon_042x.png b/common/src/main/res/mipmap-xxhdpi/icon_042x.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c80e682dbd4321ccf6df92c0020cee17375aa1
GIT binary patch
literal 1253
zcmV<B1RDE^P)<h;3K|Lk000e1NJLTq002?|002-30{{R3y*kpO0002_P)t-s0002P
z;q$)K>cimi#NqPC<@Uzp_QK!r!r<}5;`7Jk^~dD)!{PG7;PS%X@yF!$#NqPA<MhMf
z@x|iv#pCqH<@Lkh@x<Zs!{G75-|)lW@x<Zr!{713;_|}a@5bNo#p3kB-tWWU@x$Tq
z!{YJ5-|)fR@5A8n!r$@5<MhMe@xtHn!r$=5<o3kj^2Oux#NzeC;PJxX@WS8k!Q%77
z-R{QZ_QvA$!r$=2;PC(d|H0qz<MH^!;qvYF`^Dq*==1u?<MPMi@%{e)#^d$n@%hK(
z_SWk4&gS#=`u)h}_}c9E`1}6g@A%W`_44`r@Av%6<nzem@|iKA9RL6TICN4@QvebK
z_0ROpPCxbA({Nxa`-aN?`?<5Nor8aPW>_2=4!t~4Of)c7@95>>*|Mvrmz0fNHy%v9
zhIo?ovj6}CV@X6oR9M5T)z@;`KokbxMcqOI)0?R_?%hu2EMi%MWSVVa`~4p#8wf*C
zq?H8vZ*=#~X_`fWNpw5qqI51=;<;2Tce)9*R}xzF`bwk@C0PuB2^~}M>bk1!$~LtJ
zNuJLg!n92oJC~&gtr;C`)LI8~CktL7&RlNQ8qvVIA*IIz{6ofR$*4ydp_xfL82G{C
zbjA!hRH0pz$7_&}%Eh)2rbI(`wajZ@H-ZaIm1GLx<H)5{fT-mufhZyAyv7}4Cqpqr
z3#J)W@E4Dg4u;5~$s-|Fk;U;fRfQvRLlxCiY`3^`<eNX+Ue|M*-B|=oZd3nX_~8M8
z-9ruz6YkZRI)#1W=%#B$Pk9Rah320)ZO78Os%#gDLuRY>txKxk<?!Al&fV2F<Y|(E
zi?o6R7`uL=)6F|`pTjP4_|^}~+Ynr><?b76@>p@Nd(^jkL9zQI_aQ0A>({j+y4O8?
z=>_LyXt|ayR+=mFq(H%geE%Hy=kwiz1X}2>$Vc6aWPNcKKk9pu`s4b{voVoGT%CLB
zhC)mv(3{k9-<cRm<p&dm+69S^yr>Cmlw~nKl89wC%;yrp9MZD>!kaIL1X6nbbCm@A
zNitomiv3!AEyeG}lt<FS2|}vGBPTQab;OA2pf{KT6Z`gT!mCnJ5i&2aKS@4pMlI>y
zYy#L~wEe*&FHMAuvykMkFeIEA2vx;6s|2x%Pz4}hmf!HtEMK{^WU2gSy^MAc24N`r
zTW(7bSr#OaZ2JEnW9nua#8dacdFN&er9IV1yzyss<2Su=h{PY~x||04$NyXpU|)}2
zM1WmHcBun)soM_{upgw|HUP72n9c2dV%oLhdl+(a;}$#?C-^9VA$nJnum$s=_^{ol
z5VzJ8Xi(@lL)%!R2C{AFIHRFEJn|yAc`QW&=j4|fb)t6Ysv5NB7R&xYYYrDOw^|KQ
zV1|QSjzBs80}>d~EQpMW0|nA7kwJ(I*<+y4${;JN9+E%;loiDK3?SB>^}qj;(tnle
zzwmWlORut)c3z%eGiRh>7asvQC>e-QP^8vy2_pT_VNi$ip(kn&kSQ_YAI9USd>D`N
z!A80diBdjrOZo6Jtp~v=AF3Y&6ACEP9=5h%=L*@okUZ@{cydOK@Z<~tpV~@&ZfGm%
P00000NkvXXu0mjfjd-;k

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/icon_052x.png b/common/src/main/res/mipmap-xxhdpi/icon_052x.png
new file mode 100644
index 0000000000000000000000000000000000000000..211307e2f3b6a41f6ae65c651384d9183990450e
GIT binary patch
literal 1212
zcmV;t1Vj6YP)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th0002AP)t-s0002P
z;PJuV^2Orx!{PG6;PAiI>%-vj#pCqC;PJ%b^TOcp!r$@2-|@oV@WSBm!r$-0-tfcV
z@WbKq!r<}4;PAlS@5JHq#o+M5-|)iU@5$)*#p3hB-|@rV@xRsT!{G42-tfZT@x$Nn
z|NsBN-tfiY^2p`)$>{mT<Mher_|N9_`u+a*`~B$i`uzU>+wAt!==J3B`OD<;^!okl
z_4?N8^~mD#@Av!O?)TyF_{`<=^c3GK0000ZbW%=J0GKBB>N*IV`{?CXxcl<o!lZ9$
zWi%YNAj*0msi{*8d&<gEB__iF00WdsL_t(o!=#mIbE+^DK!ZTp-1pWluX95d5G#tJ
zumAsly^I<Av<4I5d~)*P%*nk1NXNn*S^ZwO)9Lp5-pHM!CbS~!GXTm7oFJS+@M%S@
zdba6!=Fo%^xPpiyXEvTbteaRNy_8)`X=qIz(z&lT<8TMg>{r)(be_!!Xduk?%!c_i
zbfiwNbcRm`c{9qv5Kd>>$S7p+04$8|`(Atw55fIE_r_;Y0uMr{RXNCyK>{^M1|JoD
z0|vEV19hX7Kur=$xep4pp)a?-cb`CQi2r``e-1e`fQPML3u!ZG1Z!U}W=NqSba-`P
zheJcSb9rfxL1UQr-{;!e4ac!|)3%Gwyy*k;T%Y*%^Zn2U#%qk%u{LpnB$hUiWEf{e
zn`lYjG~l|xBNiNWi9C>B*KuMJXp)$WPr^3UPf%bmMcPJ!g+mMi4?BZI;w*$PG78L7
zlPS{3<h@D?5eRUQiTXF~Gc^d@$8l~jMf!};JmA$X0hA)J0Fa5LJgb5PbL9G!&u*FK
z>&-4Z1&WhB7RKFXou?&0h1Pe`h^lm3VJeniSRw*tqU38?2=7*9q$A|1Zd_*gf~5!)
z#Q73mP?T^B_fVfG0@HI#c3A!0Z-2V?$JHS_cc+R((nmc|vBH8)x+RxOkiW?`-C)5=
zxs@L3LZz|zj+OiRE~HOI7j>Z8n5D659$B>yI{#=dn;e8eC<xy`O*{flT|7dIEg*XT
zd-;H9hz+xA7fpZCuPsbwh9S_D|FVKT&z8|JL*U6!q6g>gfB8JThu5A6&w10i$c7UI
z|KIn*7<ehd=EU3s7shMCzTOFNRT29h=vC}10p70zbLgM%uk>#im;<%1{4-VHXSSKz
z7dKd^UR`k}MpHRKHBAkcN5E4h0wwvUlD!^4#ksKv;31W4aeYW=_7VhTnr$K>MPn4A
zQy{C;ecNWYzI87kF-n5In!a_mwuWUXme5WkXwYjFVY;rEoPd-onkieW2ro;a;T{Q<
zpB@bvNLk`_ZfoNPd=0ye=SJ!rEu3(-IS9~)tAzRHKnf?V#8d2X4QV7!tP=Cm4v=g6
z(tg0Q;(&$EK}$1TJbtD{nR!|~Y_#p(Qr-cl<q!eogBTi&G#+N5d?1MCLsbZ%K=EK2
z<->jS9gw7a$dvLyUHT6@BL>E`a1V@Y0SCsZIdsn>B1ZP)f+YInf)Z$Qff69WD$GvG
a^alX$9kF}Lg9!ux0000<MNUMnLSTZ6E_r<b

literal 0
HcmV?d00001

diff --git a/config.gradle b/config.gradle
index 74c89ff01..8affa5db3 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
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 9cbb3efce..d30ad0c41 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -640,6 +640,9 @@ public class LiveAudienceActivity extends LiveActivity {
     public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) {
         if (verticalViewPager.ismEnableScroll()) {
             LiveBean liveBean = e.getLiveBean();
+            if (e.isLiveEnd()) {
+                manager.removeLiveEnd();
+            }
             if (liveBean != null) {
                 LiveHttpUtil.cancel(LiveHttpConsts.CHECK_LIVE);
                 LiveHttpUtil.cancel(LiveHttpConsts.ENTER_ROOM);
@@ -756,7 +759,7 @@ public class LiveAudienceActivity extends LiveActivity {
                         public void showerHtml(String htmlUrl, boolean screen) {
                             if (TextUtils.equals(htmlUrl, "recharge")) {
                                 RouteUtil.forwardMyCoin(mContext);
-                            }else {
+                            } else {
                                 if (!screen) {
                                     ZhuangBanActivity.forward(mContext, htmlUrl, false);
                                 } else {
diff --git a/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java b/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
index 802dc0332..e92136c1e 100644
--- a/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
+++ b/live/src/main/java/com/yunbao/live/activity/WebViewActivityMedal.java
@@ -31,6 +31,7 @@ import com.yunbao.common.activity.AbsActivity;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
 import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.JavascriptInterfaceUtils;
 import com.yunbao.common.utils.L;
@@ -66,6 +67,7 @@ public class WebViewActivityMedal extends AbsActivity {
 
     @Override
     protected void main() {
+        Bus.getOn(this);
         String url = getIntent().getStringExtra(Constants.URL);
         L.e("H5---3>" + url);
         LinearLayout rootView = (LinearLayout) findViewById(R.id.rootView);
@@ -300,6 +302,7 @@ public class WebViewActivityMedal extends AbsActivity {
 
     @Override
     protected void onDestroy() {
+        Bus.getOff(this);
         if (mWebView != null) {
             ViewGroup parent = (ViewGroup) mWebView.getParent();
             if (parent != null) {
diff --git a/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java b/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
index db1611661..5c934814c 100644
--- a/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/VoiceDialog.java
@@ -1,5 +1,6 @@
 package com.yunbao.live.dialog;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.SpannableStringBuilder;
@@ -52,16 +53,16 @@ public class VoiceDialog extends AbsDialogFragment {
     @Override
     public void onStop() {
         super.onStop();
+
+
+    }
+
+    public String sendMessage() {
         if (mIat != null) {
             mIat.cancel();
             mIat.destroy();
             mIat = null;
         }
-
-    }
-
-    public String sendMessage() {
-
         return WordsTypeUtil.changeTraditional(builder.toString());
     }
 
@@ -88,12 +89,6 @@ public class VoiceDialog extends AbsDialogFragment {
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
         params.gravity = Gravity.CENTER;
         window.setAttributes(params);
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-
-            }
-        }, 30000);
     }
 
     @Override
@@ -111,7 +106,6 @@ public class VoiceDialog extends AbsDialogFragment {
         voiceChat = (TextView) findViewById(R.id.voice_chat);
         fingersSlide = (TextView) findViewById(R.id.fingers_slide);
         gifView = (GifImageView) findViewById(R.id.gif_view);
-        startRecognize();
         iconWithdraw.setVisibility(View.GONE);
         gifView.setVisibility(View.GONE);
         voiceFluctuations.setVisibility(View.VISIBLE);
@@ -131,21 +125,24 @@ public class VoiceDialog extends AbsDialogFragment {
      * 上划取消
      */
     public void withdraw() {
-        mIat.stopListening();
-        if (!isDetached()) {
-            voiceFluctuations.setVisibility(View.GONE);
-            gifView.setVisibility(View.GONE);
-            iconWithdraw.setVisibility(View.VISIBLE);
-            fingersSlide.setText(getString(R.string.release_cancel_send));
-            isSend = false;
+        if (mIat != null) {
+            mIat.stopListening();
+            if (!isDetached()) {
+                voiceFluctuations.setVisibility(View.GONE);
+                gifView.setVisibility(View.GONE);
+                iconWithdraw.setVisibility(View.VISIBLE);
+                fingersSlide.setText(getString(R.string.release_cancel_send));
+                isSend = false;
+            }
         }
+
     }
 
     /**
      * 上划取消
      */
-    public void notWithdraw() {
-       startRecognize();
+    public void notWithdraw(Context context) {
+        startRecognize(context);
         if (!isDetached()) {
             if (TextUtils.isEmpty(sendMessage())) {
                 if (gifView.getVisibility() != View.VISIBLE)
@@ -227,9 +224,9 @@ public class VoiceDialog extends AbsDialogFragment {
     /**
      * 开始识别
      */
-    public void startRecognize() {
+    public void startRecognize(Context context) {
         if (null == mIat) {
-            mIat = SpeechRecognizer.createRecognizer(getContext(), mInitListener);
+            mIat = SpeechRecognizer.createRecognizer(context, mInitListener);
         }
         if (mIat.isListening()) {
             return;
diff --git a/live/src/main/java/com/yunbao/live/event/LiveRoomChangeEvent.java b/live/src/main/java/com/yunbao/live/event/LiveRoomChangeEvent.java
index 987045cba..fcdc291ac 100644
--- a/live/src/main/java/com/yunbao/live/event/LiveRoomChangeEvent.java
+++ b/live/src/main/java/com/yunbao/live/event/LiveRoomChangeEvent.java
@@ -11,6 +11,16 @@ public class LiveRoomChangeEvent {
     private LiveBean mLiveBean;
     private int mLiveType;//直播间的类型  普通 密码 门票 计时等
     private int mLiveTypeVal;//收费价格,计时收费每次扣费的值
+    private boolean isLiveEnd = false;
+
+    public boolean isLiveEnd() {
+        return isLiveEnd;
+    }
+
+    public LiveRoomChangeEvent setLiveEnd(boolean liveEnd) {
+        isLiveEnd = liveEnd;
+        return this;
+    }
 
     public LiveRoomChangeEvent(LiveBean bean, int liveType, int liveTypeVal) {
         mLiveBean = bean;
diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
index 60e3303fc..f8e36d404 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
@@ -311,6 +311,10 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 if (mProcessResultUtil.checkPermissions(new String[]{Manifest.permission.RECORD_AUDIO})) {
                     //按下
                     handler.postDelayed(mLongPressed, 500);
+                    if (voiceDialog == null) {
+                        voiceDialog = new VoiceDialog();
+                        voiceDialog.startRecognize(mContext);
+                    }
                 } else {
                     mProcessResultUtil.requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, new Runnable() {
                         @Override
@@ -328,7 +332,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 }
                 if ((downY - moveY < 100) && (downY - moveY > 30)) {
                     if (voiceDialog != null && voiceDialog.isAdded())
-                        voiceDialog.notWithdraw();
+                        voiceDialog.notWithdraw(mContext);
                 }
             } else if (event.getAction() == MotionEvent.ACTION_UP) {
                 //松开
@@ -360,28 +364,26 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
 
             Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
             vibrator.vibrate(100);//震动时间(ms)
-            if (voiceDialog == null) {
-                voiceDialog = new VoiceDialog();
-                voiceDialog.setListener(new VoiceDialog.VoiceListener() {
-                    @Override
-                    public void timeout() {
-                        //松开
-                        handler.removeCallbacks(mLongPressed);
-                        Bus.get().post(new LiveAudienceEvent()
-                                .setVoicePress(false)
-                                .setType(LiveAudienceEvent.LiveAudienceType.VOICE_PRESS));
 
-                        if (voiceDialog != null) {
-                            if (voiceDialog.isSend() && !TextUtils.isEmpty(voiceDialog.sendMessage())) {
-                                ((LiveActivity) mContext).sendChatMessage(voiceDialog.sendMessage(), null, null);
-                            }
+            voiceDialog.setListener(new VoiceDialog.VoiceListener() {
+                @Override
+                public void timeout() {
+                    //松开
+                    handler.removeCallbacks(mLongPressed);
+                    Bus.get().post(new LiveAudienceEvent()
+                            .setVoicePress(false)
+                            .setType(LiveAudienceEvent.LiveAudienceType.VOICE_PRESS));
 
-                            voiceDialog.dismiss();
-                            voiceDialog = null;
+                    if (voiceDialog != null) {
+                        if (voiceDialog.isSend() && !TextUtils.isEmpty(voiceDialog.sendMessage())) {
+                            ((LiveActivity) mContext).sendChatMessage(voiceDialog.sendMessage(), null, null);
                         }
+
+                        voiceDialog.dismiss();
+                        voiceDialog = null;
                     }
-                });
-            }
+                }
+            });
             voiceDialog.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "VoiceDialog");
             Bus.get().post(new LiveAudienceEvent()
                     .setVoicePress(true)
@@ -409,7 +411,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         handler.postDelayed(runnable = new Runnable() {
             @Override
             public void run() {
-                if(!liveUid.equals(mLiveUid)){
+                if (!liveUid.equals(mLiveUid)) {
                     return;
                 }
                 if (isattention == 0) {
@@ -421,7 +423,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 LiveChatBean lvBean2 = new LiveChatBean();
                 lvBean2.setType(-2);
                 LiveRoomViewHolder.insertChat(lvBean2, 1);
-                Log.i("chatMgs", liveUid+"|"+mLiveUid);
+                Log.i("chatMgs", liveUid + "|" + mLiveUid);
             }
         }, 10000);//3秒后执行Runnable中的run方法
     }
diff --git a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
index 8bf0729b3..0ee9fb147 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveEndViewHolder.java
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.fastjson.JSON;
 import com.yunbao.common.bean.AnchorRecommendModel;
 import com.yunbao.common.bean.IMLoginModel;
+import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.event.CloseEvent;
 import com.yunbao.common.glide.ImgLoader;
@@ -34,12 +35,13 @@ import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.SearchRecommendBodyAdapter;
-import com.yunbao.common.bean.LiveBean;
 import com.yunbao.live.event.JumpUserHomeEvent;
+import com.yunbao.live.event.LiveRoomChangeEvent;
 import com.yunbao.live.http.LiveHttpConsts;
 import com.yunbao.live.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -317,15 +319,7 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
                             if (liveBean == null) {
                                 return;
                             }
-                            LiveAudienceActivity.forward(mContext, liveBean, liveType, liveTypeVal, "", 0, liveSdk);
-                            if (mContext instanceof LiveAnchorActivity) {
-                                ((LiveAnchorActivity) mContext).superBackPressed();
-                            } else if (mContext instanceof LiveAudienceActivity) {
-                                ((LiveAudienceActivity) mContext).exitLiveRoom();
-                            } else if (mContext instanceof LiveRyAnchorActivity) {
-                                ((LiveRyAnchorActivity) mContext).superBackPressed();
-
-                            }
+                            EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, liveTypeVal).setLiveEnd(true));
 
                         }
                     });
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 ccd5fb86e..50b4e3759 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -11,7 +11,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.CountDownTimer;
 import android.os.Handler;
-import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -258,7 +257,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                     mLiveAudienceViewHolder.addToParent();
                     mLiveRoomViewHolder.addToParent();
                     mLiveAudienceViewHolder.subscribeActivityLifeCycle();
-                }else{
+                } else {
                     mLivePlayViewHolder.setLiveBeanLandscape(mLiveBean.getLandscape());
                     mLiveLinkMicPresenter.setLiveSdk(mLiveSDK);
                     mLiveLinkMicAnchorPresenter.setLiveSdk(mLiveSDK);
@@ -321,6 +320,36 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     }
 
+    public void removeLiveEnd() {
+        if (mLiveAudienceViewHolder != null) {
+            mLiveAudienceViewHolder.removeFromParent();
+            mLiveAudienceViewHolder.removeCallbacks();
+            mLiveAudienceViewHolder.release();
+        }
+        //结束播放
+        if (mLivePlayViewHolder != null) {
+            mLivePlayViewHolder.removeFromParent();
+            mLivePlayViewHolder.stopPlay();
+            mLivePlayViewHolder.release();
+        }
+        if (mLiveRoomViewHolder != null) {
+            mLiveRoomViewHolder.removeFromParent();
+            mLiveRoomViewHolder.clearData();
+            mLiveRoomViewHolder.countDownTimerTrickery = null;
+        }
+        if (mLiveEndViewHolder != null) {
+            mLiveEndViewHolder.removeFromParent();
+            mLiveEndViewHolder.release();
+        }
+        mLiveEndViewHolder = null;
+        mLiveAudienceViewHolder = null;
+        mLivePlayViewHolder = null;
+        mLiveRoomViewHolder = null;
+        mLiveLinkMicPresenter = null;
+        mLiveLinkMicAnchorPresenter = null;
+        mLiveRyLinkMicPkPresenter = null;
+    }
+
     @Override
     public void onRemove(boolean isQuit) {
         LiveHttpUtil.cancel(LiveHttpConsts.CHECK_LIVE);
@@ -379,13 +408,13 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 mLiveEndViewHolder.removeFromParent();
                 mLiveEndViewHolder.release();
             }
+            mLiveEndViewHolder = null;
             mLiveAudienceViewHolder = null;
             mLivePlayViewHolder = null;
             mLiveRoomViewHolder = null;
-            mLiveEndViewHolder = null;
-            mLiveLinkMicPresenter=null;
-            mLiveLinkMicAnchorPresenter=null;
-            mLiveRyLinkMicPkPresenter=null;
+            mLiveLinkMicPresenter = null;
+            mLiveLinkMicAnchorPresenter = null;
+            mLiveRyLinkMicPkPresenter = null;
             if (PermissionUtils.checkPermission(mContext) && !kick) {
                 LiveFloatView.getInstance()
                         .cacheLiveData(mLiveBean, mLiveType, mLiveSDK, mLiveTypeVal)
@@ -929,7 +958,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
     }
 
     @Override
-    public void onLinkMicPkStart(String pkUid, String pkhead, String pkname,String isLadders) {
+    public void onLinkMicPkStart(String pkUid, String pkhead, String pkname, String isLadders) {
         if (mLiveRyLinkMicPkPresenter != null && mLiveRoomViewHolder != null) {
             mLiveRyLinkMicPkPresenter.onLinkMicPkStart(pkUid, 1);
             Handler handler = new Handler();
diff --git a/live/src/main/res/layout/view_live_end.xml b/live/src/main/res/layout/view_live_end.xml
index 5e5a188ab..aaf9be7c0 100644
--- a/live/src/main/res/layout/view_live_end.xml
+++ b/live/src/main/res/layout/view_live_end.xml
@@ -215,7 +215,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="2dp"
                     android:layout_marginTop="14dp"
-                    android:text=":"
                     android:textColor="#70ffffff"
                     android:textSize="13.33sp" />
 
@@ -224,7 +223,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="7dp"
-                    android:layout_marginTop="17dp"
+                    android:layout_marginTop="14dp"
                     android:textColor="#70ffffff"
                     android:textSize="13.33sp" />
 
@@ -400,6 +399,7 @@
                         android:id="@+id/live_duration_anchor"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
                         android:text="0"
                         android:textColor="@color/white"
                         android:textSize="16sp"