更新推流SDK,添加视讯云推流逻辑demo

王琳
1 parent fd2149c2
Showing 7 changed files with 559 additions and 51 deletions
app/libs/libcnlivestream.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/stream/CNStreamActivity.java
app/src/main/java/com/cnlive/demo/stream/MainActivity.java
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
app/src/main/res/layout/activity_cnstream.xml
app/src/main/res/layout/activity_main.xml
@@ -36,6 +36,11 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".CNStreamActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"></activity>
     </application>
 </manifest>
 \ No newline at end of file
+package com.cnlive.demo.stream;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.opengl.GLSurfaceView;
+import android.os.Build;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.cnlive.libs.stream.Streamer;
+import com.cnlive.libs.stream.base.IStreamer;
+import com.cnlive.libs.stream.model.ActivityConfig;
+
+import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
+import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
+
+/**
+ * CNStreamActivity 本Activity主要展示的是视讯云推流SDK的使用方法，对于一些其他的设置（如：摄像头转换、美颜等）请参考StreamActivity
+ */
+public class CNStreamActivity extends AppCompatActivity implements View.OnClickListener {
+    private static final String TAG = "CNStreamActivity";
+    private GLSurfaceView surfaceView;
+    private Button button;
+
+    private Streamer mStreamer;
+
+    private String activityId;
+    private String channelId;
+    private final static int PERMISSION_REQUEST_CAMERA_AUDIOREC = 1;
+    private boolean mRecording = false;
+
+    public static final String ACTIVITYID = "activityId";
+    public static final String CHANNELID = "channelId";
+
+    public static void startActivity(Context context,
+                                     String activityID,
+                                     String channelID) {
+        Intent intent = new Intent(context, CNStreamActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(ACTIVITYID, activityID);
+        intent.putExtra(CHANNELID, channelID);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_cnstream);
+        initView();
+        initData();
+        initStream();
+    }
+
+
+    /**
+     * 初始化view
+     */
+    private void initView() {
+        surfaceView = (GLSurfaceView) findViewById(R.id.cnSurfaceView);
+        button = (Button) findViewById(R.id.startStream);
+    }
+
+    /**
+     * 得到到推流所需的参数
+     */
+    private void initData() {
+        Bundle bundle = getIntent().getExtras();
+        activityId = bundle.getString(ACTIVITYID);
+        channelId = bundle.getString(CHANNELID);
+    }
+
+    /**
+     * 初始化推流SDK，设置一些推流所需的基本参数
+     */
+    private void initStream() {
+        //初始化推流SDK
+        mStreamer = new Streamer(this);
+        //设置预览编码帧率
+        mStreamer.setPreviewFps(15);
+        //设置推流编码帧率
+        mStreamer.setTargetFps(15);
+        //设置初始、最大、最小视频码率
+        mStreamer.setVideoKBitrate(800 * 3 / 4, 800, 800 / 4);
+        //设置音频编码码率
+        mStreamer.setAudioBitrate(48);
+        //分别设置预览和推流分辨率
+        mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P);
+        mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P);
+        //设置编码模式（硬编/软编/软编兼容）
+        mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE);
+
+        //设置预览View
+        mStreamer.setDisplayPreview(surfaceView);
+        //设置Info回调，可以收到相关通知信息
+        mStreamer.setOnInfoListener(mOnInfoListener);
+        //设置错误回调，收到该回调后，一般是发生了严重错误，比如网络断开等
+        mStreamer.setOnErrorListener(mOnErrorListener);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.startStream:
+                //开始或结束推流
+                if (mRecording) {
+                    stopStream();
+                } else {
+                    startStream();
+                }
+                break;
+        }
+    }
+
+    /**
+     * 开始推流
+     */
+    private void startStream() {
+        mStreamer.startStream(activityConfig);
+        button.setText("结束推流");
+        mRecording = true;
+    }
+
+    /**
+     * 结束推流
+     */
+    private void stopStream() {
+        mStreamer.stopStream();
+        button.setText("开始推流");
+        mRecording = false;
+    }
+
+    /**
+     * 点击退出当前页面
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                mRecording = false;
+                mStreamer.stopStream();
+                CNStreamActivity.this.finish();
+                break;
+            default:
+                break;
+        }
+        return true;
+    }
+
+
+    /**
+     * 采集的状态依赖于 Activity 的生命周期，所以必须在 Activity 的生命周期中也调用 SDK 相应的接口
+     */
+    @Override
+    public void onResume() {
+        super.onResume();
+        startCameraPreviewWithPermCheck();
+        mStreamer.resume();
+    }
+
+    public void onPause() {
+        super.onPause();
+        mStreamer.pause();
+        //停止照相机预览
+        mStreamer.stopCameraPreview();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mStreamer.release();
+    }
+
+    /**
+     * 摄像头权限检测
+     */
+    private void startCameraPreviewWithPermCheck() {
+        int cameraPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
+        int audioPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
+        if (cameraPerm != PackageManager.PERMISSION_GRANTED ||
+                audioPerm != PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                Log.e(TAG, "No CAMERA or AudioRecord permission, please check");
+                Toast.makeText(this, "No CAMERA or AudioRecord permission, please check",
+                        Toast.LENGTH_LONG).show();
+            } else {
+                String[] permissions = {Manifest.permission.CAMERA,
+                        Manifest.permission.RECORD_AUDIO,
+                        Manifest.permission.READ_EXTERNAL_STORAGE};
+                ActivityCompat.requestPermissions(this, permissions,
+                        PERMISSION_REQUEST_CAMERA_AUDIOREC);
+            }
+        } else {
+            mStreamer.startCameraPreview();
+        }
+    }
+
+    /**
+     * 推流状态回调
+     */
+    private IStreamer.OnInfoListener mOnInfoListener = new IStreamer.OnInfoListener() {
+        @Override
+        public void onInfo(int what, int msg1, int msg2) {
+            Toast.makeText(CNStreamActivity.this, TAG + "   " + what, Toast.LENGTH_SHORT).show();
+            switch (what) {
+                case IStreamer.cnstream_camera_init_done:
+                    //初始化完毕
+                    Log.d(TAG, "cnstream_camera_init_done");
+                    break;
+                case IStreamer.cnstream_open_stream_succ:
+                    //推流成功
+                    Log.d(TAG, "cnstream_open_stream_success");
+                    break;
+                case IStreamer.cnstream_frame_send_slow:
+                    //网络状态不佳，数据发送可能有延迟  发送当前帧的时长
+                    Log.d(TAG, "cnstream_frame_send_slow");
+                    Toast.makeText(CNStreamActivity.this, "Network not good!", Toast.LENGTH_SHORT).show();
+                    break;
+                case IStreamer.cnstream_est_bw_raise:
+                    //码率上调了	码率上调的目标值 单位bps
+                    Log.d(TAG, "BW raise to" + msg1 / 1000 + "kbps");
+                    break;
+                case IStreamer.cnstream_est_bw_drop:
+                    //码率下调了	码率下调到的值 单位bps
+                    Log.d(TAG, "BW drop to" + msg1 / 1000 + "kbps");
+                    break;
+                default:
+                    Log.d(TAG, "OnInfo: " + what + " msg1 " + msg1 + " msg2 " + msg2);
+                    break;
+            }
+        }
+    };
+
+    /**
+     * 推流错误回调
+     */
+    private IStreamer.OnErrorListener mOnErrorListener = new IStreamer.OnErrorListener() {
+        @Override
+        public void onError(int what, int msg1, int msg2) {
+
+            /**
+             * 判断是否有异常，如果有SDK内部会停止推流；开发人员根据自己的需求可以做一些自己的操作；
+             * 本demo中改变了按钮的状态，让其从推流状态改为停止推流状态，这样点击按钮则可以继续进行推流
+             */
+            if (what < 0) {
+                mRecording = false;
+                button.setText("开始直播");
+                button.postInvalidate();
+            }
+
+            Toast.makeText(CNStreamActivity.this, TAG + "   " + what, Toast.LENGTH_SHORT).show();
+            switch (what) {
+                case IStreamer.cnstream_error_start_stream_server:
+                    //开始直播时请求服务器失败
+                    break;
+                case IStreamer.cnstream_error_start_stream_network:
+                    //开始直播时网络连接失败
+                    break;
+                case IStreamer.cnstream_error_start_stream_other:
+                    //开始直播活动失败
+                    break;
+                case IStreamer.cnstream_error_create_stream_server:
+                    //创建直播活动请求服务器失败
+                    break;
+                case IStreamer.cnstream_error_create_stream_network:
+                    //创建直播活动时网络连接失败
+                    break;
+                case IStreamer.cnstream_error_create_stream_other:
+                    //创建直播活动时失败
+                    break;
+                case IStreamer.cnstream_record_error:
+                    //直播录制失败
+                    break;
+                case IStreamer.cnstream_error_stop_stream:
+                    //停止直播活动失败
+                    break;
+                case IStreamer.cnstream_socket_disconnect:
+                    //推流Socket异常断开
+                    break;
+                case IStreamer.cnstream_init_error_instop:
+                    //初始化失败 正在停止推流
+                    break;
+                case IStreamer.cnstream_error_dns_parse_failed:
+                    //url域名解析失败
+                    Log.d(TAG, "cnstream_error_dns_parse_failed");
+                    break;
+                case IStreamer.cnstream_error_connect_failed:
+                    //网络连接失败，无法建立连接
+                    Log.d(TAG, "cnstream_error_connect_failed");
+                    break;
+                case IStreamer.cnstream_error_publish_failed:
+                    //跟RTMP服务器完成握手后,向{streamname}推流失败)
+                    Log.d(TAG, "cnstream_error_publish_failed");
+                    break;
+                case IStreamer.cnstream_error_connect_breaked:
+                    //网络连接断开
+                    Log.d(TAG, "cnstream_error_connect_breaked");
+                    break;
+                case IStreamer.cnstream_error_av_async:
+                    //音视频采集pts差值超过5s	音视频采集pts具体差值，单位ms
+                    Log.d(TAG, "cnstream_error_av_async " + msg1 + " ms");
+                    break;
+                case IStreamer.cnstream_video_encoder_error_unsupported:
+                    //编码器初始化失败
+                    Log.d(TAG, "cnstream_video_encoder_error_unsupported");
+                    break;
+                case IStreamer.cnstream_video_encoder_error_unknown:
+                    //视频编码失败
+                    Log.d(TAG, "cnstream_video_encoder_error_unknown");
+                    break;
+                case IStreamer.cnstream_audio_encoder_error_unsupported:
+                    //音频初始化失败
+                    Log.d(TAG, "cnstream_audio_encoder_error_unsupported");
+                    break;
+                case IStreamer.cnstream_audio_encoder_error_unknown:
+                    //音频编码失败
+                    Log.d(TAG, "cnstream_audio_encoder_error_unknown");
+                    break;
+                case IStreamer.cnstream_audio_recorder_error_start_failed:
+                    //录音开启失败
+                    Log.d(TAG, "cnstream_audio_recorder_error_start_failed");
+                    break;
+                case IStreamer.cnstream_audio_recorder_error_unknown:
+                    //录音开启未知错误
+                    Log.d(TAG, "cnstream_audio_recorder_error_unknown");
+                    break;
+                case IStreamer.cnstream_camera_error_unknown:
+                    //摄像头未知错误
+                    Log.d(TAG, "cnstream_camera_error_unknown");
+                    break;
+                case IStreamer.cnstream_camera_error_start_failed:
+                    //打开摄像头失败
+                    Log.d(TAG, "cnstream_camera_error_start_failed");
+                    break;
+                case IStreamer.cnstream_camera_error_server_died:
+                    //系统Camera服务进程退出
+                    Log.d(TAG, "cnstream_camera_error_server_died");
+                    break;
+                default:
+                    Log.d(TAG, "what= " + what + " msg1= " + msg1 + " msg2= " + msg2);
+                    break;
+            }
+        }
+    };
+
+    /**
+     * 设置推流参数（注意：必传参数为activityId、channelId）
+     */
+    ActivityConfig activityConfig = new ActivityConfig() {
+        @Override
+        public String getActivityID() {
+            //活动ID，确保SP下的唯一性(即appId唯一) ，不能含下划线，不支持转义字符和urlencode会处理的特殊字符，如下！ # $ % & ‘ （ ）* + , . / : ; = ? @ [ / ]
+            return activityId;
+        }
+
+        @Override
+        public String getActivityName() {
+            //活动名称
+            return "";
+        }
+
+        @Override
+        public int getActivityStatus() {
+            //活动状态，0：未开始 ／1：已开始 ／2：已结束 ／3 已下线，默认为0
+            return 0;
+        }
+
+        @Override
+        public int getIsHorizontalScreen() {
+            //屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1
+            return 0;
+        }
+
+        @Override
+        public String getChannelID() {
+            //播放通道；PGC业务：平台分配／ UGC业务：主播ID生成，确保SP下的唯一性，不能含下划线，不支持转义字符和urlencode会处理的特殊字符，如下！ # $ % & ‘ （ ）* + , . / : ; = ? @ [ / ]
+            return channelId;
+        }
+
+        @Override
+        public String getCoverImgUrl() {
+            //活动封面
+            return "";
+        }
+
+        @Override
+        public String getActivityCategory() {
+            //活动分类ID
+            return "";
+        }
+
+        @Override
+        public String getExtensions() {
+            //扩展字段，参数格式为Map对象的Json字符串（主播昵称、头像、）
+            return "";
+        }
+
+        @Override
+        public String getUuid() {
+            return "";
+        }
+
+        @Override
+        public String getCallbackAcitvityStatushttpPostUrl() {
+            //回调通知活动状态（错误，结束、心跳异常等状态），详情见回调接口说明
+            return "";
+        }
+    };
+}
@@ -12,6 +12,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private static final String TAG = MainActivity.class.getSimpleName();
     private Button mConnectButton;
+    private Button mCNStreamerBtn;
     private RadioButton mLandscapeButton;
     private RadioButton mPortraitButton;
@@ -19,6 +20,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private EditText activityId;
     private EditText channelId;
+    private String activityID = "";
+    private String channelID = "";
+    private boolean landscape;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -28,6 +33,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         mConnectButton = (Button) findViewById(R.id.connectBT);
         mConnectButton.setOnClickListener(this);
+        mCNStreamerBtn = (Button) findViewById(R.id.cnStreamer);
+        mCNStreamerBtn.setOnClickListener(this);
+
         mLandscapeButton = (RadioButton) findViewById(R.id.orientationbutton1);
         mPortraitButton = (RadioButton) findViewById(R.id.orientationbutton2);
@@ -35,23 +43,29 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         channelId = (EditText) findViewById(R.id.channelId);
     }
+    private void intentData() {
+
+        if (!TextUtils.isEmpty(activityId.getText().toString())) {
+            activityID = activityId.getText().toString();
+        }
+
+        if (!TextUtils.isEmpty(channelId.getText().toString())) {
+            channelID = channelId.getText().toString();
+        }
+        landscape = mLandscapeButton.isChecked();
+    }
+
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.connectBT:
-                String activityID = "";
-                String channelID = "";
-                boolean landscape;
-
-                if (!TextUtils.isEmpty(activityId.getText().toString())) {
-                    activityID = activityId.getText().toString();
-                }
-
-                if (!TextUtils.isEmpty(channelId.getText().toString())) {
-                    channelID = channelId.getText().toString();
-                }
-                landscape = mLandscapeButton.isChecked();
-                StreamActivity.startActivity(getApplicationContext(), 0, activityID, channelID, landscape);
+                intentData();
+                StreamActivity.startActivity(getApplicationContext(), activityID, channelID, landscape);
+                break;
+
+            case R.id.cnStreamer:
+                intentData();
+                CNStreamActivity.startActivity(getApplicationContext(), activityID, channelID);
                 break;
             default:
                 break;
@@ -41,6 +41,7 @@ import static com.cnlive.libs.stream.model.Filters.SKIN_WHITEN;
 /**
  * Created by Administrator on 2016/8/29.
+ * StreamActivity 本 Activity主要展示的是推流SDK的具体用法，包括视讯云的逻辑和推流的设置，如果只想了解视讯云的逻辑，请参考CNStreamActivity
  */
 public class StreamActivity extends Activity {
     private static final String TAG = "StreamActivity";
@@ -85,13 +86,12 @@ public class StreamActivity extends Activity {
     public static final String CHANNELID = "channelId";
     public final static String LANDSCAPE = "landscape";
-    public static void startActivity(Context context, int fromType,
+    public static void startActivity(Context context,
                                      String activityID,
                                      String channelID,
                                      boolean isLandscape) {
         Intent intent = new Intent(context, StreamActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
         intent.putExtra(ACTIVITYID, activityID);
         intent.putExtra(CHANNELID, channelID);
         intent.putExtra(LANDSCAPE, isLandscape);
@@ -125,33 +125,44 @@ public class StreamActivity extends Activity {
         mChronometer = (Chronometer) findViewById(R.id.chronometer);
         mObserverButton = new ButtonObserver();
+        //开始/结束推流按钮
         mShootingText = (TextView) findViewById(R.id.click_to_shoot);
         mShootingText.setOnClickListener(mObserverButton);
+        //返回按钮
         mDeleteView = findViewById(R.id.backoff);
         mDeleteView.setOnClickListener(mObserverButton);
+        //转换摄像头
         mSwitchCameraView = findViewById(R.id.switch_cam);
         mSwitchCameraView.setOnClickListener(mObserverButton);
+        //闪光灯
         mFlashView = findViewById(R.id.flash);
         mFlashView.setOnClickListener(mObserverButton);
-
         mCheckBoxObserver = new CheckBoxObserver();
+        //美艳
         mBeautyCheckBox = (CheckBox) findViewById(R.id.click_to_switch_beauty);
         mBeautyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //背景音乐
         mBgmCheckBox = (CheckBox) findViewById(R.id.bgm);
         mBgmCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //耳返
         mAudioPreviewCheckBox = (CheckBox) findViewById(R.id.ear_mirror);
         mAudioPreviewCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //静音
         mMuteCheckBox = (CheckBox) findViewById(R.id.mute);
         mMuteCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //水印
         mWaterMarkCheckBox = (CheckBox) findViewById(R.id.watermark);
         mWaterMarkCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //前置摄像头镜像
         mFrontMirrorCheckBox = (CheckBox) findViewById(R.id.front_camera_mirror);
         mFrontMirrorCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //纯音频推流
         mAudioOnlyCheckBox = (CheckBox) findViewById(R.id.audio_only);
         mAudioOnlyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
     }
     private void initStreamer() {
+        //初始化推流SDK
         mStreamer = new Streamer(this);
         //设置预览编码帧率
         mStreamer.setPreviewFps(15);
@@ -181,11 +192,11 @@ public class StreamActivity extends Activity {
         // 开启推流统计功能
         mStreamer.setEnableStreamStatModule(true);
-        //设置前置摄像头镜像
+        //设置前置摄像头镜像 默认不开启
         mStreamer.setFrontCameraMirror(mFrontMirrorCheckBox.isChecked());
-        //静音
+        //静音 默认不开启
         mStreamer.setMuteAudio(mMuteCheckBox.isChecked());
-        //耳返
+        //耳返 默认不开启
         mStreamer.setEnableAudioPreview(mAudioPreviewCheckBox.isChecked());
         //设置Info回调，可以收到相关通知信息
         mStreamer.setOnInfoListener(mOnInfoListener);
@@ -248,7 +259,7 @@ public class StreamActivity extends Activity {
         return true;
     }
-    //TODO 开始推流
+    // 开始推流
     private void startStream() {
         mStreamer.startStream(activityConfig);
         mShootingText.setText(STOP_STRING);
@@ -256,7 +267,7 @@ public class StreamActivity extends Activity {
         mRecording = true;
     }
-    //TODO 结束推流
+    // 结束推流
     private void stopStream() {
         mStreamer.stopStream();
@@ -418,7 +429,27 @@ public class StreamActivity extends Activity {
     //显示水印
     private void showWaterMark() {
         if (!mIsLandscape) {
+            /**
+             * 设置并显示logo水印
+             *
+             * @param path  logo图片文件的路径
+             * @param x     logo的显示位置，0-1之间，相对于视频
+             * @param y     logo的显示位置，0-1之间，相对于视频
+             * @param w     logo的显示宽度，0-1之间，相对于视频，为0时会根据h及logo图片的比例自适应
+             * @param h     logo的显示高度，0-1之间，相对于视频，为0时会根据w及logo图片的比例自适应
+             * @param alpha logo的透明度，0-1之间
+             */
             mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
+
+            /**
+             * 在推流视频中显示时间水印
+             *
+             * @param x     时间戳的显示位置，0-1之间，相对于视频
+             * @param y     时间戳的显示位置，0-1之间，相对于视频
+             * @param w     时间戳的显示宽度，0-1之间，相对于视频，高度会自适应
+             * @param color 时间戳的颜色
+             * @param alpha 时间戳的显示透明度，0-1之间
+             */
             mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.RED, 1.0f);
         } else {
             mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.08f, 0.8f);
@@ -460,6 +491,14 @@ public class StreamActivity extends Activity {
         alertDialog = new AlertDialog.Builder(this)
                 .setTitle("请选择美颜滤镜")
                 .setSingleChoiceItems(
+                        /**
+                         * BEAUTY_DISABLE	禁用美颜	无
+                         * DENOISE	        自然	美白（中）+磨皮（低）+红润（低）
+                         * SKIN_WHITEN	    白肤	美白（强）+磨皮（中）+红润（低）
+                         * BEAUTY_ILLUSION	柔肤	美白（中）+磨皮（中）+红润（低）
+                         * BEAUTY_SMOOTH	粉嫩	美白（中）+磨皮（强）+红润（中）
+                         * BEAUTY_SOFT	    嫩肤	美白（中）+磨皮（中）+红润（强）
+                         */
                         new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE",
                                 "BEAUTY_SMOOTH"}, -1,
                         new DialogInterface.OnClickListener() {
@@ -495,21 +534,24 @@ public class StreamActivity extends Activity {
         public void onInfo(int what, int msg1, int msg2) {
             switch (what) {
                 case IStreamer.cnstream_camera_init_done:
+                    //初始化完毕
                     Log.d(TAG, "cnstream_camera_init_done");
                     break;
                 case IStreamer.cnstream_open_stream_succ:
+                    //推流成功
                     Log.d(TAG, "cnstream_open_stream_success");
-                    mChronometer.setBase(SystemClock.elapsedRealtime());
-                    mChronometer.start();
                     break;
                 case IStreamer.cnstream_frame_send_slow:
+                    //网络状态不佳，数据发送可能有延迟  发送当前帧的时长
                     Log.d(TAG, "cnstream_frame_send_slow");
                     Toast.makeText(StreamActivity.this, "Network not good!", Toast.LENGTH_SHORT).show();
                     break;
                 case IStreamer.cnstream_est_bw_raise:
+                    //码率上调了	码率上调的目标值 单位bps
                     Log.d(TAG, "BW raise to" + msg1 / 1000 + "kbps");
                     break;
                 case IStreamer.cnstream_est_bw_drop:
+                    //码率下调了	码率下调到的值 单位bps
                     Log.d(TAG, "BW drop to" + msg1 / 1000 + "kbps");
                     break;
                 default:
@@ -525,10 +567,11 @@ public class StreamActivity extends Activity {
             if (what < 0) {
                 mRecording = false;
-                mShootingText.setText(START_STRING);
+                mShootingText.setText("开始直播");
                 mShootingText.postInvalidate();
             }
+            Toast.makeText(StreamActivity.this, TAG + "   " + what, Toast.LENGTH_SHORT).show();
             switch (what) {
                 case IStreamer.cnstream_error_start_stream_server:
                     //开始直播时请求服务器失败
@@ -561,67 +604,65 @@ public class StreamActivity extends Activity {
                     //初始化失败 正在停止推流
                     break;
                 case IStreamer.cnstream_error_dns_parse_failed:
+                    //url域名解析失败
                     Log.d(TAG, "cnstream_error_dns_parse_failed");
                     break;
                 case IStreamer.cnstream_error_connect_failed:
+                    //网络连接失败，无法建立连接
                     Log.d(TAG, "cnstream_error_connect_failed");
                     break;
                 case IStreamer.cnstream_error_publish_failed:
+                    //跟RTMP服务器完成握手后,向{streamname}推流失败)
                     Log.d(TAG, "cnstream_error_publish_failed");
                     break;
                 case IStreamer.cnstream_error_connect_breaked:
+                    //网络连接断开
                     Log.d(TAG, "cnstream_error_connect_breaked");
                     break;
                 case IStreamer.cnstream_error_av_async:
+                    //音视频采集pts差值超过5s	音视频采集pts具体差值，单位ms
                     Log.d(TAG, "cnstream_error_av_async " + msg1 + " ms");
                     break;
                 case IStreamer.cnstream_video_encoder_error_unsupported:
+                    //编码器初始化失败
                     Log.d(TAG, "cnstream_video_encoder_error_unsupported");
                     break;
                 case IStreamer.cnstream_video_encoder_error_unknown:
+                    //视频编码失败
                     Log.d(TAG, "cnstream_video_encoder_error_unknown");
                     break;
                 case IStreamer.cnstream_audio_encoder_error_unsupported:
+                    //音频初始化失败
                     Log.d(TAG, "cnstream_audio_encoder_error_unsupported");
                     break;
                 case IStreamer.cnstream_audio_encoder_error_unknown:
+                    //音频编码失败
                     Log.d(TAG, "cnstream_audio_encoder_error_unknown");
                     break;
                 case IStreamer.cnstream_audio_recorder_error_start_failed:
+                    //录音开启失败
                     Log.d(TAG, "cnstream_audio_recorder_error_start_failed");
                     break;
                 case IStreamer.cnstream_audio_recorder_error_unknown:
+                    //录音开启未知错误
                     Log.d(TAG, "cnstream_audio_recorder_error_unknown");
                     break;
                 case IStreamer.cnstream_camera_error_unknown:
+                    //摄像头未知错误
                     Log.d(TAG, "cnstream_camera_error_unknown");
                     break;
                 case IStreamer.cnstream_camera_error_start_failed:
+                    //打开摄像头失败
                     Log.d(TAG, "cnstream_camera_error_start_failed");
                     break;
                 case IStreamer.cnstream_camera_error_server_died:
+                    //系统Camera服务进程退出
                     Log.d(TAG, "cnstream_camera_error_server_died");
                     break;
                 default:
                     Log.d(TAG, "what= " + what + " msg1= " + msg1 + " msg2= " + msg2);
                     break;
             }
-            switch (what) {
-                case IStreamer.cnstream_camera_error_unknown:
-                case IStreamer.cnstream_camera_error_start_failed:
-                case IStreamer.cnstream_audio_recorder_error_start_failed:
-                case IStreamer.cnstream_audio_recorder_error_unknown:
-                    break;
-                case IStreamer.cnstream_camera_error_server_died:
-                    mStreamer.stopCameraPreview();
-                    mMainHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            startCameraPreviewWithPermCheck();
-                        }
-                    }, 5000);
-                    break;
-            }
         }
     };
@@ -629,51 +670,49 @@ public class StreamActivity extends Activity {
     ActivityConfig activityConfig = new ActivityConfig() {
         @Override
         public String getActivityID() {
+            //活动ID，确保SP下的唯一性(即appId唯一) ，不能含下划线，不支持转义字符和urlencode会处理的特殊字符，如下！ # $ % & ‘ （ ）* + , . / : ; = ? @ [ / ]
             return activityId;
         }
         @Override
         public String getActivityName() {
+            //活动名称
             return "";
         }
         @Override
         public int getActivityStatus() {
+            //活动状态，0：未开始 ／1：已开始 ／2：已结束 ／3 已下线，默认为0
             return 0;
         }
         @Override
         public int getIsHorizontalScreen() {
+            //屏幕方向，0：垂直即竖屏 ／1：水平即横屏 ，默认为1
             return isHorizontalScreen;
         }
         @Override
         public String getChannelID() {
+            //播放通道；PGC业务：平台分配／ UGC业务：主播ID生成，确保SP下的唯一性，不能含下划线，不支持转义字符和urlencode会处理的特殊字符，如下！ # $ % & ‘ （ ）* + , . / : ; = ? @ [ / ]
             return channelId;
         }
         @Override
-        public String getStartTime() {
-            return "";
-        }
-
-        @Override
-        public String getEndTime() {
-            return "";
-        }
-
-        @Override
         public String getCoverImgUrl() {
+            //活动封面
             return "";
         }
         @Override
         public String getActivityCategory() {
+            //活动分类ID
             return "";
         }
         @Override
         public String getExtensions() {
+            //扩展字段，参数格式为Map对象的Json字符串（主播昵称、头像、）
             return "";
         }
@@ -684,6 +723,7 @@ public class StreamActivity extends Activity {
         @Override
         public String getCallbackAcitvityStatushttpPostUrl() {
+            //回调通知活动状态（错误，结束、心跳异常等状态），详情见回调接口说明
             return "";
         }
     };
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_cnstream"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#00000000"
+    tools:context="com.cnlive.demo.stream.CNStreamActivity">
+
+    <android.opengl.GLSurfaceView
+        android:id="@+id/cnSurfaceView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <Button
+        android:id="@+id/startStream"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="16dp"
+        android:onClick="onClick"
+        android:text="开始推流" />
+
+</RelativeLayout>
@@ -80,12 +80,19 @@
             android:text="竖屏" />
     </RadioGroup>
+
     <Button
         android:id="@+id/connectBT"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="16dp"
-        android:text="准备直播" />
+        android:text="推流基本操作" />
+    <Button
+        android:id="@+id/cnStreamer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/connectBT"
+        android:text="CNStreamerDemo" />
 </RelativeLayout>
 \ No newline at end of file