diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 012b4181..c92382fa 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -63,7 +63,7 @@ public class RetrofitClient { private static RetrofitClient INSTANCE; private static ApiServer sApiServer; - public static final int DEFAULT_TIME_OUT = 60; + public static final int DEFAULT_TIME_OUT = 10; private static OkHttpClient client; private final Retrofit mRetrofit; 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 285400c9..0a38cf8a 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 @@ -2002,6 +2002,15 @@ class RoomActivity : BaseMvpActivity(), QXGiftPlayerManager.getInstance(this) .displayFullEffectView(roomMessageEvent.text.jia_jia) } + + //TODO================ 坐骑入场不触发播放 临时添加=============== + Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn( + AndroidSchedulers.mainThread() + ).subscribe { aLong: Long? -> + if (ActivityUtils.getTopActivity() is RoomActivity) { + toActivity(TransparentActivity::class.java) + } + } MvpPre?.getRoomOnline(roomId, "1", "10") // number++ @@ -2962,6 +2971,16 @@ class RoomActivity : BaseMvpActivity(), } requestLayout(mBinding!!.rlPk) requestLayout(mBinding!!.rlMai) + + + //TODO================ CP入场不触发播放 临时添加=============== + Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn( + AndroidSchedulers.mainThread() + ).subscribe { aLong: Long? -> + if (ActivityUtils.getTopActivity() is RoomActivity) { + toActivity(TransparentActivity::class.java) + } + } } @@ -3325,6 +3344,14 @@ class RoomActivity : BaseMvpActivity(), softRebuildUI() QXGiftPlayerManager.getInstance(this).displayFullEffectView(event.ride_url) } + //TODO================ 坐骑入场不触发播放 临时添加=============== + Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn( + AndroidSchedulers.mainThread() + ).subscribe { aLong: Long? -> + if (ActivityUtils.getTopActivity() is RoomActivity) { + toActivity(TransparentActivity::class.java) + } + } } is RoomWheatEvent -> { @@ -4338,9 +4365,7 @@ class RoomActivity : BaseMvpActivity(), //局部刷新 private fun requestLayout(view: View) { - view.invalidate() view.requestLayout() - mBinding?.llBottom?.invalidate() mBinding?.llBottom?.requestLayout() }