moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io.agora.rtc2.UserInfo同类名混淆冲突调整

Browse Source
This commit is contained in:
zu
2023-11-29 05:34:03 +08:00
parent 3d73cae162
commit 64b7a0a808
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/chwl/core/manager/trtc/BaseAdapterImpl.java
View File

@@ -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;
}

3
core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraHandlerInterface.java
View File

@@ -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);

5
core/src/main/java/com/chwl/core/manager/trtc/BaseAgoraInterface.java
View File

@@ -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);

3
core/src/main/java/com/chwl/core/manager/trtc/TRtcEngineEventHandler.java
View File

@@ -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) {
}