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

Author: zhaoyongqiang

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -32,7 +32,6 @@
 import io.agora.api.example.examples.advanced.RhythmPlayer;
 import io.agora.api.example.examples.advanced.SendDataStream;
 import io.agora.api.example.examples.advanced.SetAudioProfile;
-import io.agora.api.example.examples.advanced.SimpleExtension;
 import io.agora.api.example.examples.advanced.SpatialSound;
 import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
 import io.agora.api.example.examples.advanced.VideoMetadata;
@@ -148,9 +147,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_raw_audio:
                 fragment = new ProcessAudioRawData();
                 break;
-            case R.id.action_mainFragment_extension:
-                fragment = new SimpleExtension();
-                break;
             case R.id.action_mainFragment_video_enhancement:
                 fragment = new VideoProcessExtension();
                 break;

Android/APIExample/app/src/main/java/io/agora/api/example/MainApplication.java

@@ -1,10 +1,10 @@
 package io.agora.api.example;
 
 import android.app.Application;
-import android.content.Context;
+
+import com.tencent.bugly.crashreport.CrashReport;
 
 import java.lang.annotation.Annotation;
-import java.util.Collections;
 import java.util.Set;
 
 import io.agora.api.example.annotation.Example;
@@ -19,6 +19,7 @@ public class MainApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        CrashReport.initCrashReport(getApplicationContext(), "7cb50ce921", BuildConfig.DEBUG);
         initExamples();
     }
 

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SimpleExtension.java

@@ -98,9 +98,6 @@
         <action
             android:id="@+id/action_mainFragment_raw_audio"
             app:destination="@id/RawAudio" />
-        <action
-            android:id="@+id/action_mainFragment_extension"
-            app:destination="@id/SimpleExtension" />
         <action
             android:id="@+id/action_mainFragment_video_enhancement"
             app:destination="@id/VideoEnhance" />
@@ -258,11 +255,6 @@
         android:name="io.agora.api.example.examples.advanced.ProcessAudioRawData"
         android:label="RawAudio"
         tools:layout="@layout/fragment_raw_audio" />
-    <fragment
-        android:id="@+id/SimpleExtension"
-        android:name="io.agora.api.example.examples.advanced.SimpleExtension"
-        android:label="AudioExtension"
-        tools:layout="@layout/fragment_extension" />
     <fragment
         android:id="@+id/VideoEnhance"
         android:name="io.agora.api.example.examples.advanced.VideoProcessExtension"

Android/APIExample/app/src/main/res/layout/fragment_extension.xml

@@ -109,7 +109,6 @@
     <string name="item_arcore">现实增强集成</string>
     <string name="item_senddatastream">发送数据流</string>
     <string name="item_raw_audio">原始音频数据</string>
-    <string name="item_ext">插件系统</string>
     <string name="item_spatial_sound">空间音效</string>
     <string name="item_content_inspect">视频鉴黄</string>
 
@@ -144,7 +143,6 @@
     <string name="arcore">此示例演示了如何将一个基于Google ARCore构建的AR画面实时分享给远端观众。</string>
     <string name="senddatastream">此示例演示了在音视频通话过程中如何伴随视频帧发送数据流信息的方法。</string>
     <string name="rawaudio">此示例演示了在音频通话过程中如何通过回调获取裸数据的功能。</string>
-    <string name="simple_extension">此示例演示了一个简单音视频插件是如何使用的。</string>
     <string name="rhythmplayer">此示例演示了音频通话过程中如何使用虚拟节拍器。</string>
     <string name="videoEnhancement">此示例演示了音频通话过程中SDK内置的各类视频增强功能。</string>
     <string name="writeback">音频回写</string>

Android/APIExample/app/src/main/res/navigation/nav_graph.xml

@@ -111,7 +111,6 @@
     <string name="item_livestreaming">RTC Live Streaming</string>
     <string name="item_twoProcessScreenShare">Multi Process - Screen Sharing</string>
     <string name="item_raw_audio">Raw Audio Data</string>
-    <string name="item_ext">Simple Extension</string>
     <string name="item_senddatastream">Send Data Stream</string>
     <string name="item_arcore">ARCore</string>
     <string name="item_spatial_sound">Spatial Audio</string>
@@ -148,7 +147,6 @@
     <string name="arcore">This example shows how to use RTC Engine to share Artifactial Reality App to remote audience. AR module is based on Google ARCore in this Example.</string>
     <string name="senddatastream">This example shows how to use sendDataStream API to send your custom data along with Video Frame in Channel.</string>
     <string name="rawaudio">This example shows how to register Audio Observer to engine for extract raw audio data during RTC communication.</string>
-    <string name="simple_extension">This example shows how to use simple extension during RTC communication.</string>
     <string name="rhythmplayer">This example shows how to use virtual rhythm player for during RTC communication.</string>
     <string name="videoEnhancement">This example shows the features for video enhancement for RTC communication.</string>
     <string name="writeback">Write Back Audio</string>

Android/APIExample/app/src/main/res/values-zh/strings.xml

@@ -23,7 +23,7 @@
     <ProjectGuid>{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}</ProjectGuid>
     <Keyword>MFCProj</Keyword>
     <RootNamespace>APIExample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -44,7 +44,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
@@ -367,8 +367,8 @@ copy $(SolutionDir)APIExample\Advanced\LocalVideoTranscoding\agora.jpg $(Solutio
   <ItemGroup>
     <Image Include="res\APIExample.ico" />
     <Image Include="res\IDB_NETWORK_QUALITY.bmp" />
-    <Image Include="res\local.bmp" />
-    <Image Include="res\remote.bmp" />
+    <CopyFileToFolders Include="res\local.bmp" />
+    <CopyFileToFolders Include="res\remote.bmp" />
   </ItemGroup>
   <ItemGroup>
     <CopyFileToFolders Include="res\audiomixing.wav">

Android/APIExample/app/src/main/res/values/strings.xml

@@ -374,12 +374,6 @@
     <Image Include="res\IDB_NETWORK_QUALITY.bmp">
       <Filter>Resource Files</Filter>
     </Image>
-    <Image Include="res\local.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="res\remote.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
   </ItemGroup>
   <ItemGroup>
     <Media Include="res\ID_TEST_AUDIO.wav">
@@ -390,5 +384,11 @@
     <CopyFileToFolders Include="res\audiomixing.wav">
       <Filter>Resource Files</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="res\local.bmp">
+      <Filter>Resource Files</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="res\remote.bmp">
+      <Filter>Resource Files</Filter>
+    </CopyFileToFolders>
   </ItemGroup>
 </Project>

windows/APIExample/APIExample/APIExample.vcxproj

@@ -3,6 +3,8 @@
 #include "AGVideoWnd.h"
 #include <map>
 #include <string>
+#include <IAgoraRtcEngineEx.h>
+
 // CMultiCameraDlg 
 typedef struct _CameraInfos {
     std::string deviceId;
@@ -144,7 +146,7 @@ class CMultiCameraDlg : public CDialogEx
 	std::string m_strChannel;
 
 	agora::rtc::IRtcEngineEx* m_rtcEngine = nullptr;
-	
+
 	conn_id_t m_conn_camera2;
 	conn_id_t m_conn_camera;
 	std::vector<CAMERAINFO> m_vecCameraInfos;