Skip to content

Commit

Permalink
Merge pull request #150 from AgoraIO/dev/3.4.0
Browse files Browse the repository at this point in the history
Dev/3.4.0
  • Loading branch information
plutoless authored Apr 21, 2021
2 parents a1de895 + 9899c77 commit c7b8727
Show file tree
Hide file tree
Showing 88 changed files with 68,470 additions and 21,179 deletions.
6 changes: 5 additions & 1 deletion Android/APIExample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To build and run the sample application, get an App Id:
3. Save the **App Id** from the Dashboard for later use.
4. Generate a temp **Access Token** (valid for 24 hours) from dashboard page with given channel name, save for later use.

5. Open `Android/APIExample` and edit the `app/src/main/res/values/string-config.xml` file. Update `<#Your App Id#>` with your App Id, and change `<#Temp Access Token#>` with the temp Access Token generated from dashboard. Note you can leave the token variable `null` if your project has not turned on security token.
5. Open `Android/APIExample` and edit the `app/src/main/res/values/string_config.xml` file. Update `<#Your App Id#>` with your App Id, and change `<#Temp Access Token#>` with the temp Access Token generated from dashboard. Note you can leave the token variable `null` if your project has not turned on security token.

```
<string name="agora_app_id" translatable="false">YOUR APP ID</string>
Expand All @@ -33,6 +33,10 @@ To build and run the sample application, get an App Id:
You are all set. Now connect your Android device and run the project.
> To ensure communication security, Agora uses tokens (dynamic keys) to authenticate users joining a channel.
>
> Temporary tokens are for demonstration and testing purposes only and remain valid for 24 hours. In a production environment, you need to deploy your own server for generating tokens. See [Generate a Token](https://docs.agora.io/en/Interactive Broadcast/token_server)for details.
## Contact Us
- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
Expand Down
6 changes: 5 additions & 1 deletion Android/APIExample/README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
3. 复制后台的 **App Id** 并备注,稍后启动应用时会用到它
4. 在项目页面生成临时 **Access Token** (24小时内有效)并备注,注意生成的Token只能适用于对应的频道名。

5. 打开 `Android/APIExample` 并编辑 `app/src/main/res/values/string-config.xml`,将你的 AppID 和 Token 分别替换到 `<#Your App Id#>``<#Temp Access Token#>`
5. 打开 `Android/APIExample` 并编辑 `app/src/main/res/values/string_config.xml`,将你的 AppID 和 Token 分别替换到 `<#Your App Id#>``<#Temp Access Token#>`

```
<string name="agora_app_id" translatable="false">YOUR APP ID</string>
Expand All @@ -33,6 +33,10 @@
然后你就可以编译并运行项目了。
> 为提高项目的安全性,Agora 使用 Token(动态密钥)对即将加入频道的用户进行鉴权。
>
> 临时 Token 仅作为演示和测试用途。在生产环境中,你需要自行部署服务器签发 Token,详见[生成 Token](https://docs.agora.io/cn/Interactive Broadcast/token_server)。
## 联系我们
- 如果你遇到了困难,可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
Expand Down
Loading

0 comments on commit c7b8727

Please sign in to comment.