Commit e344f1333209ea3a080c1ac3323276b15b673978
1 parent
ea8dcf88
取消方法 stopStream(ActivityConfig) 统一调用 stopStream()
Showing
3 changed files
with
2 additions
and
4 deletions
app/libs/libcnlivestream.jar
No preview for this file type
app/libs/libcnliveutil.jar
No preview for this file type
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
| ... | ... | @@ -30,8 +30,6 @@ import com.cnlive.libs.stream.Streamer; |
| 30 | 30 | import com.cnlive.libs.stream.base.IStreamer; |
| 31 | 31 | import com.cnlive.libs.stream.model.ActivityConfig; |
| 32 | 32 | |
| 33 | -import java.util.Timer; | |
| 34 | - | |
| 35 | 33 | import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; |
| 36 | 34 | import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; |
| 37 | 35 | import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE; |
| ... | ... | @@ -261,7 +259,7 @@ public class StreamActivity extends Activity { |
| 261 | 259 | //TODO 结束推流 |
| 262 | 260 | private void stopStream() { |
| 263 | 261 | |
| 264 | - mStreamer.stopStream(activityConfig); | |
| 262 | + mStreamer.stopStream(); | |
| 265 | 263 | mChronometer.stop(); |
| 266 | 264 | mShootingText.setText(START_STRING); |
| 267 | 265 | mShootingText.postInvalidate(); |
| ... | ... | @@ -355,7 +353,7 @@ public class StreamActivity extends Activity { |
| 355 | 353 | public void onClick(DialogInterface arg0, int arg1) { |
| 356 | 354 | mChronometer.stop(); |
| 357 | 355 | mRecording = false; |
| 358 | - mStreamer.stopStream(activityConfig); | |
| 356 | + mStreamer.stopStream(); | |
| 359 | 357 | StreamActivity.this.finish(); |
| 360 | 358 | } |
| 361 | 359 | }).show(); | ... | ... |