-
Notifications
You must be signed in to change notification settings - Fork 76
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 #1364 from 100mslive/develop
Release 1.7.0: Develop to main
- Loading branch information
Showing
235 changed files
with
11,845 additions
and
2,069 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
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 |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| version: 0.1 | ||
| cli: | ||
| version: 1.9.1 | ||
| version: 1.11.0 | ||
| plugins: | ||
| sources: | ||
| - id: trunk | ||
| ref: v0.0.16 | ||
| ref: v0.0.17 | ||
| uri: https://github.com/trunk-io/plugins | ||
| lint: | ||
| enabled: | ||
| - [email protected] | ||
| - yamllint@1.31.0 | ||
| - markdownlint@0.34.0 | ||
| - yamllint@1.32.0 | ||
| - markdownlint@0.35.0 | ||
| - [email protected] | ||
| - git-diff-check | ||
| - [email protected] | ||
| - [email protected] | ||
| - gitleaks@8.16.3 | ||
| - gitleaks@8.17.0 | ||
| - [email protected] | ||
| - [email protected].0 | ||
| - [email protected].1 | ||
| runtimes: | ||
| enabled: | ||
| - [email protected] | ||
|
|
||
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
12 changes: 4 additions & 8 deletions
12
android/src/main/kotlin/live/hms/hmssdk_flutter/HMSAudioTrackSettingsExtension.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 |
|---|---|---|
| @@ -1,18 +1,14 @@ | ||
| package live.hms.hmssdk_flutter | ||
|
|
||
| import live.hms.hmssdk_flutter.hms_role_components.AudioParamsExtension | ||
| import live.hms.video.media.tracks.HMSTrack | ||
| import live.hms.video.media.tracks.HMSAudioTrack | ||
| import live.hms.video.utils.HMSLogger | ||
| import live.hms.video.media.settings.HMSAudioTrackSettings | ||
|
|
||
| class HMSAudioTrackSettingsExtension { | ||
| companion object{ | ||
| fun toDictionary(hmsAudioTrackSettings: HMSAudioTrackSettings?):HashMap<String,Any>? { | ||
| val map = HashMap<String,Any>() | ||
| companion object { | ||
| fun toDictionary(hmsAudioTrackSettings: HMSAudioTrackSettings?): HashMap<String, Any>? { | ||
| val map = HashMap<String, Any>() | ||
| map["user_hardware_acoustic_echo_canceler"] = hmsAudioTrackSettings?.useHardwareAcousticEchoCanceler!! | ||
| map["track_initial_state"] = HMSTrackInitStateExtension.getValueFromHMSTrackInitState(hmsAudioTrackSettings.initialState) | ||
| return map | ||
| } | ||
| } | ||
| } | ||
| } |
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
16 changes: 7 additions & 9 deletions
16
android/src/main/kotlin/live/hms/hmssdk_flutter/HMSHLSVariantExtension.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 |
|---|---|---|
| @@ -1,21 +1,19 @@ | ||
| package live.hms.hmssdk_flutter | ||
|
|
||
| import live.hms.video.error.HMSException | ||
| import live.hms.video.sdk.models.HMSHLSVariant | ||
| import java.text.SimpleDateFormat | ||
|
|
||
| class HMSHLSVariantExtension { | ||
| companion object{ | ||
| fun toDictionary(hmshlsVariant: HMSHLSVariant?):HashMap<String,Any>?{ | ||
| val args=HashMap<String,Any>() | ||
| companion object { | ||
| fun toDictionary(hmshlsVariant: HMSHLSVariant?): HashMap<String, Any>? { | ||
| val args = HashMap<String, Any>() | ||
| if (hmshlsVariant == null)return null | ||
| args["hls_stream_url"] = hmshlsVariant.hlsStreamUrl?:"" | ||
| args["meeting_url"] = hmshlsVariant.meetingUrl?:"" | ||
| args["metadata"] = hmshlsVariant.metadata?:"" | ||
| args["hls_stream_url"] = hmshlsVariant.hlsStreamUrl ?: "" | ||
| args["meeting_url"] = hmshlsVariant.meetingUrl ?: "" | ||
| args["metadata"] = hmshlsVariant.metadata ?: "" | ||
| args["started_at"] = | ||
| SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(hmshlsVariant.startedAt).toString() | ||
| return args | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
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
33 changes: 16 additions & 17 deletions
33
android/src/main/kotlin/live/hms/hmssdk_flutter/HMSLogsExtension.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 |
|---|---|---|
| @@ -1,37 +1,36 @@ | ||
| package live.hms.hmssdk_flutter | ||
|
|
||
| import live.hms.video.sdk.models.enums.HMSPeerUpdate | ||
| import live.hms.video.utils.HMSLogger | ||
|
|
||
| class HMSLogsExtension { | ||
| companion object{ | ||
| companion object { | ||
| fun toDictionary( | ||
| level: HMSLogger.LogLevel, | ||
| tag: String, | ||
| message: String, | ||
| isWebRtCLog: Boolean | ||
| ) : HashMap<String,Any>{ | ||
| val map = HashMap<String,Any>() | ||
| map["level"]= getValueOfHMSLog(level)!! | ||
| isWebRtCLog: Boolean, | ||
| ): HashMap<String, Any> { | ||
| val map = HashMap<String, Any>() | ||
| map["level"] = getValueOfHMSLog(level)!! | ||
| map["tag"] = tag | ||
| map["message"] = message | ||
| map["is_web_rtc_log"] = isWebRtCLog | ||
|
|
||
| return map | ||
| } | ||
|
|
||
| fun getValueOfHMSLog(level: HMSLogger.LogLevel?):String?{ | ||
| if(level==null)return null | ||
| fun getValueOfHMSLog(level: HMSLogger.LogLevel?): String? { | ||
| if (level == null)return null | ||
|
|
||
| return when(level){ | ||
| HMSLogger.LogLevel.DEBUG-> "debug" | ||
| HMSLogger.LogLevel.ERROR-> "error" | ||
| HMSLogger.LogLevel.INFO-> "info" | ||
| HMSLogger.LogLevel.OFF-> "off" | ||
| HMSLogger.LogLevel.VERBOSE->"verbose" | ||
| HMSLogger.LogLevel.WARN->"warn" | ||
| else-> "defaultUpdate" | ||
| return when (level) { | ||
| HMSLogger.LogLevel.DEBUG -> "debug" | ||
| HMSLogger.LogLevel.ERROR -> "error" | ||
| HMSLogger.LogLevel.INFO -> "info" | ||
| HMSLogger.LogLevel.OFF -> "off" | ||
| HMSLogger.LogLevel.VERBOSE -> "verbose" | ||
| HMSLogger.LogLevel.WARN -> "warn" | ||
| else -> "defaultUpdate" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
31 changes: 15 additions & 16 deletions
31
android/src/main/kotlin/live/hms/hmssdk_flutter/HMSMessageRecipientExtension.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 |
|---|---|---|
| @@ -1,36 +1,35 @@ | ||
| package live.hms.hmssdk_flutter | ||
|
|
||
| import io.flutter.Log | ||
| import live.hms.video.sdk.models.HMSMessageRecipient | ||
| import live.hms.video.sdk.models.enums.HMSMessageRecipientType | ||
|
|
||
| class HMSMessageRecipientExtension { | ||
| companion object{ | ||
| fun toDictionary(hmsMessageRecipient: HMSMessageRecipient?):HashMap<String,Any?>?{ | ||
| val hashMap = HashMap<String,Any?>() | ||
| if(hmsMessageRecipient==null)return null | ||
| companion object { | ||
| fun toDictionary(hmsMessageRecipient: HMSMessageRecipient?): HashMap<String, Any?>? { | ||
| val hashMap = HashMap<String, Any?>() | ||
| if (hmsMessageRecipient == null)return null | ||
|
|
||
| hashMap["recipient_peer"] = HMSPeerExtension.toDictionary(hmsMessageRecipient.recipientPeer) | ||
|
|
||
| val recipientRoles = ArrayList<HashMap<String,Any?>?>() | ||
| val recipientRoles = ArrayList<HashMap<String, Any?>?>() | ||
| hmsMessageRecipient.recipientRoles.forEach { | ||
| recipientRoles.add(HMSRoleExtension.toDictionary(it)) | ||
| } | ||
| hashMap["recipient_roles"] = if(recipientRoles.size!=0)recipientRoles else null | ||
| hashMap["recipient_roles"] = if (recipientRoles.size != 0)recipientRoles else null | ||
|
|
||
| hashMap["recipient_type"] = getValueOfHMSMessageRecipient(hmsMessageRecipient.recipientType) | ||
| hashMap["recipient_type"] = getValueOfHMSMessageRecipient(hmsMessageRecipient.recipientType) | ||
|
|
||
| return hashMap | ||
| } | ||
|
|
||
| private fun getValueOfHMSMessageRecipient(hmsMessageRecipientType: HMSMessageRecipientType?):String?{ | ||
| if(hmsMessageRecipientType==null)return null | ||
| return when(hmsMessageRecipientType){ | ||
| HMSMessageRecipientType.BROADCAST-> "broadCast" | ||
| HMSMessageRecipientType.PEER-> "peer" | ||
| HMSMessageRecipientType.ROLES-> "roles" | ||
| else-> "defaultRecipient" | ||
| private fun getValueOfHMSMessageRecipient(hmsMessageRecipientType: HMSMessageRecipientType?): String? { | ||
| if (hmsMessageRecipientType == null)return null | ||
| return when (hmsMessageRecipientType) { | ||
| HMSMessageRecipientType.BROADCAST -> "broadCast" | ||
| HMSMessageRecipientType.PEER -> "peer" | ||
| HMSMessageRecipientType.ROLES -> "roles" | ||
| else -> "defaultRecipient" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.