Skip to content

Commit f3688ab

Browse files
authored
Merge pull request #150 from AgoraIO/dev/3.4.0
Dev/3.4.0
2 parents 2e46144 + 584711d commit f3688ab

File tree

88 files changed

+68470
-21179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+68470
-21179
lines changed

Android/APIExample/README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To build and run the sample application, get an App Id:
2323
3. Save the **App Id** from the Dashboard for later use.
2424
4. Generate a temp **Access Token** (valid for 24 hours) from dashboard page with given channel name, save for later use.
2525

26-
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.
26+
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.
2727

2828
```
2929
<string name="agora_app_id" translatable="false">YOUR APP ID</string>
@@ -33,6 +33,10 @@ To build and run the sample application, get an App Id:
3333
3434
You are all set. Now connect your Android device and run the project.
3535
36+
> To ensure communication security, Agora uses tokens (dynamic keys) to authenticate users joining a channel.
37+
>
38+
> 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.
39+
3640
## Contact Us
3741
3842
- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first

Android/APIExample/README.zh.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
3. 复制后台的 **App Id** 并备注,稍后启动应用时会用到它
2424
4. 在项目页面生成临时 **Access Token** (24小时内有效)并备注,注意生成的Token只能适用于对应的频道名。
2525

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

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

0 commit comments

Comments
 (0)