From 41d47101d2dd89ac711bcbe8043e767973dabda2 Mon Sep 17 00:00:00 2001
From: wangjiyu <wangjiyu@wjy.local>
Date: Mon, 14 Apr 2025 18:24:16 +0800
Subject: [PATCH] debug

---
 test_send.py        |  2 +-
 test_time_r.py      |  2 +-
 test_time_s.py      |  2 +-
 util/RTCContext.cpp | 16 +++++++++-------
 util/RTCContext.h   |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test_send.py b/test_send.py
index 30791d3..7c6501c 100644
--- a/test_send.py
+++ b/test_send.py
@@ -17,7 +17,7 @@ ret = rtc_plugins.init(srcUserId, srcDisplayName, srcRoomId, my_callback)
 if ret != 0:
     print(f"init fail, ret:{ret}")
     exit(1)
-ret = rtc_plugins.initSend(destRoomId, destChannelIndex)
+ret = rtc_plugins.initSend(srcRoomId, destRoomId, destChannelIndex)
 if ret != 0:
     print(f"initSend fail, ret:{ret}")
     exit(1)
diff --git a/test_time_r.py b/test_time_r.py
index d328400..dce93e5 100644
--- a/test_time_r.py
+++ b/test_time_r.py
@@ -23,7 +23,7 @@ ret = rtc_plugins.initRecv(destRoomId, srcUserId, destChannelIndex)
 if ret != 0:
     print(f"initRecv fail, ret:{ret}")
     exit(1)
-ret = rtc_plugins.initSend(srcRoomId, srcChannelIndex)
+ret = rtc_plugins.initSend(destRoomId, srcRoomId, srcChannelIndex)
 if ret != 0:
     print(f"initSend fail, ret:{ret}")
     exit(1)
diff --git a/test_time_s.py b/test_time_s.py
index cc9d3d3..0e43ae0 100644
--- a/test_time_s.py
+++ b/test_time_s.py
@@ -17,7 +17,7 @@ ret = rtc_plugins.init(srcUserId, srcDisplayName, srcRoomId, my_callback)
 if ret != 0:
     print(f"init fail, ret:{ret}")
     exit(1)
-ret = rtc_plugins.initSend(destRoomId, destChannelIndex)
+ret = rtc_plugins.initSend(srcRoomId, destRoomId, destChannelIndex)
 if ret != 0:
     print(f"initSend fail, ret:{ret}")
     exit(1)
diff --git a/util/RTCContext.cpp b/util/RTCContext.cpp
index 1c1c3ea..cb90eab 100644
--- a/util/RTCContext.cpp
+++ b/util/RTCContext.cpp
@@ -507,19 +507,21 @@ bool RTCContext::initRecv(const char* destRoomId, const char* srcUserId, const i
     return true;
 
 }
-bool RTCContext::initSend(const char* destRoomId, const int16_t destChannelIndex)
+bool RTCContext::initSend(const char* srcRoomId, const char* destRoomId, const int16_t destChannelIndex)
 {
     while (!isOnRoom_)
     {
         std::cout << "wait for OnRoom" << std::endl;
         sleep(3);
     }
-    std::cout << "join multi room" << std::endl;
-    int16_t ret1 = rtcEngine_->joinMultiRoom(destRoomId);
-    if (ret1 != 0)
-    {
-        std::cout << "joinMultiRoom fail, ret:" << ret1;
-        return false;
+    if (std::string(srcRoomId) != std::string(destRoomId)) {
+        std::cout << "join multi room" << std::endl;
+        int16_t ret1 = rtcEngine_->joinMultiRoom(destRoomId);
+        if (ret1 != 0)
+        {
+            std::cout << "joinMultiRoom fail, ret:" << ret1;
+            return false;
+        }
     }
 
     mrtc::MRTCAudioOption option;
diff --git a/util/RTCContext.h b/util/RTCContext.h
index 2e65cda..5e1e27d 100644
--- a/util/RTCContext.h
+++ b/util/RTCContext.h
@@ -83,7 +83,7 @@ public:
     mrtc::IMRTCEngine* getRtcEngine() const;
     bool init(const char* selfUserId, const char* selfDisplayName, const char* selfRoomId);
     bool initRecv(const char* destRoomId, const char* srcUserId, const int16_t destChannelIndex);
-    bool initSend(const char* destRoomId, const int16_t destChannelIndex);
+    bool initSend(const char* srcRoomId, const char* destRoomId, const int16_t destChannelIndex);
 
     void* getpData() const;
     void setpData(void* pData);