From 5a65dde28707aa302f0c4e1426d4f03f7bdb640f Mon Sep 17 00:00:00 2001 From: Meherdeep Date: Thu, 17 Nov 2022 04:02:53 +0530 Subject: [PATCH 1/2] update rtm, rtc --- .idea/deploymentTargetDropDown.xml | 17 +++++++++++ README.md | 9 +++--- agorauikit_android/build.gradle.kts | 4 +-- .../AgoraRtmChannelHandler.kt | 12 +------- .../AgoraRtmClientHandler.kt | 29 +++---------------- .../AgoraRtmController+MuteRequest.kt | 2 -- 6 files changed, 29 insertions(+), 44 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..d30d999 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 68be8c0..5af801d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Agora VideoUIKit for Android

- - - - + + + + @@ -16,6 +16,7 @@ Instantly integrate Agora in your own Android application or prototype.

+ ## Requirements - Android 24+ diff --git a/agorauikit_android/build.gradle.kts b/agorauikit_android/build.gradle.kts index 8922405..d496556 100644 --- a/agorauikit_android/build.gradle.kts +++ b/agorauikit_android/build.gradle.kts @@ -62,8 +62,8 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21") implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.appcompat:appcompat:1.4.1") - api("io.agora.rtc:full-sdk:4.0.0.5") - api("io.agora.rtm:rtm-sdk:1.4.10") + api("io.agora.rtc:full-sdk:4.0.1") + api("io.agora.rtm:rtm-sdk:1.5.3") implementation("com.squareup.okhttp3:okhttp:4.10.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") testImplementation("junit:junit:4.13.2") diff --git a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt index 54769a1..e520adf 100644 --- a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt +++ b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt @@ -4,8 +4,6 @@ import io.agora.agorauikit_android.AgoraVideoViewer import io.agora.rtm.RtmChannelAttribute import io.agora.rtm.RtmChannelListener import io.agora.rtm.RtmChannelMember -import io.agora.rtm.RtmFileMessage -import io.agora.rtm.RtmImageMessage import io.agora.rtm.RtmMessage import java.util.logging.Level import java.util.logging.Logger @@ -33,15 +31,7 @@ open class AgoraRtmChannelHandler(private val hostView: AgoraVideoViewer) : RtmC AgoraRtmController.messageReceived(rtmMessage.text, hostView) this.hostView.rtmChannelOverrideHandler?.onMessageReceived(rtmMessage, rtmChannelMember) } - override fun onImageMessageReceived( - p0: RtmImageMessage?, - p1: RtmChannelMember? - ) { - this.hostView.rtmChannelOverrideHandler?.onImageMessageReceived(p0, p1) - } - override fun onFileMessageReceived(p0: RtmFileMessage?, p1: RtmChannelMember?) { - this.hostView.rtmChannelOverrideHandler?.onFileMessageReceived(p0, p1) - } + override fun onMemberJoined(rtmChannelMember: RtmChannelMember) { Logger.getLogger("AgoraVideoUIKit").log(Level.SEVERE, "RTM member : ${rtmChannelMember.userId} joined channel : ${rtmChannelMember.channelId}") AgoraRtmController.sendUserData(toChannel = false, peerRtmId = rtmChannelMember.userId, hostView = this.hostView) diff --git a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt index 7014bef..5b782b4 100644 --- a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt +++ b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt @@ -2,9 +2,6 @@ package io.agora.agorauikit_android.AgoraRtmController import io.agora.agorauikit_android.AgoraVideoViewer import io.agora.rtm.RtmClientListener -import io.agora.rtm.RtmFileMessage -import io.agora.rtm.RtmImageMessage -import io.agora.rtm.RtmMediaOperationProgress import io.agora.rtm.RtmMessage import java.util.logging.Level import java.util.logging.Logger @@ -28,32 +25,14 @@ class AgoraRtmClientHandler(private val hostView: AgoraVideoViewer) : RtmClientL this.hostView.rtmClientOverrideHandler?.onMessageReceived(rtmMessage, peerId) } - override fun onImageMessageReceivedFromPeer(p0: RtmImageMessage?, p1: String?) { - this.hostView.rtmClientOverrideHandler?.onImageMessageReceivedFromPeer(p0, p1) - } - - override fun onFileMessageReceivedFromPeer(p0: RtmFileMessage?, p1: String?) { - this.hostView.rtmClientOverrideHandler?.onFileMessageReceivedFromPeer(p0, p1) - } - - override fun onMediaUploadingProgress( - p0: RtmMediaOperationProgress?, - p1: Long - ) { - this.hostView.rtmClientOverrideHandler?.onMediaUploadingProgress(p0, p1) - } - - override fun onMediaDownloadingProgress( - p0: RtmMediaOperationProgress?, - p1: Long - ) { - this.hostView.rtmClientOverrideHandler?.onMediaDownloadingProgress(p0, p1) - } - override fun onTokenExpired() { this.hostView.rtmClientOverrideHandler?.onTokenExpired() } + override fun onTokenPrivilegeWillExpire() { + this.hostView.rtmClientOverrideHandler?.onTokenPrivilegeWillExpire() + } + override fun onPeersOnlineStatusChanged(peerStatus: MutableMap?) { Logger.getLogger("AgoraVideoUIKit").log(Level.INFO, "onPeerOnlineStatusChanged: $peerStatus") diff --git a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt index 973a785..4f3f0f3 100644 --- a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt +++ b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt @@ -87,7 +87,6 @@ fun AgoraRtmController.Companion.sendUserData( Logger.getLogger("AgoraVideoUIKit").log(Level.INFO, message.text) val option = SendMessageOptions() - option.enableOfflineMessaging = true if (!toChannel) { hostView.agRtmClient.sendMessageToPeer( @@ -142,7 +141,6 @@ fun AgoraRtmController.Companion.sendMuteRequest( val message: RtmMessage = hostView.agRtmClient.createMessage(data) val option = SendMessageOptions() - option.enableOfflineMessaging = true if (peerRtcId == hostView.userID) { Logger.getLogger("AgoraVideoUIKit").log(Level.SEVERE, "Can't send message to local user") From bdf2ff00aa56be455dcbf50b38ed797f856a65e2 Mon Sep 17 00:00:00 2001 From: Meherdeep Date: Tue, 22 Nov 2022 00:40:24 +0530 Subject: [PATCH 2/2] update UserData --- .idea/deploymentTargetDropDown.xml | 17 ----------------- .../AgoraRtmController+MuteRequest.kt | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index d30d999..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt index 4f3f0f3..70ad80b 100644 --- a/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt +++ b/agorauikit_android/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+MuteRequest.kt @@ -50,7 +50,7 @@ data class UIKitData( @SerialName("version") var version: String, ) : java.io.Serializable { companion object { - val current: UIKitData = UIKitData("android", "native", "2.1.0") + val current: UIKitData = UIKitData("android", "native", "4.0.1") } }