Merge remote-tracking branch 'origin/master' into dev/2.9.0

AgoraIO · Aug 5, 2019 · 3766793 · 3766793
2 parents 071f544 + 5eeadc9
commit 3766793
Show file tree

Hide file tree

Showing 131 changed files with 11,064 additions and 1,397 deletions.
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/README.yaml b/One-to-One-Video/Agora-Android-Tutorial-1to1/README.yaml
@@ -33,7 +33,7 @@ QuickStart:
  <!-- Obtain a temp Access Token at https://dashboard.agora.io -->
  <!-- You will need to deploy your own token server for production release -->
  <!-- Leave this value empty if Security keys/Token is not enabled for your project -->
- <string name="agora_access_token"><#YOUR TOKEN#></string>
+ <string name="agora_access_token"><#YOUR ACCESS TOKEN#></string>
  ```
  - title: Integrate the Agora Video SDK
  content: |

diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/README.zh.yaml b/One-to-One-Video/Agora-Android-Tutorial-1to1/README.zh.yaml
@@ -5,7 +5,7 @@ Meta:
  version: 2.4.1
  # | 代表这里是字符串
  description: |
- 这个开源示例项目演示了如何快速集成 Agora 视频 SDK，实现1对1视频通话。
+ 这个开源示例项目演示了如何快速集成 Agora 视频 SDK，实现一对一视频通话。
 
  在这个示例项目中包含了以下功能：
 
@@ -31,16 +31,16 @@ QuickStart:
  description:
  这个段落主要讲解了如何编译和运行实例程序。
  sections:
- - title: 创建Agora账号并获取AppId
+ - title: 创建 Agora 账号并获取 AppId
  content: |
  $_{APPID}
  5. 将 AppID 填写进 "app/src/main/res/values/strings.xml"
  ```
  <string name="private_app_id"><#YOUR APP ID#></string>
- <!-- 临时Token 可以在 https://dashboard.agora.io 获取 -->
- <!-- 在正式上线生产环境前，你必须部署你自己的Token服务器 -->
+ <!-- 临时 Token 可以在 https://dashboard.agora.io 获取 -->
+ <!-- 在正式上线生产环境前，你必须部署你自己的 Token 服务器 -->
  <!-- 如果你的项目没有打开安全证书，下面的值可以直接留空 -->
- <string name="agora_access_token"><#YOUR TOKEN#></string>
+ <string name="agora_access_token"><#YOUR ACCESS TOKEN#></string>
  ```
  - title: 集成 Agora 视频 SDK
  content: |

diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/build.gradle
@@ -18,10 +18,16 @@ android {
  }
  }
 
+ sourceSets {
+ main {
+ jniLibs.srcDirs = ['src/main/jniLibs']
+ }
+ }
+
 }
 
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar']) // DO NOT CHANGE, CI may needs it when packaging
-
  implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation project(path: ':logger')
 }
diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml b/One-to-One-Video/Agora-Android-Tutorial-1to1/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  package="io.agora.tutorials1v1vcall">
 
@@ -13,8 +13,8 @@
 
  <application
  android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
  android:label="@string/app_name"
+ android:roundIcon="@drawable/icon_launcher"
  android:supportsRtl="true"
  android:theme="@style/AppTheme">
  <activity
@@ -26,7 +26,10 @@
 
  <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ </intent-filter>
  </activity>
  </application>
 
-</manifest>
+</manifest>