Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21 from AgoraIO-Community/rtm-update
Adding host controls
- Loading branch information
Showing
34 changed files
with
1,493 additions
and
289 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...id/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmChannelHandler.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package io.agora.agorauikit_android.AgoraRtmController | ||
|
|
||
| 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 | ||
|
|
||
| @ExperimentalUnsignedTypes | ||
| open class AgoraRtmChannelHandler(private val hostView: AgoraVideoViewer) : RtmChannelListener { | ||
| override fun onMemberCountUpdated(memberCount: Int) { | ||
| Logger.getLogger("AgoraUIKit").log(Level.INFO, "RTM member count updated : $memberCount") | ||
| this.hostView.rtmChannelOverrideHandler?.onMemberCountUpdated(memberCount) | ||
| } | ||
|
|
||
| override fun onAttributesUpdated(attributeList: MutableList<RtmChannelAttribute>?) { | ||
| Logger.getLogger("AgoraUIKit").log(Level.INFO, "RTM Channel attributes updated") | ||
| this.hostView.rtmChannelOverrideHandler?.onAttributesUpdated(attributeList) | ||
| } | ||
|
|
||
| override fun onMessageReceived( | ||
| rtmMessage: RtmMessage, | ||
| rtmChannelMember: RtmChannelMember | ||
| ) { | ||
| Logger.getLogger("AgoraUIKit").log(Level.INFO, "RTM Channel Message Received") | ||
| 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("AgoraUIKit").log(Level.SEVERE, "RTM member : ${rtmChannelMember.userId} joined channel : ${rtmChannelMember.channelId}") | ||
| AgoraRtmController.sendUserData(toChannel = false, peerRtmId = rtmChannelMember.userId, hostView = this.hostView) | ||
|
|
||
| this.hostView.rtmChannelOverrideHandler?.onMemberJoined(rtmChannelMember) | ||
| } | ||
|
|
||
| override fun onMemberLeft(rtmChannelMember: RtmChannelMember) { | ||
| Logger.getLogger("AgoraUIKit").log(Level.SEVERE, "RTM member left ${rtmChannelMember.userId} from channel ${rtmChannelMember.channelId}") | ||
|
|
||
| this.hostView.rtmChannelOverrideHandler?.onMemberLeft(rtmChannelMember) | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...oid/src/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmClientHandler.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| 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 | ||
|
|
||
| @ExperimentalUnsignedTypes | ||
| class AgoraRtmClientHandler(private val hostView: AgoraVideoViewer) : RtmClientListener { | ||
| override fun onConnectionStateChanged(state: Int, reason: Int) { | ||
| Logger.getLogger("AgoraUIKit") | ||
| .log(Level.INFO, "RTM Connection State Changed. state: $state, reason: $reason") | ||
|
|
||
| this.hostView.rtmClientOverrideHandler?.onConnectionStateChanged(state, reason) | ||
| } | ||
|
|
||
| override fun onMessageReceived(rtmMessage: RtmMessage, peerId: String?) { | ||
| AgoraRtmController.messageReceived(message = rtmMessage.text, hostView = hostView) | ||
|
|
||
| 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 onPeersOnlineStatusChanged(peerStatus: MutableMap<String, Int>?) { | ||
| Logger.getLogger("AgoraUIKit").log(Level.INFO, "onPeerOnlineStatusChanged: $peerStatus") | ||
|
|
||
| this.hostView.rtmClientOverrideHandler?.onPeersOnlineStatusChanged(peerStatus) | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
...rc/main/java/io/agora/agorauikit_android/AgoraRtmController/AgoraRtmController+Helpers.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package io.agora.agorauikit_android.AgoraRtmController | ||
|
|
||
| import android.graphics.Color | ||
| import com.google.android.material.snackbar.Snackbar | ||
| import io.agora.agorauikit_android.AgoraButton | ||
| import io.agora.agorauikit_android.AgoraVideoViewer | ||
| import kotlinx.serialization.decodeFromString | ||
| import kotlinx.serialization.json.Json | ||
| import org.json.JSONObject | ||
|
|
||
| @ExperimentalUnsignedTypes | ||
| fun AgoraRtmController.Companion.messageReceived(message: String, hostView: AgoraVideoViewer) { | ||
| val messageMap = JSONObject(message) | ||
| when (messageMap.getString("messageType")) { | ||
| "UserData" -> { | ||
| val userData = Json.decodeFromString<UserData>(message) | ||
| val rtmId = userData.rtmId | ||
| userData.rtcId?.let { rtcId -> | ||
| hostView.agoraSettings.uidToUserIdMap.putIfAbsent(rtcId, rtmId) | ||
| } | ||
| hostView.agoraSettings.userRtmMap.putIfAbsent(rtmId, userData) | ||
| } | ||
| "MuteRequest" -> { | ||
| val muteRequest = Json.decodeFromString<MuteRequest>(message) | ||
| val deviceType = DeviceType.fromInt(muteRequest.device) | ||
| val snackbar = Snackbar.make( | ||
| hostView, | ||
| if (deviceType == DeviceType.MIC) | ||
| "Please " + (if (muteRequest.mute) "" else "un") + "mute your mic" | ||
| else | ||
| "Please " + (if (muteRequest.mute) "dis" else "en") + "able your camera", | ||
| Snackbar.LENGTH_LONG | ||
| ) | ||
| snackbar.setAction( | ||
| if (deviceType == DeviceType.MIC) | ||
| if (muteRequest.mute) "mute" else "unmute" | ||
| else if (muteRequest.mute) "disable" else "enable" | ||
| ) { | ||
| var changingButton: AgoraButton? | ||
| var isMuted = muteRequest.mute | ||
| if (deviceType == DeviceType.MIC) { | ||
| hostView.agkit.muteLocalAudioStream(isMuted) | ||
| changingButton = hostView.micButton | ||
| hostView.userVideoLookup[hostView.userID]?.audioMuted = isMuted | ||
| } else { | ||
| hostView.agkit.enableLocalVideo(!isMuted) | ||
| changingButton = hostView.camButton | ||
| hostView.userVideoLookup[hostView.userID]?.videoMuted = isMuted | ||
| } | ||
| changingButton?.isSelected = isMuted | ||
| changingButton?.background?.setTint(if (isMuted) Color.RED else Color.GRAY) | ||
| } | ||
| snackbar.show() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.