fix. android native binding

AgoraIO-Extensions · Aug 22, 2019 · c98af77 · c98af77
1 parent 1ca7874
commit c98af77
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 2 deletions.
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
@@ -0,0 +1,44 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+             apm-plugin-raw-data-api-java
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             src/main/cpp/src/agora_media_pre_processing.cpp )
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+                       apm-plugin-raw-data-api-java
+
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       ${log-lib} )
diff --git a/android/src/cpp/include/AgoraBase.h → android/src/main/cpp/include/AgoraBase.h b/android/src/cpp/include/AgoraBase.h → android/src/main/cpp/include/AgoraBase.h
diff --git a/android/src/cpp/include/IAgoraMediaEngine.h → .../src/main/cpp/include/IAgoraMediaEngine.h b/android/src/cpp/include/IAgoraMediaEngine.h → .../src/main/cpp/include/IAgoraMediaEngine.h
diff --git a/android/src/cpp/include/IAgoraRtcEngine.h → ...id/src/main/cpp/include/IAgoraRtcEngine.h b/android/src/cpp/include/IAgoraRtcEngine.h → ...id/src/main/cpp/include/IAgoraRtcEngine.h
diff --git a/android/src/cpp/include/IAgoraService.h → android/src/main/cpp/include/IAgoraService.h b/android/src/cpp/include/IAgoraService.h → android/src/main/cpp/include/IAgoraService.h
diff --git a/android/src/cpp/include/VMUtil.h → android/src/main/cpp/include/VMUtil.h b/android/src/cpp/include/VMUtil.h → android/src/main/cpp/include/VMUtil.h
diff --git a/...rc/cpp/src/agora_media_pre_processing.cpp → ...in/cpp/src/agora_media_pre_processing.cpp b/...rc/cpp/src/agora_media_pre_processing.cpp → ...in/cpp/src/agora_media_pre_processing.cpp
diff --git a/.../src/cpp/src/agora_media_pre_processing.h → ...main/cpp/src/agora_media_pre_processing.h b/.../src/cpp/src/agora_media_pre_processing.h → ...main/cpp/src/agora_media_pre_processing.h
diff --git a/lib/RtcEngine.native.d.ts b/lib/RtcEngine.native.d.ts
@@ -172,6 +172,8 @@ declare class RtcEngine {
      * mediaMetaDataReceived | occurs when you received media meta data from the remote side through sendMediaData | on("mediaMetaDataReceived", evt) |
      * localUserRegistered | occurs when you register user account success | on("localUserRegistered", evt) |
      * userInfoUpdated | occurs when you peer side using user account join channel | on("userInfoUpdated", evt) |
+     * receivedChannelMediaRelay | occurs when you received channel media relay | on('receivedChannelMediaRelay", evt)|
+     * mediaRelayStateChanged | occurs when you received remote media relay state changed | on('mediaRelayStateChanged", evt)|
      * ---
      *
      * @param eventType

diff --git a/lib/RtcEngine.native.js b/lib/RtcEngine.native.js
diff --git a/lib/RtcEngine.native.js.map b/lib/RtcEngine.native.js.map
diff --git a/src/RtcEngine.native.ts b/src/RtcEngine.native.ts
@@ -50,7 +50,7 @@ class RtcEngine {
      * @ignore AG_PREFIX
      */ 
     private static readonly AG_PREFIX: string = 'ag_rtc';
-    
+
     /**
      * Creates a RtcEngine Object internal.
      *
@@ -249,6 +249,8 @@ class RtcEngine {
      * mediaMetaDataReceived | occurs when you received media meta data from the remote side through sendMediaData | on("mediaMetaDataReceived", evt) | 
      * localUserRegistered | occurs when you register user account success | on("localUserRegistered", evt) |
      * userInfoUpdated | occurs when you peer side using user account join channel | on("userInfoUpdated", evt) |
+     * receivedChannelMediaRelay | occurs when you received channel media relay | on('receivedChannelMediaRelay", evt)|
+     * mediaRelayStateChanged | occurs when you received remote media relay state changed | on('mediaRelayStateChanged", evt)|
      * ---
      * 
      * @param eventType