From 67c56b2d4f11bd9a44c2452ae4ac2d15eef14fe2 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Mon, 29 Dec 2025 09:51:27 +0800
Subject: [PATCH] =?UTF-8?q?82=20=E5=85=A5=E5=9C=BA=E7=89=B9=E6=95=88?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=AE=B9=E9=94=99=EF=BC=8C=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82timeout=3D10=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xscm/moduleutil/http/RetrofitClient.java  |  2 +-
 .../activity/room/activity/RoomActivity.kt    | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

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<RoomPresenter?, ActivityRoomBinding?>(),
             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<RoomPresenter?, ActivityRoomBinding?>(),
         }
         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<RoomPresenter?, ActivityRoomBinding?>(),
                     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<RoomPresenter?, ActivityRoomBinding?>(),
 
     //局部刷新
     private fun requestLayout(view: View) {
-        view.invalidate()
         view.requestLayout()
-        mBinding?.llBottom?.invalidate()
         mBinding?.llBottom?.requestLayout()
     }