修改推流demo

王琳
1 parent 712a075f
Showing 24 changed files with 166 additions and 400 deletions
app/libs/libcnlivestream.jar
app/libs/libcnliveutil.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/stream/MainActivity.java
app/src/main/java/com/cnlive/demo/stream/StreamActivity.java
app/src/main/res/drawable-xhdpi/record_exit_disable.png
app/src/main/res/drawable-xhdpi/record_exit_normal.png
app/src/main/res/drawable-xhdpi/record_exitsure_normal.png
app/src/main/res/drawable-xhdpi/record_flash_disable.png
app/src/main/res/drawable-xhdpi/record_flash_highlighted.png
app/src/main/res/drawable-xhdpi/record_flash_normal.png
app/src/main/res/drawable-xhdpi/record_switch_camera_disable.png
app/src/main/res/drawable-xhdpi/record_switch_camera_highlighted.png
app/src/main/res/drawable-xhdpi/record_switch_camera_normal.png
app/src/main/res/drawable-xxhdpi/icon_record_close_off.png
app/src/main/res/drawable-xxhdpi/icon_record_flash_off.png
app/src/main/res/drawable-xxhdpi/icon_record_flip_off.png
app/src/main/res/drawable-xxhdpi/ksy_logo.png
app/src/main/res/drawable/recorder_delete_icon.xml
app/src/main/res/drawable/recorder_flash_icon.xml
@@ -24,16 +24,15 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.cnlive.demo.stream.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name="com.cnlive.demo.stream.StreamActivity"
+            android:name=".StreamActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
@@ -22,21 +22,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private static final String TAG = MainActivity.class.getSimpleName();
     private Button mConnectButton;
-    private EditText mFrameRateEditText;
-    private EditText mVideoBitRateEditText;
-    private EditText mAudioBitRateEditText;
-    private RadioButton mRes360Button;
-    private RadioButton mRes480Button;
-    private RadioButton mRes540Button;
-    private RadioButton mRes720Button;
     private RadioButton mLandscapeButton;
     private RadioButton mPortraitButton;
-    private RadioButton mSWButton;
-    private RadioButton mHWButton;
-    private RadioButton mSW1Button;
-
     private EditText activityId;
     private EditText channelId;
@@ -49,21 +38,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         mConnectButton = (Button) findViewById(R.id.connectBT);
         mConnectButton.setOnClickListener(this);
-        mFrameRateEditText = (EditText) findViewById(R.id.frameRatePicker);
-        mFrameRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
-        mVideoBitRateEditText = (EditText) findViewById(R.id.videoBitratePicker);
-        mVideoBitRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
-        mAudioBitRateEditText = (EditText) findViewById(R.id.audioBitratePicker);
-        mAudioBitRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
-        mRes360Button = (RadioButton) findViewById(R.id.radiobutton1);
-        mRes480Button = (RadioButton) findViewById(R.id.radiobutton2);
-        mRes540Button = (RadioButton) findViewById(R.id.radiobutton3);
-        mRes720Button = (RadioButton) findViewById(R.id.radiobutton4);
         mLandscapeButton = (RadioButton) findViewById(R.id.orientationbutton1);
         mPortraitButton = (RadioButton) findViewById(R.id.orientationbutton2);
-        mSWButton = (RadioButton) findViewById(R.id.encode_sw);
-        mHWButton = (RadioButton) findViewById(R.id.encode_hw);
-        mSW1Button = (RadioButton) findViewById(R.id.encode_sw1);
         activityId = (EditText) findViewById(R.id.activityId);
         channelId = (EditText) findViewById(R.id.channelId);
@@ -73,60 +49,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.connectBT:
-                int frameRate = 0;
-                int videoBitRate = 0;
-                int audioBitRate = 0;
-                int videoResolution;
-                int encodeMethod;
-                boolean landscape;
                 String activityID = "";
                 String channelID = "";
+                boolean landscape;
-                if (!TextUtils.isEmpty(mFrameRateEditText.getText().toString())) {
-                    frameRate = Integer.parseInt(mFrameRateEditText.getText()
-                            .toString());
-                }
-
-                if (!TextUtils.isEmpty(mVideoBitRateEditText.getText().toString())) {
-                    videoBitRate = Integer.parseInt(mVideoBitRateEditText.getText()
-                            .toString());
-                }
-
-                if (!TextUtils.isEmpty(mAudioBitRateEditText.getText().toString())) {
-                    audioBitRate = Integer.parseInt(mAudioBitRateEditText.getText()
-                            .toString());
-                }
-
-                if (!TextUtils.isEmpty(activityId.getText().toString())){
+                if (!TextUtils.isEmpty(activityId.getText().toString())) {
                     activityID = activityId.getText().toString();
                 }
-                if (!TextUtils.isEmpty(channelId.getText().toString())){
+                if (!TextUtils.isEmpty(channelId.getText().toString())) {
                     channelID = activityId.getText().toString();
                 }
-
-                if (mRes360Button.isChecked()) {
-                    videoResolution = VIDEO_RESOLUTION_360P;
-                } else if (mRes480Button.isChecked()) {
-                    videoResolution = VIDEO_RESOLUTION_480P;
-                } else if (mRes540Button.isChecked()) {
-                    videoResolution = VIDEO_RESOLUTION_540P;
-                } else {
-                    videoResolution = VIDEO_RESOLUTION_720P;
-                }
-
-                if (mHWButton.isChecked()) {
-                    encodeMethod = ENCODE_METHOD_HARDWARE;
-                } else if (mSWButton.isChecked()) {
-                    encodeMethod = ENCODE_METHOD_SOFTWARE;
-                } else {
-                    encodeMethod = ENCODE_METHOD_SOFTWARE_COMPAT;
-                }
-
                 landscape = mLandscapeButton.isChecked();
-
-                StreamActivity.startActivity(getApplicationContext(), 0, frameRate, videoBitRate,
-                        audioBitRate, videoResolution, landscape, encodeMethod, activityID, channelID);
+                StreamActivity.startActivity(getApplicationContext(), 0, activityID, channelID, landscape);
                 break;
             default:
                 break;
@@ -15,7 +15,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.support.v4.app.ActivityCompat;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -32,8 +31,9 @@ import com.cnlive.libs.stream.base.IStreamer;
 import com.cnlive.libs.stream.model.ActivityConfig;
 import java.util.Timer;
-import java.util.TimerTask;
+import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
+import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
 import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
 import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION;
 import static com.cnlive.libs.stream.model.Filters.BEAUTY_SMOOTH;
@@ -67,7 +67,6 @@ public class StreamActivity extends Activity {
     private Streamer mStreamer;
     private Handler mMainHandler;
-    private Timer mTimer;
     private boolean mIsLandscape;
     private boolean mRecording = false;
@@ -84,35 +83,20 @@ public class StreamActivity extends Activity {
     private static final String START_STRING = "开始直播";
     private static final String STOP_STRING = "停止直播";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "encode_method";
-    public final static String START_ATUO = "start_auto";
-    public static final String SHOW_DEBUGINFO = "show_debuginfo";
     public static final String ACTIVITYID = "activityId";
     public static final String CHANNELID = "channelId";
+    public final static String LANDSCAPE = "landscape";
     public static void startActivity(Context context, int fromType,
-                                     int frameRate,
-                                     int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape,
-                                     int encodeMethod,
                                      String activityID,
-                                     String channelID) {
+                                     String channelID,
+                                     boolean isLandscape) {
         Intent intent = new Intent(context, StreamActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("type", fromType);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
         intent.putExtra(ACTIVITYID, activityID);
         intent.putExtra(CHANNELID, channelID);
+        intent.putExtra(LANDSCAPE, isLandscape);
         context.startActivity(intent);
     }
@@ -126,6 +110,18 @@ public class StreamActivity extends Activity {
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        initView();
+
+        mMainHandler = new Handler();
+        Bundle bundle = getIntent().getExtras();
+        activityId = bundle.getString(ACTIVITYID);
+        channelId = bundle.getString(CHANNELID);
+        mIsLandscape = bundle.getBoolean(LANDSCAPE, false);
+        initStreamer();
+
+    }
+
+    private void initView() {
         mCameraHintView = (CameraHintView) findViewById(R.id.camera_hint);
         mCameraPreviewView = (GLSurfaceView) findViewById(R.id.camera_preview);
         mChronometer = (Chronometer) findViewById(R.id.chronometer);
@@ -155,55 +151,50 @@ public class StreamActivity extends Activity {
         mFrontMirrorCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
         mAudioOnlyCheckBox = (CheckBox) findViewById(R.id.audio_only);
         mAudioOnlyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+    }
-        mMainHandler = new Handler();
+    private void initStreamer() {
         mStreamer = new Streamer(this);
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                mStreamer.setPreviewFps(frameRate);
-                mStreamer.setTargetFps(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                mStreamer.setVideoKBitrate(videoBitrate * 3 / 4, videoBitrate, videoBitrate / 4);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                mStreamer.setAudioKBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            mStreamer.setPreviewResolution(videoResolution);
-            mStreamer.setTargetResolution(videoResolution);
-
-            int encode_method = bundle.getInt(ENCDODE_METHOD);
-            mStreamer.setEncodeMethod(encode_method);
-
-            mIsLandscape = bundle.getBoolean(LANDSCAPE, false);
-            mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);
-            if (mIsLandscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                isHorizontalScreen = 1;
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                isHorizontalScreen = 0;
-            }
+        //设置预览编码帧率
+        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);
+
+        //设置横竖屏方向
+        mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);//设置屏幕旋转角度
+        if (mIsLandscape) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//横屏
+            isHorizontalScreen = 1;
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);//竖屏
+            isHorizontalScreen = 0;
         }
-
+        //设置预览View
         mStreamer.setDisplayPreview(mCameraPreviewView);
+
+        // 开启推流统计功能
         mStreamer.setEnableStreamStatModule(true);
-        mStreamer.enableDebugLog(true);
+        //设置前置摄像头镜像
         mStreamer.setFrontCameraMirror(mFrontMirrorCheckBox.isChecked());
+        //静音
         mStreamer.setMuteAudio(mMuteCheckBox.isChecked());
+        //耳返
         mStreamer.setEnableAudioPreview(mAudioPreviewCheckBox.isChecked());
+        //设置Info回调，可以收到相关通知信息
         mStreamer.setOnInfoListener(mOnInfoListener);
+        //设置错误回调，收到该回调后，一般是发生了严重错误，比如网络断开等
         mStreamer.setOnErrorListener(mOnErrorListener);
-        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
-                DENOISE.getFilter());
+        //设置美颜滤镜
+        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), DENOISE.getFilter());
         mStreamer.setEnableImgBufBeauty(true);
         //手动变焦
@@ -212,9 +203,6 @@ public class StreamActivity extends Activity {
         mStreamer.setCameraHintView(mCameraHintView);
         mStreamer.setEnableTouchFocus(true);
         mStreamer.setEnableZoom(true);
-
-        activityId = bundle.getString(ACTIVITYID);
-        channelId = bundle.getString(CHANNELID);
     }
     @Override
@@ -247,9 +235,7 @@ public class StreamActivity extends Activity {
             mMainHandler.removeCallbacksAndMessages(null);
             mMainHandler = null;
         }
-        if (mTimer != null) {
-            mTimer.cancel();
-        }
+        mStreamer.release();
     }
     @Override
@@ -334,13 +320,16 @@ public class StreamActivity extends Activity {
                     break;
             }
         }
+
     }
+    //转换摄像头
     private void onSwitchCamera() {
         mStreamer.switchCamera();
         mCameraHintView.hideAll();
     }
+    //闪光灯
     private void onFlashClick() {
         if (isFlashOpened) {
             mStreamer.toggleTorch(false);
@@ -366,6 +355,7 @@ public class StreamActivity extends Activity {
                     public void onClick(DialogInterface arg0, int arg1) {
                         mChronometer.stop();
                         mRecording = false;
+                        mStreamer.stopStream(activityConfig);
                         StreamActivity.this.finish();
                     }
                 }).show();
@@ -395,6 +385,7 @@ public class StreamActivity extends Activity {
         }
     }
+    //背景音乐
     private void onBgmChecked(boolean isChecked) {
         if (isChecked) {
             mStreamer.startBgm(mBgmPath, true);
@@ -426,22 +417,24 @@ public class StreamActivity extends Activity {
         mStreamer.setAudioOnly(isChecked);
     }
+    //显示水印
     private void showWaterMark() {
         if (!mIsLandscape) {
             mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
             mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.RED, 1.0f);
         } else {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.20f, 0.8f);
+            mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.08f, 0.8f);
             mStreamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.RED, 1.0f);
         }
     }
-    //TODO 隐藏水印
+    //隐藏水印
     private void hideWaterMark() {
         mStreamer.hideWaterMarkLogo();
         mStreamer.hideWaterMarkTime();
     }
+    //摄像头权限检测
     private void startCameraPreviewWithPermCheck() {
         int cameraPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
         int audioPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
@@ -463,6 +456,7 @@ public class StreamActivity extends Activity {
         }
     }
+    //选择美颜滤镜
     private void showChooseFilter() {
         AlertDialog alertDialog;
         alertDialog = new AlertDialog.Builder(this)
@@ -594,17 +588,12 @@ public class StreamActivity extends Activity {
                     break;
                 default:
                     stopStream();
-                    mMainHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            startStream();
-                        }
-                    }, 3000);
                     break;
             }
         }
     };
+    //设置推流参数（注意：必传参数为activityId、channelId）
     ActivityConfig activityConfig = new ActivityConfig() {
         @Override
         public String getActivityID() {
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/record_exit_disable"
-        android:state_enabled="false"/>
-    <item android:drawable="@drawable/record_exit_normal"
-        android:state_pressed="true"/>
-    <item android:drawable="@drawable/record_exitsure_normal"
-        android:state_selected="true"/>
-    <item android:drawable="@drawable/record_exit_normal"/>
-</selector>
 \ No newline at end of file
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/record_flash_disable" android:state_enabled="false" />
-    <item android:drawable="@drawable/record_flash_highlighted" android:state_pressed="true" />
-    <item android:drawable="@drawable/record_flash_normal" />
-</selector>
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/record_switch_camera_disable"
-        android:state_enabled="false"/>
-    <item android:drawable="@drawable/record_switch_camera_highlighted"
-        android:state_pressed="true"/>
-    <item android:drawable="@drawable/record_switch_camera_normal"/>
-</selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:padding="16dp"
     tools:context=".MainActivity">
-    <RelativeLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true">
-
-        <Button
-            android:id="@+id/connectBT"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="准备直播" />
-
-        <RadioGroup
-            android:id="@+id/resolution_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/connectBT"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/radiobutton1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="360P" />
-
-            <RadioButton
-                android:id="@+id/radiobutton2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="480P" />
-
-            <RadioButton
-                android:id="@+id/radiobutton3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="540P" />
-
-            <RadioButton
-                android:id="@+id/radiobutton4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="720P" />
-        </RadioGroup>
-
-        <RadioGroup
-            android:id="@+id/orientation_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/resolution_group"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/orientationbutton1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="横屏" />
-            <RadioButton
-                android:id="@+id/orientationbutton2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="竖屏" />
-        </RadioGroup>
-
-        <RadioGroup
-            android:id="@+id/encode_group"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/orientation_group"
-            android:orientation="horizontal">
-
-            <RadioButton
-                android:id="@+id/encode_hw"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="硬编" />
-
-            <RadioButton
-                android:id="@+id/encode_sw"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="true"
-                android:text="软编" />
-
-            <RadioButton
-                android:id="@+id/encode_sw1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:checked="false"
-                android:text="软编1" />
-        </RadioGroup>
-
-        <LinearLayout
-            android:id="@+id/init_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/encode_group"
-            android:orientation="vertical">
-
-            <!--<CheckBox-->
-            <!--android:id="@+id/autoStart"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:checked="false"-->
-            <!--android:text="初始化完成后启动推流" />-->
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/frameRate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/init_group">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="采集帧率"
-                android:textSize="16sp" />
-
-            <EditText
-                android:id="@+id/frameRatePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="15" />
-        </LinearLayout>
+    <LinearLayout
+        android:id="@+id/stream_param"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
         <LinearLayout
-            android:id="@+id/videoBitrate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/frameRate"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="视频码率(Max)"
-                android:textSize="16sp" />
+                android:text="ActivityId"
+                android:textColor="#000000"
+                android:textSize="18sp" />
             <EditText
-                android:id="@+id/videoBitratePicker"
-                android:layout_width="wrap_content"
+                android:id="@+id/activityId"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="800" />
+                android:layout_marginLeft="10dp"
+                android:hint="请输入ActivityId" />
         </LinearLayout>
         <LinearLayout
-            android:id="@+id/audioBitrate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/videoBitrate"
             android:orientation="horizontal">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="音频码率"
-                android:textSize="16sp" />
+                android:text="ChannelId"
+                android:textColor="#000000"
+                android:textSize="18sp" />
             <EditText
-                android:id="@+id/audioBitratePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="48" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/audioBitrate"
-            android:orientation="vertical">
-
-            <LinearLayout
+                android:id="@+id/channelId"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_marginLeft="10dp"
+                android:hint="请输入ChannelId" />
+        </LinearLayout>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="ActivityId"
-                    android:textSize="14sp" />
+    </LinearLayout>
-                <EditText
-                    android:id="@+id/activityId"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="请输入ActivityId" />
-            </LinearLayout>
+    <RadioGroup
+        android:id="@+id/orientation_group"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/stream_param"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="ChannelId"
-                    android:textSize="14sp" />
+        <RadioButton
+            android:id="@+id/orientationbutton1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:text="横屏" />
-                <EditText
-                    android:id="@+id/channelId"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="请输入ChannelId" />
-            </LinearLayout>
+        <RadioButton
+            android:id="@+id/orientationbutton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="竖屏" />
+    </RadioGroup>
-        </LinearLayout>
+    <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="准备直播" />
-    </RelativeLayout>
-</ScrollView>
 \ No newline at end of file
+</RelativeLayout>
 \ No newline at end of file
@@ -23,7 +23,7 @@
             <CheckBox
                 android:id="@+id/watermark"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -31,12 +31,12 @@
                 android:background="#11123456"
                 android:checked="true"
                 android:text="水印"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
             <CheckBox
                 android:id="@+id/mute"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -44,12 +44,12 @@
                 android:background="#11123456"
                 android:checked="false"
                 android:text="静音"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
             <CheckBox
                 android:id="@+id/bgm"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -57,20 +57,20 @@
                 android:background="#11123456"
                 android:checked="false"
                 android:text="bgm"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
             <CheckBox
                 android:id="@+id/ear_mirror"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="false"
-                android:text="耳反"
-                android:textColor="#FF4081"
+                android:text="耳返"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
         </LinearLayout>
@@ -80,28 +80,20 @@
             android:layout_marginBottom="10dp"
             android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
+            <Button
                 android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
                 android:layout_weight="1"
-                android:background="#11123456"
                 android:text="开始直播"
-                android:textColor="#FF4081"
-                android:textSize="14sp"></TextView>
+                android:textColor="@color/colorAccent"
+                android:textSize="14sp"></Button>
             <CheckBox
                 android:id="@+id/audio_only"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -109,12 +101,12 @@
                 android:background="#11123456"
                 android:checked="false"
                 android:text="音频推流"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
             <CheckBox
                 android:id="@+id/front_camera_mirror"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -122,12 +114,12 @@
                 android:background="#11123456"
                 android:checked="true"
                 android:text="前置镜像"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
             <CheckBox
                 android:id="@+id/click_to_switch_beauty"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
@@ -135,7 +127,7 @@
                 android:background="#11123456"
                 android:checked="true"
                 android:text="美颜"
-                android:textColor="#FF4081"
+                android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
         </LinearLayout>
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="46dip"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
     <Chronometer
         android:id="@+id/chronometer"
@@ -13,25 +13,40 @@
         android:layout_gravity="center"
         android:format="%s"
         android:gravity="center"
-        android:textColor="#FF4081"
+        android:textColor="#FFFFFF"
         android:textSize="19sp" />
     <ImageView
+        android:id="@+id/flash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_toLeftOf="@+id/switch_cam"
+        android:background="@drawable/icon_record_flash_off"></ImageView>
+
+    <ImageView
         android:id="@+id/switch_cam"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
         android:layout_gravity="center_vertical"
-        android:layout_marginRight="10dp"
-        android:background="@drawable/recorder_rotate_icon" />
+        android:layout_marginRight="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_toLeftOf="@+id/backoff"
+        android:background="@drawable/icon_record_flip_off" />
     <ImageView
-        android:id="@+id/flash"
+        android:id="@+id/backoff"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
         android:layout_gravity="center_vertical"
-        android:layout_toLeftOf="@id/switch_cam"
-        android:background="@drawable/recorder_flash_icon" >
-    </ImageView>
+        android:layout_marginRight="2dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/icon_record_close_off" />
 </RelativeLayout>
 \ No newline at end of file