diff --git a/common/src/main/res/values/style.xml b/common/src/main/res/values/style.xml
index c18102442..e04a3b92f 100644
--- a/common/src/main/res/values/style.xml
+++ b/common/src/main/res/values/style.xml
@@ -6,6 +6,7 @@
- @color/colorPrimaryDark
- @color/colorAccent
- @color/background
+ - @style/Animation
+
+
\ No newline at end of file
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 aa3d405a1..f5c7cf9d4 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -1,7 +1,5 @@
package com.yunbao.live.activity;
-import static com.yunbao.live.views.LivePlayRyViewHolder.Micing;
-
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@@ -48,10 +46,8 @@ import com.yunbao.common.pay.PayCallback;
import com.yunbao.common.pay.PayPresenter;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DialogUitl;
-import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.L;
import com.yunbao.common.utils.ProcessResultUtil;
-import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.VerticalViewPager;
import com.yunbao.live.R;
@@ -68,7 +64,6 @@ import com.yunbao.live.dialog.SidebarLiveAudience;
import com.yunbao.live.event.LinkMicTxAccEvent;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.event.LiveRoomChangeEvent;
-import com.yunbao.live.event.RecommendLiveRoomEvent;
import com.yunbao.live.http.ImHttpUtil;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
@@ -83,6 +78,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import static com.yunbao.live.views.LivePlayRyViewHolder.Micing;
+
/**
* Created by cxf on 2018/10/10.
* 看直播
@@ -450,9 +447,11 @@ public class LiveAudienceActivity extends LiveActivity {
} else if (Micing == 2) {
manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal);
} else {
- manager.exitLiveRoom();
manager.onRemove();
- super.onBackPressed();
+ verticalViewPager.removeAllViews();
+ finish();
+ overridePendingTransition(0, 0);
+
}
}
@@ -790,15 +789,15 @@ public class LiveAudienceActivity extends LiveActivity {
+ "&stream=" + mStream
+ "&uid=" + CommonAppConfig.getInstance().getUid()
+ "&token=" + CommonAppConfig.getInstance().getToken();
- liveHDDialogFragment=new LiveHDDialogFragment();
+ liveHDDialogFragment = new LiveHDDialogFragment();
bundle.putString("url", url);
bundle.putInt("show_type", 0);
liveHDDialogFragment.setArguments(bundle);
- liveHDDialogFragment.show(getSupportFragmentManager(),"LiveHDDialogFragment");
+ liveHDDialogFragment.show(getSupportFragmentManager(), "LiveHDDialogFragment");
break;
case NOTICE:
- toSysMsgWeb("1");
- break;
+ toSysMsgWeb("1");
+ break;
case ONLINE:
toSysMsgWeb("3");
break;
@@ -809,9 +808,10 @@ public class LiveAudienceActivity extends LiveActivity {
/**
* 跳转到消息中心的系统信息web
+ *
* @param type 1、官方通知 2、互动信息 3、在线客服
*/
- private void toSysMsgWeb(String type){
+ private void toSysMsgWeb(String type) {
ImHttpUtil.getImUserInfo("", new HttpCallback() {
@SuppressLint("MissingPermission")
@@ -819,8 +819,8 @@ public class LiveAudienceActivity extends LiveActivity {
public void onSuccess(int code, String msg, String[] info) {
List list = JSON.parseArray(Arrays.toString(info), ImUserBean.class);
for (ImUserBean bean : list) {
- if(type.equals(bean.getType())){
- switch (type){
+ if (type.equals(bean.getType())) {
+ switch (type) {
case "1":
startActivity(new Intent(mContext, SystemMessageActivity.class)
.putExtra("type", bean.getType())
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 e5cb21181..3c9146717 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -1324,8 +1324,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
*/
public void endPlay() {
CommonAppContext.Ingroup = 0;
- mLiveAudienceViewHolder.handler.removeCallbacks(mLiveAudienceViewHolder.runnable);
- mLiveAudienceViewHolder.handler1.removeCallbacks(mLiveAudienceViewHolder.runnable1);
if (mEnd) {
return;
}