更新推流SDK，完善重试功能，更新说明文档

王琳
1 parent 8f4d702e
Showing 5 changed files with 32 additions and 1 deletions
app/libs/libcnlivestream.jar
app/src/main/java/com/cnlive/demo/stream/AudioActivity.java
app/src/main/java/com/cnlive/demo/stream/CNStreamActivity.java
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
doc/推流SDK说明文档.pdf
@@ -95,6 +95,8 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
         mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE);
         //设置纯音频推流
         mStreamer.setAudioOnly(true);
+//        //设置自动重连(是否开启重连/重连次数/重连时间间隔)
+//        mStreamer.setEnableAutoRestart(true, 3, 3000);
         //设置Info回调，可以收到相关通知信息
         mStreamer.setOnInfoListener(mOnInfoListener);
         //设置错误回调，收到该回调后，一般是发生了严重错误，比如网络断开等
@@ -336,6 +338,15 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
                     //系统Camera服务进程退出
                     Log.d(TAG, "cnstream_camera_error_server_died");
                     break;
+                case IStreamer.cnstream_error_already_over:
+                    //直播已结束
+                    Log.d(TAG, "cnstream_error_already_over");
+                    break;
+//                case IStreamer.cnstream_auto_restart_failed:
+//                    //如果开启自动重连则会有此回调
+//                    //自动重连失败
+//                    Log.d(TAG, "cnstream_auto_restart_failed");
+//                    break;
                 default:
                     Log.d(TAG, "what= " + what + " msg1= " + msg1 + " msg2= " + msg2);
                     break;
@@ -422,7 +433,7 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
                 }).setPositiveButton("确定", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int which) {
-                        switch (which){
+                        switch (which) {
                             case 0:
                                 mStreamer.setAudioFilter(IStreamer.AUDIO_REVERB_LEVEL_1);
                                 break;
@@ -345,6 +345,15 @@ public class CNStreamActivity extends AppCompatActivity implements View.OnClickL
                     //系统Camera服务进程退出
                     Log.d(TAG, "cnstream_camera_error_server_died");
                     break;
+                case IStreamer.cnstream_error_already_over:
+                    //直播已结束
+                    Log.d(TAG, "cnstream_error_already_over");
+                    break;
+//                case IStreamer.cnstream_auto_restart_failed:
+//                    //如果开启自动重连则会有此回调
+//                    //自动重连失败
+//                    Log.d(TAG, "cnstream_auto_restart_failed");
+//                    break;
                 default:
                     Log.d(TAG, "what= " + what + " msg1= " + msg1 + " msg2= " + msg2);
                     break;
@@ -235,6 +235,8 @@ public class StreamActivity extends Activity {
         mStreamer.setMuteAudio(mMuteCheckBox.isChecked());
         //耳返 默认不开启
         mStreamer.setEnableAudioPreview(mAudioPreviewCheckBox.isChecked());
+//        //设置自动重连(是否开启重连/重连次数/重连时间间隔)
+//        mStreamer.setEnableAutoRestart(true, 3, 3000);
         //设置Info回调，可以收到相关通知信息
         mStreamer.setOnInfoListener(mOnInfoListener);
         //设置错误回调，收到该回调后，一般是发生了严重错误，比如网络断开等
@@ -811,6 +813,15 @@ public class StreamActivity extends Activity {
                     //系统Camera服务进程退出
                     Log.d(TAG, "cnstream_camera_error_server_died");
                     break;
+                case IStreamer.cnstream_error_already_over:
+                    //直播已结束
+                    Log.d(TAG, "cnstream_error_already_over");
+                    break;
+//                case IStreamer.cnstream_auto_restart_failed:
+//                    //如果开启自动重连则会有此回调
+//                    //自动重连失败
+//                    Log.d(TAG, "cnstream_auto_restart_failed");
+//                    break;
                 default:
                     Log.d(TAG, "what= " + what + " msg1= " + msg1 + " msg2= " + msg2);
                     break;