Merge pull request #2 from PualGeorge/main

【Android】update dependencies to 3.4.0.1335

Author: AbySwifter

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"
 }

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"
 }

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"

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,16 +294,16 @@ 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
 }
 
 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,19 +318,19 @@ 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
     }
 }
 
 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,29 +441,29 @@ 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
     }
 }
 
 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,
     )
 }

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

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

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
                 }

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 {

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
                 }

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)