Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/values/styles.xml

Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/res/values/styles.xml
吴奎庆
2 parents 5ca52b5b 0812c7f1
Showing 69 changed files with 1909 additions and 293 deletions
app/libs/libcnlivelive.jar
app/libs/libcnliveshortvideo.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/data/network/ApiService.java
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/EditActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/ShortVideoActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/activity/ShortVideoPlayActivity.java
app/src/main/java/com/cnlive/gundam/shortvideo/dialog/ShortVideoConfigDialog.java
app/src/main/java/com/cnlive/gundam/shortvideo/fragment/MyVideoFragment.java
app/src/main/java/com/cnlive/gundam/shortvideo/model/ShortVideoDataModel.java
app/src/main/java/com/cnlive/gundam/shortvideo/model/ShortVideoInfo.java
app/src/main/java/com/cnlive/gundam/shortvideo/model/ShortVideoList.java
app/src/main/java/com/cnlive/gundam/shortvideo/util/DateUtils.java
app/src/main/java/com/cnlive/gundam/shortvideo/util/FileUtils.java
app/src/main/java/com/cnlive/gundam/shortvideo/view/RecordProgressController.java
app/src/main/java/com/cnlive/gundam/shortvideo/view/RecordProgressView.java
app/src/main/res/drawable-hdpi/default_pic.png
app/src/main/res/drawable-hdpi/ic_short_video_back.png
app/src/main/res/drawable-hdpi/ic_short_video_back_recording.png
@@ -113,9 +113,25 @@
             android:name="io.rong.imlib.HeartbeatReceiver"
             android:process=":ipc" />
  
-        <activity android:name=".shortvideo.activity.MyVideoActivity" />
-        <activity android:name=".shortvideo.activity.ShortVideoActivity" />
-        <activity android:name=".shortvideo.activity.EditActivity" />
+        <activity
+            android:name=".shortvideo.activity.MyVideoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".shortvideo.activity.ShortVideoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".shortvideo.activity.EditActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name=".shortvideo.activity.ShortVideoPlayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
     </application>
  
 </manifest>
 \ No newline at end of file
@@ -3,6 +3,7 @@ package com.cnlive.gundam.data.network;
 import com.cnlive.gundam.main.model.ActiveListModel;
 import com.cnlive.gundam.main.model.ActivePlayInfo;
 import com.cnlive.gundam.main.model.VodListPage;
+import com.cnlive.gundam.shortvideo.model.ShortVideoDataModel;
 import com.cnlive.gundam.stream.model.ChannelInfoModel;
  
 import java.util.Map;
@@ -33,4 +34,8 @@ public interface ApiService {
     //主播信息接口
     @GET("live_epg/channel/info4App")
     Call<ChannelInfoModel> getChannelInfo(@QueryMap Map<String, String> params);
+
+    //获取SP下的短视频列表
+    @GET("vod_epg/sp/shortVideoList4APP")
+    Call<ShortVideoDataModel> getShortVideoList(@QueryMap Map<String, String> params);
 }
@@ -69,7 +69,7 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 if (uid != 0) {
                     //进入个人中心页面
                     Intent intent = new Intent(getActivity(), UserPersonalActivity.class);
-                    intent.putExtra("isEdit",false);
+                    intent.putExtra("isEdit", false);
                     startActivity(intent);
                 } else {
                     //进入登录页面
@@ -81,7 +81,13 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
                 startActivity(new Intent(getActivity(), CommentActivity.class));
                 break;
             case R.id.my_video:
-                startActivity(new Intent(getActivity(), MyVideoActivity.class));
+                int userId = UserService.getInstance(getActivity()).getActiveAccountInfo().getUid();
+                if (userId != 0) {
+                    startActivity(new Intent(getActivity(), MyVideoActivity.class));
+
+                } else {
+                    startActivity(new Intent(getActivity(), LoginActivity.class));
+                }
                 break;
  
         }
@@ -99,11 +105,11 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     }
  
     private void notifyUI(boolean isLogin) {
-        if(isLogin){
+        if (isLogin) {
             User activeAccountInfo = UserService.getInstance(getActivity()).getActiveAccountInfo();
             Glide.with(getActivity()).load(activeAccountInfo.getFaceurl()).into(binding.headImg);
             binding.tvNickname.setText(activeAccountInfo.getNickname());
-        }else{
+        } else {
             Glide.with(getActivity()).load(R.drawable.cnlive_user_header).into(binding.headImg);
             binding.tvNickname.setText(getString(R.string.click_login));
         }
@@ -11,15 +11,11 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatSeekBar;
-import android.support.v7.widget.AppCompatSpinner;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextPaint;
 import android.text.TextUtils;
@@ -38,7 +34,7 @@ import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -51,18 +47,18 @@ import android.widget.Toast;
  
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityEditBinding;
-import com.cnlive.gundam.shortvideo.dialog.ShortVideoConfigDialog;
 import com.cnlive.gundam.shortvideo.sticker.StickerAdapter;
 import com.cnlive.gundam.shortvideo.util.ColorPicker;
+import com.cnlive.gundam.shortvideo.util.FileUtils;
 import com.cnlive.gundam.shortvideo.videorange.HorizontalListView;
 import com.cnlive.gundam.shortvideo.videorange.VideoRangeSeekBar;
 import com.cnlive.gundam.shortvideo.videorange.VideoThumbnailAdapter;
 import com.cnlive.gundam.shortvideo.videorange.VideoThumbnailInfo;
+import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.lib.upload.listener.CNPutObjectResponseListener;
 import com.cnlive.lib.upload.model.UploadError;
 import com.cnlive.libs.shortvideo.kit.CNEditKit;
 import com.cnlive.libs.shortvideo.utils.base.ShortVideoConstants;
-import com.cnlive.libs.shortvideo.view.CNStickerView;
 import com.cnlive.libs.shortvideo.view.CNTextView;
 import com.cnlive.libs.shortvideo.view.base.ICNTextView;
 import com.cnlive.libs.shortvideo.view.info.CNStickerHelpBoxInfo;
@@ -75,12 +71,14 @@ import com.cnlive.libs.util.Config;
 import com.cnlive.libs.video.video.MediaPlayer;
 import com.cnlive.libs.video.video.base.IDataSource;
 import com.cnlive.libs.video.video.base.IMediaPlayer;
+import com.googlecode.mp4parser.authoring.Edit;
  
 import org.apache.http.Header;
  
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -127,6 +125,14 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
     private SeekBarChangedObserver mSeekBarChangedObserver;
  
     public final static String SRC_URL = "srcurl";
+    public final static String DURATION = "duration";
+    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 ENCODE_TYPE = "encode_type";
+    public final static String ENCODE_METHOD = "encode_method";
+    public final static String ENCODE_PROFILE = "encode_profile";
  
     private String mLogoPath = "assets://Logo/cnlive_logo.png";
     private String mBgmPath = "/sdcard/uncle.mp3";
@@ -153,13 +159,32 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
  
 //    private ImageView screenShot;
  
+    private int duration;
+    private int frameRate;
+    private int videoBitrate;
+    private int audioBitrate;
+    private int videoResolution;
+    private int encode_type;
+    private int encode_method;
+    private int encodeProfile;
     private ActivityEditBinding binding;
  
-    public static void startActivity(Context context, String srcUrl) {
+    public static void startActivity(Context context, String srcUrl, int duration, int frameRate,
+                                     int videoBitrate, int audioBitrate,
+                                     int videoResolution,
+                                     int encodeType, int encodeMethod, int encodeProfile) {
         Intent intent = new Intent(context, EditActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
  
         intent.putExtra(SRC_URL, srcUrl);
+        intent.putExtra(DURATION, duration);
+        intent.putExtra(FRAME_RATE, frameRate);
+        intent.putExtra(VIDEO_BITRATE, videoBitrate);
+        intent.putExtra(AUDIO_BITRATE, audioBitrate);
+        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
+        intent.putExtra(ENCODE_TYPE, encodeType);
+        intent.putExtra(ENCODE_METHOD, encodeMethod);
+        intent.putExtra(ENCODE_PROFILE, encodeProfile);
         context.startActivity(intent);
     }
  
@@ -174,8 +199,8 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
  
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        initView();
         initEditKit();
+        initView();
         mInputMethodManager = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
     }
  
@@ -236,6 +261,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
  
         binding.clickToPause.getDrawable().setLevel(2);
  
+        binding.hint.setText("上传视频最大长度为 " + duration + "s");
         binding.editBarBottom.clickToFilter.setActivated(true);
         binding.editBarBottom.beautyChoose.getRoot().setVisibility(View.VISIBLE);
         BottomViewInfo filterView = new BottomViewInfo(binding.editBarBottom.clickToFilter, binding.editBarBottom.beautyChoose.getRoot());
@@ -321,6 +347,14 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
     private void initData() {
         Bundle bundle = getIntent().getExtras();
         String url = bundle.getString(SRC_URL);
+        duration = bundle.getInt(DURATION, 0);
+        frameRate = bundle.getInt(FRAME_RATE, 0);
+        videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
+        audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
+        videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
+        encode_type = bundle.getInt(ENCODE_TYPE);
+        encode_method = bundle.getInt(ENCODE_METHOD);
+        encodeProfile = bundle.getInt(ENCODE_PROFILE);
         if (!TextUtils.isEmpty(url)) {
             mEditKit.setEditPreviewUrl(url);
         }
@@ -547,43 +581,28 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
  
     private void onNextClick() {
         //配置合成参数
-        final ShortVideoConfigDialog configDialog = new ShortVideoConfigDialog(this,
-                ShortVideoConfigDialog
-                        .SHORTVIDEOCONFIG_TYPE_COMPOSE);
-        configDialog.setCancelable(false);
-        configDialog.show();
-        configDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-            @Override
-            public void onDismiss(DialogInterface dialogInterface) {
-                ShortVideoConfigDialog.ShortVideoConfig config = configDialog.getShortVideoConfig();
-                if (config != null) {
-                    //配置合成参数
-                    mEditKit.setTargetResolution(config.resolution);
-                    mEditKit.setVideoFps(config.fps);
-                    mEditKit.setVideoCodecId(config.encodeType);
-                    mEditKit.setVideoEncodeProfile(config.encodeProfile);
-                    mEditKit.setAudioKBitrate(config.audioBitrate);
-                    mEditKit.setVideoKBitrate(config.videoBitrate);
-                    //关闭上一次合成窗口
-                    if (mComposeAlertDialog != null) {
-                        mComposeAlertDialog.closeDialog();
-                    }
+        mEditKit.setTargetResolution(videoResolution);
+        mEditKit.setVideoFps(frameRate);
+        mEditKit.setVideoCodecId(encode_type);
+        mEditKit.setVideoEncodeProfile(encodeProfile);
+        mEditKit.setAudioKBitrate(audioBitrate);
+        mEditKit.setVideoKBitrate(videoBitrate);
+        //关闭上一次合成窗口
+        if (mComposeAlertDialog != null) {
+            mComposeAlertDialog.closeDialog();
+        }
  
-                    mComposeAlertDialog = new ComposeAlertDialog(EditActivity.this, R.style.dialog);
-                    //设置合成路径
+        mComposeAlertDialog = new ComposeAlertDialog(EditActivity.this, R.style.dialog);
+        //设置合成路径
  
-                    String fileFolder = "/sdcard/cn_sv_compose_test";
-                    File file = new File(fileFolder);
-                    if (!file.exists()) {
-                        file.mkdir();
-                    }
-                    String composeUrl = fileFolder + "/" + System.currentTimeMillis() + ".mp4";
-                    Log.d(TAG, "compose Url:" + composeUrl);
-                    mEditKit.startCompose("test.mp4", "", composeUrl);
-                }
-
-            }
-        });
+        String fileFolder = "/sdcard/cn_sv_compose_test";
+        File file = new File(fileFolder);
+        if (!file.exists()) {
+            file.mkdir();
+        }
+        String composeUrl = fileFolder + "/" + System.currentTimeMillis() + ".mp4";
+        Log.d(TAG, "compose Url:" + composeUrl);
+        mEditKit.startCompose(composeUrl);
  
     }
  
@@ -803,7 +822,6 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
         }
     };
  
-
     private CNEditKit.OnInfoListener mOnInfoListener = new CNEditKit.OnInfoListener() {
         @Override
         public Object onInfo(int type, Bitmap bitmap, final String... strings) {
@@ -828,11 +846,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
                     Log.e(TAG, bitmap + " : " + strings[0]);
                     binding.editBarBottom.audioChoose.originAudioReverb.setSelection(0);
                     binding.editBarBottom.audioChoose.originAudioEffect.setSelection(0);
-                    if (mComposeAlertDialog != null) {
-                        mComposeAlertDialog.composeFinished(strings[0]);
-                        mComposeFinished = true;
-                    }
-                    mEditKit.getUploadInfo(3, strings[0], mPutObjectResponseListener);
+                    showVideoDialog(bitmap, strings[0]);
                 }
                 case ShortVideoConstants.SHORTVIDEO_COMPOSE_ABORTED:
                     break;
@@ -850,6 +864,58 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
         }
     };
  
+    private AlertDialog uploadVideoMessageDialog;
+
+    public void showVideoDialog(final Bitmap bitmap, final String fileUrl) {
+        final String userId = String.valueOf(UserService.getInstance(this).getActiveAccountInfo().getUid());
+        Log.e("Lynntest", userId);
+        LayoutInflater layoutInflater = LayoutInflater.from(this);
+        View videoMesDialog = layoutInflater.inflate(R.layout.upload_video_dialog, null);
+
+        ImageView imageView = videoMesDialog.findViewById(R.id.cover_img);
+        imageView.setImageBitmap(bitmap);
+        final EditText title = videoMesDialog.findViewById(R.id.video_title_edit);
+        final EditText des = videoMesDialog.findViewById(R.id.video_des_edit);
+        Button cancelBtn = videoMesDialog.findViewById(R.id.cancel_btn);
+        Button configBtn = videoMesDialog.findViewById(R.id.config_btn);
+
+
+        uploadVideoMessageDialog = new AlertDialog.Builder(EditActivity.this)
+                .setView(videoMesDialog)
+                .setCancelable(false)
+                .show();
+
+        cancelBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mComposeAlertDialog.closeDialog();
+                resumeEditPreview();
+                uploadVideoMessageDialog.dismiss();
+            }
+        });
+
+        configBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String titleStr = title.getText().toString();
+                String desStr = des.getText().toString();
+
+                if (titleStr != null && !titleStr.equals("")) {
+                    if (mComposeAlertDialog != null) {
+                        mComposeAlertDialog.composeFinished(fileUrl);
+                        mComposeFinished = true;
+                    }
+                    mEditKit.getUploadInfo(userId, fileUrl, titleStr.concat(".mp4"), desStr, new File(FileUtils.saveBitmap(EditActivity.this, bitmap)), null, mPutObjectResponseListener);
+                    uploadVideoMessageDialog.dismiss();
+                } else {
+                    Toast.makeText(EditActivity.this, "标题不能为空哦~", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+
+    }
+
  
     private StickerAdapter.OnStickerItemClick mOnStickerItemClick = new StickerAdapter.OnStickerItemClick() {
         @Override
@@ -982,7 +1048,7 @@ public class EditActivity extends AppCompatActivity implements ActivityCompat.On
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 TextView textView = ((TextView) parent.getChildAt(0));
                 if (textView != null) {
-                    textView.setTextColor(getResources().getColor(R.color.colorAccent));
+                    textView.setTextColor(getResources().getColor(R.color.ffcc00));
                 }
                 switch (position) {
                     case 0:
@@ -9,20 +9,27 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.databinding.DataBindingUtil;
 import android.hardware.Camera;
+import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.util.SparseArray;
+import android.view.DragEvent;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Chronometer;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
@@ -31,6 +38,7 @@ import android.widget.Toast;
  
 import com.cnlive.gundam.R;
 import com.cnlive.gundam.databinding.ActivityShortVideoBinding;
+import com.cnlive.gundam.databinding.SpinnerItemLayoutBinding;
 import com.cnlive.gundam.shortvideo.holder.BgmItemViewHolder;
 import com.cnlive.gundam.shortvideo.model.BottomTitleViewInfo;
 import com.cnlive.gundam.shortvideo.util.FaceUnityUtil;
@@ -49,9 +57,11 @@ import com.cnlive.libs.stream.filter.CNAudioReverbFilter;
 import com.cnlive.libs.stream.util.ImgFaceunityFilter;
  
 import java.io.File;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
  
+import static android.view.View.inflate;
 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_PRO;
@@ -65,7 +75,6 @@ import static com.cnlive.libs.stream.model.Filters.SKIN_WHITEN;
 public class ShortVideoActivity extends AppCompatActivity {
     private static final String TAG = "ShortVideoActivity";
     private final static int PERMISSION_REQUEST_CAMERA_AUDIOREC = 1;
-    public static final int MAX_DURATION = 1 * 60 * 1000;
     public static final int MIN_DURATION = 3 * 1000;
     private static final int REQUEST_CODE_MUSIC = 10010;
     private static final int REQUEST_CODE_FILE = 6384;
@@ -124,15 +133,74 @@ public class ShortVideoActivity extends AppCompatActivity {
     private SeekBarChangedObserver mSeekBarChangedObserver;
  
     private Handler mMainHandler;
+    private Bundle bundle;
+    private static int duration;
+
+    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 ENCODE_TYPE = "encode_type";
+    public final static String ENCODE_METHOD = "encode_method";
+    public final static String ENCODE_PROFILE = "encode_profile";
+    public final static String DURATION = "duration";
+
+    private int frameRate;
+    private int videoBitrate;
+    private int audioBitrate;
+    private int videoResolution;
+    private int encode_type;
+    private int encode_method;
+    private int encodeProfile;
+
+    private List<String> recordUrlList;
+    private long recordingTime = 0;//记录下来的总时间
+
+    public static void startActivity(Context context, int frameRate,
+                                     int videoBitrate, int audioBitrate,
+                                     int videoResolution,
+                                     int encodeType, int encodeMethod, int encodeProfile, int duration) {
+        Intent intent = new Intent(context, ShortVideoActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        intent.putExtra(FRAME_RATE, frameRate);
+        intent.putExtra(VIDEO_BITRATE, videoBitrate);
+        intent.putExtra(AUDIO_BITRATE, audioBitrate);
+        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
+        intent.putExtra(ENCODE_TYPE, encodeType);
+        intent.putExtra(ENCODE_METHOD, encodeMethod);
+        intent.putExtra(ENCODE_PROFILE, encodeProfile);
+        intent.putExtra(DURATION, duration);
+        context.startActivity(intent);
+    }
  
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        initData();
         binding = DataBindingUtil.setContentView(this, R.layout.activity_short_video);
+        recordUrlList = new ArrayList<>();
         initView();
         initRecordKit();
+        Toast.makeText(this, "视频上传时长需要在3s - " + duration + "s之间", Toast.LENGTH_LONG).show();
+    }
+
+    public static int getMaxDuration() {
+        return duration * 1000;
+    }
+
+    private void initData() {
+        bundle = getIntent().getExtras();
+        duration = bundle.getInt(DURATION, 0);
+        frameRate = bundle.getInt(FRAME_RATE, 0);
+        videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
+        audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
+        videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
+        encode_type = bundle.getInt(ENCODE_TYPE);
+        encode_method = bundle.getInt(ENCODE_METHOD);
+        encodeProfile = bundle.getInt(ENCODE_PROFILE);
     }
  
     @Override
@@ -164,6 +232,7 @@ public class ShortVideoActivity extends AppCompatActivity {
         mRecordProgressCtl.release();
         mRecordKit.setOnLogEventListener((IStreamer.OnLogEventListener) null);
         mRecordKit.release();
+        recordUrlList.clear();
     }
  
     private void initView() {
@@ -236,26 +305,37 @@ public class ShortVideoActivity extends AppCompatActivity {
         }
     }
  
+
     private void initRecordKit() {
         mMainHandler = new Handler();
         mRecordKit = new CNRecordKit(this);
-        //设置预览编码帧率
-        mRecordKit.setPreviewFps(20);
-        //设置录制编码帧率
-        mRecordKit.setTargetFps(20);
-        //设置视频码率
-        mRecordKit.setVideoKBitrate(1000);
-        //设置音频编码码率
-        mRecordKit.setAudioKBitrate(64);
-        //设置预览分辨率
-        mRecordKit.setPreviewResolution(IStreamer.VIDEO_RESOLUTION_540P);
-        //设置录制分辨率
-        mRecordKit.setTargetResolution(IStreamer.VIDEO_RESOLUTION_540P);
-        //设置编码模式
-        mRecordKit.setVideoEncodeMethod(IStreamer.ENCODE_METHOD_SOFTWARE);
-        mRecordKit.setVideoEncodeProfile(IStreamer.ENCODE_PROFILE_BALANCE);
-        //设置竖屏
-        mRecordKit.setRotateDegrees(0);
+        if (bundle != null) {
+
+            if (frameRate > 0) {
+                mRecordKit.setPreviewFps(frameRate);
+                mRecordKit.setTargetFps(frameRate);
+            }
+
+
+            if (videoBitrate > 0) {
+                mRecordKit.setVideoKBitrate(videoBitrate);
+            }
+
+            if (audioBitrate > 0) {
+                mRecordKit.setAudioKBitrate(audioBitrate);
+            }
+
+            mRecordKit.setPreviewResolution(videoResolution);
+            mRecordKit.setTargetResolution(videoResolution);
+
+            mRecordKit.setVideoCodecId(encode_type);
+
+            mRecordKit.setEncodeMethod(encode_method);
+
+            mRecordKit.setVideoEncodeProfile(encodeProfile);
+
+            mRecordKit.setRotateDegrees(0);
+        }
         //设置预览view
         mRecordKit.setDisplayPreview(binding.shortVideoPreview);
         mRecordKit.setFilter(DENOISE.getFilter());
@@ -268,6 +348,7 @@ public class ShortVideoActivity extends AppCompatActivity {
         mRecordKit.setOnLogEventListener(mLogEventListener);
         initBeautyUI();
         initStickerUI();
+        initFaceunity();
         initBgmUI();
         initBottomTitleUI();
  
@@ -288,9 +369,8 @@ public class ShortVideoActivity extends AppCompatActivity {
                     break;
                 case IStreamer.cnstream_open_file_success:
                     Log.i(TAG, "cnstream_open_file_success");
-                    // TODO: 2017/7/10
-//                    mChronometer.setBase(SystemClock.elapsedRealtime());
-//                    mChronometer.start();
+                    binding.chronometer.setBase(SystemClock.elapsedRealtime() - recordingTime);
+                    binding.chronometer.start();
                     mRecordProgressCtl.startRecording();
                     break;
                 default:
@@ -516,11 +596,10 @@ public class ShortVideoActivity extends AppCompatActivity {
                 break;
             case R.id.short_video_record_right_img:
                 if (binding.shortVideoRecordBottomLayout.shortVideoRecordRightImg.getDrawable().getLevel() == 3) {
-                    Toast.makeText(ShortVideoActivity.this, "上传", Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(ShortVideoActivity.this, "上传", Toast.LENGTH_SHORT).show();
                     onNextClick();
  
                 } else if (binding.shortVideoRecordBottomLayout.shortVideoRecordRightImg.getDrawable().getLevel() == 1) {
-                    // TODO: 2017/7/11 选择文件
                     importVideoFile();
                 }
                 break;
@@ -897,12 +976,18 @@ public class ShortVideoActivity extends AppCompatActivity {
                     stopRecord(false);
                 }
                 //删除录制文件
+                long duration = Long.parseLong(FileUtils.getDuration(mRecordKit.getLastRecordedFiles()));
+                recordingTime = recordingTime - duration;
                 binding.shortVideoRecordBottomLayout.shortVideoRecordLeftImg.getDrawable().setLevel(3);
+                recordUrlList.remove(mRecordKit.getLastRecordedFiles());
                 mRecordKit.deleteRecordFile(mRecordKit.getLastRecordedFiles());
                 mRecordProgressCtl.rollback();
                 binding.shortVideoRecordBottomLayout.shortVideoRecordLeftImg.setEnabled(true);
+
             }
         } else {
+            binding.chronometer.stop();
+            // TODO: 2017/7/12 记录时间
             isFileRecording = false;
             binding.shortVideoRecordBottomLayout.shortVideoRecordLeftImg.getDrawable().setLevel(1);
             binding.shortVideoRecordBottomLayout.shortVideoRecordLeftTextView.setVisibility(View.VISIBLE);
@@ -916,6 +1001,7 @@ public class ShortVideoActivity extends AppCompatActivity {
      * start recording to a local file
      */
     private void startRecord() {
+        binding.chronometer.setVisibility(View.VISIBLE);
         binding.shortVideoRecordBottomLayout.shortVideoRecord.getDrawable().setLevel(2);
         binding.shortVideoRecordBottomLayout.shortVideoRecordLeftTextView.setVisibility(View.GONE);
         binding.shortVideoRecordBottomLayout.shortVideoRecordLeftImg.getDrawable().setLevel(2);
@@ -927,6 +1013,7 @@ public class ShortVideoActivity extends AppCompatActivity {
             file.mkdir();
         }
         mRecordUrl = fileFolder + "/" + System.currentTimeMillis() + ".mp4";
+        recordUrlList.add(mRecordUrl);
         float val = binding.shortVideoBgmLayout.bgmSelectLayout.recordMicAudioVolume.getProgress() / 100.f;
         mRecordKit.setVoiceVolume(val);
         mRecordKit.startRecord(mRecordUrl);
@@ -941,6 +1028,7 @@ public class ShortVideoActivity extends AppCompatActivity {
     private void stopRecord(boolean finished) {
         //录制完成进入编辑页面
         //若录制文件大于1则需要出发文件合成
+        binding.chronometer.setVisibility(View.GONE);
         binding.shortVideoRecordBottomLayout.shortVideoRecordLeftImg.getDrawable().setLevel(3);
         binding.shortVideoRecordBottomLayout.shortVideoRecord.getDrawable().setLevel(1);
         if (finished) {
@@ -960,7 +1048,7 @@ public class ShortVideoActivity extends AppCompatActivity {
                             dialog.dismiss();
                             mRecordUrl = filePath;
                             //合成结束启动编辑
-                            EditActivity.startActivity(getApplicationContext(), mRecordUrl);
+                            EditActivity.startActivity(getApplicationContext(), mRecordUrl, duration, frameRate, videoBitrate, audioBitrate, videoResolution, encode_type, encode_method, encodeProfile);
                         }
                     });
                 }
@@ -972,6 +1060,7 @@ public class ShortVideoActivity extends AppCompatActivity {
         mRecordProgressCtl.stopRecording();
         binding.shortVideoRecordBottomLayout.shortVideoRecord.getDrawable().setLevel(1);
         isFileRecording = false;
+        stopChronometer(finished);
     }
  
  
@@ -1007,7 +1096,9 @@ public class ShortVideoActivity extends AppCompatActivity {
                     .setPositiveButton("是", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            mRecordKit.deleteRecordFile(mRecordUrl);
+                            for (int i1 = 0; i1 < recordUrlList.size(); i1++) {
+                                mRecordKit.deleteRecordFile(recordUrlList.get(i1));
+                            }
                             ShortVideoActivity.this.finish();
                         }
                     })
@@ -1069,26 +1160,38 @@ public class ShortVideoActivity extends AppCompatActivity {
                         final Uri uri = data.getData();
                         Log.i(TAG, "File Uri = " + uri.toString());
                         final String path = FileUtils.getPath(this, uri);
-                        EditActivity.startActivity(this, path);
+                        EditActivity.startActivity(this, path, duration, frameRate, videoBitrate, audioBitrate, videoResolution, encode_type, encode_method, encodeProfile);
                     }
                 }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
  
+
     private void initBeautyUI() {
-        String[] items = new String[]{"DISABLE", "BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION",
+        final String[] items = new String[]{"DISABLE", "BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION",
                 "BEAUTY_DENOISE", "BEAUTY_SMOOTH", "BEAUTY_SOFT_EXT", "BEAUTY_SOFT_SHARPEN", "BEAUTY_PRO"};
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_spinner_item, items);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
+                R.layout.spinner_checked_layout, items) {
+            @Override
+            public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+                View view = inflate(getContext(), R.layout.spinner_item_layout, null);
+                TextView textView = view.findViewById(R.id.spinner_item_label);
+                textView.setText(items[position]);
+                if (binding.shortVideoBeautyLayout.recordBeautyChoose.beautySpin.getSelectedItemPosition() == position) {
+                    textView.setTextColor(getResources().getColor(R.color.ffcc00));
+                }
+                return view;
+            }
+        };
+        adapter.setDropDownViewResource(R.layout.spinner_item_layout);
         binding.shortVideoBeautyLayout.recordBeautyChoose.beautySpin.setAdapter(adapter);
         binding.shortVideoBeautyLayout.recordBeautyChoose.beautySpin.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 TextView textView = ((TextView) parent.getChildAt(0));
                 if (textView != null) {
-                    textView.setTextColor(getResources().getColor(R.color.colorAccent));
+                    textView.setTextColor(getResources().getColor(R.color.ffcc00));
                 }
                 switch (position) {
                     case 0:
@@ -1184,25 +1287,36 @@ public class ShortVideoActivity extends AppCompatActivity {
     }
  
     private void initStickerUI() {
-        String[] items = new String[]{"DISABLE", "BEAGLEDOG", "COLORCROWN", "DEER",
+        final String[] items = new String[]{"DISABLE", "BEAGLEDOG", "COLORCROWN", "DEER",
                 "HAPPYRABBI", "HARTSHORN", "ITEM0204", "ITEM0208",
                 "ITEM0210", "ITEM0501", "MOOD", "PRINCESSCROWN", "TIARA", "YELLOWEAR"};
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
-                android.R.layout.simple_spinner_item, items);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.spinner_checked_layout, items) {
+            @Override
+            public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+                View view = inflate(getContext(), R.layout.spinner_item_layout, null);
+                TextView textView = view.findViewById(R.id.spinner_item_label);
+                textView.setText(items[position]);
+                if (binding.shortVideoBeautyLayout.recordStickerChoose.stickerSpin.getSelectedItemPosition() == position) {
+                    textView.setTextColor(getResources().getColor(R.color.ffcc00));
+                }
+                return view;
+            }
+        };
+        adapter.setDropDownViewResource(R.layout.spinner_item_layout);
         binding.shortVideoBeautyLayout.recordStickerChoose.stickerSpin.setAdapter(adapter);
         binding.shortVideoBeautyLayout.recordStickerChoose.stickerSpin.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 TextView textView = ((TextView) parent.getChildAt(0));
                 if (textView != null) {
-                    textView.setTextColor(getResources().getColor(R.color.colorAccent));
+                    textView.setTextColor(getResources().getColor(R.color.ffcc00));
                 }
                 if (position == 0) {
                     //disable
                     if (mImgFaceunityFilter != null) {
                         mImgFaceunityFilter.setPropType(-1);
                     }
+
                 } else {
                     mImgFaceunityFilter.setPropType(position - 1);
                 }
@@ -1217,6 +1331,17 @@ public class ShortVideoActivity extends AppCompatActivity {
         binding.shortVideoBeautyLayout.recordStickerChoose.stickerSpin.setSelection(0);
     }
  
+    private void stopChronometer(boolean finished) {
+        if (isFileRecording) {
+            return;
+        }
+        if (finished) {
+            binding.chronometer.setBase(SystemClock.elapsedRealtime());
+        }
+        binding.chronometer.stop();
+        recordingTime = SystemClock.elapsedRealtime() - binding.chronometer.getBase();
+    }
+
     private class MegerFilesAlertDialog extends AlertDialog {
  
         protected MegerFilesAlertDialog(Context context, int themID) {
+package com.cnlive.gundam.shortvideo.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.databinding.DataBindingUtil;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.cnlive.gundam.R;
+import com.cnlive.gundam.databinding.ActivityShortVideoPlayBinding;
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.video.video.MediaPlayer;
+import com.cnlive.libs.video.video.VideoView;
+import com.cnlive.libs.video.video.base.IDataSource;
+import com.cnlive.libs.video.video.base.IMediaPlayer;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Locale;
+
+
+public class ShortVideoPlayActivity extends AppCompatActivity {
+    private static final String TAG = "VideoPlayerActivity";
+
+    public static final int UPDATE_SEEKBAR = 0;
+    public static final int HIDDEN_SEEKBAR = 1;
+
+    private Context mContext;
+    private VideoView mVideoView;
+    private LinearLayout mPlayerPanel;
+    private ImageView mPlayerStartBtn;
+    private SeekBar mPlayerSeekbar;
+    private TextView mPlayerPosition;
+    private TextView mLoadText;
+
+    private LinearLayout toppanel;
+
+    private boolean mPlayerPanelShow = false;
+    private boolean mPause = false;
+
+    private int mVideoWidth = 0;
+    private int mVideoHeight = 0;
+
+    private Handler mHandler;
+
+    private final static String VIDEO_ID = "videoId";
+    private final static String NAME = "name";
+    private final static String DES = "des";
+    private String videoId;
+    private String name;
+    private String des;
+    private ActivityShortVideoPlayBinding playBinding;
+
+    public static void startActivity(Context context, String videoId, String name, String des) {
+        Intent intent = new Intent(context, ShortVideoPlayActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(VIDEO_ID, videoId);
+        intent.putExtra(NAME, name);
+        intent.putExtra(DES, des);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = this.getApplicationContext();
+        playBinding = DataBindingUtil.setContentView(this, R.layout.activity_short_video_play);
+        initData();
+        initView();
+        initVideoView();
+
+    }
+
+    private void initData() {
+        Bundle bundle = getIntent().getExtras();
+        videoId = bundle.getString(VIDEO_ID);
+        name = bundle.getString(NAME);
+        des = bundle.getString(DES);
+    }
+
+    private void initVideoView() {
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case UPDATE_SEEKBAR:
+                        setVideoProgress(0);
+                        break;
+                    case HIDDEN_SEEKBAR:
+                        mPlayerPanelShow = false;
+                        mPlayerPanel.setVisibility(View.GONE);
+                        toppanel.setVisibility(View.GONE);
+                        break;
+                }
+
+            }
+        };
+        mVideoView.setOnPreparedListener(mOnPreparedListener);
+        mVideoView.setOnCompletionListener(mOnCompletionListener);
+        mVideoView.setOnErrorListener(mOnErrorListener);
+        mVideoView.setOnInfoListener(mOnInfoListener);
+        mVideoView.setOnPlayStateListener(mOnPlayStateListener);
+        mVideoView.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
+        mVideoView.setOnVideoSizeChangedListener(mOnVideoSizeChangeListener);
+        mVideoView.setOnTouchListener(mTouchListener);
+
+        mVideoView.setDataSource(new IDataSource() {
+            @Override
+            public String getDataSourceId() {
+                return videoId;
+            }
+
+            @Override
+            public String getDataSourceType() {
+                return Config.TYPE_VOD;
+            }
+
+            @Override
+            public String getDataSourceRate() {
+                return Config.TYPE_PLAY_RATE_2;
+            }
+        });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (mVideoView != null) {
+            mVideoView.pause();
+            mPause = true;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mVideoView != null) {
+            mVideoView.start();
+            mPause = false;
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            videoPlayEnd();
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void initView() {
+        mVideoView = playBinding.videoView;
+        mPlayerPanel = playBinding.playerPanel;
+        mPlayerStartBtn = playBinding.playerStart;
+        mPlayerSeekbar = playBinding.playerSeekbar;
+        mPlayerPosition = playBinding.playerTime;
+        mLoadText = playBinding.loadingText;
+        toppanel = playBinding.topPlayerPanel;
+        playBinding.videoTitle.setText(name);
+        playBinding.videoDescription.setText(des);
+        mPlayerSeekbar.setOnSeekBarChangeListener(mSeekBarListener);
+    }
+
+    private MediaPlayer.OnPreparedListener mOnPreparedListener = new MediaPlayer.OnPreparedListener() {
+        @Override
+        public void onPrepared(IMediaPlayer mediaplayer) {
+            mVideoWidth = mVideoView.getVideoWidth();
+            mVideoHeight = mVideoView.getVideoHeight();
+
+            // Set Video Scaling Mode
+            mVideoView.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+
+            //start player
+            mVideoView.start();
+
+            //set progress
+            setVideoProgress(0);
+
+            mPlayerPosition.setVisibility(View.VISIBLE);
+            mLoadText.setVisibility(View.VISIBLE);
+
+            mHandler.removeMessages(HIDDEN_SEEKBAR);
+            Message msg = new Message();
+            msg.what = HIDDEN_SEEKBAR;
+            mHandler.sendMessageDelayed(msg, 3000);
+        }
+    };
+
+    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
+        @Override
+        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
+            long duration = mVideoView.getDuration();
+            long progress = duration * percent / 100;
+            mPlayerSeekbar.setSecondaryProgress((int) progress);
+        }
+    };
+
+    private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangeListener = new IMediaPlayer.OnVideoSizeChangedListener() {
+        @Override
+        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int sarNum, int sarDen) {
+            if (mVideoWidth > 0 && mVideoHeight > 0) {
+                if (width != mVideoWidth || height != mVideoHeight) {
+                    mVideoWidth = mp.getVideoWidth();
+                    mVideoHeight = mp.getVideoHeight();
+
+                    if (mVideoView != null)
+                        mVideoView.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                }
+            }
+        }
+    };
+
+    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
+        @Override
+        public void onSeekComplete(IMediaPlayer mp) {
+            Log.e(TAG, "onSeekComplete...............");
+        }
+    };
+
+    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
+        @Override
+        public void onCompletion(IMediaPlayer mp) {
+//            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
+            videoPlayEnd();
+        }
+    };
+
+    private IMediaPlayer.OnErrorListener mOnErrorListener = new IMediaPlayer.OnErrorListener() {
+        @Override
+        public boolean onError(IMediaPlayer mp, int what, int extra) {
+            switch (what) {
+                case MediaPlayer.MEDIA_ERROR_UNKNOWN:
+                    Log.e(TAG, "OnErrorListener, Error Unknown:" + what + ",extra:" + extra);
+                    break;
+                default:
+                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
+            }
+
+            videoPlayEnd();
+
+            return false;
+        }
+    };
+
+    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
+        @Override
+        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
+            switch (i) {
+                case MediaPlayer.MEDIA_INFO_BUFFERING_START:
+                    Log.d(TAG, "Buffering Start.");
+                    break;
+                case MediaPlayer.MEDIA_INFO_BUFFERING_END:
+                    Log.d(TAG, "Buffering End.");
+                    break;
+                case MediaPlayer.MEDIA_INFO_AUDIO_RENDERING_START:
+//                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+                case MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
+//                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+//                case MediaPlayer.MEDIA_INFO_SUGGEST_RELOAD:
+//                    // Player find a new stream(video or audio), and we could reload the video.
+//                    if (mVideoView != null)
+//                        mVideoView.reload(mDataSource, false);
+//                    break;
+                case MediaPlayer.MEDIA_INFO_RELOADED:
+//                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
+                    Log.d(TAG, "Succeed to reload video.");
+                    return false;
+            }
+            return false;
+        }
+    };
+
+    private View.OnTouchListener mTouchListener = new View.OnTouchListener() {
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            dealTouchEvent(v, event);
+            return false;
+        }
+    };
+
+    public IMediaPlayer.OnPlayStateListener mOnPlayStateListener = new IMediaPlayer.OnPlayStateListener() {
+        @Override
+        public void onPlayState(boolean played) {
+            mPlayerStartBtn.setBackgroundResource(played ? R.drawable.pause : R.drawable.play);
+        }
+    };
+
+    private int mVideoProgress = 0;
+    private SeekBar.OnSeekBarChangeListener mSeekBarListener = new SeekBar.OnSeekBarChangeListener() {
+        @Override
+        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+            if (fromUser) {
+                mVideoProgress = progress;
+                mHandler.removeMessages(HIDDEN_SEEKBAR);
+                Message msg = new Message();
+                msg.what = HIDDEN_SEEKBAR;
+                mHandler.sendMessageDelayed(msg, 3000);
+            }
+        }
+
+        @Override
+        public void onStartTrackingTouch(SeekBar seekBar) {
+
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            mVideoView.seekTo(mVideoProgress);
+            setVideoProgress(mVideoProgress);
+        }
+    };
+
+
+    public int setVideoProgress(int currentProgress) {
+
+        if (mVideoView == null)
+            return -1;
+
+        long time = currentProgress > 0 ? currentProgress : mVideoView.getCurrentPosition();
+        long length = mVideoView.getDuration();
+
+        // Update all view elements
+        mPlayerSeekbar.setMax((int) length);
+        mPlayerSeekbar.setProgress((int) time);
+
+        if (time >= 0) {
+            String progress = millisToString(time, false) + "/" + millisToString(length, false);
+            mPlayerPosition.setText(progress);
+        }
+
+        Message msg = new Message();
+        msg.what = UPDATE_SEEKBAR;
+
+        if (mHandler != null)
+            mHandler.sendMessageDelayed(msg, 1000);
+        return (int) time;
+    }
+
+    String millisToString(long millis, boolean text) {
+        boolean negative = millis < 0;
+        millis = Math.abs(millis);
+
+        millis /= 1000;
+        int sec = (int) (millis % 60);
+        millis /= 60;
+        int min = (int) (millis % 60);
+        millis /= 60;
+        int hours = (int) millis;
+
+        String time;
+        DecimalFormat format = (DecimalFormat) NumberFormat.getInstance(Locale.US);
+        format.applyPattern("00");
+        if (text) {
+            if (millis > 0)
+                time = (negative ? "-" : "") + hours + "h" + format.format(min) + "min";
+            else if (min > 0)
+                time = (negative ? "-" : "") + min + "min";
+            else
+                time = (negative ? "-" : "") + sec + "s";
+        } else {
+            if (millis > 0)
+                time = (negative ? "-" : "") + hours + ":" + format.format(min) + ":" + format.format(sec);
+            else
+                time = (negative ? "-" : "") + min + ":" + format.format(sec);
+        }
+        return time;
+    }
+
+    private void videoPlayEnd() {
+        if (mVideoView != null) {
+            mVideoView.release();
+            mVideoView = null;
+        }
+
+
+        mHandler = null;
+
+        finish();
+    }
+
+    public void onClick(View view) {
+        mHandler.removeMessages(HIDDEN_SEEKBAR);
+        Message msg = new Message();
+        msg.what = HIDDEN_SEEKBAR;
+        mHandler.sendMessageDelayed(msg, 3000);
+        switch (view.getId()) {
+            case R.id.player_start:
+                onPlayBtnClick();
+                break;
+            case R.id.back:
+                videoPlayEnd();
+                break;
+        }
+    }
+
+    private void onPlayBtnClick() {
+        mPause = !mPause;
+        mHandler.removeMessages(HIDDEN_SEEKBAR);
+        Message msg = new Message();
+        msg.what = HIDDEN_SEEKBAR;
+        mHandler.sendMessageDelayed(msg, 3000);
+        if (mPause) {
+            mVideoView.pause();
+        } else {
+            mVideoView.start();
+        }
+    }
+
+    // Maybe we could support gesture detect
+    private void dealTouchEvent(View view, MotionEvent event) {
+        mPlayerPanelShow = !mPlayerPanelShow;
+
+        if (mPlayerPanelShow) {
+            mPlayerPanel.setVisibility(View.VISIBLE);
+            toppanel.setVisibility(View.VISIBLE);
+
+            Message msg = new Message();
+            msg.what = HIDDEN_SEEKBAR;
+            mHandler.sendMessageDelayed(msg, 3000);
+        } else {
+            mPlayerPanel.setVisibility(View.GONE);
+            toppanel.setVisibility(View.GONE);
+            mHandler.removeMessages(HIDDEN_SEEKBAR);
+        }
+    }
+
+}
 package com.cnlive.gundam.shortvideo.dialog;
  
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -8,6 +9,8 @@ import android.text.InputType;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioButton;
@@ -15,6 +18,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
  
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.shortvideo.activity.ShortVideoActivity;
 import com.cnlive.libs.stream.base.IStreamer;
  
 /**
@@ -43,12 +47,15 @@ public class ShortVideoConfigDialog extends Dialog {
     private EditText mAudioBitRateEditText;
     private TextView mConfigTitle;
  
+    private Context mContext;
+
     private ShortVideoConfig mShortVideoConfig;
     private int mConfigType = SHORTVIDEOCONFIG_TYPE_RECORD;
  
-    public ShortVideoConfigDialog(@NonNull Context context, int type) {
-        super(context);
+    public ShortVideoConfigDialog(@NonNull Context context, int type, int theme) {
+        super(context, theme);
         this.mConfigType = type;
+        this.mContext = context;
     }
  
     @Override
 package com.cnlive.gundam.shortvideo.fragment;
  
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.database.DatabaseUtils;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Toast;
  
+import com.cnlive.gundam.BR;
 import com.cnlive.gundam.R;
+import com.cnlive.gundam.data.network.RetrofitUtil;
+import com.cnlive.gundam.data.network.util.SignUtil;
 import com.cnlive.gundam.databinding.FragmentMyVideoBinding;
+import com.cnlive.gundam.main.ui.adapter.DataBindingAdapter;
 import com.cnlive.gundam.shortvideo.activity.ShortVideoActivity;
+import com.cnlive.gundam.shortvideo.activity.ShortVideoPlayActivity;
+import com.cnlive.gundam.shortvideo.dialog.ShortVideoConfigDialog;
+import com.cnlive.gundam.shortvideo.model.ShortVideoDataModel;
+import com.cnlive.gundam.shortvideo.model.ShortVideoInfo;
 import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
@@ -23,14 +36,28 @@ import com.cnlive.libs.shortvideo.callback.Callback;
 import com.cnlive.libs.shortvideo.callback.CheckAuthResultListener;
 import com.cnlive.libs.shortvideo.network.model.ShortVideoAuth;
 import com.cnlive.libs.shortvideo.utils.AuthInfoManager;
+import com.cnlive.libs.util.Config;
  
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.Response;
+
+
+public class MyVideoFragment extends Fragment implements View.OnClickListener,
+        SwipeRefreshLayout.OnRefreshListener,
+        DataBindingAdapter.OnAdapterViewClickListener<ShortVideoInfo>,
+        DataBindingAdapter.OnAdapterViewLoadMoreListener,
+        retrofit2.Callback<ShortVideoDataModel> {
  
-public class MyVideoFragment extends Fragment implements View.OnClickListener {
     private FragmentMyVideoBinding binding;
+    private DataBindingAdapter adapter;
  
     private Handler mMainHandler;
+    private int maxDuration;
+
+    private String userId;
  
     public MyVideoFragment() {
         // Required empty public constructor
@@ -42,17 +69,41 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
     }
  
     @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_my_video, container, false);
+        binding.setListAdapter(adapter = new DataBindingAdapter(getActivity(), R.layout.layout_item_short_video, BR.shortVideoInfo));
+        adapter.setOnViewClickListener(this);
+        adapter.setOnLoadMoreListener(this);
+        binding.setLayoutManager(new LinearLayoutManager(getActivity()));
+        binding.contentView.setOnRefreshListener(this);
         return binding.getRoot();
     }
  
     @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         mMainHandler = new Handler();
         initToolBar();
+        loadData();
+    }
+
+    private void loadData() {
+        userId = String.valueOf(UserService.getInstance(getActivity()).getActiveAccountInfo().getUid());
+
+        Map<String, String> params = new HashMap<>();
+        params.put("appId", Config.getAppId());
+        params.put("userId", userId);
+        params.put("page", "1");
+        params.put("pageSize", "15");
+        params.put("platform_id", Config.getContext().getPackageName());
+        params.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        RetrofitUtil.getApiService().getShortVideoList(SignUtil.getSignParamM(getActivity(), params)).enqueue(this);
     }
  
     @Override
@@ -86,13 +137,8 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
                 getActivity().finish();
                 break;
             case R.id.record:
+                onRecordClick();
                 onAuthClick();
-                User user = UserService.getInstance(getActivity()).getActiveAccountInfo();
-                if (user.getUid() == 0) {
-                    startActivity(new Intent(getActivity(), LoginActivity.class));
-                } else {
-                    startActivity(new Intent(getActivity(), ShortVideoActivity.class));
-                }
                 break;
         }
     }
@@ -110,6 +156,9 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
                 ShortVideoAuth shortVideoAuth = (ShortVideoAuth) o;
                 final String authInfo = shortVideoAuth.getData().getAuthorization();
                 final String date = shortVideoAuth.getData().getX_amz_date();
+                String duration = shortVideoAuth.getData().getMaxDuration();
+                maxDuration = Integer.parseInt(duration);
+
                 //初始化鉴权信息
  
                 AuthInfoManager.getInstance().setAuthInfo(getActivity().getApplicationContext(),
@@ -124,6 +173,32 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
  
     }
  
+    private void onRecordClick() {
+
+        final ShortVideoConfigDialog configDialog = new ShortVideoConfigDialog(getActivity(), ShortVideoConfigDialog.SHORTVIDEOCONFIG_TYPE_RECORD, R.style.RecordParamsDialog);
+        configDialog.setCancelable(false);
+        configDialog.show();
+
+        Window win = configDialog.getWindow();
+        win.getDecorView().setPadding(0, 0, 0, 0);
+        WindowManager.LayoutParams lp = win.getAttributes();
+        lp.width = WindowManager.LayoutParams.FILL_PARENT;
+        lp.height = WindowManager.LayoutParams.FILL_PARENT;
+        win.setAttributes(lp);
+        configDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialogInterface) {
+                ShortVideoConfigDialog.ShortVideoConfig config = configDialog.getShortVideoConfig();
+                if (config != null) {
+                    ShortVideoActivity.startActivity(getActivity().getApplicationContext(), config.fps,
+                            config.videoBitrate, config.audioBitrate,
+                            config.resolution, config.encodeType,
+                            config.encodeMethod, config.encodeProfile, maxDuration);
+                }
+            }
+        });
+    }
+
     private CheckAuthResultListener mCheckAuthResultListener = new CheckAuthResultListener() {
         @Override
         public void onAuthResult(int i) {
@@ -132,7 +207,7 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
                 public void run() {
                     AuthInfoManager.getInstance().removeAuthResultListener(mCheckAuthResultListener);
                     if (AuthInfoManager.getInstance().getAuthState()) {
-                        Toast.makeText(getActivity(), "Auth Success", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(getActivity(), "Auth Success", Toast.LENGTH_SHORT).show();
                     } else {
                         Toast.makeText(getActivity(), "Auth Failed", Toast.LENGTH_SHORT).show();
                     }
@@ -141,5 +216,49 @@ public class MyVideoFragment extends Fragment implements View.OnClickListener {
         }
     };
  
+    @Override
+    public void onRefresh() {
+        loadData();
+    }
+
+    @Override
+    public void onViewClick(View v, ShortVideoInfo program) {
+        String videoId = program.getVideoId();
+        String name = program.getName();
+        String des = program.getDescription();
+        if (v.getId() == R.id.item_short_video) {
+            ShortVideoPlayActivity.startActivity(getActivity(), videoId, name, des);
+        }
+    }
+
+    @Override
+    public void onLoadMore() {
+    }
  
+    @Override
+    public void onResponse(Call<ShortVideoDataModel> call, Response<ShortVideoDataModel> response) {
+        binding.contentView.setRefreshing(false);
+        if (response.isSuccessful()) {
+            ShortVideoDataModel model = response.body();
+            if (model != null && "0".equals(model.getCode())) {
+                if (model.getData() == null) {
+                    Toast.makeText(getActivity(), "暂无数据", Toast.LENGTH_SHORT).show();
+                    binding.recyclerView.setVisibility(View.GONE);
+                    binding.emptyView.setVisibility(View.VISIBLE);
+                } else {
+                    adapter.updateItems(model.getData().getList());
+                }
+            } else {
+                Toast.makeText(getActivity(), "获取数据失败1 " + model.getCode() + " : " + model.getMessage(), Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            Toast.makeText(getActivity(), "获取数据失败2", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public void onFailure(Call<ShortVideoDataModel> call, Throwable t) {
+        binding.contentView.setRefreshing(false);
+        Toast.makeText(getActivity(), "获取数据失败3", Toast.LENGTH_SHORT).show();
+    }
 }
+package com.cnlive.gundam.shortvideo.model;
+
+import com.cnlive.gundam.main.model.ErrorMessage;
+
+import java.io.Serializable;
+
+/**
+ * Created by Lynn on 2017/7/13.
+ */
+
+public class ShortVideoDataModel extends ErrorMessage implements Serializable {
+
+    private ShortVideoList data;
+
+    public ShortVideoList getData() {
+        return data;
+    }
+
+    public void setData(ShortVideoList data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "ShortVideoDataModel{" +
+                "data=" + data +
+                '}';
+    }
+}
+package com.cnlive.gundam.shortvideo.model;
+
+import java.io.Serializable;
+
+/**
+ * Created by Lynn on 2017/7/14.
+ */
+
+public class ShortVideoInfo implements Serializable {
+//    private String appId;
+//    private String createTime;
+    private String description;
+//    private String id;
+//    private String md5;
+    private String name;
+    private String picKey;
+//    private String path;
+//    private String spId;
+    private String status;
+//    private String updateTime;
+    private String videoId;
+
+//    public String getAppId() {
+//        return appId;
+//    }
+//
+//    public void setAppId(String appId) {
+//        this.appId = appId;
+//    }
+//
+//    public String getCreateTime() {
+//        if (createTime != null) {
+//            return DateUtils.getDateToString(Long.parseLong(createTime));
+//        }else {
+//            return "";
+//        }
+//    }
+//
+//    public void setCreateTime(String createTime) {
+//        this.createTime = createTime;
+//    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+//    public String getId() {
+//        return id;
+//    }
+//
+//    public void setId(String id) {
+//        this.id = id;
+//    }
+//
+//    public String getMd5() {
+//        return md5;
+//    }
+//
+//    public void setMd5(String md5) {
+//        this.md5 = md5;
+//    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPicKey() {
+        return picKey;
+    }
+
+    public void setPicKey(String picKey) {
+        this.picKey = picKey;
+    }
+
+    //    public String getPath() {
+//        return path;
+//    }
+//
+//    public void setPath(String path) {
+//        this.path = path;
+//    }
+//
+//    public String getSpId() {
+//        return spId;
+//    }
+//
+//    public void setSpId(String spId) {
+//        this.spId = spId;
+//    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+//    public String getUpdateTime() {
+//        return updateTime;
+//    }
+//
+//    public void setUpdateTime(String updateTime) {
+//        this.updateTime = updateTime;
+//    }
+
+    public String getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(String videoId) {
+        this.videoId = videoId;
+    }
+
+    @Override
+    public String toString() {
+        return "ShortVideoInfo{" +
+                "description='" + description + '\'' +
+                ", name='" + name + '\'' +
+                ", picKey='" + picKey + '\'' +
+                ", status='" + status + '\'' +
+                ", videoId='" + videoId + '\'' +
+                '}';
+    }
+}
+package com.cnlive.gundam.shortvideo.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by Lynn on 2017/7/14.
+ */
+
+public class ShortVideoList implements Serializable {
+    List<ShortVideoInfo> list;
+
+    public List<ShortVideoInfo> getList() {
+        return list;
+    }
+
+    public void setList(List<ShortVideoInfo> list) {
+        this.list = list;
+    }
+
+    @Override
+    public String toString() {
+        return "ShortVideoList{" +
+                "list=" + list +
+                '}';
+    }
+}
+package com.cnlive.gundam.shortvideo.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by Lynn on 2017/7/14.
+ */
+
+public class DateUtils {
+    private static SimpleDateFormat sf;
+
+    /*时间戳转换成字符串*/
+    public static String getDateToString(long time) {
+        Date d = new Date(time);
+        sf = new SimpleDateFormat("yyyy-MM-dd");
+        return sf.format(d);
+    }
+}
@@ -5,6 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
+import android.graphics.Bitmap;
+import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
@@ -14,6 +16,9 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
  
 import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.UUID;
  
 /**
  * Created by Lynn on 6/28/2017.
@@ -289,4 +294,72 @@ public class FileUtils {
             return "";
         }
     }
+
+    public static String getDuration(String uri) {
+        String duration = null;
+        MediaMetadataRetriever mmr = new MediaMetadataRetriever();
+        try {
+            if (uri != null) {
+                mmr.setDataSource(uri);
+                duration = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
+            } else {
+                Log.d("getUploadInfo", "path should not null");
+            }
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
+        return duration;
+    }
+
+
+    private static final String SD_PATH = "/sdcard/cn_sv_cover_img";
+    private static final String IN_PATH = "/dskqxt/pic/";
+
+    /**
+     * 随机生产文件名
+     *
+     * @return
+     */
+    private static String generateFileName() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 保存bitmap到本地
+     *
+     * @param context
+     * @param mBitmap
+     * @return
+     */
+    public static String saveBitmap(Context context, Bitmap mBitmap) {
+        String savePath;
+        File filePic;
+        if (Environment.getExternalStorageState().equals(
+                Environment.MEDIA_MOUNTED)) {
+            savePath = SD_PATH;
+        } else {
+            savePath = context.getApplicationContext().getFilesDir()
+                    .getAbsolutePath()
+                    + IN_PATH;
+        }
+        try {
+            filePic = new File(savePath + generateFileName() + ".png");
+            if (!filePic.exists()) {
+                filePic.getParentFile().mkdirs();
+                filePic.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(filePic);
+            mBitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            return null;
+        }
+
+        return filePic.getAbsolutePath();
+    }
 }
@@ -186,7 +186,7 @@ public class RecordProgressController {
      * @return
      */
     public int getRecordedTime() {
-        return mProgressView.mTotalWidth * ShortVideoActivity.MAX_DURATION / mProgressView
+        return mProgressView.mTotalWidth * ShortVideoActivity.getMaxDuration() / mProgressView
                 .mScreenWidth;
     }
  
@@ -90,7 +90,7 @@ public class RecordProgressView extends View implements RecordProgressController
         mScreenWidth = getScreenWidthPixels(getContext());
         mMinPoint = mScreenWidth
                 * ShortVideoActivity.MIN_DURATION
-                / ShortVideoActivity.MAX_DURATION;
+                / ShortVideoActivity.getMaxDuration();
         mHandler.postDelayed(mCursorRunnable, 500);
     }
  
@@ -104,7 +104,7 @@ public class RecordProgressView extends View implements RecordProgressController
             int totalWidth = 0;
             for (RecordClipModel clip : mProgressClipList) {
                 long newWidth = totalWidth + (clip.timeInterval * mScreenWidth)
-                        / ShortVideoActivity.MAX_DURATION;
+                        / ShortVideoActivity.getMaxDuration();
                 switch (clip.state) {
                     case 0: // recording
                         canvas.drawRect(totalWidth, paddingTop, newWidth,
@@ -168,7 +168,7 @@ public class RecordProgressView extends View implements RecordProgressController
             int totalWidth = 0;
             for (RecordClipModel clip : mProgressClipList) {
                 long newWidth = totalWidth + (clip.timeInterval * mScreenWidth)
-                        / ShortVideoActivity.MAX_DURATION;
+                        / ShortVideoActivity.getMaxDuration();
                 totalWidth = (int) newWidth;
             }
             if (totalWidth >= mMinPoint) {
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="10dp"
+    android:shape="rectangle">
+    <solid android:color="#ffcc00" />
+    <stroke
+        android:width="1dip"
+        android:color="#ffcc00" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <size android:width="2dp" />
+
+    <solid android:color="#ff7200" />
+
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <gradient
+                android:endColor="#ff7200"
+                android:startColor="#ff7200" />
+        </shape>
+    </item>
+    <item android:bottom="2dp">
+        <shape android:shape="rectangle" >
+            <gradient
+                android:endColor="#eeeeee"
+                android:startColor="#eeeeee" />
+        </shape>
+    </item>
+
+</layer-list>
 \ 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:state_activated="true" android:color="#02d4e1"/>
-    <item android:color="@android:color/white"/>
+    <item android:color="#ffcc00" android:state_activated="true" />
+    <item android:color="#EEE8AA" />
 </selector>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:padding="10dp"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="1dip"
+        android:color="#ffcc00" />
+</shape>
 \ 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/edittext_background" android:state_checked="false" />
+    <item android:drawable="@drawable/background_radio" android:state_checked="true" />
+</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:color="#ffcc00" android:state_checked="false" />
+    <item android:color="#ffffff" android:state_checked="true" />
+</selector>
 \ No newline at end of file
@@ -18,6 +18,16 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentTop="true" />
  
+            <TextView
+                android:id="@+id/hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="5dp"
+                android:textColor="@color/ff4e51"
+                android:textSize="14sp" />
+
             <com.cnlive.libs.shortvideo.view.CNStickerView
                 android:id="@+id/sticker_panel"
                 android:layout_width="fill_parent"
@@ -16,6 +16,19 @@
             android:id="@+id/short_video_record_top_layout"
             layout="@layout/short_video_record_top_view" />
  
+        <Chronometer
+            android:id="@+id/chronometer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="50dp"
+            android:format="%s"
+            android:gravity="center"
+            android:textColor="@color/ff4e51"
+            android:textSize="40px"
+            android:visibility="gone" />
+
         <include
             android:id="@+id/short_video_record_bottom_layout"
             layout="@layout/short_video_record_bottom_view" />
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#000000">
+
+        <com.cnlive.libs.video.video.VideoView
+            android:id="@+id/video_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true" />
+
+        <TextureView
+            android:id="@+id/player_texture"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:visibility="gone"
+            tools:targetApi="ice_cream_sandwich" />
+
+        <TextView
+            android:id="@+id/loading_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:textColor="#FFCC00" />
+
+        <LinearLayout
+            android:id="@+id/top_player_panel"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@color/transparent2"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="10dp"
+                android:onClick="onClick"
+                android:src="@drawable/player_back" />
+
+            <TextView
+                android:id="@+id/video_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textColor="@color/text_white_color" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@color/transparent2"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/video_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:ellipsize="end"
+                android:padding="10dp"
+                android:singleLine="true"
+                android:textColor="@color/text_white_color" />
+
+            <LinearLayout
+                android:id="@+id/player_panel"
+                android:layout_width="match_parent"
+                android:layout_height="50dp">
+
+                <ImageView
+                    android:id="@+id/player_start"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/play_state"
+                    android:onClick="onClick" />
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp">
+
+
+                    <TextView
+                        android:id="@+id/player_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:text="00:00/00:00" />
+
+                    <SeekBar
+                        android:id="@+id/player_seekbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/player_time"
+                        android:focusable="true" />
+
+                </RelativeLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
+</layout>
 \ No newline at end of file
@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="美颜类型："
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="16sp" />
  
             <android.support.v7.widget.AppCompatSpinner
@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="磨皮"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="美白"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -97,7 +97,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="红润"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -20,7 +20,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="原音"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -43,7 +43,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="配乐"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="原音变声"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSpinner
@@ -90,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="原音混响"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSpinner
@@ -4,7 +4,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#616060">
+        android:background="@color/white">
  
         <RelativeLayout
             android:id="@+id/edit_layout"
@@ -106,7 +106,7 @@
             android:layout_width="match_parent"
             android:layout_height="2px"
             android:layout_below="@+id/edit_layout"
-            android:background="#FF000000" />
+            android:background="@color/ffcc00" />
  
         <FrameLayout
             android:layout_width="match_parent"
@@ -21,8 +21,8 @@
                 android:layout_weight="1"
                 android:hint="input text ..."
                 android:paddingLeft="8dp"
-                android:textColor="#ffffff"
-                android:textColorHint="#ffffff" />
+                android:textColor="#ffcc00"
+                android:textColorHint="#f0f0f0" />
  
             <ImageView
                 android:id="@+id/text_color"
@@ -30,7 +30,7 @@
                 android:layout_height="25dp"
                 android:layout_gravity="center_vertical"
                 android:layout_margin="10dp"
-                android:background="#ffffff"
+                android:background="#ffcc00"
                 android:onClick="onClick" />
  
         </LinearLayout>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter" />
+
+        <import type="android.support.v7.widget.LinearLayoutManager" />
+
+        <variable
+            name="layoutManager"
+            type="LinearLayoutManager" />
+
+        <variable
+            name="listAdapter"
+            type="DataBindingAdapter" />
+    </data>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
  
-        <LinearLayout
+        <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/contentView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <include
+                    android:id="@+id/myVideoIncludLayout"
+                    layout="@layout/toolbar_my_video" />
+
+                <include layout="@layout/user_divider_head_line" />
  
-            <include
-                android:id="@+id/myVideoIncludLayout"
-                layout="@layout/toolbar_my_video" />
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    app:adapter="@{listAdapter}"
+                    app:layoutManager="@{layoutManager}" />
  
-            <include layout="@layout/user_divider_head_line" />
+                <TextView
+                    android:id="@+id/empty_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="您还没有录制过视频\n\n快去录制吧⁽⁽ଘ( ˊᵕˋ )ଓ⁾⁾*"
+                    android:textSize="20sp"
+                    android:visibility="gone" />
  
-        </LinearLayout>
+            </LinearLayout>
+        </android.support.v4.widget.SwipeRefreshLayout>
     </RelativeLayout>
  
  
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.cnlive.gundam.shortvideo.model.ShortVideoInfo" />
+
+        <import type="android.view.View" />
+
+        <import type="com.cnlive.gundam.main.ui.adapter.DataBindingAdapter.OnAdapterViewClickListener" />
+
+        <variable
+            name="shortVideoInfo"
+            type="ShortVideoInfo" />
+
+        <variable
+            name="viewClickListner"
+            type="OnAdapterViewClickListener&lt;ShortVideoInfo>" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/item_short_video"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+
+        android:onClick="@{(view)->viewClickListner.onViewClick(view, shortVideoInfo)}"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/cover_image"
+                android:layout_width="90dp"
+                android:layout_height="90dp"
+                android:padding="2dp"
+                app:error="@{@drawable/default_pic}"
+                app:imageUrl="@{shortVideoInfo.picKey}" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="90dp"
+                android:layout_marginLeft="10dp"
+                android:gravity="center_vertical"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/video_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{shortVideoInfo.name}"
+                    android:textColor="@color/black"
+                    android:textSize="18sp" />
+
+                <!--<TextView-->
+                <!--android:id="@+id/video_time"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_marginLeft="10dp"-->
+                <!--android:layout_marginTop="10dp"-->
+                <!--android:text="@{shortVideoInfo.createTime}"-->
+                <!--android:textSize="14sp" />-->
+
+                <TextView
+                    android:id="@+id/video_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="3dp"
+                    android:text="@{shortVideoInfo.description}"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/gray_line_color" />
+
+    </LinearLayout>
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@android:color/white"
     android:orientation="vertical">
  
-    <TextView
-        android:id="@+id/config_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textSize="20dp" />
-
-    <RadioGroup
-        android:id="@+id/resolution_group"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:orientation="horizontal">
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
  
-        <RadioButton
-            android:id="@+id/r360p"
+        <TextView
+            android:id="@+id/config_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="360P" />
+            android:layout_gravity="center"
+            android:textColor="#ffcc00"
+            android:textSize="20dp" />
  
-        <RadioButton
-            android:id="@+id/r480p"
+        <RadioGroup
+            android:id="@+id/resolution_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="480P" />
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
  
-        <RadioButton
-            android:id="@+id/r540p"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="540P" />
+            <RadioButton
+                android:id="@+id/r360p"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:padding="10dp"
+                android:text="360P"
+                android:textColor="@drawable/text_color_selector" />
  
-        <RadioButton
-            android:id="@+id/r720p"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="720P" />
-    </RadioGroup>
+            <RadioButton
+                android:id="@+id/r480p"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="true"
+                android:padding="10dp"
+                android:text="480P"
+                android:textColor="@drawable/text_color_selector" />
  
-    <RadioGroup
-        android:id="@+id/encode_type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/resolution_group"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal">
+            <RadioButton
+                android:id="@+id/r540p"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="540P"
+                android:textColor="@drawable/text_color_selector" />
  
-        <RadioButton
-            android:id="@+id/encode_h264"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="H264" />
+            <RadioButton
+                android:id="@+id/r720p"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="720P"
+                android:textColor="@drawable/text_color_selector" />
+        </RadioGroup>
  
-        <RadioButton
-            android:id="@+id/encode_h265"
+        <RadioGroup
+            android:id="@+id/encode_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="H265" />
-    </RadioGroup>
+            android:layout_below="@id/resolution_group"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
  
-    <RadioGroup
-        android:id="@+id/encode_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/encode_type"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal">
+            <RadioButton
+                android:id="@+id/encode_h264"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="true"
+                android:padding="10dp"
+                android:text="H264"
+                android:textColor="@drawable/text_color_selector" />
  
-        <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_h265"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="H265"
+                android:textColor="@drawable/text_color_selector" />
+        </RadioGroup>
  
-        <RadioButton
-            android:id="@+id/encode_sw"
+        <RadioGroup
+            android:id="@+id/encode_group"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="软编" />
-    </RadioGroup>
+            android:layout_below="@id/encode_type"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
  
-    <RadioGroup
-        android:id="@+id/encode_profile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/encode_group"
-        android:layout_marginTop="5dp"
-        android:orientation="horizontal">
+            <RadioButton
+                android:id="@+id/encode_hw"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="硬编"
+                android:textColor="@drawable/text_color_selector" />
  
-        <RadioButton
-            android:id="@+id/encode_profile_low_power"
-            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:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="true"
+                android:padding="10dp"
+                android:text="软编"
+                android:textColor="@drawable/text_color_selector" />
+        </RadioGroup>
  
-        <RadioButton
-            android:id="@+id/encode_profile_balance"
+        <RadioGroup
+            android:id="@+id/encode_profile"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="平衡" />
+            android:layout_below="@id/encode_group"
+            android:layout_marginTop="5dp"
+            android:orientation="horizontal">
  
-        <RadioButton
-            android:id="@+id/encode_profile_high_perf"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:text="高性能" />
-    </RadioGroup>
+            <RadioButton
+                android:id="@+id/encode_profile_low_power"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="低功耗"
+                android:textColor="@drawable/text_color_selector" />
  
-    <LinearLayout
-        android:id="@+id/frameRate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/encode_group">
+            <RadioButton
+                android:id="@+id/encode_profile_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="true"
+                android:padding="10dp"
+                android:text="平衡"
+                android:textColor="@drawable/text_color_selector" />
  
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="采集帧率"
-            android:textSize="16sp" />
+            <RadioButton
+                android:id="@+id/encode_profile_high_perf"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/radiobutton_selector"
+                android:button="@null"
+                android:checked="false"
+                android:padding="10dp"
+                android:text="高性能"
+                android:textColor="@drawable/text_color_selector" />
+        </RadioGroup>
  
-        <EditText
-            android:id="@+id/frameRatePicker"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/frameRate"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="20" />
-    </LinearLayout>
+            android:layout_below="@id/encode_group"
+            android:layout_marginTop="10dp">
  
-    <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="采集帧率"
+                android:textColor="@color/black"
+                android:textSize="16sp" />
  
-        <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:layout_marginLeft="5dp"
+                android:background="@drawable/edittext_background"
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:text="20"
+                android:textColor="#ffcc00"
+                android:textCursorDrawable="@drawable/edit_cursor_color" />
+        </LinearLayout>
  
-        <EditText
-            android:id="@+id/videoBitratePicker"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/videoBitrate"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="1000" />
-    </LinearLayout>
+            android:layout_below="@id/frameRate"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
  
-    <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:textColor="@color/black"
+                android:textSize="16sp" />
  
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="音频码率"
-            android:textSize="16sp" />
+            <EditText
+                android:id="@+id/videoBitratePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/edittext_background"
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:text="1000"
+                android:textColor="#ffcc00"
+                android:textCursorDrawable="@drawable/edit_cursor_color" />
+        </LinearLayout>
  
-        <EditText
-            android:id="@+id/audioBitratePicker"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/audioBitrate"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="64" />
-    </LinearLayout>
+            android:layout_below="@id/videoBitrate"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="音频码率"
+                android:textColor="@color/black"
+                android:textSize="16sp" />
  
+            <EditText
+                android:id="@+id/audioBitratePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/edittext_background"
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:text="64"
+                android:textColor="#ffcc00"
+                android:textCursorDrawable="@drawable/edit_cursor_color" />
+        </LinearLayout>
  
-    <Button
-        android:id="@+id/preview_params_confim"
-        android:layout_width="100dp"
-        android:layout_height="50dp"
-        android:layout_gravity="center"
-        android:text="确定" />
-</LinearLayout>
 \ No newline at end of file
+
+        <Button
+            android:id="@+id/preview_params_confim"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:background="#ffcc00"
+            android:text="确定"
+            android:textColor="#ffffff" />
+
+    </LinearLayout>
+</RelativeLayout>
 \ No newline at end of file
@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="美颜类型："
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="16sp" />
  
             <android.support.v7.widget.AppCompatSpinner
@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="磨皮"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -72,7 +72,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="美白"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -97,7 +97,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="红润"
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="14sp" />
  
             <android.support.v7.widget.AppCompatSeekBar
@@ -150,7 +150,7 @@
                         android:layout_gravity="center"
                         android:layout_marginLeft="50dp"
                         android:text="0"
-                        android:textColor="@color/colorAccent"
+                        android:textColor="@color/ffcc00"
                         android:textSize="16sp" />
  
                     <ImageView
@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="贴纸类型："
-                android:textColor="@color/colorAccent"
+                android:textColor="@color/ffcc00"
                 android:textSize="16sp" />
  
             <android.support.v7.widget.AppCompatSpinner
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:gravity="center_vertical"
+    android:singleLine="true"
+    android:textColor="@color/ffcc00"
+    android:textSize="16sp">
+
+</CheckedTextView>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/spinner_item_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+</layout>
 \ No newline at end of file
@@ -24,7 +24,8 @@
             android:singleLine="true"
             android:text="there is a title"
             android:textColor="@color/black"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            android:onClick="onClick"/>
  
         <ImageView
             android:id="@+id/record"
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp"
+        android:text="录入视频信息"
+        android:textColor="#ffcc00"
+        android:textSize="22sp" />
+
+    <ImageView
+        android:id="@+id/cover_img"
+        android:layout_width="90dp"
+        android:layout_height="120dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/video_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="标题"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/video_title_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/edittext_background"
+            android:hint="视频标题"
+            android:padding="5dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/video_des"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="描述"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/video_des_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:background="@drawable/edittext_background"
+            android:hint="视频描述"
+            android:padding="5dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/cancel_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/edittext_background"
+            android:text="取消"
+            android:textColor="#ffcc00"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/config_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="#ffcc00"
+            android:text="上传"
+            android:textColor="@color/text_white_color"
+            android:textSize="16sp" />
+    </LinearLayout>
+</LinearLayout>
 \ No newline at end of file
@@ -16,7 +16,7 @@
  
     <color name="transparent">#00000000</color>
     <color name="transparent1">#7fffffff</color><!--透明白色 -->
-    <color name="transparent2">#616060</color><!--透明白色 -->
+    <color name="transparent2">#7f616060</color><!--透明白色 -->
     <color name="record_progress_black">#2c2c2c</color>
     <color name="record_progress_bg">#2c2c2c</color>
     <color name="record_progress_blue">#368ca8</color>
@@ -24,6 +24,7 @@
     <color name="record_progress_red">#e85932</color>
     <color name="record_title_bg_default">#919191</color>
     <color name="record_title_bg_selected">#616060</color>
+    <color name="ffcc00">#ffcc00</color>
     <color name="white">#ffffff</color>
     <color name="color_text_normal_999">#999</color>
     <color name="color_cutline_ececec">#ececec</color>
@@ -21,6 +21,16 @@
         <item name="android:backgroundDimEnabled">false</item><!--模糊-->
     </style>
  
+    <style name="RecordParamsDialog" parent="@android:style/Theme.DeviceDefault.Dialog">
+        <item name="android:windowFrame">@null</item><!--边框-->
+        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">true</item><!--半透明-->
+        <item name="android:windowNoTitle">true</item><!--无标题-->
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowBackground">@color/transparent</item><!--背景透明-->
+        <item name="android:backgroundDimEnabled">false</item><!--模糊-->
+    </style>
+
     <!--礼物弹出框的动画的style-->
     <style name="gift_popwindow_anim_style">
         <item name="android:windowEnterAnimation">@anim/push_bottom_in</item>