diff --git a/application/build.gradle b/application/build.gradle index da91e33e..cfdc66ff 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -25,8 +25,8 @@ ext { minSdkVersion = 21 targetSdkVersion = 34 liteavSdk = "com.tencent.liteav:LiteAVSDK_Professional:12.8.0.19279" - roomEngineSdk = buildEngineSource.toBoolean() ? project(":engine_source") : "io.trtc.uikit:rtc_room_engine:3.4.0.1306" - atomicxCoreSdk = buildAtomicxCoreSource.toBoolean() ? project(":atomicxcore") : "io.trtc.uikit:atomicx-core:3.4.0.1307" + roomEngineSdk = buildEngineSource.toBoolean() ? project(":engine_source") : "io.trtc.uikit:rtc_room_engine:3.4.0.1335" + atomicxCoreSdk = buildAtomicxCoreSource.toBoolean() ? project(":atomicxcore") : "io.trtc.uikit:atomicx-core:3.4.0.1335" imSdk = "com.tencent.imsdk:imsdk-plus:8.7.7201" common = "io.trtc.uikit:common:3.3.0.1194" } \ No newline at end of file diff --git a/live/build.gradle b/live/build.gradle index 2619d9da..e32d43c9 100644 --- a/live/build.gradle +++ b/live/build.gradle @@ -39,8 +39,8 @@ ext { minSdkVersion = 21 targetSdkVersion = 34 liteavSdk = "com.tencent.liteav:LiteAVSDK_Professional:12.8.0.19279" - roomEngineSdk = buildEngineSource.toBoolean() ? project(":engine_source") : "io.trtc.uikit:rtc_room_engine:3.4.0.1306" - atomicxCoreSdk = buildAtomicxCoreSource.toBoolean() ? project(":atomicxcore") : "io.trtc.uikit:atomicx-core:3.4.0.1307" + roomEngineSdk = buildEngineSource.toBoolean() ? project(":engine_source") : "io.trtc.uikit:rtc_room_engine:3.4.0.1335" + atomicxCoreSdk = buildAtomicxCoreSource.toBoolean() ? project(":atomicxcore") : "io.trtc.uikit:atomicx-core:3.4.0.1335" imSdk = "com.tencent.imsdk:imsdk-plus:8.7.7201" common = "io.trtc.uikit:common:3.3.0.1194" } \ No newline at end of file diff --git a/live/tuilivekit/build.gradle b/live/tuilivekit/build.gradle index 0dace0f2..c5871094 100644 --- a/live/tuilivekit/build.gradle +++ b/live/tuilivekit/build.gradle @@ -68,8 +68,8 @@ dependencies { def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect() api projects.contains("tuicore") ? project(':tuicore') : "com.tencent.liteav.tuikit:tuicore:latest.release" - api rootProject.getProperties().containsKey("roomEngineSdk") ? rootProject.ext.roomEngineSdk : "io.trtc.uikit:rtc_room_engine:3.4.0.1306" - api rootProject.getProperties().containsKey("atomicxCoreSdk") ? rootProject.ext.atomicxCoreSdk : "io.trtc.uikit:atomicx-core:3.4.0.1307" + api rootProject.getProperties().containsKey("roomEngineSdk") ? rootProject.ext.roomEngineSdk : "io.trtc.uikit:rtc_room_engine:3.4.0.1335" + api rootProject.getProperties().containsKey("atomicxCoreSdk") ? rootProject.ext.atomicxCoreSdk : "io.trtc.uikit:atomicx-core:3.4.0.1335" api rootProject.getProperties().containsKey("liteavSdk") ? rootProject.ext.liteavSdk : "com.tencent.liteav:LiteAVSDK_Professional:12.8.0.19279" api rootProject.getProperties().containsKey("imSdk") ? rootProject.ext.imSdk : "com.tencent.imsdk:imsdk-plus:8.7.7201" api rootProject.getProperties().containsKey("common") ? rootProject.ext.common : "io.trtc.uikit:common:3.3.0.1194" diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/common/TypeConverter.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/common/TypeConverter.kt index 1b56ecd7..ad58305c 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/common/TypeConverter.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/common/TypeConverter.kt @@ -27,7 +27,7 @@ import java.util.Collections fun liveInfoFromEngineLiveInfo(liveInfo: TUILiveListManager.LiveInfo): LiveInfo { val owner = LiveUserInfo().apply { - userId = liveInfo.ownerId ?: "" + userID = liveInfo.ownerId ?: "" userName = liveInfo.ownerName ?: "" avatarURL = liveInfo.ownerAvatarUrl ?: "" } @@ -73,7 +73,7 @@ fun liveInfoFromEngineRoomInfo(roomInfo: TUIRoomDefine.RoomInfo): TUILiveListMan fun liveInfoToEngineLiveInfo(liveInfo: LiveInfo): TUILiveListManager.LiveInfo { return TUILiveListManager.LiveInfo().apply { - roomId = liveInfo.liveId + roomId = liveInfo.liveID name = liveInfo.liveName notice = liveInfo.notice isMessageDisableForAllUser = liveInfo.isMessageDisable @@ -82,17 +82,17 @@ fun liveInfoToEngineLiveInfo(liveInfo: LiveInfo): TUILiveListManager.LiveInfo { keepOwnerOnSeat = liveInfo.keepOwnerOnSeat maxSeatCount = liveInfo.maxSeatCount seatMode = seatModeToEngineSeatMode(liveInfo.seatMode) - seatLayoutTemplateId = liveInfo.seatLayoutTemplateId + seatLayoutTemplateId = liveInfo.seatLayoutTemplateID coverUrl = liveInfo.coverURL backgroundUrl = liveInfo.backgroundURL categoryList = liveInfo.categoryList activityStatus = liveInfo.activityStatus - ownerId = liveInfo.liveOwner.userId + ownerId = liveInfo.liveOwner.userID ownerName = liveInfo.liveOwner.userName ownerAvatarUrl = liveInfo.liveOwner.avatarURL roomInfo = TUIRoomDefine.RoomInfo().apply { - roomId = liveInfo.liveId - ownerId = liveInfo.liveOwner.userId + roomId = liveInfo.liveID + ownerId = liveInfo.liveOwner.userID ownerName = liveInfo.liveOwner.userName ownerAvatarUrl = liveInfo.liveOwner.avatarURL name = liveInfo.liveName @@ -204,11 +204,11 @@ fun convertToSeatUserInfo(battleInfo: TUILiveBattleManager.BattleUser?): SeatUse fun convertToSeatFullInfo(data: SeatInfo): TUIRoomDefine.SeatFullInfo { return TUIRoomDefine.SeatFullInfo().apply { - roomId = data.userInfo.liveId + roomId = data.userInfo.liveID seatIndex = data.index isSeatLocked = data.isLocked - userId = data.userInfo.userId - userName = data.userInfo.name + userId = data.userInfo.userID + userName = data.userInfo.userName userAvatar = data.userInfo.avatarURL userMicrophoneStatus = if (data.userInfo.microphoneStatus == DeviceStatus.ON) TUIRoomDefine.DeviceStatus.OPENED else TUIRoomDefine.DeviceStatus.CLOSED_BY_SELF @@ -226,10 +226,10 @@ fun convertToSeatFullInfo(data: SeatInfo): TUIRoomDefine.SeatFullInfo { fun convertToSeatInfo(seatFullInfo: TUIRoomDefine.SeatFullInfo): SeatInfo { val seatUserInfo = SeatUserInfo( - userId = seatFullInfo.userId, - name = seatFullInfo.userName, + userID = seatFullInfo.userId, + userName = seatFullInfo.userName, avatarURL = seatFullInfo.userAvatar, - liveId = seatFullInfo.roomId, + liveID = seatFullInfo.roomId, microphoneStatus = convertToDeviceStatus(seatFullInfo.userMicrophoneStatus), cameraStatus = convertToDeviceStatus(seatFullInfo.userCameraStatus) ) @@ -250,10 +250,10 @@ fun convertToSeatInfo(seatFullInfo: TUIRoomDefine.SeatFullInfo): SeatInfo { fun convertToSeatUserInfo(seatFullInfo: TUIRoomDefine.SeatFullInfo): SeatUserInfo { return SeatUserInfo( - userId = seatFullInfo.userId, - name = seatFullInfo.userName, + userID = seatFullInfo.userId, + userName = seatFullInfo.userName, avatarURL = seatFullInfo.userAvatar, - liveId = seatFullInfo.roomId, + liveID = seatFullInfo.roomId, microphoneStatus = convertToDeviceStatus(seatFullInfo.userMicrophoneStatus), cameraStatus = convertToDeviceStatus(seatFullInfo.userCameraStatus) ) @@ -278,7 +278,7 @@ fun convertToUserInfo(seatInfo: TUIRoomDefine.SeatInfo?): TUIRoomDefine.UserInfo fun convertToUserInfo(userInfo: TUIRoomDefine.UserInfo): LiveUserInfo { return LiveUserInfo( - userId = userInfo.userId, + userID = userInfo.userId, userName = userInfo.userName, avatarURL = userInfo.avatarUrl ) @@ -294,7 +294,7 @@ fun convertToUserInfo(request: TUIRoomDefine.Request): TUIRoomDefine.UserInfo { fun convertToUserInfo(liveUserInfo: LiveUserInfo): TUIRoomDefine.UserInfo { val userInfo = TUIRoomDefine.UserInfo() - userInfo.userId = liveUserInfo.userId + userInfo.userId = liveUserInfo.userID userInfo.userName = liveUserInfo.userName userInfo.avatarUrl = liveUserInfo.avatarURL return userInfo @@ -302,8 +302,8 @@ fun convertToUserInfo(liveUserInfo: LiveUserInfo): TUIRoomDefine.UserInfo { fun convertToUserInfo(audienceInfo: SeatUserInfo): TUIRoomDefine.UserInfo { val userInfo = TUIRoomDefine.UserInfo() - userInfo.userId = audienceInfo.userId - userInfo.userName = audienceInfo.name + userInfo.userId = audienceInfo.userID + userInfo.userName = audienceInfo.userName userInfo.avatarUrl = audienceInfo.avatarURL return userInfo } @@ -318,9 +318,9 @@ fun convertToUserInfo(login: TUIRoomDefine.LoginUserInfo): TUIRoomDefine.UserInf fun convertToBattleUserInfo(battleUserInfo: SeatUserInfo): TUILiveBattleManager.BattleUser { return TUILiveBattleManager.BattleUser().apply { - roomId = battleUserInfo.liveId - userId = battleUserInfo.userId - userName = battleUserInfo.name + roomId = battleUserInfo.liveID + userId = battleUserInfo.userID + userName = battleUserInfo.userName avatarUrl = battleUserInfo.avatarURL } } @@ -328,9 +328,9 @@ fun convertToBattleUserInfo(battleUserInfo: SeatUserInfo): TUILiveBattleManager. fun convertToSeatInfo(audienceInfo: SeatInfo): TUIRoomDefine.SeatInfo { return TUIRoomDefine.SeatInfo().apply { index = audienceInfo.index - userId = audienceInfo.userInfo.userId - userName = audienceInfo.userInfo.name - nameCard = audienceInfo.userInfo.name + userId = audienceInfo.userInfo.userID + userName = audienceInfo.userInfo.userName + nameCard = audienceInfo.userInfo.userName avatarUrl = audienceInfo.userInfo.avatarURL isLocked = audienceInfo.isLocked isVideoLocked = audienceInfo.userInfo.allowOpenCamera @@ -395,7 +395,7 @@ fun videoQualityToEngineVideoQuality(videoQuality: VideoQuality): TUIRoomDefine. fun networkInfoFromEngineNetworkInfo(networkInfo: TUICommonDefine.NetworkInfo): NetworkInfo { return NetworkInfo( - userId = networkInfo.userId ?: "", + userID = networkInfo.userId ?: "", quality = networkQualityFromEngineNetworkQuality(networkInfo.quality), upLoss = networkInfo.upLoss, downLoss = networkInfo.downLoss, @@ -417,8 +417,8 @@ fun networkQualityFromEngineNetworkQuality(networkQuality: TUICommonDefine.Netwo fun convertToSeatUserInfo(seatInfo: TUIRoomDefine.SeatInfo, hasAudio: Boolean): SeatUserInfo { return SeatUserInfo( - userId = seatInfo.userId, - name = seatInfo.userName, + userID = seatInfo.userId, + userName = seatInfo.userName, avatarURL = seatInfo.avatarUrl, allowOpenMicrophone = !seatInfo.isAudioLocked, allowOpenCamera = !seatInfo.isVideoLocked, @@ -432,7 +432,7 @@ fun convertToSeatUserInfo(seatInfo: TUIRoomDefine.SeatInfo, hasAudio: Boolean): fun convertToLiveUserInfo(request: TUIRoomDefine.Request): LiveUserInfo { val userInfo = LiveUserInfo().apply { - userId = request.userId + userID = request.userId userName = request.userName avatarURL = request.avatarUrl } @@ -441,19 +441,19 @@ fun convertToLiveUserInfo(request: TUIRoomDefine.Request): LiveUserInfo { fun convertToConnectionUser(request: SeatUserInfo?): ConnectionUser { val userInfo = ConnectionUser().apply { - userId = request?.userId - userName = request?.name + userId = request?.userID + userName = request?.userName avatarUrl = request?.avatarURL - roomId = request?.liveId + roomId = request?.liveID } return userInfo } fun convertToBattleUser(userInfo: SeatUserInfo): TUILiveBattleManager.BattleUser { return TUILiveBattleManager.BattleUser().apply { - roomId = userInfo.liveId - userId = userInfo.userId - userName = userInfo.name + roomId = userInfo.liveID + userId = userInfo.userID + userName = userInfo.userName avatarUrl = userInfo.avatarURL score = 0 } @@ -461,9 +461,9 @@ fun convertToBattleUser(userInfo: SeatUserInfo): TUILiveBattleManager.BattleUser fun convertToSeatUserInfo(seatInfo: ConnectionUser): SeatUserInfo { return SeatUserInfo( - liveId = seatInfo.roomId, - userId = seatInfo.userId, - name = seatInfo.userName, + liveID = seatInfo.roomId, + userID = seatInfo.userId, + userName = seatInfo.userName, avatarURL = seatInfo.avatarUrl, ) } diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/AudienceListView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/AudienceListView.kt index 2e40b6ce..396cc55a 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/AudienceListView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/AudienceListView.kt @@ -92,7 +92,7 @@ class AudienceListView @JvmOverloads constructor( override fun initStore() { liveListStore = LiveListStore.shared() - audienceStore = LiveAudienceStore.create(liveId = roomId) + audienceStore = LiveAudienceStore.create(liveID = roomId) } override fun addObserver() { @@ -147,7 +147,7 @@ class AudienceListView @JvmOverloads constructor( AudienceListIconAdapter( context, audienceStore?.liveAudienceState - ?: LiveAudienceStore.create(liveId = roomId).liveAudienceState + ?: LiveAudienceStore.create(liveID = roomId).liveAudienceState ) recycleAudienceList.adapter = adapter recycleAudienceList.setOnTouchListener(object : OnTouchListener { @@ -183,7 +183,7 @@ class AudienceListView @JvmOverloads constructor( if (audienceListPopupDialog == null) { audienceListPopupDialog = AudienceListPopupDialog( context, audienceStore?.liveAudienceState - ?: LiveAudienceStore.create(liveId = roomId).liveAudienceState + ?: LiveAudienceStore.create(liveID = roomId).liveAudienceState ) audienceListPopupDialog?.setOnUserItemClickListener(onUserItemClickListener) } diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/view/adapter/AudienceListPanelAdapter.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/view/adapter/AudienceListPanelAdapter.kt index 21a1c874..ebae73d4 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/view/adapter/AudienceListPanelAdapter.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/audiencelist/view/adapter/AudienceListPanelAdapter.kt @@ -55,13 +55,13 @@ class AudienceListPanelAdapter( } if (TextUtils.isEmpty(data[position].userName)) { - holder.textName.text = data[position].userId + holder.textName.text = data[position].userID } else { holder.textName.text = data[position].userName } val selfUserId = TUIRoomEngine.getSelfInfo().userId - if (!TextUtils.isEmpty(selfUserId) && selfUserId == LiveListStore.shared().liveState.currentLive.value.liveOwner.userId) { + if (!TextUtils.isEmpty(selfUserId) && selfUserId == LiveListStore.shared().liveState.currentLive.value.liveOwner.userID) { holder.more.visibility = if (onItemClickListener == null) View.GONE else View.VISIBLE } else { holder.more.visibility = View.GONE diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/BarrageStreamView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/BarrageStreamView.kt index 43357760..7112b0f3 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/BarrageStreamView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/BarrageStreamView.kt @@ -148,7 +148,7 @@ class BarrageStreamView @JvmOverloads constructor( val barrage = Barrage().apply { textContent = this@BarrageStreamView.context.getString(R.string.common_entered_room) sender.apply { - userId = audience.userId + userID = audience.userID userName = audience.userName avatarURL = audience.avatarURL } diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageItemDefaultAdapter.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageItemDefaultAdapter.kt index 3b62448f..200d2d45 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageItemDefaultAdapter.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageItemDefaultAdapter.kt @@ -34,7 +34,7 @@ class BarrageItemDefaultAdapter( val viewHolder = holder as ViewHolder val fontSize = getFontSize(viewHolder.textMsgContent) - if (TextUtils.equals(ownerId, barrage.sender.userId)) { + if (TextUtils.equals(ownerId, barrage.sender.userID)) { viewHolder.textAnchorFlag.visibility = View.VISIBLE val placeHolder = getSpacesStringByDP(viewHolder.textMsgContent) viewHolder.textMsgContent.apply { @@ -87,7 +87,7 @@ class BarrageItemDefaultAdapter( val textAnchorFlag: TextView = itemView.findViewById(R.id.tv_anchor_flag) fun getMessageBuilder(barrage: Barrage, fontSize: Int, placeHolder: String): SpannableStringBuilder { - val userName = barrage.sender.userName.takeIf { !TextUtils.isEmpty(it) } ?: barrage.sender.userId + val userName = barrage.sender.userName.takeIf { !TextUtils.isEmpty(it) } ?: barrage.sender.userID val userNameSplicing = if (placeHolder.isEmpty()) { "$userName: " } else { diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageMsgListAdapter.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageMsgListAdapter.kt index ad92377c..83f62a40 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageMsgListAdapter.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/barrage/view/adapter/BarrageMsgListAdapter.kt @@ -47,7 +47,7 @@ class BarrageMsgListAdapter( adapter.onBindViewHolder(holder, position, barrage) holder.itemView.setOnClickListener { val userInfo = TUIRoomDefine.UserInfo().apply { - userId = barrage.sender.userId + userId = barrage.sender.userID userName = barrage.sender.userName avatarUrl = barrage.sender.avatarURL } diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftListView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftListView.kt index c5d339b3..37001759 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftListView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftListView.kt @@ -150,7 +150,7 @@ class GiftListView : ViewPager, LifecycleOwner { } fun sendGift(gift: Gift, giftCount: Int) { - giftStore?.sendGift(gift.giftId, giftCount, null) + giftStore?.sendGift(gift.giftID, giftCount, null) if (!TextUtils.isEmpty(gift.resourceURL)) { val isSvgGift = gift.resourceURL.lowercase(Locale.getDefault()).endsWith(".svga") val key = getReportKey(isSvgGift) diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftPlayView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftPlayView.kt index 8454e20b..aade5a6d 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftPlayView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/component/gift/GiftPlayView.kt @@ -181,7 +181,7 @@ class GiftPlayView @JvmOverloads constructor( giftModel.gift = gift giftModel.giftCount = giftCount giftModel.sender = sender - giftModel.isFromSelf = TextUtils.equals(sender.userId, TUILogin.getUserId()) + giftModel.isFromSelf = TextUtils.equals(sender.userID, TUILogin.getUserId()) if (TextUtils.isEmpty(gift.resourceURL)) { giftImageAnimationManager.add(giftModel) } else { diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/anchorboardcast/AnchorView.java b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/anchorboardcast/AnchorView.java index e6e5ebfe..355b2a35 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/anchorboardcast/AnchorView.java +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/anchorboardcast/AnchorView.java @@ -30,7 +30,6 @@ import androidx.annotation.Nullable; import androidx.lifecycle.Observer; -import com.google.gson.Gson; import com.tencent.cloud.tuikit.engine.common.TUICommonDefine; import com.tencent.cloud.tuikit.engine.extension.TUILiveBattleManager; import com.tencent.cloud.tuikit.engine.extension.TUILiveConnectionManager.ConnectionUser; @@ -111,6 +110,8 @@ import io.trtc.tuikit.atomicxcore.api.LiveCoreView; import io.trtc.tuikit.atomicxcore.api.LiveUserInfo; import io.trtc.tuikit.atomicxcore.api.SeatUserInfo; +import io.trtc.tuikit.atomicxcore.api.VideoViewAdapter; +import io.trtc.tuikit.atomicxcore.api.ViewLayer; import io.trtc.tuikit.atomicxcore.api.deprecated.LiveCoreViewDefine; @SuppressLint("ViewConstructor") @@ -168,7 +169,7 @@ public void onCoHostRequestReceived(@NotNull SeatUserInfo inviter, CoHostStore coHostStore = CoHostStore.create(mLiveInfo.roomId); List list = new ArrayList<>(); for (SeatUserInfo userInfo : coGuestStore.getCoGuestState().getConnected().getValue()) { - if (!userInfo.getUserId().equals(TUIRoomEngine.getSelfInfo().userId) && userInfo.getLiveId().equals(mLiveInfo.roomId)) { + if (!userInfo.getUserID().equals(TUIRoomEngine.getSelfInfo().userId) && userInfo.getLiveID().equals(mLiveInfo.roomId)) { list.add(userInfo); } } @@ -176,7 +177,7 @@ public void onCoHostRequestReceived(@NotNull SeatUserInfo inviter, if (!list.isEmpty() || !coGuestStore.getCoGuestState().getApplicants().getValue().isEmpty() || !coGuestStore.getCoGuestState().getInvitees().getValue().isEmpty()) { - coHostStore.rejectHostConnection(inviter.getLiveId(), null); + coHostStore.rejectHostConnection(inviter.getLiveID(), null); } } }; @@ -186,10 +187,10 @@ public void onCoHostRequestReceived(@NotNull SeatUserInfo inviter, public void onGuestApplicationReceived(@NotNull LiveUserInfo guestUser) { CoGuestStore coGuestStore = CoGuestStore.create(mLiveInfo.roomId); CoHostStore coHostStore = CoHostStore.create(mLiveInfo.roomId); - if (!coHostStore.getCoHostState().getApplicants().getValue().isEmpty() + if (!coHostStore.getCoHostState().getInvitees().getValue().isEmpty() || !coHostStore.getCoHostState().getConnected().getValue().isEmpty() - || coHostStore.getCoHostState().getInvitee().getValue() != null) { - coGuestStore.rejectApplication(guestUser.getUserId(), null); + || coHostStore.getCoHostState().getApplicant().getValue() != null) { + coGuestStore.rejectApplication(guestUser.getUserID(), null); } } }; @@ -384,11 +385,11 @@ private void createOrEnterRoom() { mLiveBattleManagerObserver = new AnchorBattleObserver(mAnchorManager); mLiveCoreView.registerConnectionObserver(mLiveStreamObserver); mLiveCoreView.registerBattleObserver(mLiveBattleManagerObserver); - mLiveCoreView.setVideoViewAdapter(new LiveCoreViewDefine.VideoViewAdapter() { + mLiveCoreView.setVideoViewAdapter(new VideoViewAdapter() { @Override - public View createCoGuestView(SeatFullInfo seatInfo, LiveCoreViewDefine.ViewLayer viewLayer) { + public View createCoGuestView(SeatFullInfo seatInfo, ViewLayer viewLayer) { if (TextUtils.isEmpty(seatInfo.userId)) { - if (viewLayer == LiveCoreViewDefine.ViewLayer.BACKGROUND) { + if (viewLayer == ViewLayer.BACKGROUND) { AnchorEmptySeatView anchorEmptySeatView = new AnchorEmptySeatView(getContext()); anchorEmptySeatView.init(mAnchorManager, seatInfo); return anchorEmptySeatView; @@ -396,7 +397,7 @@ public View createCoGuestView(SeatFullInfo seatInfo, LiveCoreViewDefine.ViewLaye return null; } } - if (viewLayer == LiveCoreViewDefine.ViewLayer.BACKGROUND) { + if (viewLayer == ViewLayer.BACKGROUND) { CoGuestBackgroundWidgetsView backgroundWidgetsView = new CoGuestBackgroundWidgetsView(getContext()); backgroundWidgetsView.init(mAnchorManager, seatInfo); return backgroundWidgetsView; @@ -412,8 +413,8 @@ public View createCoGuestView(SeatFullInfo seatInfo, LiveCoreViewDefine.ViewLaye @Override public View createCoHostView(SeatFullInfo coHostUser, - LiveCoreViewDefine.ViewLayer viewLayer) { - if (viewLayer == LiveCoreViewDefine.ViewLayer.BACKGROUND) { + ViewLayer viewLayer) { + if (viewLayer == ViewLayer.BACKGROUND) { CoHostBackgroundWidgetsView backgroundWidgetsView = new CoHostBackgroundWidgetsView(mContext); backgroundWidgetsView.init(mAnchorManager, coHostUser); return backgroundWidgetsView; @@ -438,37 +439,6 @@ public View createBattleContainerView() { battleInfoView.init(mAnchorManager); return battleInfoView; } - - @Override - public View createCoGuestView(UserInfo userInfo) { - return null; - } - - @Override - public void updateCoGuestView(View coGuestView, UserInfo userInfo, - List modifyFlag) { - LOGGER.info("updateCoGuestView: userInfo = " + new Gson().toJson(userInfo) + ",modifyFlag = " + new Gson().toJson(modifyFlag) + ",coGuestView = " + coGuestView); - } - - @Override - public View createCoHostView(LiveCoreViewDefine.CoHostUser coHostUser) { - return null; - } - - @Override - public void updateCoHostView(View coHostView, LiveCoreViewDefine.CoHostUser coHostUser, - List modifyFlag) { - LOGGER.info("updateCoHostView: coHostUser = " + new Gson().toJson(coHostUser) + ",modifyFlag = " + new Gson().toJson(modifyFlag) + ",coHostView = " + coHostView); - } - - @Override - public void updateBattleView(View battleView, TUILiveBattleManager.BattleUser battleUser) { - } - - @Override - public void updateBattleContainerView(View battleContainnerView, - List userInfos) { - } }); PictureInPictureStore.sharedInstance().getState().isAnchorStreaming = true; @@ -777,8 +747,8 @@ public void onReceiveGift(GiftPlayView view, @NonNull Gift gift, int giftCount, Barrage barrage = new Barrage(); barrage.setTextContent("gift"); - barrage.getSender().setUserId(sender.getUserId()); - barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserId() : + barrage.getSender().setUserID(sender.getUserID()); + barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserID() : sender.getUserName()); barrage.getSender().setAvatarURL(sender.getAvatarURL()); Map extInfo = new HashMap<>(); diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audiencecontainer/view/AudienceView.java b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audiencecontainer/view/AudienceView.java index faa669ec..1784d4cc 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audiencecontainer/view/AudienceView.java +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/features/audiencecontainer/view/AudienceView.java @@ -39,13 +39,11 @@ import androidx.annotation.Nullable; import androidx.lifecycle.Observer; -import com.google.gson.Gson; import com.tencent.cloud.tuikit.engine.common.TUICommonDefine; import com.tencent.cloud.tuikit.engine.extension.TUILiveBattleManager; import com.tencent.cloud.tuikit.engine.extension.TUILiveConnectionManager.ConnectionUser; import com.tencent.cloud.tuikit.engine.extension.TUILiveListManager; import com.tencent.cloud.tuikit.engine.room.TUIRoomDefine; -import com.tencent.cloud.tuikit.engine.room.TUIRoomDefine.UserInfo; import com.tencent.qcloud.tuicore.TUICore; import com.tencent.qcloud.tuicore.TUIThemeManager; import com.trtc.tuikit.common.imageloader.ImageLoader; @@ -100,9 +98,9 @@ import io.trtc.tuikit.atomicxcore.api.Barrage; import io.trtc.tuikit.atomicxcore.api.Gift; import io.trtc.tuikit.atomicxcore.api.LiveCoreView; -import io.trtc.tuikit.atomicxcore.api.LiveSummaryStore; import io.trtc.tuikit.atomicxcore.api.LiveUserInfo; -import io.trtc.tuikit.atomicxcore.api.deprecated.LiveCoreViewDefine; +import io.trtc.tuikit.atomicxcore.api.VideoViewAdapter; +import io.trtc.tuikit.atomicxcore.api.ViewLayer; @SuppressLint("ViewConstructor") public class AudienceView extends BasicView implements AudienceManager.AudienceViewListener { @@ -630,8 +628,8 @@ public void onReceiveGift(GiftPlayView view, @NonNull Gift gift, int giftCount, } Barrage barrage = new Barrage(); barrage.setTextContent("gift"); - barrage.getSender().setUserId(sender.getUserId()); - barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserId() : + barrage.getSender().setUserID(sender.getUserID()); + barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserID() : sender.getUserName()); barrage.getSender().setAvatarURL(sender.getAvatarURL()); Map extInfo = new HashMap<>(); @@ -821,7 +819,7 @@ private void showLiveStreamEndDialog() { dialog.show(); } - public class VideoViewAdapterImpl implements LiveCoreViewDefine.VideoViewAdapter { + public class VideoViewAdapterImpl implements VideoViewAdapter { private final WeakReference mWeakContext; @@ -830,14 +828,14 @@ public VideoViewAdapterImpl(Context context) { } @Override - public View createCoGuestView(TUIRoomDefine.SeatFullInfo seatInfo, LiveCoreViewDefine.ViewLayer viewLayer) { + public View createCoGuestView(TUIRoomDefine.SeatFullInfo seatInfo, ViewLayer viewLayer) { Context context = mWeakContext.get(); if (context == null) { LOGGER.error("createCoGuestView: context is null"); return null; } if (TextUtils.isEmpty(seatInfo.userId)) { - if (viewLayer == LiveCoreViewDefine.ViewLayer.BACKGROUND) { + if (viewLayer == ViewLayer.BACKGROUND) { AudienceEmptySeatView emptySeatView = new AudienceEmptySeatView(getContext()); emptySeatView.init(mAudienceManager, seatInfo); emptySeatView.setTag(seatInfo); @@ -857,7 +855,7 @@ public View createCoGuestView(TUIRoomDefine.SeatFullInfo seatInfo, LiveCoreViewD return null; } } - if (LiveCoreViewDefine.ViewLayer.BACKGROUND == viewLayer) { + if (ViewLayer.BACKGROUND == viewLayer) { CoGuestBackgroundWidgetsView backgroundWidgetsView = new CoGuestBackgroundWidgetsView(context); backgroundWidgetsView.init(mAudienceManager, seatInfo); return backgroundWidgetsView; @@ -870,13 +868,13 @@ public View createCoGuestView(TUIRoomDefine.SeatFullInfo seatInfo, LiveCoreViewD } @Override - public View createCoHostView(TUIRoomDefine.SeatFullInfo coHostUser, LiveCoreViewDefine.ViewLayer viewLayer) { + public View createCoHostView(TUIRoomDefine.SeatFullInfo coHostUser, ViewLayer viewLayer) { Context context = mWeakContext.get(); if (context == null) { LOGGER.error("createCoHostView: context is null"); return null; } - if (LiveCoreViewDefine.ViewLayer.BACKGROUND == viewLayer) { + if (ViewLayer.BACKGROUND == viewLayer) { CoHostBackgroundWidgetsView backgroundWidgetsView = new CoHostBackgroundWidgetsView(context); backgroundWidgetsView.init(mAudienceManager, coHostUser); return backgroundWidgetsView; @@ -887,30 +885,6 @@ public View createCoHostView(TUIRoomDefine.SeatFullInfo coHostUser, LiveCoreView } } - @Override - public View createCoGuestView(UserInfo userInfo) { - return null; - } - - @Override - public void updateCoGuestView(View coGuestView, UserInfo userInfo, - List modifyFlag) { - LOGGER.info("updateCoGuestView: userInfo = " + new Gson().toJson(userInfo) - + ",modifyFlag = " + new Gson().toJson(modifyFlag) + ",coGuestView = " + coGuestView); - } - - @Override - public View createCoHostView(LiveCoreViewDefine.CoHostUser coHostUser) { - return null; - } - - @Override - public void updateCoHostView(View coHostView, LiveCoreViewDefine.CoHostUser coHostUser, - List modifyFlag) { - LOGGER.info("updateCoHostView: coHostUser = " + new Gson().toJson(coHostUser) - + ",modifyFlag = " + new Gson().toJson(modifyFlag) + ",coHostView = " + coHostView); - } - @Override public View createBattleView(TUILiveBattleManager.BattleUser battleUser) { Context context = mWeakContext.get(); @@ -923,11 +897,6 @@ public View createBattleView(TUILiveBattleManager.BattleUser battleUser) { return battleMemberInfoView; } - @Override - public void updateBattleView(View battleView, TUILiveBattleManager.BattleUser battleUser) { - - } - @Override public View createBattleContainerView() { Context context = mWeakContext.get(); @@ -939,13 +908,6 @@ public View createBattleContainerView() { battleInfoView.init(mAudienceManager); return battleInfoView; } - - @Override - public void updateBattleContainerView(View battleContainnerView, - List userInfos) { - BattleInfoView battleInfoView = (BattleInfoView) battleContainnerView; - battleInfoView.updateView(userInfos); - } } @Override diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/VoiceRoomRootView.java b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/VoiceRoomRootView.java index c58ee262..78e8c5dd 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/VoiceRoomRootView.java +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/VoiceRoomRootView.java @@ -328,8 +328,8 @@ public void onReceiveGift(GiftPlayView view, @NonNull Gift gift, int giftCount, Barrage barrage = new Barrage(); barrage.setTextContent("gift"); - barrage.getSender().setUserId(sender.getUserId()); - barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserId() : + barrage.getSender().setUserID(sender.getUserID()); + barrage.getSender().setUserName(TextUtils.isEmpty(sender.getUserName()) ? sender.getUserID() : sender.getUserName()); barrage.getSender().setAvatarURL(sender.getAvatarURL()); Map extInfo = new HashMap<>(); diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/bottommenu/BottomMenuView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/bottommenu/BottomMenuView.kt index d669f711..8f0939b2 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/bottommenu/BottomMenuView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroom/view/bottommenu/BottomMenuView.kt @@ -179,7 +179,7 @@ class BottomMenuView @JvmOverloads constructor( } private fun onSeatMutedStateChanged(seatList: List) { - val seatInfo = seatList.firstOrNull { it.userInfo.userId == TUIRoomEngine.getSelfInfo().userId } + val seatInfo = seatList.firstOrNull { it.userInfo.userID == TUIRoomEngine.getSelfInfo().userId } seatInfo?.let { if (!it.userInfo.allowOpenMicrophone) { mMediaManager.updateMicrophoneMuteState(true) diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/SeatGridView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/SeatGridView.kt index aa5adf97..86ea0f02 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/SeatGridView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/SeatGridView.kt @@ -218,7 +218,7 @@ class SeatGridView @JvmOverloads constructor( ) { LOGGER.info("API updateRoomSeatMode seatMode:$seatMode") reportEventData(LIVEKIT_METRICS_METHOD_CALL_SEAT_GRID_VIEW_UPDATE_SEAT_MODE) - val liveId = liveInfo?.liveId + val liveId = liveInfo?.liveID if (liveId.isNullOrEmpty()) { callback?.onError(TUICommonDefine.Error.FAILED, "please enter room first") LOGGER.error("not enter room") @@ -227,7 +227,7 @@ class SeatGridView @JvmOverloads constructor( val info = LiveInfo().apply { this.seatMode = seatModeFromEngineSeatMode(seatMode) - this.liveId = liveId + this.liveID = liveId } val flagList = ArrayList() flagList.add(LiveInfo.ModifyFlag.SEAT_MODE) @@ -300,7 +300,7 @@ class SeatGridView @JvmOverloads constructor( return } val liveInfo = liveListStore.liveState.currentLive.value - val isOwner = TUIRoomEngine.getSelfInfo().userId == liveInfo.liveOwner.userId + val isOwner = TUIRoomEngine.getSelfInfo().userId == liveInfo.liveOwner.userID if (liveInfo.seatMode == TakeSeatMode.FREE || isOwner) { seatStore?.takeSeat(index, object : CompletionHandler { override fun onSuccess() { @@ -589,10 +589,10 @@ class SeatGridView @JvmOverloads constructor( private fun isOwner(): Boolean { val liveInfo = liveListStore.liveState.currentLive.value - if (liveInfo.liveOwner.userId.isEmpty()) { + if (liveInfo.liveOwner.userID.isEmpty()) { return false } - return TUIRoomEngine.getSelfInfo().userId == liveInfo.liveOwner.userId + return TUIRoomEngine.getSelfInfo().userId == liveInfo.liveOwner.userID } private val seatGridLayoutAdapter = object : SeatGridLayout.Adapter { @@ -658,24 +658,24 @@ class SeatGridView @JvmOverloads constructor( VoiceRoomDefine.RequestType.APPLY_TO_TAKE_SEAT, convertToUserInfo(guestUser) ) - inviteCallbackMap.remove(guestUser.userId) + inviteCallbackMap.remove(guestUser.userID) } override fun onHostInvitationResponded(isAccept: Boolean, guestUser: LiveUserInfo) { if (isAccept) { - inviteCallbackMap.get(guestUser.userId)?.onAccepted(convertToUserInfo(guestUser)) + inviteCallbackMap.get(guestUser.userID)?.onAccepted(convertToUserInfo(guestUser)) } else { - inviteCallbackMap.get(guestUser.userId)?.onRejected(convertToUserInfo(guestUser)) + inviteCallbackMap.get(guestUser.userID)?.onRejected(convertToUserInfo(guestUser)) } - inviteCallbackMap.remove(guestUser.userId) + inviteCallbackMap.remove(guestUser.userID) } override fun onHostInvitationNoResponse(guestUser: LiveUserInfo, reason: NoResponseReason) { when (reason) { - NoResponseReason.TIMEOUT -> inviteCallbackMap.get(guestUser.userId) + NoResponseReason.TIMEOUT -> inviteCallbackMap.get(guestUser.userID) ?.onTimeout(convertToUserInfo(guestUser)) - NoResponseReason.ALREADY_SEATED -> inviteCallbackMap.get(guestUser.userId) + NoResponseReason.ALREADY_SEATED -> inviteCallbackMap.get(guestUser.userID) ?.onAccepted( convertToUserInfo(guestUser) ) diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/impl/SeatLayoutConfigManager.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/impl/SeatLayoutConfigManager.kt index 96497609..c9ab50d0 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/impl/SeatLayoutConfigManager.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/impl/SeatLayoutConfigManager.kt @@ -88,7 +88,7 @@ class SeatLayoutConfigManager { val newSeatInfo = list[i] if (isSeatInfoChanged(newSeatInfo, seatInfoWrapper)) { seatInfoWrapper.seatInfo = newSeatInfo - val userId = newSeatInfo.userInfo.userId + val userId = newSeatInfo.userInfo.userID if (userId.isNotEmpty()) { _seatUserMap[userId] = seatInfoWrapper } @@ -171,7 +171,7 @@ class SeatLayoutConfigManager { return newSeatInfo.isLocked != it.isLocked || newSeatInfo.userInfo.allowOpenMicrophone != it.userInfo.allowOpenMicrophone || newSeatInfo.userInfo.microphoneStatus != it.userInfo.microphoneStatus - || newSeatInfo.userInfo.userId != it.userInfo.userId + || newSeatInfo.userInfo.userID != it.userInfo.userID } return true } diff --git a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/view/SeatInfoView.kt b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/view/SeatInfoView.kt index e01aaf54..63610efa 100644 --- a/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/view/SeatInfoView.kt +++ b/live/tuilivekit/src/main/java/com/trtc/uikit/livekit/voiceroomcore/view/SeatInfoView.kt @@ -65,7 +65,7 @@ class SeatInfoView @JvmOverloads constructor( fun updateUserVolume(seatInfo: SeatInfo?, volume: Int) { seatInfo?.userInfo?.let { userInfo -> - if (userInfo.userId.isEmpty()) { + if (userInfo.userID.isEmpty()) { return } if (userInfo.microphoneStatus == DeviceStatus.OFF) { @@ -84,7 +84,7 @@ class SeatInfoView @JvmOverloads constructor( private fun updateView(seatInfo: SeatInfo?) { seatInfo?.let { - if (seatInfo.userInfo.userId.isEmpty()) updateEmptySeatView(seatInfo) + if (seatInfo.userInfo.userID.isEmpty()) updateEmptySeatView(seatInfo) else updateSeatedView(seatInfo) } } @@ -103,7 +103,7 @@ class SeatInfoView @JvmOverloads constructor( private fun updateSeatedView(seatInfo: SeatInfo) { emptyViewContainer.visibility = GONE - textName.text = seatInfo.userInfo.name.ifEmpty { seatInfo.userInfo.userId } + textName.text = seatInfo.userInfo.userName.ifEmpty { seatInfo.userInfo.userID } updateUserAvatar(seatInfo.userInfo.avatarURL) updateUserRole(seatInfo) if (!seatInfo.userInfo.allowOpenMicrophone || seatInfo.userInfo.microphoneStatus == DeviceStatus.OFF) {