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 4c6614b6..abb0e7dc 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -161,7 +161,7 @@ public class CommonAppContext extends MultiDexApplication implements Applicatio //设置mqtt环境 false 测试环境 true 正式环境 // ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false); //设置http环境 false 测试环境 true 正式环境 - ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true); + ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false); currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH(); initialization(); 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 863f316c..5d9978b3 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 @@ -253,6 +253,11 @@ class RoomActivity : BaseMvpActivity(), return false } + // TODO: ktv上麦用户展示在activity页面 + fun getBinding(): ActivityRoomBinding? { + return mBinding + } + override fun doDone() { isOnline = intent.getBooleanExtra("isOnline", false) 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 26193468..b431e4c8 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 @@ -68,9 +68,11 @@ public class RoomKtvFragment extends BaseMvpFragment adapter; - VolumeManager volumeManager ; + VolumeManager volumeManager; + + public RoomKtvFragment() { + } - public RoomKtvFragment() {} public RoomKtvFragment(RoomInfoResp roomInfoResp) { this.roomInfoResp = roomInfoResp; } @@ -199,13 +201,13 @@ public class RoomKtvFragment extends BaseMvpFragment + + + + - +