diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index 57b520f5..fc43960c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -133,7 +133,7 @@ public class CommonAppContext extends MultiDexApplication implements Application @Getter public UnreadCountEvent unreadCountEvent; - public static int selectRelease = -1; + public static int selectRelease = 1; @Override public void onCreate() { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index d89bbfbb..75996150 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -1682,7 +1682,7 @@ class RoomActivity : BaseMvpActivity(), mRoomInfoResp?.song_user_info = messageEvent.text.songInfo roomBtnShowIsHide(mRoomInfoResp?.song_user_info?.user_id!!.toInt()) } else { - mRoomInfoResp?.song_user_info = null +// mRoomInfoResp?.song_user_info = null roomBtnShowIsHide(-2) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java index cafe4c10..d29116d6 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java @@ -729,6 +729,7 @@ public class RoomKtvFragment extends BaseMvpFragment