diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 65307f2ff..8145c8ee4 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -146,7 +146,7 @@ public interface PDLiveApi { * @param liveuid * @return */ - @GET("/api/public/?service=User.slketAttents") + @GET("/api/public/?service=User.setAttents") Observable>> setAttents( @Query("touid") String liveuid ); 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 f5c7cf9d4..b7741ed97 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -441,17 +441,20 @@ public class LiveAudienceActivity extends LiveActivity { @Override public void onBackPressed() { - manager.onBackPressed(); - if (Micing == 1) { - manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal); - } else if (Micing == 2) { - manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal); - } else { - manager.onRemove(); - verticalViewPager.removeAllViews(); - finish(); - overridePendingTransition(0, 0); + try { + manager.onBackPressed(); + if (Micing == 1) { + manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal); + } else if (Micing == 2) { + manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal); + } else { + manager.onRemove(); + super.onBackPressed(); + + } + } catch (Exception e) { + e.printStackTrace(); } } @@ -471,7 +474,7 @@ public class LiveAudienceActivity extends LiveActivity { @Override protected void onDestroy() { super.onDestroy(); - + overridePendingTransition(0, 0); Bus.getOff(this); L.e("LiveAudienceActivity-------onDestroy------->"); } 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 3c9146717..de6a6fde4 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -290,7 +290,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe IMLoginManager.get(mContext).setisNewUserOne(false); //子线程执行退出操作 - endPlay(); + exitLiveRoom(); if (mLiveAudienceViewHolder != null) {