diff --git a/app/build.gradle b/app/build.gradle
index de40baa05..4ede29b32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,7 +34,6 @@ android {
 
         debug {
             minifyEnabled false
-            signingConfig signingConfigs.pictureSelectorKey
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
@@ -75,4 +74,5 @@ dependencies {
     implementation "androidx.camera:camera-camera2:${cfgs.camerax_version}"
     implementation "com.github.bumptech.glide:glide:${cfgs.glide_version}"
     implementation "com.squareup.picasso:picasso:${cfgs.picasso_version}"
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a56bc9054..5e450f7da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:targetApi="q">
diff --git a/app/src/main/java/com/luck/pictureselector/GlideEngine.java b/app/src/main/java/com/luck/pictureselector/GlideEngine.java
index 694d763f4..40943182b 100644
--- a/app/src/main/java/com/luck/pictureselector/GlideEngine.java
+++ b/app/src/main/java/com/luck/pictureselector/GlideEngine.java
@@ -13,12 +13,16 @@
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.Transformation;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.bumptech.glide.request.target.ImageViewTarget;
 import com.luck.picture.lib.engine.ImageEngine;
 import com.luck.picture.lib.listener.OnImageCompleteCallback;
 import com.luck.picture.lib.tools.MediaUtils;
+import com.luck.picture.lib.tools.ScreenUtils;
 import com.luck.picture.lib.widget.longimage.ImageSource;
 import com.luck.picture.lib.widget.longimage.ImageViewState;
 import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView;
@@ -211,6 +215,25 @@ public void loadGridImage(@NonNull Context context, @NonNull String url, @NonNul
                 .into(imageView);
     }
 
+    /**
+     * 加载图片列表图片
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadGridImageRound(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
+        Glide.with(context)
+                .load(url)
+                .centerCrop()
+                .transform(new CenterCrop(),new RoundedCorners(ScreenUtils.dip2px(context,4)))
+                .into(imageView);
+
+        imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+
+    }
+
 
     private GlideEngine() {
     }
diff --git a/app/src/main/java/com/luck/pictureselector/GlideRoundTransform.java b/app/src/main/java/com/luck/pictureselector/GlideRoundTransform.java
new file mode 100644
index 000000000..cd154a311
--- /dev/null
+++ b/app/src/main/java/com/luck/pictureselector/GlideRoundTransform.java
@@ -0,0 +1,59 @@
+package com.luck.pictureselector;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.bumptech.glide.load.resource.bitmap.TransformationUtils;
+
+import java.security.MessageDigest;
+
+/**
+ * @author yikai
+ */
+public class GlideRoundTransform extends BitmapTransformation {
+    private float radius = 0f;
+
+    public GlideRoundTransform(Context context) {
+        this(context, 4);
+    }
+
+    public GlideRoundTransform(Context context, int dp) {
+        this.radius = Resources.getSystem().getDisplayMetrics().density * dp;
+    }
+
+    @Override
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        Bitmap bitmap = TransformationUtils.centerCrop(pool, toTransform, outWidth, outHeight);
+        return roundCrop(pool, bitmap);
+    }
+
+    private Bitmap roundCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) return null;
+
+        Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+        }
+
+        Canvas canvas = new Canvas(result);
+        Paint paint = new Paint();
+        paint.setShader(new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+        paint.setAntiAlias(true);
+        RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight());
+        canvas.drawRoundRect(rectF, radius, radius, paint);
+        return result;
+    }
+
+    @Override
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+
+    }
+}
diff --git a/app/src/main/java/com/luck/pictureselector/MainActivity.java b/app/src/main/java/com/luck/pictureselector/MainActivity.java
index 8b11eafaf..54bc489ee 100644
--- a/app/src/main/java/com/luck/pictureselector/MainActivity.java
+++ b/app/src/main/java/com/luck/pictureselector/MainActivity.java
@@ -4,6 +4,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Canvas;
@@ -27,6 +28,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
@@ -395,6 +397,20 @@ public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.
         // 注册广播
         BroadcastManager.getInstance(getContext()).registerReceiver(broadcastReceiver,
                 BroadcastAction.ACTION_DELETE_PREVIEW_POSITION);
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction("com.newsclapper.picture");
+        LocalReceiver localReceiver = new LocalReceiver();
+        //注册本地广播监听器
+        LocalBroadcastManager.getInstance(this).registerReceiver(localReceiver, intentFilter);
+
+    }
+
+    class LocalReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            ArrayList<LocalMedia> result = intent.getParcelableArrayListExtra("LOCAL_MEDIA_LIST");
+        }
     }
 
     /**
@@ -427,6 +443,13 @@ private void clearCache() {
         public void onAddPicClick() {
             boolean mode = cb_mode.isChecked();
             if (mode) {
+
+                List<String> filterMimeType = new ArrayList<>();
+                filterMimeType.add("video/mp4");
+                filterMimeType.add("video/mov");
+                filterMimeType.add("image/jpeg");
+                filterMimeType.add("image/png");
+
                 // 进入相册 以下是例子：不需要的api可以不写
                 PictureSelector.create(MainActivity.this)
                         .openGallery(chooseMode)// 全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()、音频.ofAudio()
@@ -449,10 +472,12 @@ public void onAddPicClick() {
                         //.setButtonFeatures(CustomCameraView.BUTTON_STATE_BOTH)// 设置自定义相机按钮状态
                         .maxSelectNum(maxSelectNum)// 最大图片选择数量
                         .minSelectNum(1)// 最小选择数量
-                        .maxVideoSelectNum(1) // 视频最大选择数量
+                        .maxVideoSelectNum(maxSelectNum) // 视频最大选择数量
                         //.minVideoSelectNum(1)// 视频最小选择数量
                         //.closeAndroidQChangeVideoWH(!SdkVersionUtils.checkedAndroid_Q())// 关闭在AndroidQ下获取图片或视频宽高相反自动转换
                         .imageSpanCount(4)// 每行显示个数
+                        .selectCountText("yikai")
+                        .isCloseActivity(false)
                         .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
                         .closeAndroidQChangeWH(true)//如果图片有旋转角度则对换宽高,默认为true
                         .closeAndroidQChangeVideoWH(!SdkVersionUtils.checkedAndroid_Q())// 如果视频有旋转角度则对换宽高,默认为false
@@ -814,9 +839,6 @@ public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
                 chooseMode = PictureMimeType.ofAudio();
                 cb_preview_audio.setVisibility(View.VISIBLE);
                 break;
-            case R.id.rb_system:
-                language = -1;
-                break;
             case R.id.rb_jpan:
                 language = LanguageConfig.JAPAN;
                 break;
@@ -835,9 +857,6 @@ public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
             case R.id.rb_fr:
                 language = LanguageConfig.FRANCE;
                 break;
-            case R.id.rb_spanish:
-                language = LanguageConfig.SPANISH;
-                break;
             case R.id.rb_crop_default:
                 aspect_ratio_x = 0;
                 aspect_ratio_y = 0;
@@ -1257,9 +1276,9 @@ private PictureParameterStyle getWeChatStyle() {
         // 是否开启类似QQ相册带数字选择风格
         mPictureParameterStyle.isOpenCheckNumStyle = true;
         // 状态栏背景色
-        mPictureParameterStyle.pictureStatusBarColor = Color.parseColor("#393a3e");
+        mPictureParameterStyle.pictureStatusBarColor = Color.parseColor("#ffffff");
         // 相册列表标题栏背景色
-        mPictureParameterStyle.pictureTitleBarBackgroundColor = Color.parseColor("#393a3e");
+        mPictureParameterStyle.pictureTitleBarBackgroundColor = Color.parseColor("#ffffff");
         // 相册父容器背景色
         mPictureParameterStyle.pictureContainerBackgroundColor = ContextCompat.getColor(getContext(), R.color.app_color_black);
         // 相册列表标题栏右侧上拉箭头
diff --git a/app/src/main/java/com/luck/pictureselector/PicassoEngine.java b/app/src/main/java/com/luck/pictureselector/PicassoEngine.java
index 46ffd810c..b25411627 100644
--- a/app/src/main/java/com/luck/pictureselector/PicassoEngine.java
+++ b/app/src/main/java/com/luck/pictureselector/PicassoEngine.java
@@ -267,6 +267,11 @@ public void loadGridImage(@NonNull Context context, @NonNull String url, @NonNul
         }
     }
 
+    @Override
+    public void loadGridImageRound(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
+
+    }
+
     private PicassoEngine() {
     }
 
diff --git a/app/src/main/java/com/luck/pictureselector/SimpleActivity.java b/app/src/main/java/com/luck/pictureselector/SimpleActivity.java
index a3c23c420..16f67f132 100644
--- a/app/src/main/java/com/luck/pictureselector/SimpleActivity.java
+++ b/app/src/main/java/com/luck/pictureselector/SimpleActivity.java
@@ -1,14 +1,26 @@
 package com.luck.pictureselector;
 
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.language.LanguageConfig;
+import com.luck.picture.lib.listener.OnResultCallbackListener;
+import com.yalantis.ucrop.util.ScreenUtils;
+import com.yalantis.ucrop.view.widget.CustomLoadingDialog;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class SimpleActivity extends AppCompatActivity implements View.OnClickListener {
-    private Button btn_activity, btn_fragment;
+    private Button btn_activity, btn_fragment, btn_dialog, clapper,videoImage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -16,8 +28,13 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_other);
         btn_activity = findViewById(R.id.btn_activity);
         btn_fragment = findViewById(R.id.btn_fragment);
+        btn_dialog = findViewById(R.id.btn_dialog);
+        clapper = findViewById(R.id.clapper);
         btn_activity.setOnClickListener(this);
         btn_fragment.setOnClickListener(this);
+        btn_dialog.setOnClickListener(this);
+        clapper.setOnClickListener(this);
+
     }
 
     @Override
@@ -28,6 +45,57 @@ public void onClick(View v) {
                 break;
             case R.id.btn_fragment:
                 startActivity(new Intent(SimpleActivity.this, PhotoFragmentActivity.class));
+                break;
+            case R.id.btn_dialog:
+                View view = getLayoutInflater().inflate(R.layout.ucrop_dialog_loading, null);
+                CustomLoadingDialog mMyDialog = new CustomLoadingDialog(this,
+                        ScreenUtils.dip2px(this,228),
+                        ScreenUtils.dip2px(this,108),
+                        view,
+                        R.style.ucrop_DialogStyle);
+                mMyDialog.setCancelable(true);
+                mMyDialog.show();
+                break;
+            case R.id.clapper:
+                List<String> filterMimeType = new ArrayList();
+                filterMimeType.add("video/mp4");
+                filterMimeType.add("video/quicktime");
+                filterMimeType.add("image/jpeg");
+                filterMimeType.add("image/jpg");
+                filterMimeType.add("image/png");
+                //upload
+                PictureSelector.create(this)
+                        .openGallery(PictureMimeType.ofVideo())
+                        .isWeChatStyle(true)
+                        .imageEngine(GlideEngine.createGlideEngine())
+                        .isWithVideoImage(true)
+                        .theme(R.style.picture_WeChat_style)
+                        .setLanguage(LanguageConfig.ENGLISH)
+                        .maxVideoSelectNum(35)
+                        .isMaxSelectEnabledMask(true)
+                        .isOnlyVideo(false)
+                        .isPreviewVideo(false)
+                        .selectionMode(PictureConfig.MULTIPLE)
+                        .isSingleDirectReturn(false)
+                        .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+                        .isCamera(false)
+                        .maxSelectNum(35)
+                        .videoMinSecond(6)
+                        .setFilterMimeType(filterMimeType)
+                        .isShowPreView(false)
+                        .forResult(new OnResultCallbackListener(){
+
+                            @Override
+                            public void onResult(List result) {
+
+                            }
+
+                            @Override
+                            public void onCancel() {
+
+                            }
+                        });
+
                 break;
             default:
                 break;
diff --git a/app/src/main/res/layout/activity_other.xml b/app/src/main/res/layout/activity_other.xml
index 27f9298be..a9242d1e2 100644
--- a/app/src/main/res/layout/activity_other.xml
+++ b/app/src/main/res/layout/activity_other.xml
@@ -21,4 +21,25 @@
         android:layout_marginTop="10dp"
         android:text="Fragment"
         android:textAllCaps="false" />
+
+
+    <Button
+        android:id="@+id/btn_dialog"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/btn_fragment"
+        android:layout_marginTop="10dp"
+        android:text="dialog"
+        android:textAllCaps="false" />
+
+
+    <Button
+        android:id="@+id/clapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/btn_dialog"
+        android:layout_marginTop="10dp"
+        android:text="clapper"
+        android:textAllCaps="false" />
+
 </RelativeLayout>
diff --git a/picture_library/build.gradle b/picture_library/build.gradle
index 445c555b6..9aa2b53b4 100644
--- a/picture_library/build.gradle
+++ b/picture_library/build.gradle
@@ -38,4 +38,6 @@ dependencies {
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:${cfgs.localbroadcastmanager}"
     implementation "androidx.camera:camera-view:${cfgs.camerax_view}"
     api project(':ucrop')
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
diff --git a/picture_library/src/main/AndroidManifest.xml b/picture_library/src/main/AndroidManifest.xml
index babf7f7f0..c923f402a 100644
--- a/picture_library/src/main/AndroidManifest.xml
+++ b/picture_library/src/main/AndroidManifest.xml
@@ -3,10 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.luck.picture.lib">
 
-    <uses-sdk tools:overrideLibrary="androidx.camera.view,
-    androidx.camera:camera-camera2,
-    androidx.camera.camera2,androidx.camera.lifecycle,
-    androidx.camera.core" />
+    <uses-sdk tools:overrideLibrary="androidx.camera.view,     androidx.camera:camera-camera2,     androidx.camera.camera2,androidx.camera.lifecycle,     androidx.camera.core" />
 
     <!--适配Android R包可见性 开始-->
     <queries package="${applicationId}">
@@ -32,10 +29,12 @@
 
         <activity
             android:name=".PictureSelectorActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/TranslucentTheme" />
         <activity
             android:name=".PictureSelectorWeChatStyleActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize" />
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/TranslucentTheme" />
         <activity
             android:name=".PictureSelectorCameraEmptyActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -43,7 +42,6 @@
         <activity
             android:name=".PictureCustomCameraActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
-
         <activity
             android:name=".PicturePreviewActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
@@ -57,18 +55,15 @@
         <activity
             android:name=".PictureExternalPreviewActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
-
         <activity
             android:name=".PicturePlayAudioActivity"
             android:configChanges="orientation|keyboardHidden|screenSize" />
-
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
             android:theme="@style/Base.Theme.NoActionBar" />
         <activity
             android:name="com.yalantis.ucrop.PictureMultiCuttingActivity"
             android:theme="@style/Base.Theme.NoActionBar" />
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/picture_library/src/main/java/com/luck/picture/lib/ClapperStyleActivity.java b/picture_library/src/main/java/com/luck/picture/lib/ClapperStyleActivity.java
new file mode 100644
index 000000000..72f61305c
--- /dev/null
+++ b/picture_library/src/main/java/com/luck/picture/lib/ClapperStyleActivity.java
@@ -0,0 +1,157 @@
+package com.luck.picture.lib;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.luck.picture.lib.adapter.PictureImageGridAdapter;
+import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.PictureSelectionConfig;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.listener.OnQueryDataResultListener;
+import com.luck.picture.lib.model.LocalMediaPageLoader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClapperStyleActivity extends AppCompatActivity {
+
+    private TextView mEmpty;
+    private RecyclerView mPictureRecycler;
+    private int mPage = 3;
+    protected PictureImageGridAdapter mAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_clapper_style);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initView() {
+        mEmpty = findViewById(R.id.empty);
+        mPictureRecycler = findViewById(R.id.picture_recycler);
+    }
+
+    private void initData() {
+
+        PictureSelectionConfig selectionConfig = PictureSelectionConfig.getCleanInstance();
+        mAdapter = new PictureImageGridAdapter(this, selectionConfig);
+
+
+
+    }
+
+    private void initListener() {
+
+    }
+
+
+    class ImageGridAdapter extends RecyclerView.Adapter {
+
+        public static final int TYPE_CAMERA = 1;
+        public static final int TYPE_PICTURE = 2;
+
+
+        private List<LocalMedia> mediaList = new ArrayList<>();
+
+        public void setData(List<LocalMedia> list) {
+            this.mediaList = list;
+            notifyDataSetChanged();
+        }
+
+        public void addData(List<LocalMedia> list) {
+            this.mediaList.addAll(list);
+            notifyDataSetChanged();
+        }
+
+        @NonNull
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+            if (viewType == TYPE_CAMERA) {
+                View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.picture_item_camera, parent, false);
+                return new CameraViewHolder(view);
+            } else {
+                View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.picture_image_grid_item, parent, false);
+                return new ViewHolder(view);
+            }
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+
+            if (getItemViewType(position) == TYPE_CAMERA) {
+                CameraViewHolder cameraViewHolder = (CameraViewHolder) holder;
+                cameraViewHolder.itemView.setOnClickListener(v -> {
+                    //拍照
+                });
+
+            } else {
+                //展示图片
+
+
+            }
+
+
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return mediaList.size() + 1;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            if (position == 0) {
+                return TYPE_CAMERA;
+            } else {
+                return TYPE_PICTURE;
+            }
+        }
+    }
+
+    public class CameraViewHolder extends RecyclerView.ViewHolder {
+        View headerView;
+        TextView tvCamera;
+
+        public CameraViewHolder(View itemView) {
+            super(itemView);
+            headerView = itemView;
+            tvCamera = itemView.findViewById(R.id.tvCamera);
+            String title = itemView.getContext().getString(R.string.picture_take_picture);
+            tvCamera.setText(title);
+        }
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView ivPicture;
+        TextView tvCheck;
+        TextView tvDuration, tvIsGif, tvLongChart;
+        View contentView;
+        View btnCheck;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            contentView = itemView;
+            ivPicture = itemView.findViewById(R.id.ivPicture);
+            tvCheck = itemView.findViewById(R.id.tvCheck);
+            btnCheck = itemView.findViewById(R.id.btnCheck);
+            tvDuration = itemView.findViewById(R.id.tv_duration);
+            tvIsGif = itemView.findViewById(R.id.tv_isGif);
+            tvLongChart = itemView.findViewById(R.id.tv_long_chart);
+        }
+    }
+}
\ No newline at end of file
diff --git a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectionModel.java b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectionModel.java
index ec1b548ec..c6ba6150c 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectionModel.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectionModel.java
@@ -95,6 +95,16 @@ public PictureSelectionModel setLanguage(int language) {
         return this;
     }
 
+    /**
+     * @param
+     * @return PictureSelectionModel
+     *
+     */
+    public PictureSelectionModel setFilterMimeType(List filterMimeType) {
+        selectionConfig.filterMimeType = filterMimeType;
+        return this;
+    }
+
     /**
      * Change the desired orientation of this activity.  If the activity
      * is currently in the foreground or otherwise impacting the screen
@@ -251,6 +261,24 @@ public PictureSelectionModel isEnableCrop(boolean enableCrop) {
         return this;
     }
 
+    /**
+     * @param showPreView Language
+     * @return PictureSelectionModel
+     */
+    public PictureSelectionModel isShowPreView(boolean showPreView) {
+        selectionConfig.isShowPreView = showPreView;
+        return this;
+    }
+
+    /**
+     * @param messageStyle
+     * @return PictureSelectionModel
+     */
+    public PictureSelectionModel isMessageStyle(boolean messageStyle) {
+        selectionConfig.isMessageStyle = messageStyle;
+        return this;
+    }
+
     /**
      * @param uCropOptions UCrop parameter configuration is provided
      * @return
@@ -634,6 +662,31 @@ public PictureSelectionModel videoMinSecond(int videoMinSecond) {
         return this;
     }
 
+    public PictureSelectionModel selectMaxPrompt(String prompt) {
+        selectionConfig.selectMaxPrompt = prompt;
+        return this;
+    }
+
+    public PictureSelectionModel selectCountText(String selectTextCount) {
+        selectionConfig.selectTextCount = selectTextCount;
+        return this;
+    }
+
+    public PictureSelectionModel isCloseActivity(boolean isCloseActivity) {
+        selectionConfig.isCloseActivity = isCloseActivity;
+        return this;
+    }
+
+    public PictureSelectionModel isOnlyVideo(boolean isOnlyVideo) {
+        selectionConfig.isOnlyVideo = isOnlyVideo;
+        return this;
+    }
+
+    public PictureSelectionModel isCanPreView(boolean isCanPreView) {
+        selectionConfig.isCanPreView = isCanPreView;
+        return this;
+    }
+
 
     /**
      * @param recordVideoSecond video record second
diff --git a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java
index 4cc707bb0..e6b9261a7 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorActivity.java
@@ -1,20 +1,28 @@
 package com.luck.picture.lib;
 
 import android.Manifest;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.ColorStateList;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.provider.SyncStateContract;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
@@ -23,21 +31,26 @@
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
+import com.google.android.material.tabs.TabItem;
+import com.google.android.material.tabs.TabLayout;
 import com.luck.picture.lib.adapter.PictureImageGridAdapter;
+import com.luck.picture.lib.adapter.SelectedLocalDataMedia;
 import com.luck.picture.lib.animators.AlphaInAnimationAdapter;
 import com.luck.picture.lib.animators.AnimationType;
 import com.luck.picture.lib.animators.SlideInBottomAnimationAdapter;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureMimeType;
 import com.luck.picture.lib.config.PictureSelectionConfig;
-import com.luck.picture.lib.manager.UCropManager;
 import com.luck.picture.lib.decoration.GridSpacingItemDecoration;
 import com.luck.picture.lib.dialog.PhotoItemSelectedDialog;
 import com.luck.picture.lib.dialog.PictureCustomDialog;
@@ -48,6 +61,7 @@
 import com.luck.picture.lib.listener.OnPhotoSelectChangedListener;
 import com.luck.picture.lib.listener.OnQueryDataResultListener;
 import com.luck.picture.lib.listener.OnRecyclerViewPreloadMoreListener;
+import com.luck.picture.lib.manager.UCropManager;
 import com.luck.picture.lib.model.LocalMediaLoader;
 import com.luck.picture.lib.model.LocalMediaPageLoader;
 import com.luck.picture.lib.observable.ImagesObservable;
@@ -70,12 +84,12 @@
 import com.luck.picture.lib.widget.RecyclerPreloadView;
 import com.yalantis.ucrop.UCrop;
 import com.yalantis.ucrop.model.CutInfo;
-
-import org.jetbrains.annotations.NotNull;
+import com.yalantis.ucrop.view.widget.CustomLoadingDialog;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author：luck
@@ -88,8 +102,9 @@ public class PictureSelectorActivity extends PictureBaseActivity implements View
     private static final String TAG = PictureSelectorActivity.class.getSimpleName();
     protected ImageView mIvPictureLeftBack;
     protected ImageView mIvArrow;
-    protected View mTitleBar;
-    protected View viewClickMask;
+    protected TabLayout mTabLayout;
+    protected TextView mTvVideoTitle;
+    protected View titleViewBg;
     protected TextView mTvPictureTitle, mTvPictureRight, mTvPictureOk, mTvEmpty,
             mTvPictureImgNum, mTvPicturePreview, mTvPlayPause, mTvStop, mTvQuit,
             mTvMusicStatus, mTvMusicTotal, mTvMusicTime;
@@ -109,6 +124,14 @@ public class PictureSelectorActivity extends PictureBaseActivity implements View
     private long intervalClickTime = 0;
     private int allFolderSize;
     private int mOpenCameraCount;
+    private RecyclerView mSelectedLocalMedia;
+    private SelectedLocalDataMedia mSelectedLocalAdapter;
+    private TextView mtTvCount;
+    private ImageView mIvClose;
+    private TextView mTvSelectMax;
+    private List<LocalMedia> mSelectData;
+    private TextView mSend;
+    private CustomLoadingDialog mMyDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -116,8 +139,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             allFolderSize = savedInstanceState.getInt(PictureConfig.EXTRA_ALL_FOLDER_SIZE);
             oldCurrentListSize = savedInstanceState.getInt(PictureConfig.EXTRA_OLD_CURRENT_LIST_SIZE, 0);
-            List<LocalMedia> cacheData = PictureSelector.obtainSelectorList(savedInstanceState);
-            selectionMedias = cacheData != null ? cacheData : selectionMedias;
+            selectionMedias = PictureSelector.obtainSelectorList(savedInstanceState);
             if (mAdapter != null) {
                 isStartAnimation = true;
                 mAdapter.bindSelectData(selectionMedias);
@@ -158,35 +180,50 @@ public int getResourceId() {
     protected void initWidgets() {
         super.initWidgets();
         container = findViewById(R.id.container);
-        mTitleBar = findViewById(R.id.titleBar);
+        titleViewBg = findViewById(R.id.titleViewBg);
         mIvPictureLeftBack = findViewById(R.id.pictureLeftBack);
         mTvPictureTitle = findViewById(R.id.picture_title);
         mTvPictureRight = findViewById(R.id.picture_right);
         mTvPictureOk = findViewById(R.id.picture_tv_ok);
         mCbOriginal = findViewById(R.id.cb_original);
         mIvArrow = findViewById(R.id.ivArrow);
-        viewClickMask = findViewById(R.id.viewClickMask);
+        mTabLayout = findViewById(R.id.tl_tabs);
+        mTvVideoTitle = findViewById(R.id.tv_video_title);
+        mIvClose = findViewById(R.id.iv_close);
         mTvPicturePreview = findViewById(R.id.picture_id_preview);
-        mTvPictureImgNum = findViewById(R.id.tv_media_num);
+        mTvPictureImgNum = findViewById(R.id.picture_tvMediaNum);
         mRecyclerView = findViewById(R.id.picture_recycler);
-        mBottomLayout = findViewById(R.id.select_bar_layout);
+        mBottomLayout = findViewById(R.id.rl_bottom);
         mTvEmpty = findViewById(R.id.tv_empty);
+        mSelectedLocalMedia = findViewById(R.id.rv_selected);
+        mtTvCount = findViewById(R.id.tv_count);
+        mTvSelectMax = findViewById(R.id.tv_select_max);
+        mSend = findViewById(R.id.send);
         isNumComplete(numComplete);
         if (!numComplete) {
             animation = AnimationUtils.loadAnimation(this, R.anim.picture_anim_modal_in);
         }
         mTvPicturePreview.setOnClickListener(this);
-        if (config.isAutomaticTitleRecyclerTop) {
-            mTitleBar.setOnClickListener(this);
+        if (config.isAutomaticTitleRecyclerTop && titleViewBg != null) {
+            titleViewBg.setOnClickListener(this);
         }
         mTvPicturePreview.setVisibility(config.chooseMode != PictureMimeType.ofAudio() && config.enablePreview ? View.VISIBLE : View.GONE);
-        mBottomLayout.setVisibility(config.selectionMode == PictureConfig.SINGLE
-                && config.isSingleDirectReturn ? View.GONE : View.VISIBLE);
+        if (mBottomLayout != null) {
+            mBottomLayout.setVisibility(config.selectionMode == PictureConfig.SINGLE
+                    && config.isSingleDirectReturn ? View.GONE : View.VISIBLE);
+        }
         mIvPictureLeftBack.setOnClickListener(this);
         mTvPictureRight.setOnClickListener(this);
         mTvPictureOk.setOnClickListener(this);
-        viewClickMask.setOnClickListener(this);
-        mTvPictureImgNum.setOnClickListener(this);
+        if (mtTvCount != null) {
+            mtTvCount.setOnClickListener(this);
+        }
+        if (mSend != null) {
+            mSend.setOnClickListener(this);
+        }
+        if (mTvPictureImgNum != null) {
+            mTvPictureImgNum.setOnClickListener(this);
+        }
         mTvPictureTitle.setOnClickListener(this);
         mIvArrow.setOnClickListener(this);
         String title = config.chooseMode == PictureMimeType.ofAudio() ?
@@ -196,9 +233,9 @@ protected void initWidgets() {
         folderWindow = new FolderPopWindow(this);
         folderWindow.setArrowImageView(mIvArrow);
         folderWindow.setOnAlbumItemClickListener(this);
-        mRecyclerView.addItemDecoration(new GridSpacingItemDecoration(config.imageSpanCount <= 0 ? PictureConfig.DEFAULT_SPAN_COUNT : config.imageSpanCount,
+        mRecyclerView.addItemDecoration(new GridSpacingItemDecoration(config.imageSpanCount,
                 ScreenUtils.dip2px(this, 2), false));
-        mRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), config.imageSpanCount <= 0 ? PictureConfig.DEFAULT_SPAN_COUNT : config.imageSpanCount));
+        mRecyclerView.setLayoutManager(new GridLayoutManager(getContext(), config.imageSpanCount));
         if (!config.isPageStrategy) {
             mRecyclerView.setHasFixedSize(true);
         } else {
@@ -238,6 +275,115 @@ protected void initWidgets() {
                 config.isCheckOriginalImage = isChecked;
             });
         }
+
+        if (config.isWeChatStyle) {
+            mSelectedLocalMedia.setLayoutManager(new LinearLayoutManager(this,
+                    LinearLayoutManager.HORIZONTAL,false));
+            mSelectedLocalAdapter = new SelectedLocalDataMedia();
+            mSelectedLocalMedia.setAdapter(mSelectedLocalAdapter);
+            mSelectedLocalMedia.addItemDecoration(new RecyclerView.ItemDecoration() {
+                @Override
+                public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+                    super.getItemOffsets(outRect, view, parent, state);
+                    outRect.right = ScreenUtils.dip2px(PictureSelectorActivity.this, 4);
+                    outRect.left = ScreenUtils.dip2px(PictureSelectorActivity.this, 4);
+
+                    outRect.top = ScreenUtils.dip2px(PictureSelectorActivity.this, 6);
+                    outRect.bottom = ScreenUtils.dip2px(PictureSelectorActivity.this, 6);
+                }
+            });
+
+            //todo 删除
+            mSelectedLocalAdapter.setOnItemClickListener(media -> {
+                mAdapter.changeCheckboxState(media);
+            });
+
+        }
+
+//        TabLayout.Tab tabImages = new TabLayout.Tab();
+//        tabImages.setTag("Images");
+//        tabImages.setText("Images");
+//
+//        TabLayout.Tab tabVideos = new TabLayout.Tab();
+//        tabVideos.setTag("Videos");
+//        tabVideos.setText("Videos");
+
+        if (!config.isOnlyVideo) {
+            if (mTabLayout != null && mTvVideoTitle != null) {
+                mTabLayout.setVisibility(View.VISIBLE);
+                mTvVideoTitle.setVisibility(View.GONE);
+            }
+        } else {
+            if (mTabLayout != null && mTvVideoTitle != null) {
+                mTabLayout.setVisibility(View.GONE);
+                mTvVideoTitle.setVisibility(View.VISIBLE);
+            }
+        }
+
+        if (mTabLayout != null) {
+            mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+                @Override
+                public void onTabSelected(TabLayout.Tab tab) {
+                    if (tab.getText().equals("Images")) {
+                        config.chooseMode = PictureMimeType.ofImage();
+                        mPage = 1;
+                        showPleaseDialog();
+                        LocalMediaPageLoader.getInstance(getContext()).loadPageMediaData(-1, mPage,
+                                (OnQueryDataResultListener<LocalMedia>) (result, currentPage, isHasMore) -> {
+                                    if (!isFinishing()) {
+                                        if (result.size() == 0) {
+                                            mAdapter.clear();
+                                            showDataNull();
+                                        } else {
+                                            hideDataNull();
+                                        }
+                                        mAdapter.bindData(result);
+                                        mRecyclerView.onScrolled(0, 0);
+                                        mRecyclerView.smoothScrollToPosition(0);
+                                        dismissDialog();
+                                    }
+                                });
+                    } else {
+                        config.chooseMode = PictureMimeType.ofVideo();
+                        mPage = 1;
+                        LocalMediaPageLoader.getInstance(getContext()).loadPageMediaData(-1, mPage,
+                                (OnQueryDataResultListener<LocalMedia>) (result, currentPage, isHasMore) -> {
+                                    if (!isFinishing()) {
+                                        if (result.size() == 0) {
+                                            mAdapter.clear();
+                                            showDataNull();
+                                        } else {
+                                            hideDataNull();
+                                        }
+                                        mAdapter.bindData(result);
+                                        mRecyclerView.onScrolled(0, 0);
+                                        mRecyclerView.smoothScrollToPosition(0);
+                                        dismissDialog();
+                                    }
+                                });
+                    }
+                }
+
+                @Override
+                public void onTabUnselected(TabLayout.Tab tab) {
+
+                }
+
+                @Override
+                public void onTabReselected(TabLayout.Tab tab) {
+
+                }
+            });
+        }
+
+        if (mIvClose != null) {
+            mIvClose.setOnClickListener(v -> finish());
+        }
+
+        if (mTvSelectMax != null && config.selectMaxPrompt != null) {
+            mTvSelectMax.setText(config.selectMaxPrompt);
+        }
+
     }
 
     @Override
@@ -290,7 +436,8 @@ private void loadMoreData() {
                                 } else {
                                     boolean isEmpty = mAdapter.isDataEmpty();
                                     if (isEmpty) {
-                                        showDataNull(bucketId == -1 ? getString(R.string.picture_empty) : getString(R.string.picture_data_null), R.drawable.picture_icon_no_data);
+                                        showDataNull();
+
                                     }
                                 }
                             }
@@ -317,260 +464,104 @@ private void loadAllMediaData() {
 
     @Override
     public void initPictureSelectorStyle() {
-        if (PictureSelectionConfig.uiStyle != null) {
-            if (PictureSelectionConfig.uiStyle.picture_top_titleArrowDownDrawable != 0) {
-                Drawable drawable = ContextCompat.getDrawable(this, PictureSelectionConfig.uiStyle.picture_top_titleArrowDownDrawable);
+        if (config.style != null) {
+            if (config.style.pictureTitleDownResId != 0) {
+                Drawable drawable = ContextCompat.getDrawable(this, config.style.pictureTitleDownResId);
                 mIvArrow.setImageDrawable(drawable);
             }
-
-            if (PictureSelectionConfig.uiStyle.picture_top_titleTextColor != 0) {
-                mTvPictureTitle.setTextColor(PictureSelectionConfig.uiStyle.picture_top_titleTextColor);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_top_titleTextSize != 0) {
-                mTvPictureTitle.setTextSize(PictureSelectionConfig.uiStyle.picture_top_titleTextSize);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_top_titleRightTextColor.length > 0) {
-                ColorStateList colorStateList = AttrsUtils.getColorStateList(PictureSelectionConfig.uiStyle.picture_top_titleRightTextColor);
-                if (colorStateList != null) {
-                    mTvPictureRight.setTextColor(colorStateList);
-                }
-            }
-            if (PictureSelectionConfig.uiStyle.picture_top_titleRightTextSize != 0) {
-                mTvPictureRight.setTextSize(PictureSelectionConfig.uiStyle.picture_top_titleRightTextSize);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_top_leftBack != 0) {
-                mIvPictureLeftBack.setImageResource(PictureSelectionConfig.uiStyle.picture_top_leftBack);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_previewTextColor.length > 0) {
-                ColorStateList colorStateList = AttrsUtils.getColorStateList(PictureSelectionConfig.uiStyle.picture_bottom_previewTextColor);
-                if (colorStateList != null) {
-                    mTvPicturePreview.setTextColor(colorStateList);
-                }
-            }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_previewTextSize != 0) {
-                mTvPicturePreview.setTextSize(PictureSelectionConfig.uiStyle.picture_bottom_previewTextSize);
-            }
-
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotBackground != 0) {
-                mTvPictureImgNum.setBackgroundResource(PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotBackground);
+            if (config.style.pictureTitleTextColor != 0) {
+                mTvPictureTitle.setTextColor(config.style.pictureTitleTextColor);
             }
-
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotTextSize != 0) {
-                mTvPictureImgNum.setTextSize(PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotTextSize);
-            }
-
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotTextColor != 0) {
-                mTvPictureImgNum.setTextColor(PictureSelectionConfig.uiStyle.picture_bottom_completeRedDotTextColor);
+            if (config.style.pictureTitleTextSize != 0) {
+                mTvPictureTitle.setTextSize(config.style.pictureTitleTextSize);
             }
 
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeTextColor.length > 0) {
-                ColorStateList colorStateList = AttrsUtils.getColorStateList(PictureSelectionConfig.uiStyle.picture_bottom_completeTextColor);
-                if (colorStateList != null) {
-                    mTvPictureOk.setTextColor(colorStateList);
+            if (config.style.pictureRightDefaultTextColor != 0) {
+                mTvPictureRight.setTextColor(config.style.pictureRightDefaultTextColor);
+            } else {
+                if (config.style.pictureCancelTextColor != 0) {
+                    mTvPictureRight.setTextColor(config.style.pictureCancelTextColor);
                 }
             }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeTextSize != 0) {
-                mTvPictureOk.setTextSize(PictureSelectionConfig.uiStyle.picture_bottom_completeTextSize);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_barBackgroundColor != 0) {
-                mBottomLayout.setBackgroundColor(PictureSelectionConfig.uiStyle.picture_bottom_barBackgroundColor);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_container_backgroundColor != 0) {
-                container.setBackgroundColor(PictureSelectionConfig.uiStyle.picture_container_backgroundColor);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_top_titleRightDefaultText != 0) {
-                mTvPictureRight.setText(PictureSelectionConfig.uiStyle.picture_top_titleRightDefaultText);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0) {
-                mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText);
-            }
-            if (PictureSelectionConfig.uiStyle.picture_bottom_previewNormalText != 0) {
-                mTvPicturePreview.setText(PictureSelectionConfig.uiStyle.picture_bottom_previewNormalText);
-            }
-
-            if (PictureSelectionConfig.uiStyle.picture_top_titleArrowLeftPadding != 0) {
-                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mIvArrow.getLayoutParams();
-                params.leftMargin = PictureSelectionConfig.uiStyle.picture_top_titleArrowLeftPadding;
-            }
 
-            if (PictureSelectionConfig.uiStyle.picture_top_titleBarHeight > 0) {
-                ViewGroup.LayoutParams params = mTitleBar.getLayoutParams();
-                params.height = PictureSelectionConfig.uiStyle.picture_top_titleBarHeight;
-            }
-
-            if (PictureSelectionConfig.uiStyle.picture_bottom_barHeight > 0) {
-                ViewGroup.LayoutParams params = mBottomLayout.getLayoutParams();
-                params.height = PictureSelectionConfig.uiStyle.picture_bottom_barHeight;
-            }
-
-            if (config.isOriginalControl) {
-                if (PictureSelectionConfig.uiStyle.picture_bottom_originalPictureCheckStyle != 0) {
-                    mCbOriginal.setButtonDrawable(PictureSelectionConfig.uiStyle.picture_bottom_originalPictureCheckStyle);
-                } else {
-                    mCbOriginal.setButtonDrawable(ContextCompat.getDrawable(this, R.drawable.picture_original_checkbox));
-                }
-                if (PictureSelectionConfig.uiStyle.picture_bottom_originalPictureTextColor != 0) {
-                    mCbOriginal.setTextColor(PictureSelectionConfig.uiStyle.picture_bottom_originalPictureTextColor);
-                } else {
-                    mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_white));
-                }
-                if (PictureSelectionConfig.uiStyle.picture_bottom_originalPictureTextSize != 0) {
-                    mCbOriginal.setTextSize(PictureSelectionConfig.uiStyle.picture_bottom_originalPictureTextSize);
-                }
-                if (PictureSelectionConfig.uiStyle.picture_bottom_originalPictureText != 0) {
-                    mCbOriginal.setText(PictureSelectionConfig.uiStyle.picture_bottom_originalPictureText);
-                }
-            } else {
-                mCbOriginal.setButtonDrawable(ContextCompat.getDrawable(this, R.drawable.picture_original_checkbox));
-                mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_white));
-            }
-        } else if (PictureSelectionConfig.style != null) {
-            if (PictureSelectionConfig.style.pictureTitleDownResId != 0) {
-                Drawable drawable = ContextCompat.getDrawable(this, PictureSelectionConfig.style.pictureTitleDownResId);
-                mIvArrow.setImageDrawable(drawable);
-            }
-            if (PictureSelectionConfig.style.pictureTitleTextColor != 0) {
-                mTvPictureTitle.setTextColor(PictureSelectionConfig.style.pictureTitleTextColor);
-            }
-            if (PictureSelectionConfig.style.pictureTitleTextSize != 0) {
-                mTvPictureTitle.setTextSize(PictureSelectionConfig.style.pictureTitleTextSize);
+            if (config.style.pictureRightTextSize != 0) {
+                mTvPictureRight.setTextSize(config.style.pictureRightTextSize);
             }
 
-            if (PictureSelectionConfig.style.pictureRightDefaultTextColor != 0) {
-                mTvPictureRight.setTextColor(PictureSelectionConfig.style.pictureRightDefaultTextColor);
-            } else {
-                if (PictureSelectionConfig.style.pictureCancelTextColor != 0) {
-                    mTvPictureRight.setTextColor(PictureSelectionConfig.style.pictureCancelTextColor);
-                }
-            }
-            if (PictureSelectionConfig.style.pictureRightTextSize != 0) {
-                mTvPictureRight.setTextSize(PictureSelectionConfig.style.pictureRightTextSize);
+            if (config.style.pictureLeftBackIcon != 0) {
+                mIvPictureLeftBack.setImageResource(config.style.pictureLeftBackIcon);
             }
-
-            if (PictureSelectionConfig.style.pictureLeftBackIcon != 0) {
-                mIvPictureLeftBack.setImageResource(PictureSelectionConfig.style.pictureLeftBackIcon);
+            if (config.style.pictureUnPreviewTextColor != 0) {
+                mTvPicturePreview.setTextColor(config.style.pictureUnPreviewTextColor);
             }
-            if (PictureSelectionConfig.style.pictureUnPreviewTextColor != 0) {
-                mTvPicturePreview.setTextColor(PictureSelectionConfig.style.pictureUnPreviewTextColor);
+            if (config.style.picturePreviewTextSize != 0) {
+                mTvPicturePreview.setTextSize(config.style.picturePreviewTextSize);
             }
-            if (PictureSelectionConfig.style.picturePreviewTextSize != 0) {
-                mTvPicturePreview.setTextSize(PictureSelectionConfig.style.picturePreviewTextSize);
+            if (config.style.pictureCheckNumBgStyle != 0 && mTvPictureImgNum != null) {
+                mTvPictureImgNum.setBackgroundResource(config.style.pictureCheckNumBgStyle);
             }
-            if (PictureSelectionConfig.style.pictureCheckNumBgStyle != 0) {
-                mTvPictureImgNum.setBackgroundResource(PictureSelectionConfig.style.pictureCheckNumBgStyle);
+            if (config.style.pictureUnCompleteTextColor != 0) {
+                mTvPictureOk.setTextColor(config.style.pictureUnCompleteTextColor);
             }
-            if (PictureSelectionConfig.style.pictureUnCompleteTextColor != 0) {
-                mTvPictureOk.setTextColor(PictureSelectionConfig.style.pictureUnCompleteTextColor);
+            if (config.style.pictureCompleteTextSize != 0) {
+                mTvPictureOk.setTextSize(config.style.pictureCompleteTextSize);
             }
-            if (PictureSelectionConfig.style.pictureCompleteTextSize != 0) {
-                mTvPictureOk.setTextSize(PictureSelectionConfig.style.pictureCompleteTextSize);
+            if (config.style.pictureBottomBgColor != 0 && mBottomLayout != null) {
+                mBottomLayout.setBackgroundColor(config.style.pictureBottomBgColor);
             }
-            if (PictureSelectionConfig.style.pictureBottomBgColor != 0) {
-                mBottomLayout.setBackgroundColor(PictureSelectionConfig.style.pictureBottomBgColor);
+            if (config.style.pictureContainerBackgroundColor != 0) {
+                container.setBackgroundColor(config.style.pictureContainerBackgroundColor);
             }
-            if (PictureSelectionConfig.style.pictureContainerBackgroundColor != 0) {
-                container.setBackgroundColor(PictureSelectionConfig.style.pictureContainerBackgroundColor);
+            if (!TextUtils.isEmpty(config.style.pictureRightDefaultText)) {
+                mTvPictureRight.setText(config.style.pictureRightDefaultText);
             }
-            if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureRightDefaultText)) {
-                mTvPictureRight.setText(PictureSelectionConfig.style.pictureRightDefaultText);
+            if (!TextUtils.isEmpty(config.style.pictureUnCompleteText)) {
+                mTvPictureOk.setText(config.style.pictureUnCompleteText);
             }
-            if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)) {
-                mTvPictureOk.setText(PictureSelectionConfig.style.pictureUnCompleteText);
+            if (!TextUtils.isEmpty(config.style.pictureUnPreviewText)) {
+                mTvPicturePreview.setText(config.style.pictureUnPreviewText);
             }
-            if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnPreviewText)) {
-                mTvPicturePreview.setText(PictureSelectionConfig.style.pictureUnPreviewText);
+        } else {
+            if (config.downResId != 0) {
+                Drawable drawable = ContextCompat.getDrawable(this, config.downResId);
+                mIvArrow.setImageDrawable(drawable);
             }
-
-            if (PictureSelectionConfig.style.pictureTitleRightArrowLeftPadding != 0) {
-                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mIvArrow.getLayoutParams();
-                params.leftMargin = PictureSelectionConfig.style.pictureTitleRightArrowLeftPadding;
+            int pictureBottomBgColor = AttrsUtils.
+                    getTypeValueColor(getContext(), R.attr.picture_bottom_bg);
+            if (pictureBottomBgColor != 0 && mBottomLayout != null) {
+                mBottomLayout.setBackgroundColor(pictureBottomBgColor);
             }
+        }
+        if (titleViewBg != null) {
+            titleViewBg.setBackgroundColor(colorPrimary);
+        }
 
-            if (PictureSelectionConfig.style.pictureTitleBarHeight > 0) {
-                ViewGroup.LayoutParams params = mTitleBar.getLayoutParams();
-                params.height = PictureSelectionConfig.style.pictureTitleBarHeight;
-            }
-            if (config.isOriginalControl) {
-                if (PictureSelectionConfig.style.pictureOriginalControlStyle != 0) {
-                    mCbOriginal.setButtonDrawable(PictureSelectionConfig.style.pictureOriginalControlStyle);
+        if (config.isOriginalControl) {
+            if (config.style != null) {
+                if (config.style.pictureOriginalControlStyle != 0) {
+                    mCbOriginal.setButtonDrawable(config.style.pictureOriginalControlStyle);
                 } else {
                     mCbOriginal.setButtonDrawable(ContextCompat.getDrawable(this, R.drawable.picture_original_checkbox));
                 }
-                if (PictureSelectionConfig.style.pictureOriginalFontColor != 0) {
-                    mCbOriginal.setTextColor(PictureSelectionConfig.style.pictureOriginalFontColor);
+                if (config.style.pictureOriginalFontColor != 0) {
+                    mCbOriginal.setTextColor(config.style.pictureOriginalFontColor);
                 } else {
-                    mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_white));
+                    mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_53575e));
                 }
-                if (PictureSelectionConfig.style.pictureOriginalTextSize != 0) {
-                    mCbOriginal.setTextSize(PictureSelectionConfig.style.pictureOriginalTextSize);
+                if (config.style.pictureOriginalTextSize != 0) {
+                    mCbOriginal.setTextSize(config.style.pictureOriginalTextSize);
                 }
             } else {
                 mCbOriginal.setButtonDrawable(ContextCompat.getDrawable(this, R.drawable.picture_original_checkbox));
-                mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_white));
-            }
-        } else {
-            int titleColor = AttrsUtils.getTypeValueColor(getContext(), R.attr.picture_title_textColor);
-            if (titleColor != 0) {
-                mTvPictureTitle.setTextColor(titleColor);
-            }
-            int rightTitleColor = AttrsUtils.getTypeValueColor(getContext(), R.attr.picture_right_textColor);
-            if (rightTitleColor != 0) {
-                mTvPictureRight.setTextColor(rightTitleColor);
-            }
-            int containerBackgroundColor = AttrsUtils.getTypeValueColor(getContext(), R.attr.picture_container_backgroundColor);
-            if (containerBackgroundColor != 0) {
-                container.setBackgroundColor(containerBackgroundColor);
-            }
-            Drawable leftDrawable = AttrsUtils.getTypeValueDrawable(getContext(), R.attr.picture_leftBack_icon, R.drawable.picture_icon_back);
-            mIvPictureLeftBack.setImageDrawable(leftDrawable);
-
-            if (config.downResId != 0) {
-                Drawable drawable = ContextCompat.getDrawable(this, config.downResId);
-                mIvArrow.setImageDrawable(drawable);
-            } else {
-                Drawable downDrawable = AttrsUtils.getTypeValueDrawable(getContext(), R.attr.picture_arrow_down_icon, R.drawable.picture_icon_arrow_down);
-                mIvArrow.setImageDrawable(downDrawable);
-            }
-            int pictureBottomBgColor = AttrsUtils.getTypeValueColor(getContext(), R.attr.picture_bottom_bg);
-            if (pictureBottomBgColor != 0) {
-                mBottomLayout.setBackgroundColor(pictureBottomBgColor);
-            }
-            ColorStateList completeColorStateList = AttrsUtils.getTypeValueColorStateList(getContext(), R.attr.picture_complete_textColor);
-            if (completeColorStateList != null) {
-                mTvPictureOk.setTextColor(completeColorStateList);
-            }
-            ColorStateList previewColorStateList = AttrsUtils.getTypeValueColorStateList(getContext(), R.attr.picture_preview_textColor);
-            if (previewColorStateList != null) {
-                mTvPicturePreview.setTextColor(previewColorStateList);
-            }
-            int pictureTitleRightArrowLeftPadding = AttrsUtils.getTypeValueSizeForInt(getContext(), R.attr.picture_titleRightArrow_LeftPadding);
-            if (pictureTitleRightArrowLeftPadding != 0) {
-                RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mIvArrow.getLayoutParams();
-                params.leftMargin = pictureTitleRightArrowLeftPadding;
-            }
-            Drawable ovalBgDrawable = AttrsUtils.getTypeValueDrawable(getContext(), R.attr.picture_num_style, R.drawable.picture_num_oval);
-            mTvPictureImgNum.setBackground(ovalBgDrawable);
-
-            int titleBarHeight = AttrsUtils.getTypeValueSizeForInt(getContext(), R.attr.picture_titleBar_height);
-            if (titleBarHeight > 0) {
-                ViewGroup.LayoutParams params = mTitleBar.getLayoutParams();
-                params.height = titleBarHeight;
-            }
-            if (config.isOriginalControl) {
-                Drawable originalDrawable = AttrsUtils.getTypeValueDrawable(getContext(), R.attr.picture_original_check_style, R.drawable.picture_original_wechat_checkbox);
-                mCbOriginal.setButtonDrawable(originalDrawable);
-                int originalTextColor = AttrsUtils.getTypeValueColor(getContext(), R.attr.picture_original_text_color);
-                if (originalTextColor != 0) {
-                    mCbOriginal.setTextColor(originalTextColor);
-                }
+                mCbOriginal.setTextColor(ContextCompat.getColor(this, R.color.picture_color_53575e));
             }
         }
-        mTitleBar.setBackgroundColor(colorPrimary);
+
         mAdapter.bindSelectData(selectionMedias);
     }
 
     @Override
-    protected void onSaveInstanceState(@NotNull Bundle outState) {
+    protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         if (mAdapter != null) {
             // Save the number of pictures or videos in the current list
@@ -601,97 +592,33 @@ private void isNumComplete(boolean numComplete) {
      */
     @Override
     protected void initCompleteText(int startCount) {
+        boolean isNotEmptyStyle = config.style != null;
         if (config.selectionMode == PictureConfig.SINGLE) {
             if (startCount <= 0) {
-                if (PictureSelectionConfig.uiStyle != null) {
-                    if (PictureSelectionConfig.uiStyle.isCompleteReplaceNum) {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0
-                                ? String.format(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText), startCount, 1) : getString(R.string.picture_please_select));
-                    } else {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0
-                                ? getString(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText) : getString(R.string.picture_please_select));
-                    }
-                } else if (PictureSelectionConfig.style != null) {
-                    if (PictureSelectionConfig.style.isCompleteReplaceNum && !TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)) {
-                        mTvPictureOk.setText(String.format(PictureSelectionConfig.style.pictureUnCompleteText, startCount, 1));
-                    } else {
-                        mTvPictureOk.setText(!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)
-                                ? PictureSelectionConfig.style.pictureUnCompleteText : getString(R.string.picture_done));
-                    }
-                }
+                mTvPictureOk.setText(isNotEmptyStyle && !TextUtils.isEmpty(config.style.pictureUnCompleteText)
+                        ? config.style.pictureUnCompleteText : getString(R.string.picture_please_select));
             } else {
-                if (PictureSelectionConfig.uiStyle != null) {
-                    if (PictureSelectionConfig.uiStyle.isCompleteReplaceNum) {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText != 0
-                                ? String.format(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText), startCount, 1) : getString(R.string.picture_done));
-                    } else {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText != 0
-                                ? getString(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText) : getString(R.string.picture_done));
-                    }
-                } else if (PictureSelectionConfig.style != null) {
-                    if (PictureSelectionConfig.style.isCompleteReplaceNum && !TextUtils.isEmpty(PictureSelectionConfig.style.pictureCompleteText)) {
-                        mTvPictureOk.setText(String.format(PictureSelectionConfig.style.pictureCompleteText, startCount, 1));
-                    } else {
-                        mTvPictureOk.setText(!TextUtils.isEmpty(PictureSelectionConfig.style.pictureCompleteText)
-                                ? PictureSelectionConfig.style.pictureCompleteText : getString(R.string.picture_done));
-                    }
+                boolean isCompleteReplaceNum = isNotEmptyStyle && config.style.isCompleteReplaceNum;
+                if (isCompleteReplaceNum && !TextUtils.isEmpty(config.style.pictureCompleteText)) {
+                    mTvPictureOk.setText(String.format(config.style.pictureCompleteText, startCount, 1));
+                } else {
+                    mTvPictureOk.setText(isNotEmptyStyle && !TextUtils.isEmpty(config.style.pictureCompleteText)
+                            ? config.style.pictureCompleteText : getString(R.string.picture_done));
                 }
             }
 
         } else {
+            boolean isCompleteReplaceNum = isNotEmptyStyle && config.style.isCompleteReplaceNum;
             if (startCount <= 0) {
-                if (PictureSelectionConfig.uiStyle != null) {
-                    if (PictureSelectionConfig.uiStyle.isCompleteReplaceNum) {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0
-                                ? String.format(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText), startCount, config.maxSelectNum) :
-                                getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                    } else {
-                        mTvPictureOk.setText(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0
-                                ? getString(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText) :
-                                getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                    }
-                } else if (PictureSelectionConfig.style != null) {
-                    if (PictureSelectionConfig.style.isCompleteReplaceNum) {
-                        mTvPictureOk.setText(!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)
-                                ? String.format(PictureSelectionConfig.style.pictureUnCompleteText, startCount, config.maxSelectNum) :
-                                getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                    } else {
-                        mTvPictureOk.setText(!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)
-                                ? PictureSelectionConfig.style.pictureUnCompleteText :
-                                getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                    }
-                }
+                mTvPictureOk.setText(isNotEmptyStyle && !TextUtils.isEmpty(config.style.pictureUnCompleteText)
+                        ? config.style.pictureUnCompleteText : getString(R.string.picture_done_front_num,
+                        startCount, config.maxSelectNum));
             } else {
-                if (PictureSelectionConfig.uiStyle != null) {
-
-                    if (PictureSelectionConfig.uiStyle.isCompleteReplaceNum) {
-                        if (PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText != 0) {
-                            mTvPictureOk.setText(String.format(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText), startCount, config.maxSelectNum));
-                        } else {
-                            mTvPictureOk.setText(getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                        }
-                    } else {
-                        if (PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText != 0) {
-                            mTvPictureOk.setText(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText));
-                        } else {
-                            mTvPictureOk.setText(getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                        }
-                    }
-
-                } else if (PictureSelectionConfig.style != null) {
-                    if (PictureSelectionConfig.style.isCompleteReplaceNum) {
-                        if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureCompleteText)) {
-                            mTvPictureOk.setText(String.format(PictureSelectionConfig.style.pictureCompleteText, startCount, config.maxSelectNum));
-                        } else {
-                            mTvPictureOk.setText(getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                        }
-                    } else {
-                        if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureCompleteText)) {
-                            mTvPictureOk.setText(PictureSelectionConfig.style.pictureCompleteText);
-                        } else {
-                            mTvPictureOk.setText(getString(R.string.picture_done_front_num, startCount, config.maxSelectNum));
-                        }
-                    }
+                if (isCompleteReplaceNum && !TextUtils.isEmpty(config.style.pictureCompleteText)) {
+                    mTvPictureOk.setText(String.format(config.style.pictureCompleteText, startCount, config.maxSelectNum));
+                } else {
+                    mTvPictureOk.setText(getString(R.string.picture_done_front_num,
+                            startCount, config.maxSelectNum));
                 }
             }
         }
@@ -742,6 +669,12 @@ private void initPageModel(List<LocalMediaFolder> folders) {
             mTvPictureTitle.setTag(R.id.view_index_tag, 0);
             long bucketId = folder != null ? folder.getBucketId() : -1;
             mRecyclerView.setEnabledLoadMore(true);
+
+            if (mTvVideoTitle != null && mTvVideoTitle.getVisibility() == View.VISIBLE) {
+                config.chooseMode = PictureMimeType.ofVideo();
+            } else {
+                config.chooseMode = PictureMimeType.ofImage();
+            }
             LocalMediaPageLoader.getInstance(getContext()).loadPageMediaData(bucketId, mPage,
                     (OnQueryDataResultListener<LocalMedia>) (data, currentPage, isHasMore) -> {
                         if (!isFinishing()) {
@@ -770,7 +703,7 @@ private void initPageModel(List<LocalMediaFolder> folders) {
                                 }
                                 boolean isEmpty = mAdapter.isDataEmpty();
                                 if (isEmpty) {
-                                    showDataNull(getString(R.string.picture_empty), R.drawable.picture_icon_no_data);
+                                    showDataNull();
                                 } else {
                                     hideDataNull();
                                 }
@@ -779,7 +712,7 @@ private void initPageModel(List<LocalMediaFolder> folders) {
                         }
                     });
         } else {
-            showDataNull(getString(R.string.picture_data_exception), R.drawable.picture_icon_data_error);
+            showDataNull();
             dismissDialog();
         }
     }
@@ -847,16 +780,16 @@ private void initStandardModel(List<LocalMediaFolder> folders) {
                     }
                     boolean isEmpty = mAdapter.isDataEmpty();
                     if (isEmpty) {
-                        showDataNull(getString(R.string.picture_empty), R.drawable.picture_icon_no_data);
+                        showDataNull();
                     } else {
                         hideDataNull();
                     }
                 }
             } else {
-                showDataNull(getString(R.string.picture_empty), R.drawable.picture_icon_no_data);
+                showDataNull();
             }
         } else {
-            showDataNull(getString(R.string.picture_data_exception), R.drawable.picture_icon_data_error);
+            showDataNull();
         }
         dismissDialog();
     }
@@ -939,8 +872,11 @@ private void startCustomCamera() {
         if (PermissionChecker.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO)) {
             Intent intent = new Intent(this, PictureCustomCameraActivity.class);
             startActivityForResult(intent, PictureConfig.REQUEST_CAMERA);
-            PictureWindowAnimationStyle windowAnimationStyle = PictureSelectionConfig.windowAnimationStyle;
-            overridePendingTransition(windowAnimationStyle.activityEnterAnimation, R.anim.picture_anim_fade_in);
+            PictureWindowAnimationStyle windowAnimationStyle = config.windowAnimationStyle;
+            overridePendingTransition(windowAnimationStyle != null &&
+                    windowAnimationStyle.activityEnterAnimation != 0 ?
+                    windowAnimationStyle.activityEnterAnimation :
+                    R.anim.picture_anim_enter, R.anim.picture_anim_fade_in);
         } else {
             PermissionChecker
                     .requestPermissions(this,
@@ -952,8 +888,7 @@ private void startCustomCamera() {
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if (id == R.id.pictureLeftBack
-                || id == R.id.picture_right) {
+        if (id == R.id.pictureLeftBack || id == R.id.picture_right) {
             if (folderWindow != null && folderWindow.isShowing()) {
                 folderWindow.dismiss();
             } else {
@@ -961,13 +896,12 @@ public void onClick(View v) {
             }
             return;
         }
-
-        if (id == R.id.picture_title || id == R.id.ivArrow || id == R.id.viewClickMask) {
+        if (id == R.id.picture_title || id == R.id.ivArrow) {
             if (folderWindow.isShowing()) {
                 folderWindow.dismiss();
             } else {
                 if (!folderWindow.isEmpty()) {
-                    folderWindow.showAsDropDown(mTitleBar);
+                    folderWindow.showAsDropDown(titleViewBg);
                     if (!config.isSingleDirectReturn) {
                         List<LocalMedia> selectedImages = mAdapter.getSelectedData();
                         folderWindow.updateFolderCheckStatus(selectedImages);
@@ -982,12 +916,25 @@ public void onClick(View v) {
             return;
         }
 
-        if (id == R.id.picture_tv_ok || id == R.id.tv_media_num) {
-            onComplete();
+        if (id == R.id.picture_tv_ok || id == R.id.picture_tvMediaNum || id == R.id.tv_count || id == R.id.send) {
+
+            if (mSelectData == null || mSelectData.size() == 0) {
+                return;
+            }
+
+            View view = getLayoutInflater().inflate(R.layout.ucrop_dialog_loading, null);
+            mMyDialog = new CustomLoadingDialog(this,
+                    com.yalantis.ucrop.util.ScreenUtils.dip2px(this,228),
+                    com.yalantis.ucrop.util.ScreenUtils.dip2px(this,108),
+                    view,
+                    R.style.ucrop_DialogStyle);
+            mMyDialog.setCancelable(true);
+            mMyDialog.show();
+            onComplete(config.isCloseActivity);
             return;
         }
 
-        if (id == R.id.titleBar) {
+        if (id == R.id.titleViewBg) {
             if (config.isAutomaticTitleRecyclerTop) {
                 int intervalTime = 500;
                 if (SystemClock.uptimeMillis() - intervalClickTime < intervalTime) {
@@ -1026,14 +973,16 @@ private void onPreview() {
         JumpUtils.startPicturePreviewActivity(getContext(), config.isWeChatStyle, bundle,
                 config.selectionMode == PictureConfig.SINGLE ? UCrop.REQUEST_CROP : UCrop.REQUEST_MULTI_CROP);
 
-        overridePendingTransition(PictureSelectionConfig.windowAnimationStyle.activityPreviewEnterAnimation,
+        overridePendingTransition(config.windowAnimationStyle != null
+                        && config.windowAnimationStyle.activityPreviewEnterAnimation != 0
+                        ? config.windowAnimationStyle.activityPreviewEnterAnimation : R.anim.picture_anim_enter,
                 R.anim.picture_anim_fade_in);
     }
 
     /**
      * Complete
      */
-    private void onComplete() {
+    private void onComplete(boolean isCloseActivity) {
         List<LocalMedia> result = mAdapter.getSelectedData();
         int size = result.size();
         LocalMedia image = result.size() > 0 ? result.get(0) : null;
@@ -1101,6 +1050,31 @@ private void onComplete() {
             exit();
             return;
         }
+
+        if (!isCloseActivity) {
+            // 本地广播发起
+            long totalTime = 0;
+
+            for (LocalMedia localMedia: result) {
+                totalTime = totalTime + localMedia.getDuration();
+            }
+
+
+            if (totalTime < 6000) {
+                Toast.makeText(this, getString(R.string.video_at_least_6_seconds), Toast.LENGTH_SHORT).show();
+                if (mMyDialog != null) {
+                    mMyDialog.dismiss();
+                }
+                return;
+            }
+
+            LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(this);//获取实例
+            Intent intent = new Intent("com.newsclapper.picture");
+            intent.putParcelableArrayListExtra("LOCAL_MEDIA_LIST", (ArrayList<? extends Parcelable>) result);
+            localBroadcastManager.sendBroadcast(intent);
+            return;
+        }
+
         if (config.isCheckOriginalImage) {
             onResult(result);
             return;
@@ -1239,7 +1213,9 @@ private void AudioDialog(final String path) {
             mTvPlayPause = audioDialog.findViewById(R.id.tv_PlayPause);
             mTvStop = audioDialog.findViewById(R.id.tv_Stop);
             mTvQuit = audioDialog.findViewById(R.id.tv_Quit);
-            mHandler.postDelayed(() -> initPlayer(path), 30);
+            if (mHandler != null) {
+                mHandler.postDelayed(() -> initPlayer(path), 30);
+            }
             mTvPlayPause.setOnClickListener(new AudioOnClick(path));
             mTvStop.setOnClickListener(new AudioOnClick(path));
             mTvQuit.setOnClickListener(new AudioOnClick(path));
@@ -1260,7 +1236,9 @@ public void onStopTrackingTouch(SeekBar seekBar) {
                 }
             });
             audioDialog.setOnDismissListener(dialog -> {
-                mHandler.removeCallbacks(mRunnable);
+                if (mHandler != null) {
+                    mHandler.removeCallbacks(mRunnable);
+                }
                 new Handler().postDelayed(() -> stop(path), 30);
                 try {
                     if (audioDialog != null
@@ -1271,7 +1249,9 @@ public void onStopTrackingTouch(SeekBar seekBar) {
                     e.printStackTrace();
                 }
             });
-            mHandler.post(mRunnable);
+            if (mHandler != null) {
+                mHandler.post(mRunnable);
+            }
             audioDialog.show();
         }
     }
@@ -1285,7 +1265,9 @@ public void run() {
                     musicSeekBar.setProgress(mediaPlayer.getCurrentPosition());
                     musicSeekBar.setMax(mediaPlayer.getDuration());
                     mTvMusicTotal.setText(DateUtils.formatDurationTime(mediaPlayer.getDuration()));
-                    mHandler.postDelayed(mRunnable, 200);
+                    if (mHandler != null) {
+                        mHandler.postDelayed(mRunnable, 200);
+                    }
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1333,16 +1315,18 @@ public void onClick(View v) {
                 stop(path);
             }
             if (id == R.id.tv_Quit) {
-                mHandler.postDelayed(() -> stop(path), 30);
-                try {
-                    if (audioDialog != null
-                            && audioDialog.isShowing()) {
-                        audioDialog.dismiss();
+                if (mHandler != null) {
+                    mHandler.postDelayed(() -> stop(path), 30);
+                    try {
+                        if (audioDialog != null
+                                && audioDialog.isShowing()) {
+                            audioDialog.dismiss();
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
+                    mHandler.removeCallbacks(mRunnable);
                 }
-                mHandler.removeCallbacks(mRunnable);
             }
         }
     }
@@ -1366,7 +1350,9 @@ private void playAudio() {
             playOrPause();
         }
         if (!isPlayAudio) {
-            mHandler.post(mRunnable);
+            if (mHandler != null) {
+                mHandler.post(mRunnable);
+            }
             isPlayAudio = true;
         }
     }
@@ -1500,9 +1486,78 @@ public void onTakePhoto() {
         }
     }
 
+    @SuppressLint("UseCompatLoadingForDrawables")
     @Override
     public void onChange(List<LocalMedia> selectData) {
         changeImageNumber(selectData);
+        if (mSelectedLocalAdapter != null) {
+            mSelectedLocalAdapter.setList(selectData);
+            if (mSelectedLocalMedia != null) {
+                if (selectData.size() > 0) {
+                    mSelectedLocalMedia.setVisibility(View.VISIBLE);
+                } else {
+                    mSelectedLocalMedia.setVisibility(View.GONE);
+                }
+            }
+
+            mSelectData = selectData;
+            if (selectData.size() > 0) {
+                mtTvCount.setClickable(true);
+                if (config.selectTextCount != null) {
+                    if (selectData.size() > 1) {
+                        mtTvCount.setText(config.selectTextCount + "(" + selectData.size() + ")");
+                    } else {
+                        mtTvCount.setText(config.selectTextCount);
+                    }
+                } else {
+                    if (selectData.size() > 1) {
+                        mtTvCount.setText("Next (" + selectData.size() + ")");
+                    } else {
+                        mtTvCount.setText("Next");
+                    }
+                }
+
+                mtTvCount.setTextColor(getResources().getColor(R.color.ucrop_color_white));
+                mtTvCount.setBackground(getResources().getDrawable(R.drawable.radius_bg_shape_16));
+
+                //判断是否展示
+                if (config.isMessageStyle){
+                    if (mSend.getVisibility() != View.VISIBLE) {
+                        mSend.setVisibility(View.VISIBLE);
+                        ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mSend, "alpha", 0.0f, 1.0f);
+                        objectAnimator.setDuration(300);
+                        objectAnimator.start();
+                    }
+
+                }
+            } else {
+                ObjectAnimator objectAnimator = ObjectAnimator.ofFloat(mSend, "alpha", 1.0f, 0.0f);
+                objectAnimator.setDuration(300);
+                objectAnimator.start();
+
+                objectAnimator.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationStart(Animator animation, boolean isReverse) {
+
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation, boolean isReverse) {
+                        mSend.setVisibility(View.GONE);
+                    }
+                });
+
+                mtTvCount.setClickable(true);
+                if (config.selectTextCount != null) {
+                    mtTvCount.setText(config.selectTextCount);
+                } else {
+                    mtTvCount.setText("Next");
+                }
+
+                mtTvCount.setTextColor(getResources().getColor(R.color.picture_color_light_grey));
+                mtTvCount.setBackground(getResources().getDrawable(R.drawable.radius_bg_shape_gray_16));
+            }
+        }
     }
 
     @Override
@@ -1537,13 +1592,17 @@ public void startPreview(List<LocalMedia> previewData, int position) {
             // video
             if (config.selectionMode == PictureConfig.SINGLE && !config.enPreviewVideo) {
                 result.add(media);
-                onResult(result);
+                if (config.isCanPreView) {
+                    onResult(result);
+                }
             } else {
                 if (PictureSelectionConfig.customVideoPlayCallback != null) {
                     PictureSelectionConfig.customVideoPlayCallback.startPlayVideo(media);
                 } else {
                     bundle.putParcelable(PictureConfig.EXTRA_MEDIA_KEY, media);
-                    JumpUtils.startPictureVideoPlayActivity(getContext(), bundle, PictureConfig.PREVIEW_VIDEO_CODE);
+                    if (config.isCanPreView) {
+                        JumpUtils.startPictureVideoPlayActivity(getContext(), bundle, PictureConfig.PREVIEW_VIDEO_CODE);
+                    }
                 }
             }
         } else if (PictureMimeType.isHasAudio(mimeType)) {
@@ -1552,7 +1611,7 @@ public void startPreview(List<LocalMedia> previewData, int position) {
                 result.add(media);
                 onResult(result);
             } else {
-                AudioDialog(media.getRealPath());
+                AudioDialog(media.getPath());
             }
         } else {
             // image
@@ -1571,9 +1630,13 @@ public void startPreview(List<LocalMedia> previewData, int position) {
             bundle.putParcelable(PictureConfig.EXTRA_CONFIG, config);
             bundle.putInt(PictureConfig.EXTRA_DATA_COUNT, ValueOf.toInt(mTvPictureTitle.getTag(R.id.view_count_tag)));
             bundle.putString(PictureConfig.EXTRA_IS_CURRENT_DIRECTORY, mTvPictureTitle.getText().toString());
-            JumpUtils.startPicturePreviewActivity(getContext(), config.isWeChatStyle, bundle,
-                    config.selectionMode == PictureConfig.SINGLE ? UCrop.REQUEST_CROP : UCrop.REQUEST_MULTI_CROP);
-            overridePendingTransition(PictureSelectionConfig.windowAnimationStyle.activityPreviewEnterAnimation, R.anim.picture_anim_fade_in);
+            if (config.isCanPreView) {
+                JumpUtils.startPicturePreviewActivity(getContext(), config.isWeChatStyle, bundle,
+                        config.selectionMode == PictureConfig.SINGLE ? UCrop.REQUEST_CROP : UCrop.REQUEST_MULTI_CROP);
+            }
+            overridePendingTransition(config.windowAnimationStyle != null
+                    && config.windowAnimationStyle.activityPreviewEnterAnimation != 0
+                    ? config.windowAnimationStyle.activityPreviewEnterAnimation : R.anim.picture_anim_enter, R.anim.picture_anim_fade_in);
         }
     }
 
@@ -1590,46 +1653,29 @@ protected void changeImageNumber(List<LocalMedia> selectData) {
             mTvPictureOk.setSelected(true);
             mTvPicturePreview.setEnabled(true);
             mTvPicturePreview.setSelected(true);
-            if (PictureSelectionConfig.uiStyle != null) {
-                if (PictureSelectionConfig.uiStyle.picture_bottom_previewNormalText != 0) {
-                    if (PictureSelectionConfig.uiStyle.isCompleteReplaceNum) {
-                        mTvPicturePreview.setText(String.format(getString(PictureSelectionConfig.uiStyle.picture_bottom_previewNormalText), selectData.size()));
-                    } else {
-                        mTvPicturePreview.setText(PictureSelectionConfig.uiStyle.picture_bottom_previewNormalText);
-                    }
-                } else {
-                    mTvPicturePreview.setText(getString(R.string.picture_preview_num, selectData.size()));
+            if (config.style != null) {
+                if (config.style.pictureCompleteTextColor != 0) {
+                    mTvPictureOk.setTextColor(config.style.pictureCompleteTextColor);
                 }
-            } else if (PictureSelectionConfig.style != null) {
-                if (PictureSelectionConfig.style.pictureCompleteTextColor != 0) {
-                    mTvPictureOk.setTextColor(PictureSelectionConfig.style.pictureCompleteTextColor);
-                }
-                if (PictureSelectionConfig.style.picturePreviewTextColor != 0) {
-                    mTvPicturePreview.setTextColor(PictureSelectionConfig.style.picturePreviewTextColor);
-                }
-                if (!TextUtils.isEmpty(PictureSelectionConfig.style.picturePreviewText)) {
-                    mTvPicturePreview.setText(PictureSelectionConfig.style.picturePreviewText);
-                } else {
-                    mTvPicturePreview.setText(getString(R.string.picture_preview_num, selectData.size()));
+                if (config.style.picturePreviewTextColor != 0) {
+                    mTvPicturePreview.setTextColor(config.style.picturePreviewTextColor);
                 }
             }
-
+            if (config.style != null && !TextUtils.isEmpty(config.style.picturePreviewText)) {
+                mTvPicturePreview.setText(config.style.picturePreviewText);
+            } else {
+                mTvPicturePreview.setText(getString(R.string.picture_preview_num, selectData.size()));
+            }
             if (numComplete) {
                 initCompleteText(selectData.size());
             } else {
-                if (!isStartAnimation) {
+                if (!isStartAnimation && mTvPictureImgNum != null) {
                     mTvPictureImgNum.startAnimation(animation);
+                    mTvPictureImgNum.setVisibility(View.VISIBLE);
+                    mTvPictureImgNum.setText(String.valueOf(selectData.size()));
                 }
-                mTvPictureImgNum.setVisibility(View.VISIBLE);
-                mTvPictureImgNum.setText(String.valueOf(selectData.size()));
-                if (PictureSelectionConfig.uiStyle != null) {
-                    if (PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText != 0) {
-                        mTvPictureOk.setText(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeNormalText));
-                    }
-                } else if (PictureSelectionConfig.style != null) {
-                    if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureCompleteText)) {
-                        mTvPictureOk.setText(PictureSelectionConfig.style.pictureCompleteText);
-                    }
+                if (config.style != null && !TextUtils.isEmpty(config.style.pictureCompleteText)) {
+                    mTvPictureOk.setText(config.style.pictureCompleteText);
                 } else {
                     mTvPictureOk.setText(getString(R.string.picture_completed));
                 }
@@ -1640,38 +1686,27 @@ protected void changeImageNumber(List<LocalMedia> selectData) {
             mTvPictureOk.setSelected(false);
             mTvPicturePreview.setEnabled(false);
             mTvPicturePreview.setSelected(false);
-            if (PictureSelectionConfig.uiStyle != null) {
-                if (PictureSelectionConfig.uiStyle.picture_bottom_previewDefaultText != 0) {
-                    mTvPicturePreview.setText(getString(PictureSelectionConfig.uiStyle.picture_bottom_previewDefaultText));
-                } else {
-                    mTvPicturePreview.setText(getString(R.string.picture_preview));
-                }
-
-            } else if (PictureSelectionConfig.style != null) {
-                if (PictureSelectionConfig.style.pictureUnCompleteTextColor != 0) {
-                    mTvPictureOk.setTextColor(PictureSelectionConfig.style.pictureUnCompleteTextColor);
-                }
-                if (PictureSelectionConfig.style.pictureUnPreviewTextColor != 0) {
-                    mTvPicturePreview.setTextColor(PictureSelectionConfig.style.pictureUnPreviewTextColor);
+            if (config.style != null) {
+                if (config.style.pictureUnCompleteTextColor != 0) {
+                    mTvPictureOk.setTextColor(config.style.pictureUnCompleteTextColor);
                 }
-                if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnPreviewText)) {
-                    mTvPicturePreview.setText(PictureSelectionConfig.style.pictureUnPreviewText);
-                } else {
-                    mTvPicturePreview.setText(getString(R.string.picture_preview));
+                if (config.style.pictureUnPreviewTextColor != 0) {
+                    mTvPicturePreview.setTextColor(config.style.pictureUnPreviewTextColor);
                 }
             }
+            if (config.style != null && !TextUtils.isEmpty(config.style.pictureUnPreviewText)) {
+                mTvPicturePreview.setText(config.style.pictureUnPreviewText);
+            } else {
+                mTvPicturePreview.setText(getString(R.string.picture_preview));
+            }
             if (numComplete) {
                 initCompleteText(selectData.size());
             } else {
-                mTvPictureImgNum.setVisibility(View.INVISIBLE);
-                if (PictureSelectionConfig.uiStyle != null) {
-                    if (PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText != 0) {
-                        mTvPictureOk.setText(getString(PictureSelectionConfig.uiStyle.picture_bottom_completeDefaultText));
-                    }
-                } else if (PictureSelectionConfig.style != null) {
-                    if (!TextUtils.isEmpty(PictureSelectionConfig.style.pictureUnCompleteText)) {
-                        mTvPictureOk.setText(PictureSelectionConfig.style.pictureUnCompleteText);
-                    }
+                if (mTvPictureImgNum != null) {
+                    mTvPictureImgNum.setVisibility(View.INVISIBLE);
+                }
+                if (config.style != null && !TextUtils.isEmpty(config.style.pictureUnCompleteText)) {
+                    mTvPictureOk.setText(config.style.pictureUnCompleteText);
                 } else {
                     mTvPictureOk.setText(getString(R.string.picture_please_select));
                 }
@@ -1707,10 +1742,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             }
         } else if (resultCode == RESULT_CANCELED) {
             previewCallback(data);
-            // Delete this cameraPath when you cancel the camera
-            if (SdkVersionUtils.checkedAndroid_Q() && PictureMimeType.isContent(config.cameraPath)) {
-                getContentResolver().delete(Uri.parse(config.cameraPath), null, null);
-            }
         } else if (resultCode == UCrop.RESULT_ERROR) {
             if (data != null) {
                 Throwable throwable = (Throwable) data.getSerializableExtra(UCrop.EXTRA_ERROR);
@@ -1823,6 +1854,7 @@ private void dispatchHandleCamera(Intent intent) {
             public LocalMedia doInBackground() {
                 LocalMedia media = new LocalMedia();
                 String mimeType = isAudio ? PictureMimeType.MIME_TYPE_AUDIO : "";
+                int[] newSize = new int[2];
                 long duration = 0;
                 if (!isAudio) {
                     if (PictureMimeType.isContent(config.cameraPath)) {
@@ -1832,12 +1864,9 @@ public LocalMedia doInBackground() {
                             File cameraFile = new File(path);
                             mimeType = PictureMimeType.getMimeType(config.cameraMimeType);
                             media.setSize(cameraFile.length());
-                            media.setFileName(cameraFile.getName());
                         }
                         if (PictureMimeType.isHasImage(mimeType)) {
-                            int[] newSize = MediaUtils.getImageSizeForUrlToAndroidQ(getContext(), config.cameraPath);
-                            media.setWidth(newSize[0]);
-                            media.setHeight(newSize[1]);
+                            newSize = MediaUtils.getImageSizeForUrlToAndroidQ(getContext(), config.cameraPath);
                         } else if (PictureMimeType.isHasVideo(mimeType)) {
                             MediaUtils.getVideoSizeForUri(getContext(), Uri.parse(config.cameraPath), media);
                             duration = MediaUtils.extractDuration(getContext(), SdkVersionUtils.checkedAndroid_Q(), config.cameraPath);
@@ -1852,18 +1881,13 @@ public LocalMedia doInBackground() {
                         File cameraFile = new File(config.cameraPath);
                         mimeType = PictureMimeType.getMimeType(config.cameraMimeType);
                         media.setSize(cameraFile.length());
-                        media.setFileName(cameraFile.getName());
                         if (PictureMimeType.isHasImage(mimeType)) {
                             int degree = PictureFileUtils.readPictureDegree(getContext(), config.cameraPath);
                             BitmapUtils.rotateImage(degree, config.cameraPath);
-                            int[] newSize = MediaUtils.getImageSizeForUrl(config.cameraPath);
-                            media.setWidth(newSize[0]);
-                            media.setHeight(newSize[1]);
+                            newSize = MediaUtils.getImageSizeForUrl(config.cameraPath);
                         } else if (PictureMimeType.isHasVideo(mimeType)) {
-                            int[] newSize = MediaUtils.getVideoSizeForUrl(config.cameraPath);
+                            newSize = MediaUtils.getVideoSizeForUrl(config.cameraPath);
                             duration = MediaUtils.extractDuration(getContext(), SdkVersionUtils.checkedAndroid_Q(), config.cameraPath);
-                            media.setWidth(newSize[0]);
-                            media.setHeight(newSize[1]);
                         }
                         // Taking a photo generates a temporary id
                         media.setId(System.currentTimeMillis());
@@ -1871,6 +1895,8 @@ public LocalMedia doInBackground() {
                     media.setPath(config.cameraPath);
                     media.setDuration(duration);
                     media.setMimeType(mimeType);
+                    media.setWidth(newSize[0]);
+                    media.setHeight(newSize[1]);
                     if (SdkVersionUtils.checkedAndroid_Q() && PictureMimeType.isHasVideo(media.getMimeType())) {
                         media.setParentFolderName(Environment.DIRECTORY_MOVIES);
                     } else {
@@ -1971,16 +1997,22 @@ private void dispatchHandleMultiple(LocalMedia media) {
                     if (videoSize >= config.maxVideoSelectNum) {
                         showPromptDialog(getString(R.string.picture_message_max_num, config.maxVideoSelectNum));
                     } else {
-                        selectedData.add(media);
-                        mAdapter.bindSelectData(selectedData);
+                        if (videoSize < config.maxVideoSelectNum) {
+                            selectedData.add(0, media);
+                            mAdapter.bindSelectData(selectedData);
+                        } else {
+                            showPromptDialog(StringUtils.getMsg(getContext(), media.getMimeType(),
+                                    config.maxVideoSelectNum));
+                        }
                     }
                 }
             } else {
                 if (selectedData.size() < config.maxSelectNum) {
-                    selectedData.add(media);
+                    selectedData.add(0, media);
                     mAdapter.bindSelectData(selectedData);
                 } else {
-                    showPromptDialog(StringUtils.getMsg(getContext(), media.getMimeType(), config.maxSelectNum));
+                    showPromptDialog(StringUtils.getMsg(getContext(), media.getMimeType(),
+                            config.maxSelectNum));
                 }
             }
 
@@ -1989,7 +2021,7 @@ private void dispatchHandleMultiple(LocalMedia media) {
                 if (count < config.maxVideoSelectNum) {
                     if (mimeTypeSame || count == 0) {
                         if (selectedData.size() < config.maxVideoSelectNum) {
-                            selectedData.add(media);
+                            selectedData.add(0, media);
                             mAdapter.bindSelectData(selectedData);
                         }
                     }
@@ -2000,11 +2032,12 @@ private void dispatchHandleMultiple(LocalMedia media) {
             } else {
                 if (count < config.maxSelectNum) {
                     if (mimeTypeSame || count == 0) {
-                        selectedData.add(media);
+                        selectedData.add(0, media);
                         mAdapter.bindSelectData(selectedData);
                     }
                 } else {
-                    showPromptDialog(StringUtils.getMsg(getContext(), oldMimeType, config.maxSelectNum));
+                    showPromptDialog(StringUtils.getMsg(getContext(), oldMimeType,
+                            config.maxSelectNum));
                 }
             }
         }
@@ -2363,17 +2396,21 @@ private void updateMediaFolder(List<LocalMediaFolder> imageFolders, LocalMedia m
 
     @Override
     public void onBackPressed() {
-        if (SdkVersionUtils.checkedAndroid_Q()) {
-            finishAfterTransition();
-        } else {
-            super.onBackPressed();
-        }
-        if (PictureSelectionConfig.listener != null) {
+        super.onBackPressed();
+        if (config != null && PictureSelectionConfig.listener != null) {
             PictureSelectionConfig.listener.onCancel();
         }
         exit();
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (mMyDialog != null) {
+            mMyDialog.dismiss();
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -2381,7 +2418,7 @@ protected void onDestroy() {
             animation.cancel();
             animation = null;
         }
-        if (mediaPlayer != null) {
+        if (mediaPlayer != null && mHandler != null) {
             mHandler.removeCallbacks(mRunnable);
             mediaPlayer.release();
             mediaPlayer = null;
@@ -2492,23 +2529,24 @@ protected void showPermissionsDialog(boolean isCamera, String errorMsg) {
 
     /**
      * set Data Null
-     *
-     * @param msg
      */
-    private void showDataNull(String msg, int topErrorResId) {
-        if (mTvEmpty.getVisibility() == View.GONE || mTvEmpty.getVisibility() == View.INVISIBLE) {
-            mTvEmpty.setCompoundDrawablesRelativeWithIntrinsicBounds(0, topErrorResId, 0, 0);
-            mTvEmpty.setText(msg);
-            mTvEmpty.setVisibility(View.VISIBLE);
+    private void showDataNull() {
+
+        if (config.chooseMode == PictureMimeType.ofImage()) {
+            mTvEmpty.setText(getString(R.string.no_photos_available));
+        } else if (config.chooseMode == PictureMimeType.ofVideo()){
+            mTvEmpty.setText(getString(R.string.no_videos_available));
+        } else  {
+            mTvEmpty.setText(getString(R.string.no_photos_or_videos_available));
         }
+
+        mTvEmpty.setVisibility(View.VISIBLE);
     }
 
     /**
      * hidden
      */
     private void hideDataNull() {
-        if (mTvEmpty.getVisibility() == View.VISIBLE) {
-            mTvEmpty.setVisibility(View.GONE);
-        }
+        mTvEmpty.setVisibility(View.GONE);
     }
-}
+}
\ No newline at end of file
diff --git a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorWeChatStyleActivity.java b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorWeChatStyleActivity.java
index 3f3709fd2..235ef4c6a 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorWeChatStyleActivity.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/PictureSelectorWeChatStyleActivity.java
@@ -1,13 +1,20 @@
 package com.luck.picture.lib;
 
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureMimeType;
@@ -24,6 +31,10 @@
  */
 public class PictureSelectorWeChatStyleActivity extends PictureSelectorActivity {
     private RelativeLayout rlAlbum;
+    private RelativeLayout selectButtomLayout;
+    private TextView mPictureSendView;
+    private ImageView mIvClose;
+    private LocalReceiver mLocalReceiver;
 
     @Override
     public int getResourceId() {
@@ -34,8 +45,17 @@ public int getResourceId() {
     protected void initWidgets() {
         super.initWidgets();
         rlAlbum = findViewById(R.id.rlAlbum);
+
+        mPictureSendView = findViewById(R.id.picture_send);
+        selectButtomLayout = findViewById(R.id.select_buttom_layout);
+        mIvClose = findViewById(R.id.iv_close);
+        mPictureSendView.setOnClickListener(this);
+        mIvClose.setOnClickListener(this);
+        mPictureSendView.setText(getString(R.string.picture_send));
+
         mTvPictureRight.setOnClickListener(this);
         mTvPictureRight.setText(getString(R.string.picture_send));
+
         mTvPicturePreview.setTextSize(16);
         mCbOriginal.setTextSize(16);
         boolean isChooseMode = config.selectionMode ==
@@ -50,6 +70,26 @@ protected void initWidgets() {
                 lp.addRule(RelativeLayout.RIGHT_OF, R.id.pictureLeftBack);
             }
         }
+
+        if (config.isMessageStyle) {
+            selectButtomLayout.setVisibility(View.GONE);
+        } else {
+            selectButtomLayout.setVisibility(View.VISIBLE);
+        }
+
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction("com.newsclapper.picture.close");
+        mLocalReceiver = new LocalReceiver();
+        //注册本地广播监听器
+        LocalBroadcastManager.getInstance(this).registerReceiver(mLocalReceiver, intentFilter);
+    }
+
+    class LocalReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+
+            PictureSelectorWeChatStyleActivity.this.finish();
+        }
     }
 
     @Override
@@ -303,6 +343,8 @@ public void onClick(View v) {
             } else {
                 mTvPictureOk.performClick();
             }
+        } else if (id == R.id.iv_close) {
+            onBackPressed();
         } else {
             super.onClick(v);
         }
@@ -363,4 +405,10 @@ protected void initCompleteText(List<LocalMedia> list) {
             }
         }
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalReceiver);
+    }
 }
diff --git a/picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java b/picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java
index b72f9fb3b..48d37e27c 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/adapter/PictureImageGridAdapter.java
@@ -6,12 +6,14 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
@@ -222,6 +224,8 @@ public void onBindViewHolder(@NotNull final RecyclerView.ViewHolder holder, fina
             } else {
                 if (PictureSelectionConfig.imageEngine != null) {
                     PictureSelectionConfig.imageEngine.loadGridImage(context, path, contentHolder.ivPicture);
+
+                    Log.d("yikai","path = " +path);
                 }
             }
 
@@ -252,8 +256,12 @@ public void onBindViewHolder(@NotNull final RecyclerView.ViewHolder holder, fina
                             }
                         } else {
                             if (!contentHolder.tvCheck.isSelected() && getSelectedSize() >= config.maxSelectNum) {
-                                String msg = StringUtils.getMsg(context, image.getMimeType(), config.maxSelectNum);
-                                showPromptDialog(msg);
+                                String msg = "Select up to "+ getSelectedSize() +" videos";
+
+//                                showPromptDialog(msg);
+
+                                Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+
                                 return;
                             }
                         }
@@ -555,6 +563,7 @@ private void changeCheckboxState(ViewHolder contentHolder, LocalMedia image) {
                     return;
                 }
             }
+
         } else {
             if (!TextUtils.isEmpty(mimeType)) {
                 boolean mimeTypeSame = PictureMimeType.isMimeTypeSame(mimeType, image.getMimeType());
@@ -706,6 +715,29 @@ private void changeCheckboxState(ViewHolder contentHolder, LocalMedia image) {
         }
     }
 
+
+
+    public void changeCheckboxState(LocalMedia image) {
+        int count = selectData.size();
+
+        for (int i = 0; i < count; i++) {
+            LocalMedia media = selectData.get(i);
+            if (media == null || TextUtils.isEmpty(media.getPath())) {
+                continue;
+            }
+            if (media.getPath().equals(image.getPath())
+                    || media.getId() == image.getId()) {
+                selectData.remove(media);
+                subSelectPosition();
+                break;
+            }
+        }
+        notifyDataSetChanged();
+        if (imageSelectChangedListener != null) {
+            imageSelectChangedListener.onChange(selectData);
+        }
+    }
+
     /**
      * Radio mode
      */
@@ -771,4 +803,4 @@ public void setOnPhotoSelectChangedListener(OnPhotoSelectChangedListener
                                                         imageSelectChangedListener) {
         this.imageSelectChangedListener = imageSelectChangedListener;
     }
-}
+}
\ No newline at end of file
diff --git a/picture_library/src/main/java/com/luck/picture/lib/adapter/SelectedLocalDataMedia.java b/picture_library/src/main/java/com/luck/picture/lib/adapter/SelectedLocalDataMedia.java
new file mode 100644
index 000000000..46d2b8bc6
--- /dev/null
+++ b/picture_library/src/main/java/com/luck/picture/lib/adapter/SelectedLocalDataMedia.java
@@ -0,0 +1,119 @@
+package com.luck.picture.lib.adapter;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.luck.picture.lib.R;
+import com.luck.picture.lib.config.PictureSelectionConfig;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.tools.DateUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SelectedLocalDataMedia extends RecyclerView
+        .Adapter<SelectedLocalDataMedia.SelectedLocalDataMediaViewHolder> {
+
+    private List<LocalMedia> list = new ArrayList<>();
+    private OnItemClickListener mListener;
+
+    public void setOnItemClickListener(OnItemClickListener listener){
+        this.mListener = listener;
+    }
+
+    @NonNull
+    @Override
+    public SelectedLocalDataMedia.SelectedLocalDataMediaViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+        View inflate = View.inflate(parent.getContext(), R.layout.selected_local_data, null);
+
+        SelectedLocalDataMediaViewHolder selectedLocalDataMediaViewHolder
+                = new SelectedLocalDataMediaViewHolder(inflate);
+        return selectedLocalDataMediaViewHolder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SelectedLocalDataMedia
+            .SelectedLocalDataMediaViewHolder holder, int position) {
+
+        if (PictureSelectionConfig.imageEngine != null) {
+            PictureSelectionConfig.imageEngine.loadGridImageRound(holder.itemView.getContext(),
+                    list.get(position).getPath(), holder.ivCover);
+        }
+
+        holder.tvDuration.setText(DateUtils.formatDurationTime(list.get(position).getDuration()));
+
+        holder.ivClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (mListener != null) {
+                    mListener.setOnItemClickListener(list.get(position));
+                }
+            }
+        });
+    }
+
+    private String secToTime(int time) {
+
+        String timeStr;
+        int hour = time / 3600;
+        int minute = time / 60 % 60;
+        int second = time % 60;
+
+        if (hour > 0) {
+            timeStr = unitFormat(hour) + ":" + unitFormat(minute) + ":" + unitFormat(second);
+        } else {
+            timeStr = unitFormat(minute) + ":" + unitFormat(second);
+        }
+        return timeStr;
+    }
+
+
+    private String unitFormat(int i) {
+        String retStr;
+        if (i >= 0 && i < 10) {
+            retStr = "0" + i;
+        } else {
+            retStr = "" + i;
+        }
+        return retStr;
+    }
+
+
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public void setList(List<LocalMedia> list) {
+        this.list.clear();
+        this.list.addAll(list);
+        notifyDataSetChanged();
+    }
+
+    static class SelectedLocalDataMediaViewHolder extends RecyclerView.ViewHolder {
+
+        private ImageView ivClose;
+        private ImageView ivCover;
+        private TextView tvDuration;
+        public SelectedLocalDataMediaViewHolder(@NonNull View itemView) {
+            super(itemView);
+            ivClose = itemView.findViewById(R.id.iv_close);
+            ivCover = itemView.findViewById(R.id.iv_cover);
+            tvDuration = itemView.findViewById(R.id.tv_duration);
+        }
+    }
+
+   public interface OnItemClickListener{
+
+        void setOnItemClickListener(LocalMedia media);
+
+    }
+}
diff --git a/picture_library/src/main/java/com/luck/picture/lib/config/PictureSelectionConfig.java b/picture_library/src/main/java/com/luck/picture/lib/config/PictureSelectionConfig.java
index cbbd388dc..c1480cbca 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/config/PictureSelectionConfig.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/config/PictureSelectionConfig.java
@@ -113,6 +113,7 @@ public final class PictureSelectionConfig implements Parcelable {
     public static OnCustomImagePreviewCallback<LocalMedia> onCustomImagePreviewCallback;
     public static OnCustomCameraInterfaceListener onCustomCameraInterfaceListener;
     public List<LocalMedia> selectionMedias;
+    public List<String> filterMimeType;
     public String cameraFileName;
     public boolean isCheckOriginalImage;
     @Deprecated
@@ -163,8 +164,23 @@ public final class PictureSelectionConfig implements Parcelable {
     public boolean isFallbackVersion2;
     public boolean isFallbackVersion3;
 
+    public String selectTextCount;
+
+    //点击下一步的文案提示 例如 最多可选35个视频等等
+    public String selectMaxPrompt;
+    //是否仅仅展示Video
+    public boolean isOnlyVideo;
+    //是否可以预览图片或者视频
+    public boolean isCanPreView;
+    //点击item 是否可以展开item 默认是true
+    public boolean isShowPreView;
+    //发送消息的图片选择
+    public boolean isMessageStyle;
+    public boolean isCloseActivity = true;
+
     protected void initDefaultValue() {
         chooseMode = PictureMimeType.ofImage();
+        filterMimeType = new ArrayList<>();
         camera = false;
         themeStyleId = R.style.picture_default_style;
         selectionMode = PictureConfig.MULTIPLE;
@@ -265,6 +281,10 @@ protected void initDefaultValue() {
         isAndroidQChangeWH = true;
         isAndroidQChangeVideoWH = false;
         isQuickCapture = true;
+        isShowPreView = true;
+        isMessageStyle = false;
+        selectTextCount = "";
+        isCloseActivity = true;
     }
 
     public static PictureSelectionConfig getInstance() {
diff --git a/picture_library/src/main/java/com/luck/picture/lib/engine/ImageEngine.java b/picture_library/src/main/java/com/luck/picture/lib/engine/ImageEngine.java
index 9fa7ac559..ecbdbc08f 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/engine/ImageEngine.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/engine/ImageEngine.java
@@ -69,4 +69,16 @@ public interface ImageEngine {
      * @param imageView
      */
     void loadGridImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView);
+
+
+    /**
+     * Load picture list picture
+     *
+     * @param context
+     * @param url
+     * @param imageView
+     */
+    void loadGridImageRound(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView);
+
+
 }
diff --git a/picture_library/src/main/java/com/luck/picture/lib/tools/DateUtils.java b/picture_library/src/main/java/com/luck/picture/lib/tools/DateUtils.java
index 8c1b6a66f..9018b0b03 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/tools/DateUtils.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/tools/DateUtils.java
@@ -1,5 +1,7 @@
 package com.luck.picture.lib.tools;
 
+import android.util.Log;
+
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -37,10 +39,17 @@ public static int dateDiffer(long d) {
      * @return
      */
     public static String formatDurationTime(long duration) {
+
+        int remainder;
+        if (duration % 1000 >= 500) {
+            remainder = 1;
+        } else {
+            remainder = 0;
+        }
         return String.format(Locale.getDefault(), "%02d:%02d",
                 TimeUnit.MILLISECONDS.toMinutes(duration),
                 TimeUnit.MILLISECONDS.toSeconds(duration)
-                        - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(duration)));
+                        - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(duration)) + remainder);
     }
 
 
diff --git a/picture_library/src/main/java/com/luck/picture/lib/tools/StringUtils.java b/picture_library/src/main/java/com/luck/picture/lib/tools/StringUtils.java
index c3edef85e..1ceb55d8f 100644
--- a/picture_library/src/main/java/com/luck/picture/lib/tools/StringUtils.java
+++ b/picture_library/src/main/java/com/luck/picture/lib/tools/StringUtils.java
@@ -61,6 +61,16 @@ public static String getMsg(Context context, String mimeType, int maxSelectNum)
         }
     }
 
+    public static String getMsg(Context context, String mimeType, String maxSelectNum) {
+        if (PictureMimeType.isHasVideo(mimeType)) {
+            return context.getString(R.string.picture_message_video_max_num, maxSelectNum);
+        } else if (PictureMimeType.isHasAudio(mimeType)) {
+            return context.getString(R.string.picture_message_audio_max_num, maxSelectNum);
+        } else {
+            return context.getString(R.string.picture_message_max_num, maxSelectNum);
+        }
+    }
+
     /**
      * 重命名相册拍照
      *
diff --git a/picture_library/src/main/res/drawable-xxhdpi/ic_video_close.png b/picture_library/src/main/res/drawable-xxhdpi/ic_video_close.png
new file mode 100644
index 000000000..ff2a1098b
Binary files /dev/null and b/picture_library/src/main/res/drawable-xxhdpi/ic_video_close.png differ
diff --git a/picture_library/src/main/res/drawable-xxhdpi/item_close.png b/picture_library/src/main/res/drawable-xxhdpi/item_close.png
new file mode 100644
index 000000000..e05c46d17
Binary files /dev/null and b/picture_library/src/main/res/drawable-xxhdpi/item_close.png differ
diff --git a/picture_library/src/main/res/drawable/picture_wechat_num_oval_selected.xml b/picture_library/src/main/res/drawable/picture_wechat_num_oval_selected.xml
index 9588c975c..eca64b482 100644
--- a/picture_library/src/main/res/drawable/picture_wechat_num_oval_selected.xml
+++ b/picture_library/src/main/res/drawable/picture_wechat_num_oval_selected.xml
@@ -3,7 +3,7 @@
     android:shape="oval"
     android:useLevel="false">
 
-    <solid android:color="@color/picture_color_bfe85d" />
+    <solid android:color="@color/picture_color_white" />
     <stroke
         android:width="0.5dp"
         android:color="@color/picture_color_white" />
diff --git a/picture_library/src/main/res/drawable/radius_bg_shape.xml b/picture_library/src/main/res/drawable/radius_bg_shape.xml
new file mode 100644
index 000000000..ce7f3ce48
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_bg_shape.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/red_ff6500" />
+
+    <!-- 边框的颜色和粗细 -->
+    <stroke
+        android:width="1dp"
+        android:color="@color/red_ff6500"
+        />
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/picture_library/src/main/res/drawable/radius_bg_shape_16.xml b/picture_library/src/main/res/drawable/radius_bg_shape_16.xml
new file mode 100644
index 000000000..f6f662809
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_bg_shape_16.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/red_ff6500" />
+
+    <!-- 边框的颜色和粗细 -->
+    <stroke
+        android:width="1dp"
+        android:color="@color/red_ff6500"
+        />
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/picture_library/src/main/res/drawable/radius_bg_shape_24.xml b/picture_library/src/main/res/drawable/radius_bg_shape_24.xml
new file mode 100644
index 000000000..a47145123
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_bg_shape_24.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/red_ff6500" />
+
+    <!-- 边框的颜色和粗细 -->
+    <stroke
+        android:width="1dp"
+        android:color="@color/red_ff6500"
+        />
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:radius="24dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/picture_library/src/main/res/drawable/radius_bg_shape_gray.xml b/picture_library/src/main/res/drawable/radius_bg_shape_gray.xml
new file mode 100644
index 000000000..015cb93a2
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_bg_shape_gray.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/picture_color_f2" />
+
+    <!-- 边框的颜色和粗细 -->
+    <stroke
+        android:width="1dp"
+        android:color="@color/picture_color_f2"
+        />
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/picture_library/src/main/res/drawable/radius_bg_shape_gray_16.xml b/picture_library/src/main/res/drawable/radius_bg_shape_gray_16.xml
new file mode 100644
index 000000000..36f5a4262
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_bg_shape_gray_16.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/picture_color_f2" />
+
+    <!-- 边框的颜色和粗细 -->
+    <stroke
+        android:width="1dp"
+        android:color="@color/picture_color_f2"
+        />
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/picture_library/src/main/res/drawable/radius_shape.xml b/picture_library/src/main/res/drawable/radius_shape.xml
new file mode 100644
index 000000000..2d9585258
--- /dev/null
+++ b/picture_library/src/main/res/drawable/radius_shape.xml
@@ -0,0 +1,20 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="MissingDefaultResource">
+    <!-- rectangle表示为矩形 -->
+
+    <!-- 填充的颜色 -->
+    <solid android:color="@color/ucrop_color_white" />
+
+    <!-- 边框的颜色和粗细 -->
+
+    <!-- android:radius 圆角的半径 -->
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:radius="2dp"
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+
+</shape>
diff --git a/picture_library/src/main/res/drawable/select_text_color_selecter.xml b/picture_library/src/main/res/drawable/select_text_color_selecter.xml
new file mode 100644
index 000000000..a9b96525d
--- /dev/null
+++ b/picture_library/src/main/res/drawable/select_text_color_selecter.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/ucrop_color_black" android:state_selected="true"/>
+    <item android:color="@color/ucrop_color_black" android:state_focused="true"/>
+    <item android:color="@color/ucrop_color_black" android:state_pressed="true"/>
+    <item android:color="@color/ucrop_color_gray999"/>
+</selector>
\ No newline at end of file
diff --git a/picture_library/src/main/res/layout/activity_clapper_style.xml b/picture_library/src/main/res/layout/activity_clapper_style.xml
new file mode 100644
index 000000000..146c4d510
--- /dev/null
+++ b/picture_library/src/main/res/layout/activity_clapper_style.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ClapperStyleActivity">
+
+    <RelativeLayout
+        android:id="@+id/titleContainer"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@drawable/radius_shape"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tl_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_below="@+id/iv_close"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            app:tabIndicatorColor="@color/ucrop_color_black"
+            app:tabTextAppearance="@style/TabLayoutTextSize"
+            app:tabTextColor="@drawable/select_text_color_selecter">
+
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:tag="Images"
+                android:text="Images" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:tag="Videos"
+                android:text="Videos" />
+
+
+        </com.google.android.material.tabs.TabLayout>
+
+
+        <TextView
+            android:id="@+id/tv_video_title"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="Videos"
+            android:textColor="#333"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_close"
+            android:layout_width="40dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:src="@drawable/ic_video_close" />
+
+    </RelativeLayout>
+
+
+
+    <RelativeLayout
+        android:id="@+id/selectBottomContainer"
+        android:layout_width="match_parent"
+        android:layout_height="128dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/picture_color_white"
+        android:gravity="center_vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_selected"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginEnd="8dp"
+            android:background="#fff" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#e8e8e8" />
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="80dp"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/tv_select_max"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:textSize="12sp"
+                android:text="You can Upload up to 1 videos" />
+
+            <TextView
+                android:id="@+id/tv_count"
+                android:layout_width="84dp"
+                android:layout_height="32dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="14dp"
+                android:background="@drawable/radius_bg_shape_16"
+                android:gravity="center"
+                android:text="Next (0)"
+                android:textColor="@color/picture_color_white"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="80dp"
+            android:background="#e8e8e8" />
+
+    </RelativeLayout>
+
+    <com.luck.picture.lib.widget.RecyclerPreloadView
+        android:id="@+id/picture_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/selectBottomContainer"
+        android:layout_below="@id/titleContainer"
+        android:background="@color/picture_color_white" />
+
+    <TextView
+        android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:gravity="center"
+        android:lineSpacingExtra="3dp"
+        android:textColor="@color/picture_color_9b"
+        android:textSize="18sp"
+        android:visibility="invisible" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/picture_library/src/main/res/layout/picture_image_grid_item.xml b/picture_library/src/main/res/layout/picture_image_grid_item.xml
index 3f7e433cb..56964e2eb 100644
--- a/picture_library/src/main/res/layout/picture_image_grid_item.xml
+++ b/picture_library/src/main/res/layout/picture_image_grid_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.luck.picture.lib.widget.SquareRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@color/picture_color_white"
     android:layout_height="wrap_content">
 
     <ImageView
@@ -16,8 +17,8 @@
         android:layout_alignParentEnd="true"
         android:layout_margin="8dp"
         android:gravity="center"
+        android:textColor="@color/picture_color_3"
         android:background="@drawable/picture_checkbox_selector"
-        android:textColor="@color/picture_color_white"
         android:textSize="12sp" />
 
     <View
@@ -56,14 +57,14 @@
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:layout_alignParentBottom="true"
+        android:gravity="end"
         android:background="@drawable/picture_icon_shadow_bg"
-        android:drawableLeft="@drawable/picture_icon_video"
         android:drawablePadding="5dp"
-        android:gravity="center_vertical"
-        android:paddingLeft="5dp"
+        android:paddingRight="8dp"
         android:paddingTop="8dp"
         android:text="00:00"
+        android:layout_alignParentEnd="true"
         android:textColor="@color/picture_color_white"
-        android:textSize="11sp"
-        android:visibility="gone" />
+        android:textSize="12sp"
+         />
 </com.luck.picture.lib.widget.SquareRelativeLayout>
\ No newline at end of file
diff --git a/picture_library/src/main/res/layout/picture_wechat_style_selector.xml b/picture_library/src/main/res/layout/picture_wechat_style_selector.xml
index c46599b7f..407099b28 100644
--- a/picture_library/src/main/res/layout/picture_wechat_style_selector.xml
+++ b/picture_library/src/main/res/layout/picture_wechat_style_selector.xml
@@ -1,25 +1,284 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/picture_color_white"
+    android:background="@color/ucrop_color_black"
     android:fitsSystemWindows="true"
     tools:context="com.luck.picture.lib.PictureSelectorActivity">
 
-    <include layout="@layout/picture_title_bar" />
 
-    <include layout="@layout/picture_bottom_bar" />
+    <RelativeLayout
+        android:id="@+id/rl_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="visible">
+
+        <View
+            android:id="@+id/titleViewBg"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="?colorPrimary" />
+
+        <RelativeLayout
+            android:id="@+id/rlAlbum"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_marginTop="10dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/picture_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxEms="8"
+                android:maxLines="1"
+                android:text="@string/picture_camera_roll"
+                android:textColor="?picture.title.textColor"
+                android:textSize="16sp" />
+
+            <ImageView
+                android:id="@+id/ivArrow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/picture_title"
+                android:scaleType="centerInside"
+                android:src="?attr/picture.arrow_down.icon" />
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/picture_right"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_alignParentRight="true"
+            android:gravity="center"
+            android:padding="10dp"
+            android:text="@string/picture_cancel"
+            android:textColor="?picture.right.textColor"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/picture_send"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="15dp"
+            android:background="@drawable/picture_send_button_default_bg"
+            android:gravity="center"
+            android:textColor="?picture.right.textColor"
+            android:textSize="16sp" />
+
+        <ImageView
+            android:id="@+id/pictureLeftBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/titleViewBg"
+            android:layout_alignBottom="@id/titleViewBg"
+            android:padding="15dp"
+            android:src="?attr/picture.leftBack.icon" />
+
+    </RelativeLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/rl_custom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/radius_shape">
+
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tl_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_below="@+id/iv_close"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            app:tabIndicatorColor="@color/ucrop_color_black"
+            app:tabTextAppearance="@style/TabLayoutTextSize"
+            app:tabTextColor="@drawable/select_text_color_selecter">
+
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:tag="Images"
+                android:text="Images" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:tag="Videos"
+                android:text="Videos" />
+
+
+        </com.google.android.material.tabs.TabLayout>
+
+
+        <TextView
+            android:id="@+id/tv_video_title"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:gravity="center"
+            android:text="Videos"
+            android:textColor="#333"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_close"
+            android:layout_width="40dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:src="@drawable/ic_video_close" />
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:layout_alignParentBottom="true"
+        android:background="?attr/picture.bottom.bg"
+        android:gravity="center_vertical"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/picture_id_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:enabled="false"
+            android:gravity="left|center"
+            android:padding="12dp"
+            android:text="@string/picture_preview"
+            android:textColor="?attr/picture.preview.textColor"
+            android:textSize="14sp" />
+
+        <CheckBox
+            android:id="@+id/cb_original"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:background="@color/picture_color_transparent"
+            android:button="@color/picture_color_transparent"
+            android:gravity="center"
+            android:paddingLeft="5dp"
+            android:text="@string/picture_original_image"
+            android:textColor="@color/picture_color_53575e"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/picture_tvMediaNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="5dp"
+            android:layout_toLeftOf="@id/picture_tv_ok"
+            android:background="?attr/picture.num.style"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/picture_color_white"
+            android:textSize="12sp"
+            android:visibility="invisible" />
+
+        <TextView
+            android:id="@+id/picture_tv_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:enabled="false"
+            android:gravity="center|left"
+            android:paddingRight="12dp"
+            android:text="@string/picture_please_select"
+            android:textColor="?attr/picture.complete.textColor"
+            android:textSize="14sp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/select_buttom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/picture_color_white"
+        android:gravity="center_vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_selected"
+            android:layout_width="match_parent"
+            android:layout_height="74dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:visibility="gone"
+            android:background="#fff" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/rv_selected"
+            android:background="#e8e8e8" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="2dp"
+            android:gravity="center_vertical"
+            android:layout_below="@id/rv_selected"
+            >
+
+            <TextView
+                android:id="@+id/tv_select_max"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="16dp"
+                android:textSize="12sp"
+                android:text="You can select one or more videos" />
+
+            <TextView
+                android:id="@+id/tv_count"
+                android:layout_width="84dp"
+                android:layout_height="32dp"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="14dp"
+                android:background="@drawable/radius_bg_shape_16"
+                android:gravity="center"
+                android:text="Next (0)"
+                android:textColor="@color/picture_color_white"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
 
     <com.luck.picture.lib.widget.RecyclerPreloadView
         android:id="@+id/picture_recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/select_bar_layout"
-        android:layout_below="@id/titleBar"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp" />
+        android:layout_above="@id/select_buttom_layout"
+        android:layout_below="@id/rl_custom"
+        android:background="@color/picture_color_white" />
 
     <TextView
         android:id="@+id/tv_empty"
@@ -30,9 +289,24 @@
         android:layout_marginRight="15dp"
         android:gravity="center"
         android:lineSpacingExtra="3dp"
-        android:text="@string/picture_empty"
         android:textColor="@color/picture_color_9b"
         android:textSize="18sp"
         android:visibility="invisible" />
 
-</RelativeLayout>
+
+    <TextView
+        android:id="@+id/send"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:background="@drawable/radius_bg_shape_24"
+        android:gravity="center"
+        android:text="@string/send"
+        android:textColor="@color/ucrop_color_white"
+        android:textSize="15sp"
+        android:visibility="gone" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/picture_library/src/main/res/layout/selected_local_data.xml b/picture_library/src/main/res/layout/selected_local_data.xml
new file mode 100644
index 000000000..58ac5923f
--- /dev/null
+++ b/picture_library/src/main/res/layout/selected_local_data.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="50dp"
+    android:layout_height="50dp">
+    
+    <ImageView
+        android:id="@+id/iv_cover"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:scaleType="centerCrop"
+        />
+    
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/item_close"
+        android:paddingStart="8dp"
+        android:paddingBottom="8dp"
+        android:layout_alignEnd="@id/iv_cover"
+        />
+
+    <TextView
+        android:id="@+id/tv_duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:textColor="@color/picture_color_white"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values-de-rDE/strings.xml b/picture_library/src/main/res/values-de-rDE/strings.xml
index 4cfb0ecc0..59040520f 100644
--- a/picture_library/src/main/res/values-de-rDE/strings.xml
+++ b/picture_library/src/main/res/values-de-rDE/strings.xml
@@ -61,4 +61,7 @@
     <string name="picture_go_setting">Set up</string>
     <string name="picture_know">Das stimmt</string>
     <string name="picture_data_null">Hier ist es leer…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-en/strings.xml b/picture_library/src/main/res/values-en/strings.xml
index 0a4d0d2ed..671abf660 100644
--- a/picture_library/src/main/res/values-en/strings.xml
+++ b/picture_library/src/main/res/values-en/strings.xml
@@ -5,9 +5,9 @@
     <string name="picture_take_picture">Shot</string>
     <string name="picture_rule">not pictures or video</string>
     <string name="picture_min_video_num">Video Selection Cannot%1$sNumber</string>
-    <string name="picture_message_max_num">Select up to %1$s images</string>
+    <string name="picture_message_max_num">Only %1$s video/image can be selected</string>
     <string name="picture_message_audio_max_num">Select up to %1$s Audio</string>
-    <string name="picture_message_video_max_num">Select up to %1$s Video</string>
+    <string name="picture_message_video_max_num">Only %1$s video/image can be selected</string>
     <string name="picture_preview">Preview</string>
     <string name="picture_please">Please later…</string>
     <string name="picture_done_front_num">%1$d/%2$d Ok</string>
@@ -38,9 +38,9 @@
     <string name="picture_stop_audio">Stop</string>
     <string name="picture_quit_audio">Quit</string>
     <string name="picture_pause_audio">Pause</string>
-    <string name="picture_error">The picture is corrupted</string>
-    <string name="picture_video_error">The video is corrupted</string>
-    <string name="picture_audio_error">The audio is corrupted</string>
+    <string name="picture_error">Oops, this image is corrupted.</string>
+    <string name="picture_video_error">Oops, this video is corrupted.</string>
+    <string name="picture_audio_error">Oops, this audio is corrupted.</string>
     <string name="picture_confirm">Confirm</string>
     <string name="picture_preview_image_num">%1$d/%2$d</string>
     <string name="picture_not_crop_data">No cropped data</string>
@@ -59,6 +59,10 @@
     <string name="picture_photo_pictures">Take Picture</string>
     <string name="picture_photo_recording">Long Press Camera</string>
     <string name="picture_go_setting">Go Setting</string>
-    <string name="picture_know">I know the</string>
+    <string name="picture_know">Get it</string>
     <string name="picture_data_null">There no data here…</string>
+    <string name="uploading_this_video_is_not_supported_please_convert_to_MP4_file">uploading this video is not supported, please convert to MP4 file</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-fr-rFR/strings.xml b/picture_library/src/main/res/values-fr-rFR/strings.xml
index a087263bb..52219826d 100644
--- a/picture_library/src/main/res/values-fr-rFR/strings.xml
+++ b/picture_library/src/main/res/values-fr-rFR/strings.xml
@@ -61,4 +61,7 @@
     <string name="picture_photo_recording">Imagerie</string>
     <string name="picture_know">Je sais</string>
     <string name="picture_data_null">Pas de données…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-ja-rJP/strings.xml b/picture_library/src/main/res/values-ja-rJP/strings.xml
index 906aa2913..a4b49e4a8 100644
--- a/picture_library/src/main/res/values-ja-rJP/strings.xml
+++ b/picture_library/src/main/res/values-ja-rJP/strings.xml
@@ -60,4 +60,7 @@
     <string name="picture_go_setting">設定</string>
     <string name="picture_know">はい</string>
     <string name="picture_data_null">データがありません…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-ko-rKR/strings.xml b/picture_library/src/main/res/values-ko-rKR/strings.xml
index d1f4fee68..9b99d2d2d 100644
--- a/picture_library/src/main/res/values-ko-rKR/strings.xml
+++ b/picture_library/src/main/res/values-ko-rKR/strings.xml
@@ -60,4 +60,7 @@
     <string name="picture_go_setting">설치</string>
     <string name="picture_know">알 겠 습 니 다</string>
     <string name="picture_data_null">데이터 없 음…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-v19/strings.xml b/picture_library/src/main/res/values-v19/strings.xml
new file mode 100644
index 000000000..e2203022f
--- /dev/null
+++ b/picture_library/src/main/res/values-v19/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
+</resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values-v21/strings.xml b/picture_library/src/main/res/values-v21/strings.xml
new file mode 100644
index 000000000..e2203022f
--- /dev/null
+++ b/picture_library/src/main/res/values-v21/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
+</resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values-v21/styles.xml b/picture_library/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..a134cdb9d
--- /dev/null
+++ b/picture_library/src/main/res/values-v21/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TranslucentTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        //设置为false，意味着布局不会延伸到状态栏
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <!--Android 5.x开始需要把颜色设置为程序的主题色白色，否则导航栏会呈现系统默认的浅灰色-->
+        <item name="android:statusBarColor">@android:color/white</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values-vi-rVN/strings.xml b/picture_library/src/main/res/values-vi-rVN/strings.xml
new file mode 100644
index 000000000..e2203022f
--- /dev/null
+++ b/picture_library/src/main/res/values-vi-rVN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
+</resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values-zh-rTW/strings.xml b/picture_library/src/main/res/values-zh-rTW/strings.xml
index bf06f8f4a..fdb20ea09 100644
--- a/picture_library/src/main/res/values-zh-rTW/strings.xml
+++ b/picture_library/src/main/res/values-zh-rTW/strings.xml
@@ -60,4 +60,7 @@
     <string name="picture_go_setting">去設置</string>
     <string name="picture_know">我知道了</string>
     <string name="picture_data_null">這裏空空如也…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values-zh/strings.xml b/picture_library/src/main/res/values-zh/strings.xml
index 708203e59..7424e710e 100644
--- a/picture_library/src/main/res/values-zh/strings.xml
+++ b/picture_library/src/main/res/values-zh/strings.xml
@@ -60,4 +60,7 @@
     <string name="picture_go_setting">去设置</string>
     <string name="picture_know">我知道了</string>
     <string name="picture_data_null">这里空空如也…</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="send">Send</string>
 </resources>
diff --git a/picture_library/src/main/res/values/attrs.xml b/picture_library/src/main/res/values/attrs.xml
index 48f6885b1..05b81cf5e 100644
--- a/picture_library/src/main/res/values/attrs.xml
+++ b/picture_library/src/main/res/values/attrs.xml
@@ -37,6 +37,23 @@
     <attr name="picture.crop.status.color" format="reference|color" />
     <attr name="picture.crop.title.color" format="reference|color" />
     <attr name="picture.folder_checked_dot" format="reference" />
+
+
+    <declare-styleable name="NiceImageView">
+        <attr name="is_circle" format="boolean" />
+        <attr name="is_cover_src" format="boolean" />
+        <attr name="corner_radius" format="dimension" />
+        <attr name="corner_top_left_radius" format="dimension" />
+        <attr name="corner_top_right_radius" format="dimension" />
+        <attr name="corner_bottom_left_radius" format="dimension" />
+        <attr name="corner_bottom_right_radius" format="dimension" />
+        <attr name="border_width" format="dimension" />
+        <attr name="border_color" format="color" />
+        <attr name="inner_border_width" format="dimension" />
+        <attr name="inner_border_color" format="color" />
+        <attr name="mask_color" format="color" />
+    </declare-styleable>
+
     <attr name="picture.original.check.style" format="reference" />
     <attr name="picture.original.text.color" format="reference|color" />
     <attr name="picture.folder.textColor" format="color" />
@@ -44,4 +61,5 @@
     <attr name="picture.container.backgroundColor" format="color" />
     <attr name="picture.titleBar.height" format="dimension" />
     <attr name="picture.titleRightArrow.LeftPadding" format="dimension" />
+
 </resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values/colors.xml b/picture_library/src/main/res/values/colors.xml
index cd5d333d9..8456374da 100644
--- a/picture_library/src/main/res/values/colors.xml
+++ b/picture_library/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
     <color name="picture_color_blue">#7D7DFF</color>
     <color name="picture_color_light_grey">#999999</color>
     <color name="picture_color_a83">#a8333333</color>
+    <color name="picture_color_3">#333333</color>
     <color name="picture_color_70">#70000000</color>
     <color name="picture_color_80">#80000000</color>
     <color name="picture_color_20">#20000000</color>
@@ -36,4 +37,5 @@
     <color name="picture_color_half_white">#99FFFFFF</color>
     <color name="picture_color_ff572e">#ff572e</color>
     <color name="picture_color_529BeA">#529BeA</color>
+    <color name="red_ff6500">#ff6500</color>
 </resources>
\ No newline at end of file
diff --git a/picture_library/src/main/res/values/strings.xml b/picture_library/src/main/res/values/strings.xml
index 708203e59..7d16edbee 100644
--- a/picture_library/src/main/res/values/strings.xml
+++ b/picture_library/src/main/res/values/strings.xml
@@ -60,4 +60,11 @@
     <string name="picture_go_setting">去设置</string>
     <string name="picture_know">我知道了</string>
     <string name="picture_data_null">这里空空如也…</string>
+    <string name="uploading_this_video_is_not_supported_please_convert_to_MP4_file">uploading this video is not supported, please convert to MP4 file</string>
+    <string name="sorry_please_convert_your_video_to_MP4_or_MOV_format">Sorry, please convert your video to MP4 or MOV format.</string>
+    <string name="no_photos_available">No photos available</string>
+    <string name="no_videos_available">No videos available</string>
+    <string name="no_photos_or_videos_available">No photos or videos available.</string>
+    <string name="send">Send</string>
+    <string name="video_at_least_6_seconds">Video at least 6.0 seconds</string>
 </resources>
diff --git a/picture_library/src/main/res/values/styles.xml b/picture_library/src/main/res/values/styles.xml
index 4794532cb..6573dbb31 100644
--- a/picture_library/src/main/res/values/styles.xml
+++ b/picture_library/src/main/res/values/styles.xml
@@ -193,4 +193,9 @@
 
     <style name="Base.Theme.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar" />
 
+    <style name="TabLayoutTextSize">
+        <item name="android:textSize">15sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/ucrop/src/main/java/com/yalantis/ucrop/util/LoadDialogUtils.java b/ucrop/src/main/java/com/yalantis/ucrop/util/LoadDialogUtils.java
new file mode 100644
index 000000000..2ae7caf85
--- /dev/null
+++ b/ucrop/src/main/java/com/yalantis/ucrop/util/LoadDialogUtils.java
@@ -0,0 +1,55 @@
+package com.yalantis.ucrop.util;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.yalantis.ucrop.R;
+
+public class LoadDialogUtils {
+
+
+    public static Dialog createLoadingDialog(Context context, String msg) {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View v = inflater.inflate(R.layout.ucrop_dialog_loading, null);// 得到加载view
+
+        Dialog loadingDialog = new Dialog(context, R.style.ucrop_DialogStyle);// 创建自定义样式dialog
+        loadingDialog.setCancelable(true); // 是否可以按“返回键”消失
+        loadingDialog.setCanceledOnTouchOutside(false); // 点击加载框以外的区域
+        loadingDialog.setContentView(v, new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT));// 设置布局
+        /**
+         *将显示Dialog的方法封装在这里面
+         */
+        Window window = loadingDialog.getWindow();
+        WindowManager.LayoutParams lp = window.getAttributes();
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        window.setGravity(Gravity.CENTER);
+        window.setAttributes(lp);
+        loadingDialog.show();
+
+        return loadingDialog;
+    }
+
+    /**
+     * 关闭dialog
+     *
+     * http://blog.csdn.net/qq_21376985
+     *
+     * @param mDialogUtils
+     */
+    public static void closeDialog(Dialog mDialogUtils) {
+        if (mDialogUtils != null && mDialogUtils.isShowing()) {
+            mDialogUtils.dismiss();
+        }
+    }
+
+}
diff --git a/ucrop/src/main/java/com/yalantis/ucrop/view/widget/CustomLoadingDialog.java b/ucrop/src/main/java/com/yalantis/ucrop/view/widget/CustomLoadingDialog.java
new file mode 100644
index 000000000..e084d6b65
--- /dev/null
+++ b/ucrop/src/main/java/com/yalantis/ucrop/view/widget/CustomLoadingDialog.java
@@ -0,0 +1,38 @@
+package com.yalantis.ucrop.view.widget;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+
+import com.yalantis.ucrop.R;
+
+public class CustomLoadingDialog extends Dialog {
+    public CustomLoadingDialog(Context context, int width, int height, View layout, int style) {
+        super(context, style);
+        setContentView(layout);
+
+
+        layout.findViewById(R.id.cancel).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CustomLoadingDialog.this.dismiss();
+            }
+        });
+
+        Window window = getWindow();
+
+        WindowManager.LayoutParams params = window.getAttributes();
+        params.width = width;
+        params.height = height;
+
+        params.gravity = Gravity.CENTER;
+
+        window.setAttributes(params);
+    }
+
+
+}
diff --git a/ucrop/src/main/res/drawable/bg_progress.xml b/ucrop/src/main/res/drawable/bg_progress.xml
new file mode 100755
index 000000000..e98dc9777
--- /dev/null
+++ b/ucrop/src/main/res/drawable/bg_progress.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="ResourceName">
+    <solid android:color="#8c000000" />
+    <corners android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/ucrop/src/main/res/drawable/ic_close_light.xml b/ucrop/src/main/res/drawable/ic_close_light.xml
new file mode 100644
index 000000000..5d8364ce7
--- /dev/null
+++ b/ucrop/src/main/res/drawable/ic_close_light.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14"
+    tools:ignore="ResourceName">
+  <path
+      android:pathData="M8.077,7l5.712,-5.674c0.281,-0.28 0.281,-0.745 0,-1.07l-0.047,-0.047c-0.28,-0.279 -0.749,-0.279 -1.03,0L7,5.93 1.288,0.256c-0.281,-0.28 -0.75,-0.28 -1.03,0L0.21,0.302c-0.281,0.28 -0.281,0.745 0,1.07L5.923,7 0.211,12.674c-0.281,0.28 -0.281,0.745 0,1.07l0.047,0.047c0.28,0.279 0.749,0.279 1.03,0L7,8.07l5.712,5.674c0.281,0.28 0.75,0.28 1.03,0l0.047,-0.046c0.281,-0.28 0.281,-0.745 0,-1.07L8.077,7z"
+      android:fillColor="#FFF"/>
+</vector>
diff --git a/ucrop/src/main/res/layout/ucrop_dialog_loading.xml b/ucrop/src/main/res/layout/ucrop_dialog_loading.xml
new file mode 100644
index 000000000..997f40823
--- /dev/null
+++ b/ucrop/src/main/res/layout/ucrop_dialog_loading.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="220dp"
+    android:layout_height="108dp"
+    android:background="@drawable/bg_progress">
+
+    <ProgressBar
+        android:id="@+id/progress"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_centerInParent="true"
+        android:indeterminateTint="#ffffff"
+        android:max="100" />
+
+    <TextView
+        android:id="@+id/percent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textColor="#ffffff"
+        android:textSize="13sp"
+        tools:text="100%" />
+
+    <ImageView
+        android:id="@+id/cancel"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentEnd="true"
+        android:layout_margin="8dp"
+        android:padding="4dp"
+        android:layerType="software"
+        app:srcCompat="@drawable/ic_close_light" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/ucrop/src/main/res/values/colors.xml b/ucrop/src/main/res/values/colors.xml
index 86d4cbfae..235c51152 100755
--- a/ucrop/src/main/res/values/colors.xml
+++ b/ucrop/src/main/res/values/colors.xml
@@ -34,5 +34,6 @@
     <!--more-->
     <color name="ucrop_color_ba3">#b0567ba3</color>
     <color name="ucrop_color_ec">#ececec</color>
+    <color name="ucrop_color_gray999">#999999</color>
 
 </resources>
\ No newline at end of file
diff --git a/ucrop/src/main/res/values/styles.xml b/ucrop/src/main/res/values/styles.xml
index a535d31c9..26c88a63b 100755
--- a/ucrop/src/main/res/values/styles.xml
+++ b/ucrop/src/main/res/values/styles.xml
@@ -54,4 +54,23 @@
         <item name="android:textSize">@dimen/ucrop_text_size_controls_text</item>
     </style>
 
+    <!-- my loading dialog -->
+    <style name="ucrop_DialogStyle">
+        <!-- 边框 -->
+        <item name="android:windowFrame">@null</item>
+        <!-- 是否浮现在activity之上 -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 半透明 -->
+        <item name="android:windowIsTranslucent">true</item>
+        <!-- 无标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <!-- 背景透明 -->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!-- 模糊 -->
+        <item name="android:backgroundDimEnabled">true</item>
+        <!-- 遮罩层 -->
+        <item name="android:backgroundDimAmount">0.5</item>
+    </style>
+
 </resources>
\ No newline at end of file