Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNStreamDemo

Conflicts: app/libs/libcnlivestream.jar app/libs/libcnliveutil.jar

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/CNStreamDemo
Conflicts: app/libs/libcnlivestream.jar app/libs/libcnliveutil.jar
朱显松
2 parents e344f133 d3231b3e
Showing 3 changed files with 2 additions and 2 deletions
.idea/misc.xml
app/src/main/java/com/cnlive/demo/stream/MainActivity.java
doc/推流Android SDK 说明文档.pdf
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -58,7 +58,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 }
                 if (!TextUtils.isEmpty(channelId.getText().toString())) {
-                    channelID = activityId.getText().toString();
+                    channelID = channelId.getText().toString();
                 }
                 landscape = mLandscapeButton.isChecked();
                 StreamActivity.startActivity(getApplicationContext(), 0, activityID, channelID, landscape);