Merge pull request #115 from chandarlee/v1.10.0

V1.10.0
netease-kit · Jul 12, 2021 · 0ace6f2 · 0ace6f2
2 parents b12ff42 + baac486
commit 0ace6f2
Show file tree

Hide file tree

Showing 159 changed files with 3,306 additions and 258 deletions.
diff --git a/SampleCode/Android/app/build.gradle b/SampleCode/Android/app/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     implementation 'com.google.android:flexbox:2.0.1'
 
     //NEMeeting-SDK
-    implementation 'com.netease.yunxin:meetinglib:1.9.0'
+    implementation 'com.netease.yunxin:meetinglib:1.10.0'
 
     //NIM-SDK, 如果单独接入了云信NIM，或者需要依赖指定的NIM版本，则可根据需要进行依赖声明。
     //正常情况下不用声明

diff --git a/SampleCode/iOS/Podfile b/SampleCode/iOS/Podfile
@@ -5,7 +5,7 @@ target 'NEMeetingDemo' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
 
-  pod 'NEMeetingSDK', '~> 1.9.0'
+  pod 'NEMeetingSDK', '~> 1.10.0'
   pod 'XLForm', '~> 4.1.0'
   pod 'IQKeyboardManager', '~> 6.5.6'
   pod 'Masonry', '~> 1.1.0'

diff --git a/docs/android/META-INF/MANIFEST.MF b/docs/android/META-INF/MANIFEST.MF
diff --git a/docs/android/allclasses-frame.html b/docs/android/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>所有类 (sdk_deployer 1.9.0 API)</title>
+<title>所有类 (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -45,6 +45,8 @@ <h1 class="bar">所有类</h1>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingOnInjectedMenuItemClickListener.html" title="com.netease.meetinglib.sdk中的接口" target="classFrame"><span class="interfaceName">NEMeetingOnInjectedMenuItemClickListener</span></a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingOptions.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">NEMeetingOptions</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingParams.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">NEMeetingParams</a></li>
+<li><a href="com/netease/meetinglib/sdk/NEMeetingRoleConfiguration.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">NEMeetingRoleConfiguration</a></li>
+<li><a href="com/netease/meetinglib/sdk/NEMeetingScene.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">NEMeetingScene</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingSDK.html" title="com.netease.meetinglib.sdk中的接口" target="classFrame"><span class="interfaceName">NEMeetingSDK</span></a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingSDKConfig.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">NEMeetingSDKConfig</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingService.html" title="com.netease.meetinglib.sdk中的接口" target="classFrame"><span class="interfaceName">NEMeetingService</span></a></li>
@@ -69,6 +71,7 @@ <h1 class="bar">所有类</h1>
 <li><a href="com/netease/meetinglib/sdk/control/NETCProtocolUpgrade.html" title="com.netease.meetinglib.sdk.control中的类" target="classFrame">NETCProtocolUpgrade</a></li>
 <li><a href="com/netease/meetinglib/sdk/control/NEUnbindType.html" title="com.netease.meetinglib.sdk.control中的类" target="classFrame">NEUnbindType</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEWindowMode.html" title="com.netease.meetinglib.sdk中的枚举" target="classFrame">NEWindowMode</a></li>
+<li><a href="com/netease/meetinglib/sdk/RoleType.html" title="com.netease.meetinglib.sdk中的类" target="classFrame">RoleType</a></li>
 </ul>
 </div>
 </body>

diff --git a/docs/android/allclasses-noframe.html b/docs/android/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>所有类 (sdk_deployer 1.9.0 API)</title>
+<title>所有类 (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -45,6 +45,8 @@ <h1 class="bar">所有类</h1>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingOnInjectedMenuItemClickListener.html" title="com.netease.meetinglib.sdk中的接口"><span class="interfaceName">NEMeetingOnInjectedMenuItemClickListener</span></a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingOptions.html" title="com.netease.meetinglib.sdk中的类">NEMeetingOptions</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingParams.html" title="com.netease.meetinglib.sdk中的类">NEMeetingParams</a></li>
+<li><a href="com/netease/meetinglib/sdk/NEMeetingRoleConfiguration.html" title="com.netease.meetinglib.sdk中的类">NEMeetingRoleConfiguration</a></li>
+<li><a href="com/netease/meetinglib/sdk/NEMeetingScene.html" title="com.netease.meetinglib.sdk中的类">NEMeetingScene</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingSDK.html" title="com.netease.meetinglib.sdk中的接口"><span class="interfaceName">NEMeetingSDK</span></a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingSDKConfig.html" title="com.netease.meetinglib.sdk中的类">NEMeetingSDKConfig</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEMeetingService.html" title="com.netease.meetinglib.sdk中的接口"><span class="interfaceName">NEMeetingService</span></a></li>
@@ -69,6 +71,7 @@ <h1 class="bar">所有类</h1>
 <li><a href="com/netease/meetinglib/sdk/control/NETCProtocolUpgrade.html" title="com.netease.meetinglib.sdk.control中的类">NETCProtocolUpgrade</a></li>
 <li><a href="com/netease/meetinglib/sdk/control/NEUnbindType.html" title="com.netease.meetinglib.sdk.control中的类">NEUnbindType</a></li>
 <li><a href="com/netease/meetinglib/sdk/NEWindowMode.html" title="com.netease.meetinglib.sdk中的枚举">NEWindowMode</a></li>
+<li><a href="com/netease/meetinglib/sdk/RoleType.html" title="com.netease.meetinglib.sdk中的类">RoleType</a></li>
 </ul>
 </div>
 </body>

diff --git a/docs/android/com/netease/meetinglib/sdk/NEAccountInfo.html b/docs/android/com/netease/meetinglib/sdk/NEAccountInfo.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEAccountInfo (sdk_deployer 1.9.0 API)</title>
+<title>NEAccountInfo (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEAccountInfo (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEAccountInfo (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEAccountService.html b/docs/android/com/netease/meetinglib/sdk/NEAccountService.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEAccountService (sdk_deployer 1.9.0 API)</title>
+<title>NEAccountService (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEAccountService (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEAccountService (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEAuthListener.html b/docs/android/com/netease/meetinglib/sdk/NEAuthListener.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEAuthListener (sdk_deployer 1.9.0 API)</title>
+<title>NEAuthListener (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEAuthListener (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEAuthListener (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NECallback.html b/docs/android/com/netease/meetinglib/sdk/NECallback.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NECallback (sdk_deployer 1.9.0 API)</title>
+<title>NECallback (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NECallback (sdk_deployer 1.9.0 API)";
+            parent.document.title="NECallback (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEHistoryMeetingItem.html b/docs/android/com/netease/meetinglib/sdk/NEHistoryMeetingItem.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEHistoryMeetingItem (sdk_deployer 1.9.0 API)</title>
+<title>NEHistoryMeetingItem (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEHistoryMeetingItem (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEHistoryMeetingItem (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEInMeetingUserInfo.html b/docs/android/com/netease/meetinglib/sdk/NEInMeetingUserInfo.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEInMeetingUserInfo (sdk_deployer 1.9.0 API)</title>
+<title>NEInMeetingUserInfo (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEInMeetingUserInfo (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEInMeetingUserInfo (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {
@@ -130,10 +130,14 @@ <h3>字段概要</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#userId">userId</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#tag">tag</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#userId">userId</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#userName">userName</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -151,8 +155,9 @@ <h3>构造器概要</h3>
 <th class="colOne" scope="col">构造器和说明</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#NEInMeetingUserInfo-java.lang.String-java.lang.String-">NEInMeetingUserInfo</a></span>(java.lang.String&nbsp;userId,
-                   java.lang.String&nbsp;userName)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../com/netease/meetinglib/sdk/NEInMeetingUserInfo.html#NEInMeetingUserInfo-java.lang.String-java.lang.String-java.lang.String-">NEInMeetingUserInfo</a></span>(java.lang.String&nbsp;userId,
+                   java.lang.String&nbsp;userName,
+                   java.lang.String&nbsp;tag)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -207,12 +212,21 @@ <h4>userId</h4>
 <a name="userName">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>userName</h4>
 <pre>public final&nbsp;java.lang.String userName</pre>
 </li>
 </ul>
+<a name="tag">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tag</h4>
+<pre>public final&nbsp;java.lang.String tag</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -221,14 +235,15 @@ <h4>userName</h4>
 <!--   -->
 </a>
 <h3>构造器详细资料</h3>
-<a name="NEInMeetingUserInfo-java.lang.String-java.lang.String-">
+<a name="NEInMeetingUserInfo-java.lang.String-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NEInMeetingUserInfo</h4>
 <pre>public&nbsp;NEInMeetingUserInfo(java.lang.String&nbsp;userId,
-                           java.lang.String&nbsp;userName)</pre>
+                           java.lang.String&nbsp;userName,
+                           java.lang.String&nbsp;tag)</pre>
 </li>
 </ul>
 </li>

diff --git a/docs/android/com/netease/meetinglib/sdk/NEJoinMeetingOptions.html b/docs/android/com/netease/meetinglib/sdk/NEJoinMeetingOptions.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEJoinMeetingOptions (sdk_deployer 1.9.0 API)</title>
+<title>NEJoinMeetingOptions (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEJoinMeetingOptions (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEJoinMeetingOptions (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEJoinMeetingParams.html b/docs/android/com/netease/meetinglib/sdk/NEJoinMeetingParams.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEJoinMeetingParams (sdk_deployer 1.9.0 API)</title>
+<title>NEJoinMeetingParams (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEJoinMeetingParams (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEJoinMeetingParams (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {
@@ -140,7 +140,7 @@ <h3>字段概要</h3>
 <!--   -->
 </a>
 <h3>从类继承的字段&nbsp;com.netease.meetinglib.sdk.<a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html" title="com.netease.meetinglib.sdk中的类">NEMeetingParams</a></h3>
-<code><a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html#displayName">displayName</a>, <a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html#meetingId">meetingId</a></code></li>
+<code><a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html#displayName">displayName</a>, <a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html#meetingId">meetingId</a>, <a href="../../../../com/netease/meetinglib/sdk/NEMeetingParams.html#tag">tag</a></code></li>
 </ul>
 </li>
 </ul>

diff --git a/docs/android/com/netease/meetinglib/sdk/NELogLevel.html b/docs/android/com/netease/meetinglib/sdk/NELogLevel.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NELogLevel (sdk_deployer 1.9.0 API)</title>
+<title>NELogLevel (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NELogLevel (sdk_deployer 1.9.0 API)";
+            parent.document.title="NELogLevel (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NELoggerConfig.html b/docs/android/com/netease/meetinglib/sdk/NELoggerConfig.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NELoggerConfig (sdk_deployer 1.9.0 API)</title>
+<title>NELoggerConfig (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NELoggerConfig (sdk_deployer 1.9.0 API)";
+            parent.document.title="NELoggerConfig (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEMeetingCode.html b/docs/android/com/netease/meetinglib/sdk/NEMeetingCode.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEMeetingCode (sdk_deployer 1.9.0 API)</title>
+<title>NEMeetingCode (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEMeetingCode (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEMeetingCode (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEMeetingError.html b/docs/android/com/netease/meetinglib/sdk/NEMeetingError.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEMeetingError (sdk_deployer 1.9.0 API)</title>
+<title>NEMeetingError (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEMeetingError (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEMeetingError (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {

diff --git a/docs/android/com/netease/meetinglib/sdk/NEMeetingIdDisplayOption.html b/docs/android/com/netease/meetinglib/sdk/NEMeetingIdDisplayOption.html
@@ -3,15 +3,15 @@
 <html lang="zh">
 <head>
 <!-- Generated by javadoc -->
-<title>NEMeetingIdDisplayOption (sdk_deployer 1.9.0 API)</title>
+<title>NEMeetingIdDisplayOption (sdk_deployer 1.10.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NEMeetingIdDisplayOption (sdk_deployer 1.9.0 API)";
+            parent.document.title="NEMeetingIdDisplayOption (sdk_deployer 1.10.0 API)";
         }
     }
     catch(err) {