From 8046d63fdb6bd14860930670ae1ee3f9f7cbfe1d Mon Sep 17 00:00:00 2001 From: notedit Date: Tue, 6 Mar 2018 01:07:00 +0800 Subject: [PATCH 1/8] add docs --- README.md | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fe83f45..5f1c00a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,45 @@ -# dotEngine sdk android demo +# dotEngine sdk android +dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话, 一对多直播, 连麦直播, 抓娃娃, 支持定制以及二次开发 -#### todo add more docs +## 特点 +- 支持音视频以及单独音频单独视频 +- 客户端视频裁剪 +- 硬件加速 +- 美颜磨皮 +- 支持音视频自定义输入 +- 支持音视频自定义输出 +- 音量回调 +- 支持纯观看模式 +- 视频截图 +- 支持但用户发送多路流 +- 内置消息通道,支持发送自定义消息 +- 视频渲染支持全显示以及填充模式 + + +## 使用 + +把DotEngine-release.aar文件导入项目 + +``` +dependencies { + compile(name:'DotEngine-release', ext:'aar') +} + + +``` + +## 文档 docs[http://docs.dot.cc] + + +## 商业开发以及技术支持 + +- 定制开发 +- 定制部署 +- 技术咨询 + +邮箱: leeoxiang@gmail.com From 91b2be209adc45249a292137e17c7fd19c49b63d Mon Sep 17 00:00:00 2001 From: notedit Date: Tue, 6 Mar 2018 16:51:41 +0800 Subject: [PATCH 2/8] fix README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5f1c00a..1fe43c3 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话 - 支持但用户发送多路流 - 内置消息通道,支持发送自定义消息 - 视频渲染支持全显示以及填充模式 +- 支持断线重连 ## 使用 From 1ab1261be1025ef6546b1bc763e7a4bdc249635f Mon Sep 17 00:00:00 2001 From: notedit Date: Wed, 7 Mar 2018 00:59:15 +0800 Subject: [PATCH 3/8] add screen share --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2787d66..d77c543 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话 - 视频渲染支持全显示以及填充模式 - 断网重连 - Simulcast +- 屏幕共享 **需要Android5.0+** ## 使用 From 5eaa21dd8917e3f6acc3fd2128de421205696f9a Mon Sep 17 00:00:00 2001 From: notedit Date: Wed, 7 Mar 2018 01:06:27 +0800 Subject: [PATCH 4/8] fix docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d77c543..49c1c51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # dotEngine sdk android -dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话, 一对多直播, 连麦直播, 抓娃娃, 支持定制以及二次开发 +dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话, 一对多直播, 连麦直播, 抓娃娃, 视频客服, 远程问诊, 支持定制以及二次开发 ## 特点 From 4d764171b41c1f1478c17e5227d1666d07ffdf3a Mon Sep 17 00:00:00 2001 From: notedit Date: Thu, 8 Mar 2018 01:25:55 +0800 Subject: [PATCH 5/8] fix doc --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 49c1c51..deb032c 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话 - 断网重连 - Simulcast - 屏幕共享 **需要Android5.0+** +- 视频录制 ## 使用 From d6a9645ffdae62a2dff6f8f96fbf190e588b2944 Mon Sep 17 00:00:00 2001 From: notedit Date: Thu, 8 Mar 2018 01:58:14 +0800 Subject: [PATCH 6/8] fix docs --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index deb032c..dec481b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,8 @@ dotEngine 音视频实时通话SDK. 应用场景一对一通话, 多对多通话 - 断网重连 - Simulcast - 屏幕共享 **需要Android5.0+** -- 视频录制 +- 视频录制 +- 支持TCP模式 ## 使用 From 4bb734571c0a3b80a84efaf54b4d2161b06a920a Mon Sep 17 00:00:00 2001 From: notedit Date: Thu, 8 Mar 2018 16:12:35 +0800 Subject: [PATCH 7/8] fix --- .../main/java/cc/dot/engine/example/CropVideoActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DotEngineExample/src/main/java/cc/dot/engine/example/CropVideoActivity.java b/DotEngineExample/src/main/java/cc/dot/engine/example/CropVideoActivity.java index e6180c7..ac0760d 100644 --- a/DotEngineExample/src/main/java/cc/dot/engine/example/CropVideoActivity.java +++ b/DotEngineExample/src/main/java/cc/dot/engine/example/CropVideoActivity.java @@ -17,6 +17,7 @@ import cc.dot.engine.DotEngine; import cc.dot.engine.DotStream; import cc.dot.engine.DotView; +import cc.dot.engine.audio.DotAudioManager; import cc.dot.engine.listener.DotEngineListener; import cc.dot.engine.listener.DotStreamListener; import cc.dot.engine.type.DotEngineErrorType; @@ -297,6 +298,11 @@ public void onStateChange(DotEngineStatus dotEngineStatus) { } } + + @Override + public void onAudioDeviceChanged(DotAudioManager.AudioDevice device) { + + } }; From 51a2991ed2b67d346cceecaef47c2f7ea62d2fc8 Mon Sep 17 00:00:00 2001 From: notedit Date: Tue, 11 Jun 2019 22:57:46 +0800 Subject: [PATCH 8/8] update android stadio --- DotEngineExample/build.gradle | 14 +++++++------- DotEngineExample/src/main/AndroidManifest.xml | 3 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/DotEngineExample/build.gradle b/DotEngineExample/build.gradle index dc60b82..c37e72f 100644 --- a/DotEngineExample/build.gradle +++ b/DotEngineExample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 26 + buildToolsVersion '28.0.3' defaultConfig { applicationId "cc.dot.engine.example" minSdkVersion 16 - targetSdkVersion 24 + targetSdkVersion 26 versionCode 1 versionName "1.0" multiDexEnabled true @@ -33,9 +33,9 @@ allprojects { dependencies { - compile(name:'DotEngine-release', ext:'aar') - compile 'com.android.support:appcompat-v7:24.0.0' - compile 'com.squareup.okhttp3:okhttp:3.6.0' - compile 'com.orhanobut:logger:2.1.1' + implementation(name:'DotEngine-release', ext:'aar') + implementation 'com.android.support:appcompat-v7:24.0.0' + implementation 'com.squareup.okhttp3:okhttp:3.6.0' + implementation 'com.orhanobut:logger:2.1.1' } diff --git a/DotEngineExample/src/main/AndroidManifest.xml b/DotEngineExample/src/main/AndroidManifest.xml index 26d6c66..001cf48 100644 --- a/DotEngineExample/src/main/AndroidManifest.xml +++ b/DotEngineExample/src/main/AndroidManifest.xml @@ -4,9 +4,6 @@ android:versionCode="1" android:versionName="1.0"> - diff --git a/build.gradle b/build.gradle index c095292..3f6e6c1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5051615..363b1b6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 01 00:37:35 CST 2018 +#Tue Jun 11 16:00:12 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip