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

@@ -109,9 +109,10 @@ 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
-mv arm64-v8a agora-simple-filter/src/main/jniLibs
-mv armeabi-v7a agora-simple-filter/src/main/jniLibs
+mkdir -p agora-simple-filter/src/main/jniLibs2
+mv arm64-v8a agora-simple-filter/src/main/jniLibs2
+mv armeabi-v7a agora-simple-filter/src/main/jniLibs2
+sed -i -e "s#jniLibs/#jniLibs2/#g" agora-simple-filter/src/main/cpp/CMakeLists.txt
 
 ./gradlew clean
 ./gradlew :app:assembleDebug

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

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

windows/APIExample/APIExample/APIExample.vcxproj

@@ -23,20 +23,20 @@
     <ProjectGuid>{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}</ProjectGuid>
     <Keyword>MFCProj</Keyword>
     <RootNamespace>APIExample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>

windows/APIExample/install.ps1

@@ -13,30 +13,32 @@ if (-not (Test-Path ThirdParty)){
 	Remove-Item $ThirdPartyDes -Recurse
 }
 
-if (Test-Path $agora_local_sdk){
-	mkdir sdk
-	mkdir sdk\x64
-	mkdir sdk\high_level_api
-	mkdir sdk\high_level_api\include
-	Copy-Item $agora_local_sdk\x86\*  sdk
-	Copy-Item $agora_local_sdk\x86_64\*  sdk\x64
-	Copy-Item $agora_local_sdk\high_level_api\include\*  sdk\high_level_api\include
-}
+
 
 if (-not (Test-Path sdk)){
-	echo "download $agora_des"
-	mkdir sdk
-	mkdir sdk\x64
-	mkdir sdk\high_level_api
-	mkdir sdk\high_level_api\include
-	(New-Object System.Net.WebClient).DownloadFile($agora_sdk,$agora_des)
-	Unblock-File $agora_des
-	Expand-Archive -Path $agora_des -DestinationPath . -Force 
-	Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86\*  sdk
-	Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86_64\*  sdk\x64
-	Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\high_level_api\include\*  sdk\high_level_api\include
-	Remove-Item  $agora_des -Recurse -Force
-	Remove-Item  Agora_Native_SDK_for_Windows_FULL -Recurse -Force
+    if (Test-Path $agora_local_sdk){
+	    mkdir sdk
+	    mkdir sdk\x64
+	    mkdir sdk\high_level_api
+	    mkdir sdk\high_level_api\include
+	    Copy-Item $agora_local_sdk\x86\*  sdk
+	    Copy-Item $agora_local_sdk\x86_64\*  sdk\x64
+	    Copy-Item $agora_local_sdk\high_level_api\include\*  sdk\high_level_api\include
+    }else{
+        echo "download $agora_des"
+	    mkdir sdk
+	    mkdir sdk\x64
+	    mkdir sdk\high_level_api
+	    mkdir sdk\high_level_api\include
+	    (New-Object System.Net.WebClient).DownloadFile($agora_sdk,$agora_des)
+	    Unblock-File $agora_des
+	    Expand-Archive -Path $agora_des -DestinationPath . -Force 
+	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86\*  sdk
+	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86_64\*  sdk\x64
+	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\high_level_api\include\*  sdk\high_level_api\include
+	    Remove-Item  $agora_des -Recurse -Force
+	    Remove-Item  Agora_Native_SDK_for_Windows_FULL -Recurse -Force
+    }
 }