From 64b7a0a808a7cf9895421b3b2d2792e5ca3b5d6a Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 29 Nov 2023 05:34:03 +0800 Subject: [PATCH] =?UTF-8?q?io.agora.rtc2.UserInfo=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E6=B7=B7=E6=B7=86=E5=86=B2=E7=AA=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chwl/core/manager/trtc/BaseAdapterImpl.java | 5 ++--- .../chwl/core/manager/trtc/BaseAgoraHandlerInterface.java | 3 +-- .../java/com/chwl/core/manager/trtc/BaseAgoraInterface.java | 5 ++--- .../com/chwl/core/manager/trtc/TRtcEngineEventHandler.java | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java index 3392c8244..65901e6bd 100644 --- a/core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java +++ b/core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java @@ -10,7 +10,6 @@ import io.agora.rtc2.IAudioEffectManager; import io.agora.rtc2.IAudioFrameObserver; import io.agora.rtc2.IMetadataObserver; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; import io.agora.rtc2.internal.LastmileProbeConfig; import io.agora.rtc2.live.LiveInjectStreamConfig; import io.agora.rtc2.live.LiveTranscoding; @@ -193,12 +192,12 @@ public class BaseAdapterImpl implements IRTCEngine { } @Override - public int getUserInfoByUserAccount(String userAccount, UserInfo userInfo) { + public int getUserInfoByUserAccount(String userAccount, io.agora.rtc2.UserInfo userInfo) { return 0; } @Override - public int getUserInfoByUid(int uid, UserInfo userInfo) { + public int getUserInfoByUid(int uid, io.agora.rtc2.UserInfo userInfo) { return 0; } diff --git a/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java index 5898af4eb..2a7b86e7f 100644 --- a/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java +++ b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java @@ -3,7 +3,6 @@ package com.chwl.core.manager.trtc; import android.graphics.Rect; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; /** @@ -26,7 +25,7 @@ interface BaseAgoraHandlerInterface { void onLocalUserRegistered(int uid, String userAccount); @Version(agora = "4.2.2") - void onUserInfoUpdated(int uid, UserInfo userInfo); + void onUserInfoUpdated(int uid, io.agora.rtc2.UserInfo userInfo); void onUserJoined(int uid, int elapsed); diff --git a/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java index 6362a7d5d..5d23480bc 100644 --- a/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java +++ b/core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java @@ -3,7 +3,6 @@ package com.chwl.core.manager.trtc; import io.agora.rtc2.IAudioFrameObserver; import io.agora.rtc2.IMetadataObserver; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; import io.agora.rtc2.internal.LastmileProbeConfig; import io.agora.rtc2.live.LiveInjectStreamConfig; import io.agora.rtc2.live.LiveTranscoding; @@ -38,9 +37,9 @@ public interface BaseAgoraInterface { int joinChannelWithUserAccount(String token, String channelName, String userAccount); - int getUserInfoByUserAccount(String userAccount, UserInfo userInfo); + int getUserInfoByUserAccount(String userAccount, io.agora.rtc2.UserInfo userInfo); - int getUserInfoByUid(int uid, UserInfo userInfo); + int getUserInfoByUid(int uid, io.agora.rtc2.UserInfo userInfo); int enableWebSdkInteroperability(boolean enabled); diff --git a/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java b/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java index 28b141425..c8d74bc3d 100644 --- a/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java +++ b/core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java @@ -17,7 +17,6 @@ import com.chwl.library.utils.SingleToastUtil; import io.agora.rtc2.Constants; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; /** @@ -227,7 +226,7 @@ public class TRtcEngineEventHandler implements IRTCEngineHandler { } @Override - public void onUserInfoUpdated(int uid, UserInfo userInfo) { + public void onUserInfoUpdated(int uid, io.agora.rtc2.UserInfo userInfo) { }