Merge branch 'dev/4.0.0.3' of github.com:AgoraIO/API-Examples into dev/4.0.0.3

Author: zhaoyongqiang

.github/ci/build/build_android.sh

@@ -105,8 +105,8 @@ cat app/src/main/res/values/string_configs.xml
 ## config simple filter
 sed -i -e "s#simpleFilter = false#simpleFilter = true#g" gradle.properties
 mkdir -p agora-simple-filter/src/main/agoraLibs
-cp ../../sdk/arm64-v8a agora-simple-filter/src/main/agoraLibs/
-cp ../../sdk/armeabi-v7a agora-simple-filter/src/main/agoraLibs/
+cp -r ../../sdk/arm64-v8a agora-simple-filter/src/main/agoraLibs/
+cp -r ../../sdk/armeabi-v7a agora-simple-filter/src/main/agoraLibs/
 wget https://agora-adc-artifacts.s3.cn-north-1.amazonaws.com.cn/androidLibs/opencv4.zip
 unzip opencv4.zip
 mkdir -p agora-simple-filter/src/main/jniLibs

.github/ci/build/build_windows.bat

@@ -30,12 +30,12 @@ REM for example: python %WORKSPACE%\\artifactory_utils.py --action=upload_file -
 REM upload folder to artifactory
 REM python %WORKSPACE%\\artifactory_utils.py --action=upload_file --file=FILEPATTERN --server_path=SERVERPATH --server_repo=SERVER_REPO --with_folder
 REM for example: python %WORKSPACE%\\artifactory_utils.py --action=upload_file --file=publish --server_path=windows/ --server_repo=ACCS_repo --with_folder
-# --- Input: ----
-# sourcePath: see jenkins console for details.
-# WORKSPACE: %WORKSPACE%
-# --- Output: ----
-# pr: output test.zip to workspace dir
-# others: Rename the zip package name yourself, But need copy it to workspace dir
+REM --- Input: ----
+REM sourcePath: see jenkins console for details.
+REM WORKSPACE: %WORKSPACE%
+REM --- Output: ----
+REM pr: output test.zip to workspace dir
+REM others: Rename the zip package name yourself, But need copy it to workspace dir
 REM ##################################
 
 echo Package_Publish: %Package_Publish%
@@ -70,7 +70,6 @@ echo off
 REM curl --silent %sdk_url% ./
 python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
 7z x ./%zip_name% -y
-del /F ./%zip_name%
 echo on
 
 dir
@@ -88,9 +87,13 @@ xcopy /Y /E windows\README.zh.md Agora_Native_SDK_for_Windows_FULL\samples\API-e
 7z a -tzip result.zip -r Agora_Native_SDK_for_Windows_FULL
 copy result.zip %WORKSPACE%\\withAPIExample_%zip_name%
 del /F result.zip
+del /F %WORKSPACE%\\%zip_name%
 
 cd Agora_Native_SDK_for_Windows_FULL\samples\API-example
-./installThirdParty.bat
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" "APIExample.sln" /p:platform="Win32" /p:configuration="Release"
+echo "compile start..."
+call installThirdParty.bat
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" "APIExample.sln" /p:platform="Win32" /p:configuration="Release"
 7z a -tzip result.zip -r Release
 copy result.zip %WORKSPACE%\\APIExample-windows.zip
+del /F result.zip
+echo "compile done."

Android/APIExample/agora-simple-filter/build.gradle

@@ -37,6 +37,11 @@ android {
         }
     }
 
+    packagingOptions {
+        pickFirst 'src/main/jniLibs/arm64-v8a/libopencv_java4.so'
+        pickFirst 'src/main/jniLibs/armeabi-v7a/libopencv_java4.so'
+    }
+
 }
 
 dependencies {

Android/APIExample/settings.gradle

@@ -1,5 +1,7 @@
 pluginManagement {
     repositories {
+        maven { url "https://maven.aliyun.com/repository/jcenter" }
+        maven { url "https://maven.aliyun.com/repository/public" }
         gradlePluginPortal()
         google()
         mavenCentral()
@@ -8,10 +10,12 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        mavenCentral()
+        maven { url "https://maven.aliyun.com/repository/public" }
+        maven { url "https://maven.aliyun.com/repository/google" }
+        maven { url "https://maven.aliyun.com/repository/jcenter" }
+        maven { url "https://jitpack.io" }
         google()
-        jcenter()
-        maven { url 'https://jitpack.io' }
+        mavenCentral()
     }
 }
 rootProject.name='APIExample'