From ac7a3b13259a42cadaab56786851add3d9f2c742 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Sat, 17 Jan 2026 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=E5=B0=8F=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8B=E9=BA=A6=E6=A0=87=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E5=A4=B4=E6=B7=BB=E5=8A=A0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/moduleutil/http/RetrofitClient.java     | 8 +++++---
 .../main/java/com/xscm/moduleutil/utils/SystemUtils.java  | 7 +++----
 .../modulemain/activity/room/activity/RoomActivity.kt     | 4 +++-
 3 files changed, 11 insertions(+), 8 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 dafa7b4f..136c583b 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -98,9 +98,7 @@ public class RetrofitClient {
 
     private OkHttpClient provideOkHttpClient() {
         Map<String, String> headers = Collections.emptyMap();
-        if (SpUtil.isAgreePolicy()) {
-            headers = SystemUtils.getSystemParams();
-        }
+        headers = SystemUtils.getSystemParams();
         SetCookieCache cookieCache = new SetCookieCache();
         ClearableCookieJar cookieJar =
                 new PersistentCookieJar(cookieCache, new SharedPrefsCookiePersistor(CommonAppContext.getInstance()));
@@ -123,6 +121,10 @@ public class RetrofitClient {
             sslContext = SSLContext.getInstance("SSL");
             sslContext.init(null, new TrustManager[]{trustAllCert}, new SecureRandom());
 
+            headers.entrySet().stream()
+                    .forEach(entry -> LogUtils.e("Header: %-20s Value: %s", entry.getKey(), entry.getValue()));
+
+
             final OkHttpClient client = new OkHttpClient.Builder()
                     .addInterceptor(new DataLoggingInterceptor(new DataLogger()))
                     .addInterceptor(new AccessTokenInterceptor(headers))
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SystemUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SystemUtils.java
index fd234b94..5b9cd409 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SystemUtils.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SystemUtils.java
@@ -5,7 +5,6 @@ import android.os.Build;
 
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.MetaDataUtils;
-import com.chad.library.BuildConfig;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.utils.config.ConfigUtils;
 
@@ -106,9 +105,9 @@ public class SystemUtils {
     public static Map<String, String> getSystemParams() {
         Map<String, String> headers = new HashMap<>();
         headers.put("deviceId", SystemUtils.getShortClientID(CommonAppContext.getInstance()));
-        headers.put("appVersion", BuildConfig.VERSION_NAME + "." + BuildConfig.VERSION_CODE);
-        headers.put("versionName", BuildConfig.VERSION_NAME);
-        headers.put("versionCode", String.valueOf(BuildConfig.VERSION_CODE));
+        headers.put("appId", CommonAppContext.getInstance().appId);
+        headers.put("versionName", CommonAppContext.getInstance().appVersionName);
+        headers.put("versionCode", CommonAppContext.getInstance().appVersionCode);
         headers.put("system", "android");
         headers.put("emulator", CommonAppContext.getInstance().emulator);
         headers.put("deviceName", SystemUtils.getDeviceBrand() + SystemUtils.getSystemModel() + SystemUtils.getSystemVersion());
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 1779db95..f812ea76 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
@@ -1593,7 +1593,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             roomFragment!!.handleRoomMessage(messageEvent)
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeSingerRoomCurrentSongDidChanged) { //点歌房当前歌曲发生变化)
             if (mRoomInfoResp != null && mRoomInfoResp!!.room_info != null) {
-                if (messageEvent?.text?.song_info != null) {
+                if (messageEvent.text?.song_info != null) {
                     mRoomInfoResp?.singer_info?.song_info = messageEvent.text.song_info
                     roomBtnShowIsHide(mRoomInfoResp?.singer_info?.song_info?.singer_user_id!!)
                 } else {
@@ -3115,6 +3115,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         }
 
         mRoomInfoResp?.user_info?.pit_number = 9527
+
+        roomBtnShowIsHide()
     }
 
     /** 进入小黑屋将所有的底部隐藏 */