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

同步hiyoo混淆配置：io.agora.rtc2.UserInfo同类名混淆冲突调整

Browse Source
This commit is contained in:
Max
2024-01-06 16:17:16 +08:00
parent be75ae855a
commit 2d002958cd
9 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/yizhuan/erban/avroom/dialog/CreateGameRoomDialog.kt
View File

@@ -3,24 +3,16 @@ package com.yizhuan.erban.avroom.dialog
import android.annotation.SuppressLint
import android.view.Gravity
import android.view.WindowManager
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.adapter.CreateRoomGameAdapter
import com.yizhuan.erban.avroom.adapter.CreateRoomGameGuideAdapter
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogCreateGameRoomBinding
import com.yizhuan.erban.databinding.DialogCreateRoomBinding
import com.yizhuan.erban.home.helper.OpenRoomHelper
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class CreateGameRoomDialog : BaseDialog<DialogCreateGameRoomBinding>() {

1
app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageResultAdapter.kt
View File

@@ -1,7 +1,6 @@
package com.yizhuan.erban.avroom.redpackage.open
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.core.view.isVisible
import com.chad.library.adapter.base.BaseQuickAdapter

1
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKCreateActivity.kt
View File

@@ -20,7 +20,6 @@ import com.yizhuan.xchat_android_core.utils.extension.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toIntOrDef
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.common.application.Env
import com.yizhuan.xchat_android_library.utils.ResUtil
class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkCreateBinding>() {

1
app/src/main/java/com/yizhuan/erban/pay/GiveGoldModel.kt
View File

@@ -6,7 +6,6 @@ import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo
import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo
import com.yizhuan.xchat_android_core.utils.extension.toast
class GiveGoldModel : BaseViewModel() {

2
app/src/main/java/com/yizhuan/erban/vip/VipViewModel.kt
View File

@@ -5,8 +5,6 @@ import androidx.lifecycle.MutableLiveData
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.bean.response.BeanResult
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
import com.yizhuan.xchat_android_core.user.UserInfoUiMgr
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.utils.extension.toast

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

@@ -3,7 +3,6 @@ package com.yizhuan.xchat_android_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/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java
View File

@@ -3,7 +3,6 @@ package com.yizhuan.xchat_android_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/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java
View File

@@ -17,7 +17,6 @@ import com.yizhuan.xchat_android_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) {
}