Commit e43bd08761100c5b53f9887ffb785d926de32a9c
1 parent
31c2f5b4
添加活动创建完成事件
Showing
7 changed files
with
7 additions
and
3 deletions
.idea/modules.xml
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ProjectModuleManager"> | 3 | <component name="ProjectModuleManager"> |
| 4 | <modules> | 4 | <modules> |
| 5 | + <module fileurl="file://$PROJECT_DIR$/CNStreamDemo.iml" filepath="$PROJECT_DIR$/CNStreamDemo.iml" /> | ||
| 5 | <module fileurl="file://$PROJECT_DIR$/StreamDemo.iml" filepath="$PROJECT_DIR$/StreamDemo.iml" /> | 6 | <module fileurl="file://$PROJECT_DIR$/StreamDemo.iml" filepath="$PROJECT_DIR$/StreamDemo.iml" /> |
| 6 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | 7 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
| 7 | </modules> | 8 | </modules> |
app/libs/libcnlivestream.jar
No preview for this file type
app/libs/libcnliveutil.jar
No preview for this file type
app/libs/libcnlivevideo.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
| @@ -184,6 +184,9 @@ public class StreamActivity extends Activity { | @@ -184,6 +184,9 @@ public class StreamActivity extends Activity { | ||
| 184 | //初始化完成 后开始直播推流等操作 | 184 | //初始化完成 后开始直播推流等操作 |
| 185 | initDone = true; | 185 | initDone = true; |
| 186 | break; | 186 | break; |
| 187 | + case StreamConfig.cnstream_create_stream_done: | ||
| 188 | + //创建直播活动完成 | ||
| 189 | + break; | ||
| 187 | case StreamConfig.cnstream_init_error_instop: | 190 | case StreamConfig.cnstream_init_error_instop: |
| 188 | //初始化失败 正在停止播放 | 191 | //初始化失败 正在停止播放 |
| 189 | break; | 192 | break; |
build.gradle
| @@ -5,7 +5,7 @@ buildscript { | @@ -5,7 +5,7 @@ buildscript { | ||
| 5 | jcenter() | 5 | jcenter() |
| 6 | } | 6 | } |
| 7 | dependencies { | 7 | dependencies { |
| 8 | - classpath 'com.android.tools.build:gradle:2.1.0' | 8 | + classpath 'com.android.tools.build:gradle:2.1.3' |
| 9 | 9 | ||
| 10 | // NOTE: Do not place your application dependencies here; they belong | 10 | // NOTE: Do not place your application dependencies here; they belong |
| 11 | // in the individual module build.gradle files | 11 | // in the individual module build.gradle files |
gradle/wrapper/gradle-wrapper.properties
| 1 | -#Mon Dec 28 10:00:20 PST 2015 | 1 | +#Wed Sep 14 18:44:41 CST 2016 |
| 2 | distributionBase=GRADLE_USER_HOME | 2 | distributionBase=GRADLE_USER_HOME |
| 3 | distributionPath=wrapper/dists | 3 | distributionPath=wrapper/dists |
| 4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |
| 6 | -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | 6 | +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |