Merge pull request #137 from AgoraIO/dev/3.0.0_conflict

Dev/3.0.0 conflict

Author: plutoless

Group-Video/OpenVideoCall-Android/.gitignore

@@ -1,3 +1,8 @@
+include
+agora-rtc-sdk.jar
+*.so
+.settings
+
 # built application files
 *.apk
 *.ap_

Group-Video/OpenVideoCall-Android/README.md

@@ -9,10 +9,9 @@ With this sample app, you can:
 - Mute / unmute audio
 - Enable / disable video
 - Switch camera
-- Send message to channel
 - Setup resolution, frame rate and bit rate
 - Enable encryption
-- Enable / disable black and white filter
+- Enable beautify filter
 
 ## Prerequisites
 
@@ -53,7 +52,7 @@ The SDK must be integrated into the sample project before it can opened and buil
   ...
   dependencies {
       ...
-      implementation 'io.agora.rtc:full-sdk:2.4.1'
+      implementation 'io.agora.rtc:full-sdk:3.0.0'
   }
   ```
 
@@ -81,8 +80,13 @@ Or use `Gradle` to build and run.
 
 ## Resources
 
-- You can find full API document at [Document Center](https://docs.agora.io/en/)
-- You can file bugs about this demo at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
+- Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
+- 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)
 
 ## License
 

Group-Video/OpenVideoCall-Android/README.yaml

@@ -10,12 +10,9 @@
 - 静音和解除静音；
 - 关闭摄像头和打开摄像头；
 - 切换前置摄像头和后置摄像头；
-- 发送频道内消息；
 - 选择分辨率、码率和帧率；
 - 设置加密模式；
-- 开启和关闭黑白滤镜；
-
-你也可以在这里查看入门版的示例项目：[Agora-Android-Tutorial-1to1](https://github.com/AgoraIO/Basic-Video-Call/tree/master/One-to-One-Video/Agora-Android-Tutorial-1to1)
+- 开启和关闭基础美颜；
 
 ## 环境准备
 
@@ -46,14 +43,12 @@
 ### 集成 Agora 视频 SDK
 
 集成方式有以下两种：
-  - 首选集成方式：
+  - 通过JCenter集成：
     - 在项目对应的模块的 `app/build.gradle` 文件的依赖属性中加入通过 JCenter 自动集成 Agora 视频 SDK 的地址：
       ```
-      implementation 'io.agora.rtc:full-sdk:2.4.1'
+      implementation 'io.agora.rtc:full-sdk:3.0.0'
       ```
-      (如果要在自己的应用中集成 Agora 视频 SDK，添加链接地址是最重要的一步。）
-    - 在 [Agora.io SDK](https://www.agora.io/cn/download/) 下载 **视频通话 + 直播 SDK**，解压后将其中的 **libs**/**include** 文件夹下的 ***.h** 复制到本项目的 **app**/**src**/**main**/**cpp**/**agora** 下。
-  - 次选集成方式：
+  - 手动集成：
     - 在 [Agora.io SDK](https://www.agora.io/cn/download/) 下载 **视频通话 + 直播 SDK**并解压，按以下对应关系将 **libs** 目录的内容复制到项目内。
       
       SDK目录|项目目录
@@ -62,6 +57,7 @@
       **arm64-v8a** folder|**/app/src/main/jniLibs** folder
       **x86** folder|**/app/src/main/jniLibs** folder
       **armeabi-v7a** folder|**/app/src/main/jniLibs** folder
+    - 若需要需要使用C++头文件，可以在解压SDK后将其中的 **libs**/**include** 文件夹下的 ***.h** 复制到本项目的 **app**/**src**/**main**/**cpp**/**agora** 下。
 
 
 ### 启动应用程序
@@ -73,11 +69,13 @@
 
 ## 联系我们
 
+- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
-- 如果在集成中遇到问题, 你可以到 [开发者社区](https://dev.agora.io/cn/) 提问
-- 如果有售前咨询问题, 可以拨打 400 632 6626，或加入官方Q群 12742516 提问
-- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
-- 如果发现了示例代码的 bug, 欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
+- 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
 
 ## 代码许可
 

Group-Video/OpenVideoCall-Android/README.zh.md

@@ -45,12 +45,14 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:design:28.0.0'
-    implementation 'org.slf4j:slf4j-api:1.7.21'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'com.github.tony19:logback-android-core:1.1.1-4'
     implementation('com.github.tony19:logback-android-classic:1.1.1-4') {
         // workaround issue #73
         exclude group: 'com.google.android', module: 'android'
     }
+
+    implementation 'io.agora.rtc:full-sdk:2.9.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
 }

Group-Video/OpenVideoCall-Android/README.zh.yaml

@@ -1,35 +1,78 @@
 package io.agora.openvcall;
 
 import android.app.Application;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.agora.openvcall.model.AGEventHandler;
 import io.agora.openvcall.model.CurrentUserSettings;
-import io.agora.openvcall.model.WorkerThread;
+import io.agora.openvcall.model.EngineConfig;
+import io.agora.openvcall.model.MyEngineEventHandler;
+import io.agora.rtc.Constants;
+import io.agora.rtc.RtcEngine;
 
 public class AGApplication extends Application {
+    private CurrentUserSettings mVideoSettings = new CurrentUserSettings();
 
-    private WorkerThread mWorkerThread;
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+    private RtcEngine mRtcEngine;
+    private EngineConfig mConfig;
+    private MyEngineEventHandler mEventHandler;
 
-    public synchronized void initWorkerThread() {
-        if (mWorkerThread == null) {
-            mWorkerThread = new WorkerThread(getApplicationContext());
-            mWorkerThread.start();
+    public RtcEngine rtcEngine() {
+        return mRtcEngine;
+    }
 
-            mWorkerThread.waitForReady();
-        }
+    public EngineConfig config() {
+        return mConfig;
+    }
+
+    public CurrentUserSettings userSettings() {
+        return mVideoSettings;
+    }
+
+    public void addEventHandler(AGEventHandler handler) {
+        mEventHandler.addEventHandler(handler);
     }
 
-    public synchronized WorkerThread getWorkerThread() {
-        return mWorkerThread;
+    public void remoteEventHandler(AGEventHandler handler) {
+        mEventHandler.removeEventHandler(handler);
     }
 
-    public synchronized void deInitWorkerThread() {
-        mWorkerThread.exit();
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        createRtcEngine();
+    }
+
+    private void createRtcEngine() {
+        Context context = getApplicationContext();
+        String appId = context.getString(R.string.agora_app_id);
+        if (TextUtils.isEmpty(appId)) {
+            throw new RuntimeException("NEED TO use your App ID, get your own ID at https://dashboard.agora.io/");
+        }
+
+        mEventHandler = new MyEngineEventHandler();
         try {
-            mWorkerThread.join();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+            mRtcEngine = RtcEngine.create(context, appId, mEventHandler);
+        } catch (Exception e) {
+            log.error(Log.getStackTraceString(e));
+            throw new RuntimeException("NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));
         }
-        mWorkerThread = null;
+
+        mRtcEngine.setChannelProfile(Constants.CHANNEL_PROFILE_COMMUNICATION);
+        mRtcEngine.enableVideo();
+        mRtcEngine.enableAudioVolumeIndication(200, 3, false);
+
+        mConfig = new EngineConfig();
     }
 
-    public static final CurrentUserSettings mVideoSettings = new CurrentUserSettings();
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+    }
 }

Group-Video/OpenVideoCall-Android/app/build.gradle

@@ -9,6 +9,6 @@ public void reset() {
         mChannel = null;
     }
 
-    EngineConfig() {
+    public EngineConfig() {
     }
 }