Merge pull request #156 from AgoraIO/dev/3.4.2

Dev/3.4.2

Android/APIExample/app/build.gradle

@@ -60,4 +60,5 @@ dependencies {
     implementation project(path: ':lib-raw-data')
     implementation project(path: ':lib-switch-external-video')
     implementation project(path: ':lib-screensharing')
+    implementation project(path: ':lib-player-helper')
 }

Android/APIExample/lib-component/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    api 'com.github.agorabuilder:native-full-sdk:3.4.0'
-    api 'io.agora:agoraplayer:1.2.2'
+    api 'com.github.agorabuilder:native-full-sdk:3.4.2'
+    api 'io.agora:agoraplayer:1.2.4'
 
 }

Android/APIExample/lib-player-helper/.gitignore

@@ -0,0 +1,70 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+
+# generated files
+bin/
+obj
+obj/local
+gen/
+bin/dexedLibs
+bin/res
+bin/*.xml
+bin/classes
+bin/res
+bin/jarlist.cache
+*.cache
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Eclipse project files
+.classpath
+.project
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+
+# Gradle
+.gradle/
+.gradle
+build/
+build
+.externalNativeBuild/
+.externalNativeBuild
+# gedit
+*~
+
+.idea/*.xml
+!.idea/codeStyleSettings.xml
+!.idea/copyright/*.xml
+!.idea/fileColors.xml
+!.idea/encodings.xml
+!.idea/gradle.xml
+!.idea/runConfigurations/*.xml
+
+!.idea/inspectionProfiles/*.xml
+.idea/inspectionProfiles/profiles_settings.xml
+
+!.idea/scopes/*.xml
+.idea/scopes/scope_settings.xml
+
+!.idea/templateLanguages.xml
+!.idea/vcs.xml
+profiles_settings.xml
+.idea/libraries

Android/APIExample/lib-player-helper/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.
+
+include_directories(src/main/cpp/include)
+add_library( # Sets the name of the library.
+
+             apm-plugin-agora-rtc-player
+             # Sets the library as a shared library.
+             SHARED
+             src/main/cpp/agora_plugin_rtc.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-agora-rtc-player
+                       android
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       ${log-lib} )

Android/APIExample/lib-player-helper/build.gradle

@@ -0,0 +1,53 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 26
+    flavorDimensions "default"
+
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 26
+        versionCode 5
+        versionName "1.0"
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11 "
+            }
+        }
+
+        ndk {
+            abiFilters "armeabi-v7a","arm64-v8a","x86"
+        }
+    }
+
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+
+    android.libraryVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "RtcChannelPublishHelper"+'.aar'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    api project(path: ':lib-component')
+}

Android/APIExample/lib-player-helper/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Oct 21 11:34:03 PDT 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

Android/APIExample/lib-player-helper/libs/PLACEHOLDER

@@ -0,0 +1,2 @@
+libagora-rtc-sdk-jni.so
+libagora-crypto.so

Android/APIExample/lib-player-helper/proguard-rules.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

Android/APIExample/lib-player-helper/src/main/AndroidManifest.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * AudioVideoRecordingSample
+ * Sample project to cature audio and video from internal mic/camera and save as MPEG4 file.
+ *
+ * Copyright (c) 2014-2016 saki t_sagoraiant.com
+ *
+ * File name: AndroidManifest.xml
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ * All files in the folder are under this Apache License, Version 2.0.
+*/
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="io.agora.rtcconnect" >
+
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <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" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+	<uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <!--
+    We don't use these uses-features to run this sample on the devices like Nexus7(2012)
+    that have only in-camera without autofocus. 
+	<uses-feature android:name="android.hardware.camera" />
+ 	<uses-feature android:name="android.hardware.camera.autofocus" />
+     -->
+
+    <application
+>
+        <!--<activity-->
+            <!--android:name="io.agora.mediaKit"-->
+            <!--android:label="@string/app_name" >-->
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        <!--</activity>-->
+    </application>
+
+</manifest>