处理七牛兼容性问题

吴奎庆
1 parent 176eea5f
Showing 49 changed files with 775 additions and 516 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/demo/MainActivity.java → app/src/main/java/com/cnlive/strike/debug/MainActivity.java
app/src/main/java/com/cnlive/demo/MediaApplication.java → app/src/main/java/com/cnlive/strike/debug/MediaApplication.java
config.gradle
lib_media/src/main/java/com/cnlive/media/ImagePicker.java
lib_media/src/main/java/com/cnlive/media/frame/presenter/RecordFragmentPresenter.java
lib_media/src/main/java/com/cnlive/media/frame/view/ImageCropView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaFView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPreviewViewView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
lib_media/src/main/java/com/cnlive/media/frame/view/RecordFragmentView.java
lib_media/src/main/java/com/cnlive/media/frame/view/RecordPreviewView.java
lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
lib_media/src/main/java/com/cnlive/media/meidia/DataCallback.java → lib_media/src/main/java/com/cnlive/media/media/DataCallback.java
lib_media/src/main/java/com/cnlive/media/meidia/entity/Folder.java → lib_media/src/main/java/com/cnlive/media/media/entity/Folder.java
lib_media/src/main/java/com/cnlive/media/meidia/entity/Media.java → lib_media/src/main/java/com/cnlive/media/media/entity/Media.java
lib_media/src/main/java/com/cnlive/media/meidia/loader/ImageLoader.java → lib_media/src/main/java/com/cnlive/media/media/loader/ImageLoader.java
lib_media/src/main/java/com/cnlive/media/meidia/loader/LoaderM.java → lib_media/src/main/java/com/cnlive/media/media/loader/LoaderM.java
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 29
     defaultConfig {
-        applicationId "com.cnlive.demo"
+        applicationId "com.cnlive.strike.debug"
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cnlive.demo">
+    package="com.cnlive.strike.debug">
     <application
         android:allowBackup="true"
-        android:name="com.cnlive.demo.MediaApplication"
+        android:name=".MediaApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -13,7 +13,7 @@
         android:theme="@style/AppTheme">
         <meta-data android:name="android.max_aspect"
             android:value="ratio_float"/>
-        <activity android:name="com.cnlive.demo.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-package com.cnlive.demo;
+package com.cnlive.strike.debug;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -8,11 +8,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
-import com.cnlive.demo.databinding.ActivityMainBinding;
 import com.cnlive.media.ImagePicker;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.GlideCacheUtil;
+import com.cnlive.strike.debug.R;
+import com.cnlive.strike.debug.databinding.ActivityMainBinding;
 import java.util.ArrayList;
@@ -50,13 +51,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 //打开相册
                 new ImagePicker.Builder()
                         .setSelectGif(false)
-                        .needCamera(false)
+                        .needCamera(true)
                         .maxNum(9)
                         .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
                         .maxVideoSize(100 * 1024 * 1024)
                         .maxImageSize(1 * 1024 * 1024)
                         .defaultSelectList(select)
-                        .doCrop(1, 1, 900, 900)
+//                        .doCrop(1, 1, 900, 900)
                         .builder()
                         .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
                 break;
-package com.cnlive.demo;
+package com.cnlive.strike.debug;
 import android.app.Application;
 import androidx.multidex.MultiDex;
+import com.cnlive.media.utils.QiniuVideoUtil;
-//import com.alibaba.android.arouter.launcher.ARouter;
 public class MediaApplication extends Application {
@@ -14,6 +14,6 @@ public class MediaApplication extends Application {
         super.onCreate();
 //        ARouter.init(this);
         MultiDex.install(this);
-//        PLShortVideoEnv.init(this);
+        QiniuVideoUtil.initVideo(this);
     }
 }
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.1.6",
+            version: "1.0.1.8",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -7,13 +7,13 @@ import android.content.Intent;
 import com.cnlive.media.model.ImagePickerCropParams;
 import com.cnlive.media.model.ImagePickerOptions;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.activity.MediaPreviewActivity;
 import com.cnlive.media.ui.activity.RecordActivity;
+import com.qiniu.pili.droid.shortvideo.PLShortVideoEnv;
 import java.util.ArrayList;
-import java.util.List;
 /**
  *
@@ -125,6 +125,7 @@ public class ImagePicker {
             mOptions = new ImagePickerOptions();
         }
+
         public Builder selectMode(int selectMode) {
             mOptions.setSelectMode(selectMode);
             return this;
+package com.cnlive.media.frame.presenter;
+
+import com.cnlive.media.frame.view.RecordFragmentView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+/**
+ * 作 者 : wkq
+ * <p>
+ * 时 间 : 2020/10/29 10:06
+ * <p>
+ * 名 字 : RecordFragmentPresenter
+ * <p>
+ * 简 介 :
+ */
+public class RecordFragmentPresenter extends MvpBasePresenter<RecordFragmentView> {
+
+}
@@ -10,7 +10,7 @@ import android.text.TextUtils;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.FileUtils;
 import com.cnlive.media.R;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.ImageCropActivity;
 import com.cnlive.media.utils.AndroidQUtil;
 import com.cnlive.media.utils.observable.MeidaResultObservable;
@@ -4,7 +4,7 @@ import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.VideoPlayerActivity;
 import com.cnlive.media.ui.fragment.MediaFragment;
 import com.cnlive.media.ui.widget.large.ImageSource;
@@ -11,8 +11,8 @@ import com.bumptech.glide.Glide;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.DoublePressed;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.fragment.MediaPickerFragment;
 import com.cnlive.media.ui.adapter.MediaAdapter;
@@ -11,14 +11,12 @@ import androidx.viewpager2.widget.ViewPager2;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.MediaPreviewActivity;
 import com.cnlive.media.ui.adapter.MediaPreviewAdapter;
 import com.cnlive.media.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import java.util.ArrayList;
-
 /**
  * 作 者 : wkq
  * <p>
@@ -24,8 +24,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.ImageCropActivity;
 import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.activity.RecordActivity;
@@ -103,7 +103,7 @@ public class MediaView implements MvpView {
     private void initState() {
         StatusBarUtil2.setColor(mActivity, mActivity.getResources().getColor(R.color.status_bar_color), 0);
-        //初始化七牛录制
+//        //初始化七牛录制
         PLShortVideoEnv.init(mActivity.getApplicationContext());
         MediaAddObservable.getInstance().addObserver(mActivity);
         MeidaResultObservable.getInstance().addObserver(mActivity);
+package com.cnlive.media.frame.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.OvershootInterpolator;
+
+import androidx.activity.OnBackPressedCallback;
+
+import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.media.PickerConfig;
+import com.cnlive.media.ui.activity.MediaActivity;
+import com.cnlive.media.ui.activity.RecordActivity;
+import com.cnlive.media.ui.fragment.RecordFragment;
+import com.cnlive.media.utils.AndroidQUtil;
+import com.cnlive.media.utils.ScreenUtils;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qiniu.pili.droid.shortvideo.PLAudioEncodeSetting;
+import com.qiniu.pili.droid.shortvideo.PLCameraSetting;
+import com.qiniu.pili.droid.shortvideo.PLDisplayMode;
+import com.qiniu.pili.droid.shortvideo.PLMicrophoneSetting;
+import com.qiniu.pili.droid.shortvideo.PLRecordSetting;
+import com.qiniu.pili.droid.shortvideo.PLRecordStateListener;
+import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder;
+import com.qiniu.pili.droid.shortvideo.PLVideoEncodeSetting;
+
+import java.io.File;
+
+/**
+ * 作 者 : wkq
+ * <p>
+ * 时 间 : 2020/10/29 10:05
+ * <p>
+ * 名 字 : RecordFragmentView
+ * <p>
+ * 简 介 :
+ */
+public class RecordFragmentView implements MvpView, PLRecordStateListener {
+
+    RecordFragment mFragment;
+    private PLRecordSetting recordSetting;
+    private PLAudioEncodeSetting audioEncodeSetting;
+    private PLMicrophoneSetting microphoneSetting;
+    private PLVideoEncodeSetting videoEncodeSetting;
+    private PLCameraSetting cameraSetting;
+    String videoCaceDirPath;
+
+    public RecordFragmentView(RecordFragment mFragment) {
+        this.mFragment = mFragment;
+    }
+
+    public RecordActivity getActivity() {
+        return (RecordActivity) mFragment.getActivity();
+    }
+
+    public void initView() {
+        // 摄像头采集选项
+        if (mFragment.plShortVideoRecorder == null)
+            mFragment.plShortVideoRecorder = new PLShortVideoRecorder();
+        if (cameraSetting == null)
+            cameraSetting = new PLCameraSetting();
+        //设置摄像头
+        cameraSetting.setCameraId(chooseCameraFacingId());
+        cameraSetting.setCameraPreviewSizeRatio(PLCameraSetting.CAMERA_PREVIEW_SIZE_RATIO.RATIO_16_9);
+        cameraSetting.setCameraPreviewSizeLevel(PLCameraSetting.CAMERA_PREVIEW_SIZE_LEVEL.PREVIEW_SIZE_LEVEL_720P);
+        // 麦克风采集选项
+        if (microphoneSetting == null)
+            microphoneSetting = new PLMicrophoneSetting();
+        // 视频编码选项
+        videoEncodeSetting = new PLVideoEncodeSetting(mFragment.getActivity());
+        videoEncodeSetting.setEncodingSizeLevel(PLVideoEncodeSetting.VIDEO_ENCODING_SIZE_LEVEL.VIDEO_ENCODING_SIZE_LEVEL_720P_3); // 480x480
+        videoEncodeSetting.setEncodingBitrate(4000 * 1024); // 1000kbps
+        videoEncodeSetting.setHWCodecEnabled(true); // true:硬编 false:软编
+        // 音频编码选项
+        audioEncodeSetting = new PLAudioEncodeSetting();
+        audioEncodeSetting.setHWCodecEnabled(true); // true:硬编 false:软编
+        // 美颜选项
+        // 录制选项
+        recordSetting = new PLRecordSetting();
+//        最大录制时常
+        recordSetting.setMaxRecordDuration(getActivity() .mOptions.getMaxTime());
+        recordSetting.setRecordSpeedVariable(true);
+        recordSetting.setDisplayMode(PLDisplayMode.FULL);
+
+
+        if (TextUtils.isEmpty(getActivity() .mOptions.getCachePath())) {
+            if (AndroidQUtil.isAndroidQ()) {
+                videoCaceDirPath = getActivity() .getExternalFilesDir("").getPath() + File.separator + "MediaPickerVideo";
+            } else {
+                videoCaceDirPath = Environment.getExternalStorageDirectory().getPath() + File.separator + "MediaPickerVideo";
+            }
+        } else {
+            if (AndroidQUtil.isAndroidQ()) {
+                videoCaceDirPath = mFragment.getActivity().getExternalFilesDir("").getPath() + File.separator + "MediaPickerVideo";
+            } else {
+                videoCaceDirPath = getActivity() .mOptions.getCachePath();
+            }
+        }
+        getActivity() .mOptions.setCachePath(videoCaceDirPath);
+        recordSetting.setVideoCacheDir(videoCaceDirPath);
+
+        getActivity() .videoPath = getActivity() .mOptions.getCachePath() + System.currentTimeMillis() + ".mp4";
+        recordSetting.setVideoFilepath(getActivity() .videoPath);
+        mFragment.binding.rcControl.setFlashState(false);
+        mFragment.binding.rcControl.setMaxTime(getActivity() .mOptions.getMaxTime());
+
+        //设置闪光灯
+
+        // 设置录制速度 (默认为 1.0)
+        mFragment.plShortVideoRecorder.setRecordStateListener(this);
+
+        mFragment.plShortVideoRecorder.prepare(mFragment.binding.gSf, cameraSetting, microphoneSetting, videoEncodeSetting, audioEncodeSetting, null, recordSetting);
+        //处理手动对焦事件
+        mFragment.binding.gSf.requestRender();
+        mFragment.binding.gSf.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() == MotionEvent.ACTION_UP) {
+                    moveFocus(event.getRawX(), event.getRawY());
+                }
+                return true;
+            }
+        });
+        //如果是裁剪类型只支持拍照
+        if (getActivity() .isJumpCamera && getActivity() .mOptions.getJumpCameraMode() >= 0) {
+            mFragment.binding.rcControl.setRecordType(getActivity() .mOptions.getJumpCameraMode());
+        } else {
+            if (getActivity() .mOptions.isNeedCrop()) {
+                mFragment.binding.rcControl.setRecordType(PickerConfig.CAMERA_MODE_PIC);
+            } else {
+                mFragment.binding.rcControl.setRecordType(PickerConfig.CAMERA_MODE_ALL);
+            }
+        }
+    }
+
+    /**
+     * 选择相机
+     * @return
+     */
+    private PLCameraSetting.CAMERA_FACING_ID chooseCameraFacingId() {
+        if (PLCameraSetting.hasCameraFacing(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_3RD)) {
+            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_3RD;
+        } else if (PLCameraSetting.hasCameraFacing(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK)) {
+            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK;
+        } else {
+            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_FRONT;
+        }
+    }
+
+    /**
+     * 设置闪光灯
+     * @param isFlashingState
+     */
+    public void processFlash(boolean isFlashingState) {
+        mFragment.binding.rcControl.setFlashState(isFlashingState);
+    }
+
+    /**
+     * 异常
+     * @param message
+     */
+    public void showMesage(String message) {
+
+        if (TextUtils.isEmpty(message) || mFragment == null || mFragment.getActivity().isFinishing())
+            return;
+        mFragment.getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                AlertUtil.showDeftToast(mFragment.getActivity(), message);
+            }
+        });
+
+
+    }
+
+    //移动对焦的动画
+    public void moveFocus(float x, float y) {
+
+        mFragment.plShortVideoRecorder.manualFocus(80, 80, (int) x, (int) y);
+        //缩小
+        float transX = x - ScreenUtils.getScreenWidth(getActivity()) / 2;
+
+        float transY = y - ScreenUtils.getScreenHeight(getActivity()) / 2;
+        ObjectAnimator translationX = ObjectAnimator.ofFloat(mFragment.binding.fv, "translationX", 0, transX);
+        ObjectAnimator translationY = ObjectAnimator.ofFloat(mFragment.binding.fv, "translationY", 0, transY);
+        AnimatorSet animSet = new AnimatorSet();
+        animSet.play(translationX).with(translationY);
+        animSet.start();
+        animSet.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mFragment.binding.fv.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
+        ObjectAnimator scaleX = ObjectAnimator.ofFloat(mFragment.binding.fv, "scaleX", 1, 0.6f);
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(mFragment.binding.fv, "scaleY", 1, 0.6f);
+
+        AnimatorSet animSet2 = new AnimatorSet();
+        animSet2.play(scaleY).with(scaleX);
+        animSet2.setInterpolator(new OvershootInterpolator());
+        animSet2.setDuration(800);
+        animSet2.start();
+        animSet2.addListener(new Animator.AnimatorListener() {
+
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mFragment.binding.fv.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
+    }
+
+
+
+    @Override
+    public void onReady() {
+        //设置闪光灯
+        mFragment.isReady = true;
+    }
+
+    @Override
+    public void onError(int i) {
+        showMesage("相机初始化异常");
+        mFragment.isReady = false;
+        mFragment.isRecordIng = false;
+    }
+
+    @Override
+    public void onDurationTooShort() {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onRecordStarted() {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onSectionRecording(long l, long l1, int i) {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onRecordStopped() {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onSectionIncreased(long l, long l1, int i) {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onSectionDecreased(long l, long l1, int i) {
+        Log.e("", "");
+    }
+
+    @Override
+    public void onRecordCompleted() {
+        mFragment.isReady = false;
+        mFragment.isRecordIng = false;
+    }
+}
@@ -13,7 +13,7 @@ import android.widget.RelativeLayout;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.ImageCropActivity;
 import com.cnlive.media.ui.activity.RecordActivity;
 import com.cnlive.media.ui.fragment.RecordPreviewFragment;
 package com.cnlive.media.frame.view;
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
 import android.app.Dialog;
 import android.content.pm.ActivityInfo;
-import android.graphics.Bitmap;
 import android.os.Build;
-import android.os.Environment;
 import android.text.TextUtils;
-import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.animation.OvershootInterpolator;
+import android.view.WindowManager;
 import androidx.activity.OnBackPressedCallback;
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.Fragment;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.media.PickerConfig;
+import com.cnlive.media.R;
 import com.cnlive.media.ui.activity.RecordActivity;
+import com.cnlive.media.ui.fragment.RecordFragment;
 import com.cnlive.media.ui.fragment.RecordPreviewFragment;
 import com.cnlive.media.utils.AlertDialogUtils;
-import com.cnlive.media.utils.AndroidQUtil;
 import com.cnlive.media.utils.PermissionChecker;
-import com.cnlive.media.utils.ScreenUtils;
-import com.cnlive.media.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qiniu.pili.droid.shortvideo.PLAudioEncodeSetting;
-import com.qiniu.pili.droid.shortvideo.PLCameraSetting;
-import com.qiniu.pili.droid.shortvideo.PLDisplayMode;
-import com.qiniu.pili.droid.shortvideo.PLErrorCode;
-import com.qiniu.pili.droid.shortvideo.PLMicrophoneSetting;
-import com.qiniu.pili.droid.shortvideo.PLRecordSetting;
-import com.qiniu.pili.droid.shortvideo.PLRecordStateListener;
-import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder;
-import com.qiniu.pili.droid.shortvideo.PLVideoEncodeSetting;
-
-import java.io.File;
 /**
  * 作 者 : wkq
@@ -49,28 +29,22 @@ import java.io.File;
  * <p>
  * 简 介 :
  */
-public class RecordView implements MvpView, PLRecordStateListener {
+public class RecordView implements MvpView {
     RecordActivity mActivity;
-    private PLRecordSetting recordSetting;
-    private PLAudioEncodeSetting audioEncodeSetting;
-    private PLMicrophoneSetting microphoneSetting;
-    private PLVideoEncodeSetting videoEncodeSetting;
-    private PLCameraSetting cameraSetting;
-    String videoCaceDirPath;
     public RecordView(RecordActivity mActivity) {
         this.mActivity = mActivity;
     }
     public void initView() {
+        processFullScreen();
         //处理fragment 回调
         mActivity.getOnBackPressedDispatcher().addCallback(mActivity, new OnBackPressedCallback(true) {
             @Override
             public void handleOnBackPressed() {
                 Fragment currentFragment = mActivity.getSupportFragmentManager().findFragmentById(R.id.pre_frame);
                 if (currentFragment instanceof RecordPreviewFragment) {
-                    showControl();
                     mActivity.getSupportFragmentManager().popBackStack();
                 } else {
                     mActivity.finish();
@@ -78,6 +52,7 @@ public class RecordView implements MvpView, PLRecordStateListener {
             }
         });
+
         if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
             mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
@@ -90,242 +65,27 @@ public class RecordView implements MvpView, PLRecordStateListener {
         boolean hasPermissions = mActivity.getPresenter()
                 .checkPermissions(mActivity, mActivity.permissionsRecord, mActivity.PERMISISSION_CODE_ASK, true);
         if (hasPermissions) {
-            initQNRecord();
-        }
-    }
-
-    public void showControl() {
-
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.binding.gSf.setVisibility(View.VISIBLE);
-                mActivity.binding.rcControl.setVisibility(View.VISIBLE);
-                mActivity.binding.preFrame.setVisibility(View.GONE);
-            }
-        });
-    }
-
-    public void showPre() {
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.binding.gSf.setVisibility(View.GONE);
-                mActivity.binding.rcControl.setVisibility(View.GONE);
-                mActivity.binding.preFrame.setVisibility(View.VISIBLE);
-            }
-        });
-
-    }
-
-    private PLCameraSetting.CAMERA_FACING_ID chooseCameraFacingId() {
-        if (PLCameraSetting.hasCameraFacing(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_3RD)) {
-            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_3RD;
-        } else if (PLCameraSetting.hasCameraFacing(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK)) {
-            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK;
-        } else {
-            return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_FRONT;
+            mActivity.getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordFragment.newInstance()).addToBackStack("").commit();
         }
-    }
-
-    @Override
-    public void onReady() {
-        //设置闪光灯
-        mActivity.isReady = true;
-    }
-    @Override
-    public void onError(int i) {
-        processError(i);
-        mActivity.isReady=false;
-        mActivity.isRecordIng=false;
     }
-
-    @Override
-    public void onDurationTooShort() {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onRecordStarted() {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onSectionRecording(long l, long l1, int i) {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onRecordStopped() {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onSectionIncreased(long l, long l1, int i) {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onSectionDecreased(long l, long l1, int i) {
-        Log.e("", "");
-    }
-
-    @Override
-    public void onRecordCompleted() {
-        mActivity.isReady=false;
-        mActivity.isRecordIng=false;
-    }
-
     /**
-     * 初始化七牛录制
+     *   处理刘海屏全屏问题
      */
-    private void initQNRecord() {
-        // 摄像头采集选项
-        if (mActivity.plShortVideoRecorder == null)
-            mActivity.plShortVideoRecorder = new PLShortVideoRecorder();
-        if (cameraSetting == null)
-            cameraSetting = new PLCameraSetting();
-        //设置摄像头
-        cameraSetting.setCameraId(chooseCameraFacingId());
-        cameraSetting.setCameraPreviewSizeRatio(PLCameraSetting.CAMERA_PREVIEW_SIZE_RATIO.RATIO_16_9);
-        cameraSetting.setCameraPreviewSizeLevel(PLCameraSetting.CAMERA_PREVIEW_SIZE_LEVEL.PREVIEW_SIZE_LEVEL_720P);
-        // 麦克风采集选项
-        if (microphoneSetting == null)
-            microphoneSetting = new PLMicrophoneSetting();
-        // 视频编码选项
-        videoEncodeSetting = new PLVideoEncodeSetting(mActivity);
-        videoEncodeSetting.setEncodingSizeLevel(PLVideoEncodeSetting.VIDEO_ENCODING_SIZE_LEVEL.VIDEO_ENCODING_SIZE_LEVEL_720P_3); // 480x480
-        videoEncodeSetting.setEncodingBitrate( 4000 * 1024); // 1000kbps
-        videoEncodeSetting.setHWCodecEnabled(true); // true:硬编 false:软编
-        // 音频编码选项
-        audioEncodeSetting = new PLAudioEncodeSetting();
-        audioEncodeSetting.setHWCodecEnabled(true); // true:硬编 false:软编
-        // 美颜选项
-        // 录制选项
-        recordSetting = new PLRecordSetting();
-//        最大录制时常
-        recordSetting.setMaxRecordDuration(mActivity.mOptions.getMaxTime());
-        recordSetting.setRecordSpeedVariable(true);
-        recordSetting.setDisplayMode(PLDisplayMode.FULL);
+    public void processFullScreen() {
-
-        if (TextUtils.isEmpty(mActivity.mOptions.getCachePath())) {
-            if (AndroidQUtil.isAndroidQ()) {
-                videoCaceDirPath = mActivity.getExternalFilesDir("").getPath() + File.separator + "MediaPickerVideo";
-            } else {
-                videoCaceDirPath = Environment.getExternalStorageDirectory().getPath() + File.separator + "MediaPickerVideo";
-            }
-        } else {
-            if (AndroidQUtil.isAndroidQ()) {
-                videoCaceDirPath = mActivity.getExternalFilesDir("").getPath() + File.separator + "MediaPickerVideo";
-            }else {
-                videoCaceDirPath=  mActivity.mOptions.getCachePath();
-            }
-        }
-        mActivity.mOptions.setCachePath(videoCaceDirPath);
-        recordSetting.setVideoCacheDir(videoCaceDirPath);
-
-        mActivity.videoPath = mActivity.mOptions.getCachePath() + System.currentTimeMillis() + ".mp4";
-        recordSetting.setVideoFilepath(mActivity.videoPath);
-        mActivity.binding.rcControl.setFlashState(false);
-        mActivity.binding.rcControl.setMaxTime(mActivity.mOptions.getMaxTime());
-
-        //设置闪光灯
-
-        // 设置录制速度 (默认为 1.0)
-        mActivity.plShortVideoRecorder.setRecordStateListener(this);
-        mActivity.plShortVideoRecorder.prepare(mActivity.binding.gSf, cameraSetting, microphoneSetting, videoEncodeSetting, audioEncodeSetting,null, recordSetting);
-        //处理手动对焦事件
-
-        mActivity.binding.gSf.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_UP) {
-                    moveFocus(event.getRawX(), event.getRawY());
-                }
-                return true;
-            }
-        });
-        //如果是裁剪类型只支持拍照
-        if (mActivity.isJumpCamera && mActivity.mOptions.getJumpCameraMode() >= 0) {
-            mActivity.binding.rcControl.setRecordType(mActivity.mOptions.getJumpCameraMode());
-        } else {
-            if (mActivity.mOptions.isNeedCrop()) {
-                mActivity.binding.rcControl.setRecordType(PickerConfig.CAMERA_MODE_PIC);
-            } else {
-                mActivity.binding.rcControl.setRecordType(PickerConfig.CAMERA_MODE_ALL);
-            }
+        WindowManager.LayoutParams lp= mActivity.getWindow().getAttributes();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            lp.layoutInDisplayCutoutMode =WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         }
+        mActivity.getWindow().setAttributes(lp);
+        // 设置页面全屏显示
+        View decorView  = mActivity.getWindow().getDecorView();
+        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN|View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
-    //移动对焦的动画
-    public void moveFocus(float x, float y) {
-
-        mActivity.plShortVideoRecorder.manualFocus(80, 80, (int) x, (int) y);
-        //缩小
-        float transX = x - ScreenUtils.getScreenWidth(mActivity) / 2;
-
-        float transY = y - ScreenUtils.getScreenHeight(mActivity) / 2;
-        ObjectAnimator translationX = ObjectAnimator.ofFloat(mActivity.binding.fv, "translationX", 0, transX);
-        ObjectAnimator translationY = ObjectAnimator.ofFloat(mActivity.binding.fv, "translationY", 0, transY);
-        AnimatorSet animSet = new AnimatorSet();
-        animSet.play(translationX).with(translationY);
-        animSet.start();
-        animSet.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mActivity.binding.fv.setVisibility(View.VISIBLE);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
-        ObjectAnimator scaleX = ObjectAnimator.ofFloat(mActivity.binding.fv, "scaleX", 1, 0.6f);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(mActivity.binding.fv, "scaleY", 1, 0.6f);
-
-        AnimatorSet animSet2 = new AnimatorSet();
-        animSet2.play(scaleY).with(scaleX);
-        animSet2.setInterpolator(new OvershootInterpolator());
-        animSet2.setDuration(800);
-        animSet2.start();
-        animSet2.addListener(new Animator.AnimatorListener() {
-            @Override
-            public void onAnimationStart(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mActivity.binding.fv.setVisibility(View.GONE);
-            }
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-
-            }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-
-            }
-        });
-    }
-
-    public void showMesage(String message) {
+    public void showMessage(String message) {
         if (TextUtils.isEmpty(message) || mActivity == null || mActivity.isFinishing()) return;
         mActivity.runOnUiThread(new Runnable() {
@@ -338,33 +98,7 @@ public class RecordView implements MvpView, PLRecordStateListener {
     }
-    public void processError(int code) {
-        showMesage("相机异常:" + code);
-        if (PLErrorCode.ERROR_UNAUTHORIZED != code) {
-            initQNRecord();
-        }
-    }
-    public void processFlash(boolean isFlashingState) {
-        mActivity.binding.rcControl.setFlashState(isFlashingState);
-    }
-
-    public void showPreViewImg(Bitmap plbitMap) {
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (plbitMap != null && plbitMap.getByteCount() > 0) {
-                    showPre();
-                    mActivity.preBitmap = plbitMap;
-                    mActivity.getSupportFragmentManager().beginTransaction().add(R.id.pre_frame, RecordPreviewFragment.newInstance(0, "")).addToBackStack("").commit();
-
-                } else {
-                    showMesage("相机异常");
-                }
-            }
-        });
-
-    }
     public void showPermission(String[] needList, int requestCode) {
@@ -378,7 +112,7 @@ public class RecordView implements MvpView, PLRecordStateListener {
                     @Override
                     public void onClickLeft(Dialog dialog) {
                         dialog.dismiss();
-                        showMesage("无法获取存读取权限,您的app将无法正常使用");
+                        showMessage("无法获取存读取权限,您的app将无法正常使用");
                         mActivity.finish();
                     }
@@ -402,7 +136,7 @@ public class RecordView implements MvpView, PLRecordStateListener {
                     @Override
                     public void onClickLeft(Dialog dialog) {
                         dialog.dismiss();
-                        showMesage("无法获取存读取权限,您的app将无法正常使用");
+                        showMessage("无法获取存读取权限,您的app将无法正常使用");
                         mActivity.finish();
                     }
-package com.cnlive.media.meidia;
+package com.cnlive.media.media;
-import com.cnlive.media.meidia.entity.Folder;
+import com.cnlive.media.media.entity.Folder;
 import java.util.ArrayList;
-package com.cnlive.media.meidia.entity;
+package com.cnlive.media.media.entity;
 import android.os.Parcel;
 import android.os.Parcelable;
-package com.cnlive.media.meidia.entity;
+package com.cnlive.media.media.entity;
 import android.os.Parcel;
 import android.os.Parcelable;
-package com.cnlive.media.meidia.loader;
+package com.cnlive.media.media.loader;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -10,9 +10,9 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-import com.cnlive.media.meidia.DataCallback;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.DataCallback;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.MediaUtils;
 import com.cnlive.media.R;
-package com.cnlive.media.meidia.loader;
+package com.cnlive.media.media.loader;
-import com.cnlive.media.meidia.entity.Folder;
+import com.cnlive.media.media.entity.Folder;
 import java.util.ArrayList;
-package com.cnlive.media.meidia.loader;
+package com.cnlive.media.media.loader;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -10,9 +10,9 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-import com.cnlive.media.meidia.DataCallback;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.DataCallback;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.MediaUtils;
 import com.cnlive.media.R;
-package com.cnlive.media.meidia.loader;
+package com.cnlive.media.media.loader;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -12,9 +12,9 @@ import android.text.TextUtils;
 import android.util.Log;
-import com.cnlive.media.meidia.DataCallback;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.DataCallback;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.R;
 import java.io.File;
@@ -4,7 +4,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.ArrayList;
@@ -13,15 +13,16 @@ import androidx.fragment.app.Fragment;
 import com.cnlive.libs.base.frame.activity.MvpBindingActivity;
 import com.cnlive.media.PickerConfig;
 import com.cnlive.media.R;
+import com.cnlive.media.databinding.ActivityMediaBinding;
 import com.cnlive.media.frame.presenter.MediaPresenter;
 import com.cnlive.media.frame.view.MediaView;
-import com.cnlive.media.meidia.DataCallback;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
-import com.cnlive.media.meidia.loader.ImageLoader;
-import com.cnlive.media.meidia.loader.LoaderM;
-import com.cnlive.media.meidia.loader.MediaLoader;
-import com.cnlive.media.meidia.loader.VideoLoader;
+import com.cnlive.media.media.DataCallback;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
+import com.cnlive.media.media.loader.ImageLoader;
+import com.cnlive.media.media.loader.LoaderM;
+import com.cnlive.media.media.loader.MediaLoader;
+import com.cnlive.media.media.loader.VideoLoader;
 import com.cnlive.media.model.ImagePickerCropParams;
 import com.cnlive.media.model.ImagePickerOptions;
 import com.cnlive.media.ui.adapter.FolderAdapter;
@@ -33,7 +34,6 @@ import com.cnlive.media.utils.observable.MediaOpenInfo;
 import com.cnlive.media.utils.observable.MediaPageSelectStateObservable;
 import com.cnlive.media.utils.observable.MediaSelectStateObservable;
 import com.cnlive.media.utils.observable.MeidaResultObservable;
-import com.cnlive.media.databinding.ActivityMediaBinding;
 import java.io.File;
 import java.util.ArrayList;
@@ -41,7 +41,6 @@ import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
-
 import static com.cnlive.media.PickerConfig.REQUEST_CODE_PERMISSION_CAMERA;
 import static com.cnlive.media.PickerConfig.REQUEST_CODE_PERMISSION_CROP;
 import static com.cnlive.media.PickerConfig.REQUEST_CODE_PERMISSION_READ;
@@ -146,6 +145,7 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
         if (getMvpView() != null) getMvpView().initView();
         getSupportFragmentManager().beginTransaction().add(R.id.frame, MediaPickerFragment.newInstanse(), MEDIA_HOME).addToBackStack("").commit();
         getMediaData();
+
     }
     void getMediaData() {
@@ -7,7 +7,7 @@ import com.cnlive.media.PickerConfig;
 import com.cnlive.media.R;
 import com.cnlive.media.frame.presenter.MediaPreviewViewPresenter;
 import com.cnlive.media.frame.view.MediaPreviewViewView;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.adapter.MediaPreviewAdapter;
 import com.cnlive.media.databinding.ActivityPreviewImageBinding;
@@ -7,28 +7,22 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import com.cnlive.libs.base.frame.activity.MvpBindingActivity;
-import com.cnlive.libs.base.util.DoublePressed;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.media.PickerConfig;
 import com.cnlive.media.R;
+import com.cnlive.media.databinding.ActivityRecordBinding;
 import com.cnlive.media.frame.presenter.RecordPresenter;
 import com.cnlive.media.frame.view.RecordView;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.model.ImagePickerOptions;
 import com.cnlive.media.ui.fragment.RecordPreviewFragment;
-import com.cnlive.media.ui.widget.record.observable.RecordCameraViewObservable;
+import com.cnlive.media.utils.QiniuVideoUtil;
 import com.cnlive.media.utils.observable.MeidaResultObservable;
-import com.cnlive.media.databinding.ActivityRecordBinding;
-import com.qiniu.pili.droid.shortvideo.PLCaptureFrameListener;
-import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder;
-import com.qiniu.pili.droid.shortvideo.PLVideoFrame;
-import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener;
 import java.util.ArrayList;
 import java.util.Observable;
@@ -46,12 +40,6 @@ import java.util.Observer;
  */
 public class RecordActivity extends MvpBindingActivity<RecordView, RecordPresenter, Object, ActivityRecordBinding> implements Observer {
-    public PLShortVideoRecorder plShortVideoRecorder;
-    public boolean isFlash;
-    //准备就绪
-    public boolean isReady;
-    //录制中
-    public boolean isRecordIng;
     public ImagePickerOptions mOptions;
@@ -67,6 +55,7 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
     public boolean isNeverAsk;
     public ArrayList<Media> selectMedia;
     // 存读取权限
+
     public static String[] permissionsRecord = {
             Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
@@ -88,13 +77,43 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
         this.getWindow().getDecorView().setBackgroundColor(Color.TRANSPARENT);
         StatusBarUtil2.setTransparentForWindow(this);
         StatusBarUtil2.addTranslucentView(this, 0);
-        resultCode = getIntent().getIntExtra(PickerConfig.RESULT_CODE, 0);
-        isJumpCamera = getIntent().getBooleanExtra(PickerConfig.WHERE_JUMP_CAMERA, false);
-        selectMedia = getIntent().getParcelableArrayListExtra(PickerConfig.WHERE_JUMP_CAMERA_SELECTS);
-        mOptions = getIntent().getParcelableExtra(PickerConfig.INTENT_KEY_OPTIONS);
-        RecordCameraViewObservable.newInstance().addObserver(this);
-        MeidaResultObservable.getInstance().addObserver(this);
-        if (getMvpView() != null) getMvpView().initView();
+        QiniuVideoUtil.chcekInitState(this, isInit -> {
+            if (isInit) {
+                resultCode = getIntent().getIntExtra(PickerConfig.RESULT_CODE, 0);
+                isJumpCamera = getIntent().getBooleanExtra(PickerConfig.WHERE_JUMP_CAMERA, false);
+                selectMedia = getIntent().getParcelableArrayListExtra(PickerConfig.WHERE_JUMP_CAMERA_SELECTS);
+                mOptions = getIntent().getParcelableExtra(PickerConfig.INTENT_KEY_OPTIONS);
+                MeidaResultObservable.getInstance().addObserver(this);
+                if (getMvpView() != null) getMvpView().initView();
+            } else {
+                getMvpView().showMessage("初始化异常");
+                onBackPressed();
+            }
+
+        });
+
+
+    }
+
+    public void showPreViewImg(Bitmap plbitMap) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                preBitmap = plbitMap;
+                getSupportFragmentManager().beginTransaction().add(R.id.pre_frame, RecordPreviewFragment.newInstance(0, "")).addToBackStack("").commit();
+            }
+        });
+
+    }
+
+    public void showVideo(String path) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordPreviewFragment.newInstance(1, path)).addToBackStack("").commit();
+            }
+        });
+
     }
     @Override
@@ -121,29 +140,18 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
     @Override
     protected void onResume() {
         super.onResume();
-        if (isFlash && getMvpView() != null) getMvpView().processFlash(isFlash);
-        if (plShortVideoRecorder != null) plShortVideoRecorder.resume();
-        if (isNeverAsk) {
-            isNeverAsk = false;
-            //永久拒绝后，返回页面时检测权限并初始化
-            if (getMvpView() != null) getMvpView().checkPermisssion();
-        }
     }
     @Override
     protected void onPause() {
         super.onPause();
-        isRecordIng=false;
-        if (plShortVideoRecorder != null) plShortVideoRecorder.pause();
     }
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (plShortVideoRecorder != null) plShortVideoRecorder.destroy();
         MeidaResultObservable.getInstance().deleteObserver(this);
-        RecordCameraViewObservable.newInstance().deleteObserver(this);
         if (preBitmap != null) {
             //  glide 加载维护了 bitmap 回收
 //            if (!preBitmap.isRecycled()){
@@ -157,115 +165,29 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
     @Override
     public void update(Observable o, Object arg) {
-        if (o instanceof RecordCameraViewObservable) {
-            int state = (int) arg;
-            if (plShortVideoRecorder == null || getMvpView() == null) return;
-            //闪光灯
-            if (state == RecordCameraViewObservable.CLICK_FLASH) {
-                if (isRecordIng) {
-                    getMvpView().showMesage("录制中...");
-                } else {
-                    if (plShortVideoRecorder.isFlashSupport()) {
-                        isFlash = (!isFlash);
-                        plShortVideoRecorder.setFlashEnabled(isFlash);
-                        getMvpView().processFlash(isFlash);
-                    } else {
-                        isFlash = false;
-                        getMvpView().processFlash(false);
-                        getMvpView().showMesage("暂不支持闪光灯");
-                    }
-                }
-
-            } else if (state == RecordCameraViewObservable.CLICK_SWITCH) {
-                if (isRecordIng) {
-                    //设置前后摄像头
-                    getMvpView().showMesage("录制中...");
-
-                } else {
-                    if (DoublePressed.onDoublePressed()) return;
-                    plShortVideoRecorder.switchCamera();
-                }
-            } else if (state == RecordCameraViewObservable.CLICK_FINISH) {
-                finish();
-            } else if (state == RecordCameraViewObservable.CLICK_TAKE) {
-                //拍照
-                if (isReady) {
-                    plShortVideoRecorder.captureFrame(new PLCaptureFrameListener() {
-                        @Override
-                        public void onFrameCaptured(PLVideoFrame plVideoFrame) {
-                            Bitmap plbitMap = plVideoFrame.toBitmap();
-                            getMvpView().showPreViewImg(plbitMap);
-                        }
-                    });
-                }
-
-
-            } else if (state == RecordCameraViewObservable.CLICK_RECODE_START) {
-                //视频录制开始
-                if (isReady) {
-                    isRecordIng = true;
-                    plShortVideoRecorder.deleteLastSection();
-                    plShortVideoRecorder.beginSection();
-                } else {
-                    isRecordIng = false;
-                    getMvpView().showMesage("相机还未准备完成,请稍后");
-                }
-            } else if (state == RecordCameraViewObservable.CLICK_RECODE_FINISH) {
-                //录制完成
-                plShortVideoRecorder.endSection();
-                plShortVideoRecorder.concatSections(new PLVideoSaveListener() {
-                    //视频保存完成
-                    @Override
-                    public void onSaveVideoSuccess(String s) {
-                        isRecordIng = false;
-                        getMvpView().showPre();
-                        getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordPreviewFragment.newInstance(1, s)).addToBackStack("").commit();
-
-                    }
-
-                    @Override
-                    public void onSaveVideoFailed(int i) {
-                        isRecordIng = false;
-                        if (getMvpView() != null) getMvpView().showMesage("视频录制失败");
-                    }
-
-                    @Override
-                    public void onSaveVideoCanceled() {
-
-                    }
-
-                    @Override
-                    public void onProgressUpdate(float v) {
-
-                    }
-                });
-
-            }
-        } else if (o instanceof MeidaResultObservable) {
+        if (o instanceof MeidaResultObservable) {
             Media media = (Media) arg;
             if (isJumpCamera) {
                 if (selectMedia == null)
-                   selectMedia = new ArrayList<Media>();
+                    selectMedia = new ArrayList<Media>();
                 selectMedia.add(media);
                 Intent intent = new Intent();
                 intent.putParcelableArrayListExtra(PickerConfig.EXTRA_RESULT, selectMedia);
                 setResult(resultCode, intent);
                 finish();
-            }else {
+            } else {
                 finish();
             }
         }
     }
+
     @Override
     public void onBackPressed() {
         Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.pre_frame);
         if (currentFragment == null) super.onBackPressed();
         if (currentFragment instanceof RecordPreviewFragment) {
-            binding.gSf.setVisibility(View.VISIBLE);
-            binding.rcControl.setVisibility(View.VISIBLE);
-            binding.preFrame.setVisibility(View.GONE);
             getSupportFragmentManager().popBackStack();
         } else {
             finish();
@@ -12,8 +12,8 @@ import androidx.core.content.ContextCompat;
 import com.cnlive.media.R;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.GlideCacheUtil;
 import java.util.ArrayList;
@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cnlive.libs.base.util.StringUtils;
 import com.cnlive.media.PickerConfig;
 import com.cnlive.media.R;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.model.ImagePickerOptions;
 import com.cnlive.media.utils.FileUtils;
 import com.cnlive.media.utils.GlideCacheUtil;
@@ -5,7 +5,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.fragment.MediaFragment;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ public class MediaPreviewAdapter extends FragmentStateAdapter {
     @NonNull
     @Override
     public Fragment createFragment(int position) {
-        return MediaFragment.newInstanse(mediaList.get(position));
+        return MediaFragment.newInstance(mediaList.get(position));
     }
     @Override
 package com.cnlive.media.ui.adapter;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 /**
  * 作 者 : wkq
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.cnlive.media.R;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.GlideCacheUtil;
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
 import com.cnlive.media.R;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.utils.GlideCacheUtil;
 import com.cnlive.media.databinding.MediaPreviewBottomBarItemBinding;
@@ -9,7 +9,7 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.media.R;
 import com.cnlive.media.frame.presenter.MediaFPresenter;
 import com.cnlive.media.frame.view.MediaFView;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.databinding.FragmentMediaBinding;
 /**
@@ -25,7 +25,7 @@ public class MediaFragment extends MvpBindingFragment&lt;MediaFView, MediaFPresente
     public Media mMedia;
-    public static MediaFragment newInstanse(Media mMedia) {
+    public static MediaFragment newInstance(Media mMedia) {
         MediaFragment fragment = new MediaFragment();
         Bundle bundle = new Bundle();
@@ -11,8 +11,8 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.media.R;
 import com.cnlive.media.frame.presenter.MediaPickerFragmentPresenter;
 import com.cnlive.media.frame.view.MediaPickerFragmentView;
-import com.cnlive.media.meidia.entity.Folder;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Folder;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.adapter.MediaAdapter;
 import com.cnlive.media.utils.observable.SelectStateUpdateObservable;
@@ -11,7 +11,7 @@ import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.media.R;
 import com.cnlive.media.frame.presenter.MediaPreviewPresenter;
 import com.cnlive.media.frame.view.MediaPreviewView;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.adapter.MediaPreviewAdapter;
 import com.cnlive.media.databinding.FragmentPreviewBinding;
+package com.cnlive.media.ui.fragment;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.Nullable;
+
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.libs.base.util.DoublePressed;
+import com.cnlive.media.R;
+import com.cnlive.media.databinding.FragmentRecordBinding;
+import com.cnlive.media.frame.presenter.RecordFragmentPresenter;
+import com.cnlive.media.frame.view.RecordFragmentView;
+import com.cnlive.media.ui.widget.record.observable.RecordCameraViewObservable;
+import com.qiniu.pili.droid.shortvideo.PLCaptureFrameListener;
+import com.qiniu.pili.droid.shortvideo.PLShortVideoRecorder;
+import com.qiniu.pili.droid.shortvideo.PLVideoFrame;
+import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener;
+
+import java.util.Observable;
+import java.util.Observer;
+
+/**
+ * 作 者 : wkq
+ * <p>
+ * 时 间 : 2020/10/29 10:04
+ * <p>
+ * 名 字 : RecordFragment
+ * <p>
+ * 简 介 :  录制操作页面
+ */
+public class RecordFragment extends MvpBindingFragment<RecordFragmentView, RecordFragmentPresenter, Object, FragmentRecordBinding> implements Observer {
+
+
+    public static RecordFragment newInstance() {
+
+        RecordFragment fragment = new RecordFragment();
+        Bundle bundle = new Bundle();
+        fragment.setArguments(bundle);
+        return fragment;
+
+    }
+
+    // 处理 返回事件的监听
+    public OnBackPressedCallback callback = new OnBackPressedCallback(true) {
+        @Override
+        public void handleOnBackPressed() {
+            callback.setEnabled(false);
+            requireActivity().getOnBackPressedDispatcher().onBackPressed();
+        }
+    };
+
+    public PLShortVideoRecorder plShortVideoRecorder;
+    public boolean isFlash;
+    //准备就绪
+    public boolean isReady;
+    //录制中
+    public boolean isRecordIng;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_record;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        RecordCameraViewObservable.newInstance().addObserver(this);
+        if (getMvpView() != null) getMvpView().initView();
+        requireActivity().getOnBackPressedDispatcher().addCallback(this, callback);
+    }
+
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (isFlash && getMvpView() != null) getMvpView().processFlash(isFlash);
+        if (plShortVideoRecorder != null) plShortVideoRecorder.resume();
+
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        isRecordIng = false;
+        if (plShortVideoRecorder != null) plShortVideoRecorder.pause();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        RecordCameraViewObservable.newInstance().deleteObserver(this);
+        if (plShortVideoRecorder != null) plShortVideoRecorder.destroy();
+
+    }
+
+
+    @Override
+    public void update(Observable o, Object arg) {
+        if (o instanceof RecordCameraViewObservable) {
+            int state = (int) arg;
+            if (plShortVideoRecorder == null || getMvpView() == null) return;
+            //闪光灯
+            if (state == RecordCameraViewObservable.CLICK_FLASH) {
+                if (isRecordIng) {
+                    getMvpView().showMesage("录制中...");
+                } else {
+                    if (plShortVideoRecorder.isFlashSupport()) {
+                        isFlash = (!isFlash);
+                        plShortVideoRecorder.setFlashEnabled(isFlash);
+                        getMvpView().processFlash(isFlash);
+                    } else {
+                        isFlash = false;
+                        getMvpView().processFlash(false);
+                        getMvpView().showMesage("暂不支持闪光灯");
+                    }
+                }
+
+            } else if (state == RecordCameraViewObservable.CLICK_SWITCH) {
+                if (isRecordIng) {
+                    //设置前后摄像头
+                    getMvpView().showMesage("录制中...");
+
+                } else {
+                    if (DoublePressed.onDoublePressed()) return;
+                    plShortVideoRecorder.switchCamera();
+                }
+            } else if (state == RecordCameraViewObservable.CLICK_FINISH) {
+                requireActivity().getOnBackPressedDispatcher().onBackPressed();
+            } else if (state == RecordCameraViewObservable.CLICK_TAKE) {
+                //拍照
+                if (isReady) {
+                    plShortVideoRecorder.captureFrame(new PLCaptureFrameListener() {
+                        @Override
+                        public void onFrameCaptured(PLVideoFrame plVideoFrame) {
+                            Bitmap plbitMap = plVideoFrame.toBitmap();
+
+                            if (plbitMap != null && plbitMap.getByteCount() > 0) {
+                                getMvpView().getActivity().showPreViewImg(plbitMap);
+                            } else {
+                                getMvpView().showMesage("图片拍摄异常");
+                            }
+                        }
+                    });
+                }
+
+
+            } else if (state == RecordCameraViewObservable.CLICK_RECODE_START) {
+                //视频录制开始
+                if (isReady) {
+                    isRecordIng = true;
+                    plShortVideoRecorder.deleteLastSection();
+                    plShortVideoRecorder.beginSection();
+                } else {
+                    isRecordIng = false;
+                    getMvpView().showMesage("相机还未准备完成,请稍后");
+                }
+            } else if (state == RecordCameraViewObservable.CLICK_RECODE_FINISH) {
+                //录制完成
+                plShortVideoRecorder.endSection();
+                plShortVideoRecorder.concatSections(new PLVideoSaveListener() {
+                    //视频保存完成
+                    @Override
+                    public void onSaveVideoSuccess(String s) {
+                        if (!TextUtils.isEmpty(s)) {
+                            isRecordIng = false;
+                            getMvpView().getActivity().showVideo(s);
+                        } else {
+                            getMvpView().showMesage("视频录制异常");
+                        }
+                    }
+
+                    @Override
+                    public void onSaveVideoFailed(int i) {
+                        isRecordIng = false;
+                        if (getMvpView() != null) getMvpView().showMesage("视频录制失败");
+                    }
+
+                    @Override
+                    public void onSaveVideoCanceled() {
+
+                    }
+
+                    @Override
+                    public void onProgressUpdate(float v) {
+
+                    }
+                });
+
+            }
+        }
+    }
+
+}
@@ -23,7 +23,7 @@ import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import com.cnlive.media.R;
 import java.io.File;
 package com.cnlive.media.utils;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 public class MediaUtils {
     private final static String MIME_TYPE_PNG = "image/png";
+package com.cnlive.media.utils;
+
+import android.opengl.EGLConfig;
+import android.opengl.GLSurfaceView;
+
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * 作 者 : wkq
+ * <p>
+ * 时 间 : 2020/10/28 17:16
+ * <p>
+ * 名 字 : MyGLRenderer
+ * <p>
+ * 简 介 :
+ */
+public class MyGLRenderer implements GLSurfaceView.Renderer {
+    public void onSurfaceCreated(GL10 gl, EGLConfig config)
+    {
+        gl.glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+    }
+
+    @Override
+    public void onSurfaceCreated(GL10 gl, javax.microedition.khronos.egl.EGLConfig config) {
+
+    }
+
+    public void onSurfaceChanged(GL10 gl, int w, int h) {
+        gl.glViewport(0, 0, w, h);
+    }
+
+    public void onDrawFrame(GL10 gl) {
+        gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);
+    }
+}
 \ No newline at end of file
+package com.cnlive.media.utils;
+
+import android.content.Context;
+
+import com.qiniu.pili.droid.shortvideo.PLShortVideoEnv;
+
+/**
+ * 作 者 : wkq
+ * <p>
+ * 时 间 : 2020/10/29 9:46
+ * <p>
+ * 名 字 : QiniuVideoUtil
+ * <p>
+ * 简 介 : 七牛 初始化
+ */
+public class QiniuVideoUtil {
+    /**
+     * 初始化七牛sdk
+     * @param context
+     */
+    public static void initVideo(Context context) {
+        PLShortVideoEnv.init(context.getApplicationContext());
+    }
+
+    /**
+     * 检查授权状态
+     * @param context
+     * @param listener
+     */
+    public static void chcekInitState(Context context, QiniuVideoInitListener listener) {
+        PLShortVideoEnv.checkAuthentication(context, i -> {
+            if (i==1){
+                listener.isInitState(true);
+            }else {
+                listener.isInitState(false);
+            }
+
+        });
+    }
+
+   public interface  QiniuVideoInitListener{
+        void isInitState(boolean isInit);
+    }
+}
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.Observable;
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 /**
  * 作 者 : wkq
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.Observable;
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.Observable;
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.Observable;
 package com.cnlive.media.utils.observable;
-import com.cnlive.media.meidia.entity.Media;
+import com.cnlive.media.media.entity.Media;
 import java.util.Observable;
@@ -10,27 +10,7 @@
             android:id="@+id/pre_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/transparent"
-            android:visibility="gone" />
-
-
-        <android.opengl.GLSurfaceView
-            android:id="@+id/g_sf"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <com.cnlive.media.ui.widget.record.FoucsView
-            android:id="@+id/fv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:visibility="gone" />
-
-        <com.cnlive.media.ui.widget.record.RecordCameraView
-            android:id="@+id/rc_control"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
+            android:background="@color/transparent" />
     </RelativeLayout>
 </layout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:background="@color/transparent"
+        android:layout_height="match_parent">
+
+        <android.opengl.GLSurfaceView
+            android:id="@+id/g_sf"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <com.cnlive.media.ui.widget.record.FoucsView
+            android:id="@+id/fv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:visibility="gone" />
+
+        <com.cnlive.media.ui.widget.record.RecordCameraView
+            android:id="@+id/rc_control"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </RelativeLayout>
+</layout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <data>
-        <import type="android.view.View.OnClickListener"/>
+
+        <import type="android.view.View.OnClickListener" />
+
         <variable
             name="onClick"
             type="OnClickListener" />
@@ -9,35 +12,37 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/transparent">
         <com.github.chrisbanes.photoview.PhotoView
-            android:visibility="gone"
             android:id="@+id/iv_pre"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop" />
+            android:scaleType="centerCrop"
+            android:visibility="gone" />
         <FrameLayout
-            android:visibility="gone"
             android:id="@+id/fl_video"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
+            android:layout_centerInParent="true"
+            android:visibility="gone">
+
             <android.opengl.GLSurfaceView
-                android:onClick="@{onClick}"
                 android:id="@+id/gv_video"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:onClick="@{onClick}" />
             <ImageView
-                android:onClick="@{onClick}"
                 android:id="@+id/play_control_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:onClick="@{onClick}"
                 android:src="@drawable/iv_pre_play"
                 android:visibility="gone" />
@@ -51,24 +56,24 @@
             android:layout_marginBottom="40dp">
             <com.cnlive.media.ui.widget.record.TypeButton
-                android:onClick="@{onClick}"
                 android:id="@+id/tb_cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:layout_marginLeft="30dp"
+                android:onClick="@{onClick}"
                 app:typeBg="@drawable/fb_chongpai"
                 app:typeSize="35dp" />
             <com.cnlive.media.ui.widget.record.TypeButton
-                android:onClick="@{onClick}"
                 android:id="@+id/tb_ok"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_marginRight="30dp"
+                android:onClick="@{onClick}"
                 app:typeBg="@drawable/fb_wancheng"
                 app:typeSize="35dp" />
         </RelativeLayout>