Explorar el Código

Revert "fix: 更新腾讯云Atomic依赖"

This reverts commit 123a14b6d50215f6dab65f7be5a5574f26165d3f.
DoggyZhang hace 3 horas
padre
commit
3296c48ff5

+ 4 - 4
app/dependencies/releaseRuntimeClasspath.txt

@@ -259,8 +259,8 @@ com.squareup.okio:okio:3.6.0
 com.squareup.wire:wire-runtime:2.3.0-RC1
 com.tencent.imsdk:imsdk-plus:8.8.7357
 com.tencent.liteav.tuikit:tuicore:8.8.7357
-com.tencent.liteav:LiteAVSDK_Professional:13.0.0.19676
-com.tencent.liteav:LiteAVSDK_ScreenCapture:13.0.0.19676
+com.tencent.liteav:LiteAVSDK_Professional:12.8.0.19279
+com.tencent.liteav:LiteAVSDK_ScreenCapture:12.8.0.19279
 com.tencent.timpush:fcm:8.8.7357
 com.tencent.timpush:timpush:8.8.7357
 com.tencent.vasdolly:common:3.0.6
@@ -274,9 +274,9 @@ io.github.scwang90:refresh-header-material:3.0.0-alpha
 io.github.scwang90:refresh-layout-kernel:3.0.0-alpha
 io.reactivex.rxjava3:rxandroid:3.0.0
 io.reactivex.rxjava3:rxjava:3.0.4
-io.trtc.uikit:atomicx-core:4.0.2.169
+io.trtc.uikit:atomicx-core:4.0.0.110
 io.trtc.uikit:common:3.5.0.1332
-io.trtc.uikit:rtc_room_engine:4.0.1.132
+io.trtc.uikit:rtc_room_engine:3.6.1.76
 javax.inject:javax.inject:1
 org.checkerframework:checker-qual:3.43.0
 org.conscrypt:conscrypt-android:2.5.3

+ 1 - 1
gradle/libs.versions.toml

@@ -185,7 +185,7 @@ tencentLiteavSDK = "13.0.0.19676"
 tencnetRoommEngine = "3.6.1.76"
 tencnetTimpush = "8.8.7357"
 tencnetTimpushFcm = "8.8.7357"
-tencnetAtomicX = "4.0.2.169"
+tencnetAtomicX = "4.0.0.110"
 
 # rong cloud
 rongcloud = "5.24.0"

+ 1 - 1
module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.kt

@@ -526,7 +526,7 @@ class TUICallKitImpl private constructor(context: Context) : TUICallKit() {
                         Log.w(TAG_CALL_KIT, "startSmallScreenView, current status: None, ignore")
                         return
                     }
-                    caller.avatarURL = data?.firstOrNull()?.avatarURL ?: ""
+                    caller.avatarUrl = data?.firstOrNull()?.avatarUrl ?: ""
                     caller.name = data?.firstOrNull()?.name ?: ""
                     if (view is IncomingNotificationBanner) {
                         view.showNotification(caller)

+ 1 - 1
module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/manager/UserManager.kt

@@ -31,7 +31,7 @@ class UserManager {
                     if (name != null) {
                         user.name = name
                     }
-                    user.avatarURL = userInfo.avatar
+                    user.avatarUrl = userInfo.avatar
                     userList.add(user)
                 }
                 callback?.onSuccess(userList)

+ 2 - 2
module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/incomingbanner/IncomingNotificationBanner.kt

@@ -79,14 +79,14 @@ class IncomingNotificationBanner(context: Context) {
         )
         remoteViews?.setImageViewResource(R.id.btn_accept, R.drawable.call_accept_ic)
 
-        if (participant.avatarURL.isNullOrEmpty()) {
+        if (participant.avatarUrl.isNullOrEmpty()) {
             remoteViews?.setImageViewResource(
                 R.id.img_incoming_avatar,
                 APP_R.drawable.common_default_avatar_ic
             )
             notificationManager.notify(notificationId, notification)
         } else {
-            val uri = Uri.parse(participant.avatarURL)
+            val uri = Uri.parse(participant.avatarUrl)
             Glide.with(context).asBitmap().load(uri)
                 .diskCacheStrategy(DiskCacheStrategy.ALL)
                 .placeholder(APP_R.drawable.common_default_avatar_ic)