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

Author: zhaoyongqiang

Android/APIExample/README.md

@@ -40,7 +40,7 @@ Since version 4.0.0, Agora SDK provides an Extension Interface Framework. Develo
 In order to enable it, you could do as follows:
 
 1. Download [opencv](https://github.com/AgoraIO/API-Examples/releases/download/3.7.201/opencv4.zip) library, unzip it and copy into Android/APIExample/agora-simple-filter/src/main/jniLibs
-2. Download [Agora SDK包](https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_v4.0.0.preview.5_full.zip), unzip it and copy c++ .so library (keeps arch folder) to Android/APIExample/agora-simple-filter/src/main/agoraLibs
+2. Download [Agora SDK包](https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_v4.0.0-rc.1_FULL.zip), unzip it and copy c++ .so library (keeps arch folder) to Android/APIExample/agora-simple-filter/src/main/agoraLibs
 3. Modify simpleFilter to true in Android/APIExample/gradle.properties
 
 ## Contact Us
@@ -51,7 +51,7 @@ In order to enable it, you could do as follows:
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)
 - You can find full API documentation at [Document Center](https://docs.agora.io/en/)
 - If you encounter problems during integration, you can ask question in [Stack Overflow](https://stackoverflow.com/questions/tagged/agora.io)
-- You can file bugs about this sample at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- You can file bugs about this sample at [issue](https://github.com/AgoraIO/API-Examples/issues)
 
 ## License
 

Android/APIExample/README.zh.md

@@ -38,7 +38,7 @@
 从4.0.0SDK开始，Agora SDK支持插件系统和开放的云市场帮助开发者发布自己的音视频插件，本项目包含了一个SimpleFilter示例，默认是禁用的状态，如果需要开启编译和使用需要完成以下步骤：
 
 1. 下载 [opencv](https://github.com/AgoraIO/API-Examples/releases/download/3.7.201/opencv4.zip) 解压后复制到 Android/APIExample/agora-simple-filter/src/main/jniLibs
-2. 手动下载[Agora SDK包](https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_v4.0.0.preview.5_full.zip), 解压后将c++动态库（包括架构文件夹）copy到Android/APIExample/agora-simple-filter/src/main/agoraLibs
+2. 手动下载[Agora SDK包](https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_v4.0.0-rc.1_FULL.zip), 解压后将c++动态库（包括架构文件夹）copy到Android/APIExample/agora-simple-filter/src/main/agoraLibs
 3. 修改Android/APIExample/gradle.properties配置文件中simpleFilter值为true
 
 ## 联系我们
@@ -50,7 +50,7 @@
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
 - 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
-- 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/API-Examples/issues)
 
 ## 代码许可
 

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraMediaBase.h

@@ -49,43 +49,43 @@ enum AudioRoute
   /**
    * The headset.
    */
-  ROUTE_HEADSET,
+  ROUTE_HEADSET = 0,
   /**
    * The earpiece.
    */
-  ROUTE_EARPIECE,
+  ROUTE_EARPIECE = 1,
   /**
    * The headset with no microphone.
    */
-  ROUTE_HEADSETNOMIC,
+  ROUTE_HEADSETNOMIC = 2,
   /**
    * The speakerphone.
    */
-  ROUTE_SPEAKERPHONE,
+  ROUTE_SPEAKERPHONE = 3,
   /**
    * The loudspeaker.
    */
-  ROUTE_LOUDSPEAKER,
+  ROUTE_LOUDSPEAKER = 4,
   /**
    * The Bluetooth headset.
    */
-  ROUTE_HEADSETBLUETOOTH,
+  ROUTE_HEADSETBLUETOOTH = 5,
   /**
-   * The HDMI
+   * The USB
    */
-  ROUTE_HDMI,
+  ROUTE_USB = 6,
   /**
-   * The USB
+   * The HDMI
    */
-  ROUTE_USB,
+  ROUTE_HDMI = 7,
   /**
    * The DISPLAYPORT
    */
-  ROUTE_DISPLAYPORT,
+  ROUTE_DISPLAYPORT = 8,
   /**
    * The AIRPLAY
    */
-  ROUTE_AIRPLAY
+  ROUTE_AIRPLAY = 9,
 };
 
 /**

windows/APIExample/install.ps1

@@ -1,6 +1,6 @@
 $ThirdPartysrc = 'https://agora-adc-artifacts.oss-cn-beijing.aliyuncs.com/libs/ThirdParty.zip'
 $ThirdPartydes = 'ThirdParty.zip'
-$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.0.0-beta.1_FULL.zip'
+$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.0.0-rc.1_FULL.zip'
 $agora_des = 'AgoraSdk.zip'
 
 if (-not (Test-Path ThirdParty)){
@@ -16,15 +16,17 @@ if (-not (Test-Path ThirdParty)){
 if (-not (Test-Path sdk)){
 	echo "download $agora_des"
 	mkdir sdk
-	mkdir sdk/x86
-	mkdir sdk/x64
+	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\x86\rtc\sdk\*  sdk\x86
-	Move-Item Agora_Native_SDK_for_Windows_FULL\x86_64\rtc\sdk\*  sdk\x64
-	Remove-Item  $agora_des -Recurse
-	Remove-Item  Agora_Native_SDK_for_Windows_FULL -Recurse
+	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
 }