diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAdapterImpl.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAdapterImpl.java index f8762aaac..eca9b358f 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAdapterImpl.java +++ b/core/src/diff_src_erban/java/com/nnbc123/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/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraHandlerInterface.java index 1c5252fc5..5b04c5eb7 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraHandlerInterface.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraHandlerInterface.java @@ -3,7 +3,6 @@ package com.nnbc123.core.manager.trtc; import android.graphics.Rect; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; /** * 对齐IRtcEngineEventHandler的所有接口 @@ -25,7 +24,7 @@ interface BaseAgoraHandlerInterface { void onLocalUserRegistered(int uid, String userAccount); @Version(agora = "2.9.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/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraInterface.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraInterface.java index 3e20604e9..00c7d714c 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraInterface.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraInterface.java @@ -4,7 +4,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; @@ -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/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineEventHandler.java b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineEventHandler.java index 6d387d562..a03b25057 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineEventHandler.java @@ -16,7 +16,6 @@ import com.nnbc123.library.utils.SingleToastUtil; import io.agora.rtc2.Constants; import io.agora.rtc2.IRtcEngineEventHandler; -import io.agora.rtc2.UserInfo; /** * @author by 梁馨 on 2020/9/14. @@ -224,7 +223,7 @@ public class TRtcEngineEventHandler implements IRTCEngineHandler { } @Override - public void onUserInfoUpdated(int uid, UserInfo userInfo) { + public void onUserInfoUpdated(int uid, io.agora.rtc2.UserInfo userInfo) { }