Merge pull request #248 from AgoraIO-Community/rc/3.0.1

Rc/3.0.1
AgoraIO-Extensions · Jul 30, 2020 · ed12806 · ed12806
2 parents 5cb706a + eebb01e
commit ed12806
Show file tree

Hide file tree

Showing 21 changed files with 5,308 additions and 4,734 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## THE CHANGELOG
 
+#### 3.0.1-rc.3
+  - fix multiple channel render bug
+  - remove `Types` from export, you can import enum or class by `import {} from 'react-native-agora'`
+  - optimize ts code and doc
+
 #### 3.0.1-rc.2
   - add `startPreview` `stopPreview`
 

diff --git a/README.md b/README.md
@@ -3,13 +3,19 @@
 [![npm](https://img.shields.io/npm/v/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
 [![npm](https://img.shields.io/npm/dm/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
 [![npm](https://img.shields.io/npm/dt/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
-[![npm](https://img.shields.io/npm/l/react-native-agora.svg)](https://github.com/syanbo/react-native-agora/blob/master/LICENSE)
-[![join chat](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg)](https://gitter.im/react-native-agora/community)
+[![npm](https://img.shields.io/npm/l/react-native-agora.svg)](LICENSE)
 
-The *react-native-agora* is an open-source wrapper for React Native developers. 
+[中文](README.zh.md)
 
 This SDK takes advantage of React Native and Agora RTC Video SDK on Android && iOS.
 
+## Community Contributor
+
+The community developer [Syanbo](https://github.com/syanbo) developed 1.0 version React Native SDK based on the Agora Native SDK from 2016 to 2017. As the community's demand for React Native SDK keeps growing, Agora has achieved official cooperation with Syanbo, this project now is officially maintained by Agora. Thanks to Syanbo for his long-term contributions to React Native SDK.
+
+## Release Note
+[Changelog](CHANGELOG.md)
+
 ## Installation
 
 ### Installing (React Native >= 0.60.0)
@@ -24,17 +30,18 @@ or
 npm i --save react-native-agora
 ```
 
-Go to your ios folder and run:
+Go to your **ios** folder and run:
 
 ```shell script
-cd ios
 pod install
 ```
 
 **_ IMPORTANT _**
 
 [Native Modules are now Autolinked.](https://github.com/react-native-community/cli/blob/master/docs/autolinking.md)
 
+[Migrating to Swift.](https://github.com/AgoraIO-Community/react-native-agora/blob/master/docs/v3/installation.ios.md#step-1-migrating-to-swift)
+
 ### Installing (React Native == 0.59.x)
 
 Install `react-native-agora`(^3.0.0):
@@ -92,7 +99,7 @@ The error log:
 [!] The 'xxx' target has libraries with conflicting names: libcrypto.a.
 ```
 
-You should disable Flipper, you can found it in the Podfile, and comment the code about Flipper in AppDelegate
+You should disable Flipper, you can found it in the Podfile, and comment the code about Flipper in AppDelegate.
 
 ```
   # Enables Flipper.
@@ -141,7 +148,7 @@ Source: https://github.com/facebook/react-native/issues/25154
 ## Resources
 
 * Complete [API Doc](https://docs.agora.io/en/) at the Developer Center
-* [File bugs about this sample](https://github.com/syanbo/react-native-agora/issues)
+* [File bugs about this sample](https://github.com/AgoraIO-Community/react-native-agora/issues)
 * [React Native Getting Started](https://facebook.github.io/react-native/docs/getting-started.html)
 
 License

diff --git a/README.zh.md b/README.zh.md
@@ -0,0 +1,175 @@
+# react-native-agora
+
+[![npm](https://img.shields.io/npm/v/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
+[![npm](https://img.shields.io/npm/dm/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
+[![npm](https://img.shields.io/npm/dt/react-native-agora.svg)](https://www.npmjs.com/package/react-native-agora)
+[![npm](https://img.shields.io/npm/l/react-native-agora.svg)](LICENSE)
+
+[English](README.md)
+
+此 SDK 基于 React Native 和 Agora Android 和 iOS 的视频 SDK 实现。
+
+## 社区贡献者
+
+声网社区开发者 [Syanbo](https://github.com/syanbo) 于 2016 年 - 2017 年期间，基于声网 Native SDK 独自完成了最初的 1.0 版本 React Native SDK。随着社区对于 React Native SDK 的需求增长，声网官方与 Syanbo 达成正式合作关系，目前该项目由声网官方进行更新维护。感谢 Syanbo 对于该项目长期以来的贡献。
+
+## 发版说明
+[变更日志](CHANGELOG.md)
+
+## 集成文档
+
+### 安装在 (React Native >= 0.60.0)
+
+安装 `react-native-agora`(^3.0.0)：
+
+```shell script
+yarn add react-native-agora
+```
+或者
+```shell script
+npm i --save react-native-agora
+```
+
+前往你的 **ios** 目录并执行:
+
+```shell script
+pod install
+```
+
+**_ 重要信息 _**
+
+[原生模块现在已经是自动链接](https://github.com/react-native-community/cli/blob/master/docs/autolinking.md)
+
+[迁移至Swift](https://github.com/AgoraIO-Community/react-native-agora/blob/master/docs/v3/installation.ios.md#step-1-migrating-to-swift)
+
+### 安装在 (React Native == 0.59.x)
+
+安装 `react-native-agora`(^3.0.0)：
+
+```shell script
+yarn add react-native-agora
+```
+或者
+```shell script
+npm i --save react-native-agora
+```
+
+**_ 重要信息 _**
+
+[Android 集成文档](./docs/v3/installation.android.md)
+
+[iOS 集成文档](./docs/v3/installation.ios.md)
+
+### 安装在 (React Native <= 0.58.x)
+
+**_ 重要信息 _**
+
+我们已经不再支持，你可以尝试老版本。
+
+[安装 `react-native-agora`(^1.0.0)](./docs/v1/README.md)
+
+[安装 `react-native-agora`(^2.0.0)](./docs/v2/README.md)
+
+## 如何使用
+
+```javascript
+import RtcEngine from 'react-native-agora';
+RtcEngine.create('YOUR APP ID');
+```
+或者
+```javascript
+const RtcEngine = require('react-native-agora');
+RtcEngine.create('YOUR APP ID');
+```
+
+## 使用 TypeScript
+
+我们建议你使用 TypeScript 进行开发，或者使用 TypeScript eslint 来检查你的代码。
+
+* [快速开始 TypeScript](https://reactnative.dev/docs/typescript#getting-started-with-typescript)
+* [将 TypeScript 添加至现有项目](https://reactnative.dev/docs/typescript#adding-typescript-to-an-existing-project)
+
+## 常见错误
+
+### Pod install 失败 (React Native >= 0.62.0) 
+
+错误日志：
+
+```
+[!] The 'xxx' target has libraries with conflicting names: libcrypto.a.
+```
+
+你应该禁用 Flipper， 你可以在 Podfile 中找到它， 并且注释掉 AppDelegate 中有关 Flipper 的代码。
+
+```
+  # Enables Flipper.
+  #
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
+  # you should disable these next few lines.
+  add_flipper_pods!
+  post_install do |installer|
+    flipper_post_install(installer)
+  end
+```
+
+### RCT_EXTERN_MODULE Swift modules broken in Xcode 10.2
+
+错误日志：
+
+```
+Swift class extensions and categories on Swift classes are not allowed to have +load methods
+```
+
+React Native 0.59.3 已修复。
+
+参考：https://github.com/facebook/react-native/issues/24139
+
+### XCode 11 Beta App Launch Crash
+
+错误日志：
+
+```
+Exception '*** -[__NSArrayM objectAtIndexedSubscript:]: index 1 beyond bounds [0 .. 0]' was thrown while invoking getCurrentAppState on target AppState with params (
+2,
+3
+)
+```
+
+React Native 0.59.9 已修复。
+
+参考：https://github.com/facebook/react-native/issues/25154
+
+## API文档
+
+* [React Native API](https://agoraio-community.github.io/react-native-agora/globals.html)
+* [Android API](https://docs.agora.io/en/Video/API%20Reference/java/index.html)
+* [iOS API](https://docs.agora.io/en/Video/API%20Reference/oc/docs/headers/Agora-Objective-C-API-Overview.html)
+
+## 资源
+
+* 完整的 [API Doc](https://docs.agora.io/cn/) 在开发者中心
+* [反馈问题](https://github.com/AgoraIO-Community/react-native-agora/issues)
+* [React Native 快速开始](https://facebook.github.io/react-native/docs/getting-started.html)
+
+开源许可
+--------
+
+    Copyright (c) 2020 syanbo luxuhui
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
diff --git a/android/src/main/java/io/agora/rtc/base/RtcSurfaceView.kt b/android/src/main/java/io/agora/rtc/base/RtcSurfaceView.kt
@@ -46,35 +46,42 @@ class RtcSurfaceView(
         }
     }
 
-    fun setRenderMode(engine: RtcEngine, @Annotations.AgoraVideoRenderMode renderMode: Int) {
-        canvas.renderMode = renderMode
-        setupRenderMode(engine)
-    }
+    fun setData(engine: RtcEngine, channel: RtcChannel?, uid: Int) {
+        resetVideoCanvas(engine)
 
-    fun setChannel(engine: RtcEngine, channel: RtcChannel?) {
         this.channel = if (channel != null) WeakReference(channel) else null
-        canvas.channelId = channel?.channelId()
+        canvas.channelId = this.channel?.get()?.channelId()
+        canvas.uid = uid
+        setupVideoCanvas(engine)
+    }
+
+    private fun resetVideoCanvas(engine: RtcEngine) {
+        val canvas = VideoCanvas(null, canvas.renderMode, canvas.channelId, canvas.uid, canvas.mirrorMode)
         if (canvas.uid == 0) {
             engine.setupLocalVideo(canvas)
         } else {
             engine.setupRemoteVideo(canvas)
         }
     }
 
-    fun setMirrorMode(engine: RtcEngine, @Annotations.AgoraVideoMirrorMode mirrorMode: Int) {
-        canvas.mirrorMode = mirrorMode
-        setupRenderMode(engine)
-    }
-
-    fun setUid(engine: RtcEngine, uid: Int) {
-        canvas.uid = uid
+    private fun setupVideoCanvas(engine: RtcEngine) {
         if (canvas.uid == 0) {
             engine.setupLocalVideo(canvas)
         } else {
             engine.setupRemoteVideo(canvas)
         }
     }
 
+    fun setRenderMode(engine: RtcEngine, @Annotations.AgoraVideoRenderMode renderMode: Int) {
+        canvas.renderMode = renderMode
+        setupRenderMode(engine)
+    }
+
+    fun setMirrorMode(engine: RtcEngine, @Annotations.AgoraVideoMirrorMode mirrorMode: Int) {
+        canvas.mirrorMode = mirrorMode
+        setupRenderMode(engine)
+    }
+
     private fun setupRenderMode(engine: RtcEngine) {
         if (canvas.uid == 0) {
             engine.setLocalRenderMode(canvas.renderMode, canvas.mirrorMode)

diff --git a/android/src/main/java/io/agora/rtc/base/RtcTextureView.kt b/android/src/main/java/io/agora/rtc/base/RtcTextureView.kt
@@ -22,8 +22,11 @@ class RtcTextureView(
         addView(texture)
     }
 
-    fun setChannel(engine: RtcEngine, channel: RtcChannel?) {
+    fun setData(engine: RtcEngine, channel: RtcChannel?, uid: Int) {
+        resetVideoRender(engine)
+
         this.channel = if (channel != null) WeakReference(channel) else null
+        this.uid = uid
         setupVideoRenderer(engine)
     }
 
@@ -32,22 +35,26 @@ class RtcTextureView(
         setupVideoRenderer(engine)
     }
 
-    fun setUid(engine: RtcEngine, uid: Int) {
-        this.uid = uid
-        setupVideoRenderer(engine)
+    private fun resetVideoRender(engine: RtcEngine) {
+        if (uid == 0) {
+            engine.setLocalVideoRenderer(null)
+        } else {
+            channel?.get()?.let {
+                it.setRemoteVideoRenderer(uid, null)
+                return@resetVideoRender
+            }
+            engine.setRemoteVideoRenderer(uid, null)
+        }
     }
 
     private fun setupVideoRenderer(engine: RtcEngine) {
         if (uid == 0) {
-            engine.setLocalVideoRenderer(null)
             engine.setLocalVideoRenderer(texture)
         } else {
             channel?.get()?.let {
-                it.setRemoteVideoRenderer(uid, null)
                 it.setRemoteVideoRenderer(uid, texture)
                 return@setupVideoRenderer
             }
-            engine.setRemoteVideoRenderer(uid, null)
             engine.setRemoteVideoRenderer(uid, texture)
         }
     }

diff --git a/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcSurfaceViewManager.kt b/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcSurfaceViewManager.kt
@@ -1,5 +1,6 @@
 package io.agora.rtc.react
 
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -33,26 +34,22 @@ class RCTAgoraRtcSurfaceViewManager : SimpleViewManager<RtcSurfaceView>() {
         view.setZOrderOnTop(onTop)
     }
 
+    @ReactProp(name = "data")
+    fun setData(view: RtcSurfaceView, data: ReadableMap) {
+        val channel = data.getString("channelId")?.let { getChannel(it) }
+        getEngine()?.let { view.setData(it, channel, data.getInt("uid")) }
+    }
+
     @ReactProp(name = "renderMode")
     fun setRenderMode(view: RtcSurfaceView, renderMode: Int) {
         getEngine()?.let { view.setRenderMode(it, renderMode) }
     }
 
-    @ReactProp(name = "channelId")
-    fun setChannelId(view: RtcSurfaceView, channelId: String) {
-        getEngine()?.let { view.setChannel(it, getChannel(channelId)) }
-    }
-
     @ReactProp(name = "mirrorMode")
     fun setMirrorMode(view: RtcSurfaceView, mirrorMode: Int) {
         getEngine()?.let { view.setMirrorMode(it, mirrorMode) }
     }
 
-    @ReactProp(name = "uid")
-    fun setUid(view: RtcSurfaceView, uid: Int) {
-        getEngine()?.let { view.setUid(it, uid) }
-    }
-
     private fun getEngine(): RtcEngine? {
         return reactContext?.getNativeModule(RCTAgoraRtcEngineModule::class.java)?.engine()
     }