Commit e344f1333209ea3a080c1ac3323276b15b673978

Authored by 朱显松
1 parent ea8dcf88

取消方法 stopStream(ActivityConfig) 统一调用 stopStream()

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,8 +30,6 @@ import com.cnlive.libs.stream.Streamer;
30 import com.cnlive.libs.stream.base.IStreamer; 30 import com.cnlive.libs.stream.base.IStreamer;
31 import com.cnlive.libs.stream.model.ActivityConfig; 31 import com.cnlive.libs.stream.model.ActivityConfig;
32 32
33 -import java.util.Timer;  
34 -  
35 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE; 33 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
36 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P; 34 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
37 import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE; 35 import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
@@ -261,7 +259,7 @@ public class StreamActivity extends Activity { @@ -261,7 +259,7 @@ public class StreamActivity extends Activity {
261 //TODO 结束推流 259 //TODO 结束推流
262 private void stopStream() { 260 private void stopStream() {
263 261
264 - mStreamer.stopStream(activityConfig); 262 + mStreamer.stopStream();
265 mChronometer.stop(); 263 mChronometer.stop();
266 mShootingText.setText(START_STRING); 264 mShootingText.setText(START_STRING);
267 mShootingText.postInvalidate(); 265 mShootingText.postInvalidate();
@@ -355,7 +353,7 @@ public class StreamActivity extends Activity { @@ -355,7 +353,7 @@ public class StreamActivity extends Activity {
355 public void onClick(DialogInterface arg0, int arg1) { 353 public void onClick(DialogInterface arg0, int arg1) {
356 mChronometer.stop(); 354 mChronometer.stop();
357 mRecording = false; 355 mRecording = false;
358 - mStreamer.stopStream(activityConfig); 356 + mStreamer.stopStream();
359 StreamActivity.this.finish(); 357 StreamActivity.this.finish();
360 } 358 }
361 }).show(); 359 }).show();