feat: support 3.1.+

Author: LichKing-2234

CHANGELOG.md

@@ -1,4 +1,70 @@
-# Change log
+## [3.1.6](https://github.com/AgoraIO/Flutter-SDK/compare/v3.1.5...v3.1.6) (2020-12-21)
+
+
+### Bug Fixes
+
+* `MetadataReceived` event parameters bug ([56ab25b](https://github.com/AgoraIO/Flutter-SDK/commit/56ab25bcf41b9b7034049fb307cca95fdfae3e4c))
+* `MetadataReceived` event parameters bug ([9ab28a7](https://github.com/AgoraIO/Flutter-SDK/commit/9ab28a7ae559f3bd5ce8ab8e0455860d9de89977))
+* add missing permissions for Android ([fd74959](https://github.com/AgoraIO/Flutter-SDK/commit/fd74959e94d5f43d6ab7a77d197ec450e3421769))
+* some rendering problems when change render widget order ([12e2561](https://github.com/AgoraIO/Flutter-SDK/commit/12e25618ce8fabd5bf9b34e418792450518e219e))
+* some rendering problems when change render widget order ([95bbf39](https://github.com/AgoraIO/Flutter-SDK/commit/95bbf39ef58bcda58c1b2ba9063d07e631939c69))
+* some rendering problems when change render widget order ([c737102](https://github.com/AgoraIO/Flutter-SDK/commit/c737102ecc22e3cb563f9762a88d9b519fdc599f))
+* use the better way to fix rendering problems ([a290e73](https://github.com/AgoraIO/Flutter-SDK/commit/a290e7313e3d189dc9ea69e49c0c3be4799a7933))
+* use the better way to fix rendering problems ([75f572d](https://github.com/AgoraIO/Flutter-SDK/commit/75f572df2afed36a4bbd3ccffd0baad7bace2eae))
+
+
+### Features
+
+* example support render multi remote-videos ([72e94b0](https://github.com/AgoraIO/Flutter-SDK/commit/72e94b0aa06332f5477e336ecf28bcbb89141c46))
+
+## [3.1.5](https://github.com/AgoraIO/Flutter-SDK/compare/v3.1.4...v3.1.5) (2020-12-15)
+
+
+### Bug Fixes
+
+* `RtcSurfaceView` memory leak ([c0f7025](https://github.com/AgoraIO/Flutter-SDK/commit/c0f7025d641c61f47fefcbdc71f988823f513dfc))
+* `RtcSurfaceView` memory leak ([c8845fe](https://github.com/AgoraIO/Flutter-SDK/commit/c8845fe04c1596fe2e7242302bf160bc671910cb))
+
+
+### Features
+
+* example support `switchRender` ([f69c495](https://github.com/AgoraIO/Flutter-SDK/commit/f69c4953b31e551f8ec7259e9e43398e1560fc1d))
+
+## [3.1.4](https://github.com/AgoraIO/Flutter-SDK/compare/v3.1.4-rc.0...v3.1.4) (2020-12-02)
+
+
+### Bug Fixes
+
+* add lost file ([4e899b7](https://github.com/AgoraIO/Flutter-SDK/commit/4e899b7be469b0f5cc16f4d594e596171a659047))
+
+
+### Features
+
+* add `getAssetAbsolutePath` to support flutter assets. (fix [#181](https://github.com/AgoraIO/Flutter-SDK/issues/181)) ([b158d7d](https://github.com/AgoraIO/Flutter-SDK/commit/b158d7d67b790f7c1773bf6b58afb64378c0ff5b))
+* optimize for other platforms ([0df4a28](https://github.com/AgoraIO/Flutter-SDK/commit/0df4a28c813e0c9a9a3fa632bf0da49b30a71394))
+
+## [3.1.4-rc.0](https://github.com/AgoraIO/Flutter-SDK/compare/3.1.3...v3.1.4-rc.0) (2020-10-23)
+
+
+### Bug Fixes
+
+* `getUserInfoByUid` `getUserInfoByUserAccount` type cast error, resolve [#204](https://github.com/AgoraIO/Flutter-SDK/issues/204) ([cb75715](https://github.com/AgoraIO/Flutter-SDK/commit/cb757152f81717fb640771e38e489fb0a268b2d6))
+* events.dart `joinChannelSuccess` `rejoinChannelSuccess` bug ([b25771f](https://github.com/AgoraIO/Flutter-SDK/commit/b25771f73be3dd8a4ac2cfbce435f78e824ba0e6))
+* rtc_engine `destroy` bug ([263ad09](https://github.com/AgoraIO/Flutter-SDK/commit/263ad09c0b20073eb10c4d8cdd2c5a1e7ad87fd4))
+
+
+### Features
+
+* add API example ([1b01711](https://github.com/AgoraIO/Flutter-SDK/commit/1b01711ccdac0ea182afd71735e791af5a008bae))
+* Android add getNativeHandle ([0eab471](https://github.com/AgoraIO/Flutter-SDK/commit/0eab47114cde933482f90879e177fd019430cafd))
+* iOS add getNativeHandle ([1a4833e](https://github.com/AgoraIO/Flutter-SDK/commit/1a4833eadd97d48149bcac04549bc7debbaf5e36))
+
+## 3.1.3
+* fix `setDefaultAudioRoutetoSpeakerphone` crash bug
+* add `setAudioSessionOperationRestriction` and `sendCustomReportMessage` method
+
+## 3.1.2
+* upgrade Agora SDK to 3.1.2
 
 ## 3.0.1-dev.7
 * fix android `VideoSizeChanged` bug
@@ -14,7 +80,7 @@
 * fix `startPreview` `stopPreview` bug
 
 ## 3.0.1-dev.3
-* fix `toJson` bug 
+* fix `toJson` bug
 * add `startPreview` `stopPreview`
 
 ## 3.0.1-dev.2

README.md

@@ -35,7 +35,7 @@ Open the `AndroidManifest.xml` file and add the required device permissions to t
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
+    
     <!-- The Agora SDK requires Bluetooth permissions in case users are using Bluetooth devices.-->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     ...

android/build.gradle

@@ -52,5 +52,5 @@ android {
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${safeExtGet('kotlin_version', '1.3.72')}"
   implementation "org.jetbrains.kotlin:kotlin-reflect:${safeExtGet('kotlin_version', '1.3.72')}"
-  implementation "io.agora.rtc:full-sdk:3.0.1.1"
+  implementation "io.agora.rtc:full-sdk:3.1.3"
 }

android/src/main/java/io/agora/rtc/base/Annotations.java

@@ -1,7 +1,6 @@
 package io.agora.rtc.base;
 
 import androidx.annotation.IntDef;
-import androidx.annotation.StringDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -389,16 +388,20 @@ public class Annotations {
     int MAINTAIN_BALANCED = 2;
   }
 
-  @StringDef({
+  @IntDef({
+    AgoraEncryptionMode.NONE,
     AgoraEncryptionMode.AES128XTS,
-    AgoraEncryptionMode.AES256XTS,
     AgoraEncryptionMode.AES128ECB,
+    AgoraEncryptionMode.AES256XTS,
+    AgoraEncryptionMode.SM4128ECB,
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface AgoraEncryptionMode {
-    String AES128XTS = "aes-128-xts";
-    String AES256XTS = "aes-256-xts";
-    String AES128ECB = "aes-128-ecb";
+    int NONE = 0;
+    int AES128XTS = 1;
+    int AES128ECB = 2;
+    int AES256XTS = 3;
+    int SM4128ECB = 4;
   }
 
   @IntDef({
@@ -422,6 +425,7 @@ public class Annotations {
     Constants.ERR_ALREADY_IN_USE,
     Constants.ERR_INVALID_APP_ID,
     Constants.ERR_INVALID_CHANNEL_NAME,
+    Constants.ERR_NO_SERVER_RESOURCES,
     Constants.ERR_TOKEN_EXPIRED,
     Constants.ERR_INVALID_TOKEN,
     Constants.ERR_CONNECTION_INTERRUPTED,
@@ -751,26 +755,57 @@ public class Annotations {
     Constants.WARN_ADM_RUNTIME_PLAYOUT_WARNING,
     Constants.WARN_ADM_RUNTIME_RECORDING_WARNING,
     Constants.WARN_ADM_RECORD_AUDIO_SILENCE,
+    Constants.WARN_ADM_PLAYOUT_ABNORMAL_FREQUENCY,
+    Constants.WARN_ADM_RECORD_ABNORMAL_FREQUENCY,
     Constants.WARN_ADM_CALL_INTERRUPTION,
     Constants.WARN_ADM_RECORD_AUDIO_LOWLEVEL,
     Constants.WARN_ADM_PLAYOUT_AUDIO_LOWLEVEL,
     Constants.WARN_ADM_RECORD_IS_OCCUPIED,
     Constants.WARN_APM_HOWLING,
     Constants.WARN_ADM_GLITCH_STATE,
-    Constants.WARN_ADM_IMPROPER_SETTINGS,
+    Constants.WARN_APM_RESIDUAL_ECHO,
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface AgoraWarningCode {
   }
 
   @IntDef({
-    RtcEngineConfig.IPAreaCode.AREA_CN,
-    RtcEngineConfig.IPAreaCode.AREA_NA,
-    RtcEngineConfig.IPAreaCode.AREA_EUR,
-    RtcEngineConfig.IPAreaCode.AREA_AS,
-    RtcEngineConfig.IPAreaCode.AREA_GLOBAL,
+    RtcEngineConfig.AreaCode.AREA_CODE_CN,
+    RtcEngineConfig.AreaCode.AREA_CODE_NA,
+    RtcEngineConfig.AreaCode.AREA_CODE_EU,
+    RtcEngineConfig.AreaCode.AREA_CODE_AS,
+    RtcEngineConfig.AreaCode.AREA_CODE_JP,
+    RtcEngineConfig.AreaCode.AREA_CODE_IN,
+    RtcEngineConfig.AreaCode.AREA_CODE_GLOB,
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface AgoraAreaCode {
   }
+
+  @IntDef({
+    Constants.SUB_STATE_IDLE,
+    Constants.SUB_STATE_NO_SUBSCRIBED,
+    Constants.SUB_STATE_SUBSCRIBING,
+    Constants.SUB_STATE_SUBSCRIBED,
+  })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface AgoraStreamSubscribeState {
+  }
+
+  @IntDef({
+    Constants.PUB_STATE_IDLE,
+    Constants.PUB_STATE_NO_PUBLISHED,
+    Constants.PUB_STATE_PUBLISHING,
+    Constants.PUB_STATE_PUBLISHED,
+  })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface AgoraStreamPublishState {
+  }
+
+  @IntDef({
+    Constants.RTMP_STREAMING_EVENT_FAILED_LOAD_IMAGE,
+  })
+  @Retention(RetentionPolicy.SOURCE)
+  public @interface AgoraRtmpStreamingEvent {
+  }
 }

android/src/main/java/io/agora/rtc/base/BeanCovertor.kt

@@ -2,6 +2,7 @@ package io.agora.rtc.base
 
 import android.graphics.Color
 import io.agora.rtc.RtcEngineConfig
+import io.agora.rtc.internal.EncryptionConfig
 import io.agora.rtc.internal.LastmileProbeConfig
 import io.agora.rtc.live.LiveInjectStreamConfig
 import io.agora.rtc.live.LiveTranscoding
@@ -177,3 +178,10 @@ fun mapToRtcEngineConfig(map: Map<*, *>): RtcEngineConfig {
     (map["areaCode"] as? Number)?.toInt()?.let { mAreaCode = it }
   }
 }
+
+fun mapToEncryptionConfig(map: Map<*, *>): EncryptionConfig {
+  return EncryptionConfig().apply {
+    (map["encryptionMode"] as? Number)?.let { encryptionMode = intToEncryptionMode(it.toInt()) }
+    (map["encryptionKey"] as? String)?.let { encryptionKey = it }
+  }
+}

android/src/main/java/io/agora/rtc/base/EnumCovertor.kt

@@ -1,5 +1,6 @@
 package io.agora.rtc.base
 
+import io.agora.rtc.internal.EncryptionConfig
 import io.agora.rtc.live.LiveInjectStreamConfig
 import io.agora.rtc.live.LiveTranscoding
 import io.agora.rtc.video.CameraCapturerConfiguration
@@ -85,3 +86,12 @@ fun intToCameraDirection(@Annotations.AgoraCameraDirection intValue: Int): Camer
   }
   throw RuntimeException("CameraCapturerConfiguration.CAMERA_DIRECTION not contains $intValue")
 }
+
+fun intToEncryptionMode(@Annotations.AgoraEncryptionMode intValue: Int): EncryptionConfig.EncryptionMode {
+  for (value in EncryptionConfig.EncryptionMode.values()) {
+    if (value.value == intValue) {
+      return value
+    }
+  }
+  throw RuntimeException("EncryptionConfig.EncryptionMode not contains $intValue")
+}

android/src/main/java/io/agora/rtc/base/Extensions.kt

@@ -15,7 +15,8 @@ fun LocalAudioStats.toMap(): Map<String, Any?> {
   return hashMapOf(
     "numChannels" to numChannels,
     "sentSampleRate" to sentSampleRate,
-    "sentBitrate" to sentBitrate
+    "sentBitrate" to sentBitrate,
+    "txPacketLossRate" to txPacketLossRate
   )
 }
 
@@ -68,7 +69,8 @@ fun RemoteAudioStats.toMap(): Map<String, Any?> {
     "receivedBitrate" to receivedBitrate,
     "totalFrozenTime" to totalFrozenTime,
     "frozenRate" to frozenRate,
-    "totalActiveTime" to totalActiveTime
+    "totalActiveTime" to totalActiveTime,
+    "publishDuration" to publishDuration
   )
 }
 
@@ -85,7 +87,9 @@ fun LocalVideoStats.toMap(): Map<String, Any?> {
     "encodedFrameWidth" to encodedFrameWidth,
     "encodedFrameHeight" to encodedFrameHeight,
     "encodedFrameCount" to encodedFrameCount,
-    "codecType" to codecType
+    "codecType" to codecType,
+    "txPacketLossRate" to txPacketLossRate,
+    "captureFrameRate" to captureFrameRate
   )
 }
 
@@ -102,7 +106,8 @@ fun RemoteVideoStats.toMap(): Map<String, Any?> {
     "rxStreamType" to rxStreamType,
     "totalFrozenTime" to totalFrozenTime,
     "frozenRate" to frozenRate,
-    "totalActiveTime" to totalActiveTime
+    "totalActiveTime" to totalActiveTime,
+    "publishDuration" to publishDuration
   )
 }
 

android/src/main/java/io/agora/rtc/base/RtcChannel.kt

@@ -1,8 +1,10 @@
 package io.agora.rtc.base
 
+import io.agora.rtc.Constants
 import io.agora.rtc.IMetadataObserver
 import io.agora.rtc.RtcChannel
 import io.agora.rtc.RtcEngine
+import io.agora.rtc.internal.EncryptionConfig
 import java.util.*
 
 class IRtcChannel {
@@ -95,6 +97,8 @@ class IRtcChannel {
     fun setEncryptionSecret(params: Map<String, *>, callback: Callback)
 
     fun setEncryptionMode(params: Map<String, *>, callback: Callback)
+
+    fun enableEncryption(params: Map<String, *>, callback: Callback)
   }
 
   interface RtcInjectStreamInterface {
@@ -283,7 +287,16 @@ class RtcChannelManager(
   }
 
   override fun setEncryptionMode(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.setEncryptionMode(params["encryptionMode"] as String))
+    callback.code(this[params["channelId"] as String]?.setEncryptionMode(when ((params["encryptionMode"] as Number).toInt()) {
+      EncryptionConfig.EncryptionMode.AES_128_XTS.value -> "aes-128-xts"
+      EncryptionConfig.EncryptionMode.AES_128_ECB.value -> "aes-128-ecb"
+      EncryptionConfig.EncryptionMode.AES_256_XTS.value -> "aes-256-xts"
+      else -> ""
+    }))
+  }
+
+  override fun enableEncryption(params: Map<String, *>, callback: Callback) {
+    callback.code(this[params["channelId"] as String]?.enableEncryption(params["enabled"] as Boolean, mapToEncryptionConfig(params["config"] as Map<*, *>)))
   }
 
   override fun addInjectStreamUrl(params: Map<String, *>, callback: Callback) {

android/src/main/java/io/agora/rtc/base/RtcChannelEvent.kt

@@ -37,6 +37,11 @@ class RtcChannelEvents {
     const val ChannelMediaRelayStateChanged = "ChannelMediaRelayStateChanged"
     const val ChannelMediaRelayEvent = "ChannelMediaRelayEvent"
     const val MetadataReceived = "MetadataReceived"
+    const val AudioPublishStateChanged = "AudioPublishStateChanged"
+    const val VideoPublishStateChanged = "VideoPublishStateChanged"
+    const val AudioSubscribeStateChanged = "AudioSubscribeStateChanged"
+    const val VideoSubscribeStateChanged = "VideoSubscribeStateChanged"
+    const val RtmpStreamingEvent = "RtmpStreamingEvent"
 
     fun toMap(): Map<String, String> {
       return hashMapOf(
@@ -69,7 +74,12 @@ class RtcChannelEvents {
         "StreamMessageError" to StreamMessageError,
         "ChannelMediaRelayStateChanged" to ChannelMediaRelayStateChanged,
         "ChannelMediaRelayEvent" to ChannelMediaRelayEvent,
-        "MetadataReceived" to MetadataReceived
+        "MetadataReceived" to MetadataReceived,
+        "AudioPublishStateChanged" to AudioPublishStateChanged,
+        "VideoPublishStateChanged" to VideoPublishStateChanged,
+        "AudioSubscribeStateChanged" to AudioSubscribeStateChanged,
+        "VideoSubscribeStateChanged" to VideoSubscribeStateChanged,
+        "RtmpStreamingEvent" to RtmpStreamingEvent
       )
     }
   }
@@ -206,4 +216,24 @@ class RtcChannelEventHandler(
   override fun onChannelMediaRelayEvent(rtcChannel: RtcChannel?, @Annotations.AgoraChannelMediaRelayEvent code: Int) {
     callback(RtcChannelEvents.ChannelMediaRelayEvent, rtcChannel, code)
   }
+
+  override fun onAudioPublishStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraStreamPublishState oldState: Int, @Annotations.AgoraStreamPublishState newState: Int, elapseSinceLastState: Int) {
+    callback(RtcChannelEvents.AudioPublishStateChanged, rtcChannel, rtcChannel?.channelId(), oldState, newState, elapseSinceLastState)
+  }
+
+  override fun onVideoPublishStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraStreamPublishState oldState: Int, @Annotations.AgoraStreamPublishState newState: Int, elapseSinceLastState: Int) {
+    callback(RtcChannelEvents.VideoPublishStateChanged, rtcChannel, rtcChannel?.channelId(), oldState, newState, elapseSinceLastState)
+  }
+
+  override fun onAudioSubscribeStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraStreamSubscribeState oldState: Int, @Annotations.AgoraStreamSubscribeState newState: Int, elapseSinceLastState: Int) {
+    callback(RtcChannelEvents.AudioSubscribeStateChanged, rtcChannel, rtcChannel?.channelId(), uid, oldState, newState, elapseSinceLastState)
+  }
+
+  override fun onVideoSubscribeStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraStreamSubscribeState oldState: Int, @Annotations.AgoraStreamSubscribeState newState: Int, elapseSinceLastState: Int) {
+    callback(RtcChannelEvents.VideoSubscribeStateChanged, rtcChannel, rtcChannel?.channelId(), uid, oldState, newState, elapseSinceLastState)
+  }
+
+  override fun onRtmpStreamingEvent(rtcChannel: RtcChannel?, url: String?, @Annotations.AgoraRtmpStreamingEvent errCode: Int) {
+    callback(RtcChannelEvents.RtmpStreamingEvent, rtcChannel, url, errCode)
+  }
 }