yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

混淆配置：同名类冲突处理

Browse Source
This commit is contained in:
Max
2024-01-17 16:14:34 +08:00
parent 9591c3dc37
commit 29ced00df8
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/diff_src_erban/java/com/nnbc123/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/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraHandlerInterface.java
View File

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

5
core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/BaseAgoraInterface.java
View File

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

3
core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineEventHandler.java
View File

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