From 8b9fd2ba08576580b6c76af56d420c79340601f3 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Tue, 9 Dec 2025 15:07:27 +0800
Subject: [PATCH] fix bugs.

---
 .../java/com/xscm/moduleutil/base/CommonAppContext.java    | 2 +-
 .../main/java/com/xscm/moduleutil/rtc/AgoraManager.java    | 2 +-
 .../activity/room/fragment/FriendshipRoomFragment.java     | 5 +++++
 .../activity/user/presenter/CurrencyExchangePresenter.java | 7 ++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

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 abb0e7dc..4c6614b6 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(false);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
         initialization();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
index 288fd60a..49c91594 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
@@ -402,8 +402,8 @@ public class AgoraManager {
             @Override
             public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) {
                 super.onRemoteAudioStateChanged(uid, state, reason, elapsed);
-                LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed);
                 if (state == 0){
+                    LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed);
                     for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
                         if (listener != null) {
                             // Pk 关闭远端推流
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
index 393c6fe2..4ee0ffab 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
@@ -504,6 +504,11 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
             if (i == 6 || i == 7)
                 continue;
             RoomPitBean roomPitBean = roomInfoResp.getRoom_info().getPit_list().get(i);
+
+            if (roomPitBean.getUser_id() == null || roomPitBean.getUser_id().isEmpty()){
+                continue;
+            }
+
             if (Integer.parseInt(roomPitBean.getUser_id()) == message.getText().getFromUserInfo().getUser_id()) {
                 RoomFriendshipWheatView object = mWheatViews.get(i);
                 if (object != null) {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
index 31683d2a..a2055963 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
@@ -6,6 +6,7 @@ import com.xscm.modulemain.activity.user.conacts.CurrencyExchangeConacts;
 import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.bean.WalletConfig;
 import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 import java.lang.ref.WeakReference;
@@ -23,7 +24,7 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
 
     @Override
     public void exchangeCoin(String earnings_num) {
-        api.exchangeCoin(earnings_num, new BaseObserver<String>() {
+        RetrofitClient.getInstance().exchangeCoin(earnings_num, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -41,7 +42,7 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
 
     @Override
     public void wallet() {
-        api.wallet(new BaseObserver<WalletBean>() {
+        RetrofitClient.getInstance().wallet(new BaseObserver<WalletBean>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -59,7 +60,7 @@ public class CurrencyExchangePresenter extends BasePresenter<CurrencyExchangeCon
 
     @Override
     public void getWalletConfig() {
-        api.getWalletConfig(new BaseObserver<WalletConfig>() {
+        RetrofitClient.getInstance().getWalletConfig(new BaseObserver<WalletConfig>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);