1.当只存在一个的时候，底部隐藏

2.当默认显示录制界面时候，设置一个比较好的过渡动画。
zhongjhATC · Apr 20, 2019 · ba6457b · ba6457b
1 parent d8132dd
commit ba6457b
Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/zhongjh/cameraapp/MainActivity.java b/app/src/main/java/com/zhongjh/cameraapp/MainActivity.java
@@ -310,6 +310,7 @@ else if (mBinding.rbAllImage.isChecked())
 
         GlobalSetting globalSetting = MultiMediaSetting.from(MainActivity.this).choose(mimeTypes);
         globalSetting.defaultPosition(1);// 默认从第二个开始
+        globalSetting.isCutscenes(true);// 启动过场动画，从下往上动画
         if (mBinding.cbAlbum.isChecked())
             // 开启相册功能
             globalSetting.albumSetting(albumSetting);

diff --git a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/GlobalSetting.java b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/GlobalSetting.java
@@ -19,6 +19,7 @@
 
 import gaode.zhongjh.com.common.entity.SaveStrategy;
 import gaode.zhongjh.com.common.enums.MimeType;
+
 import com.zhongjh.albumcamerarecorder.listener.OnMainListener;
 import com.zhongjh.albumcamerarecorder.settings.api.GlobalSettingApi;
 
@@ -158,7 +159,13 @@ public GlobalSetting imageEngine(ImageEngine imageEngine) {
         return this;
     }
 
-    @NonNull  @Override
+    @Override
+    public GlobalSetting isCutscenes(boolean isCutscenes) {
+        return null;
+    }
+
+    @NonNull
+    @Override
     public GlobalSetting setOnMainListener(@Nullable OnMainListener listener) {
         mGlobalSpec.onMainListener = listener;
         return this;
@@ -183,9 +190,9 @@ public void forResult(int requestCode) {
             if (mGlobalSpec.maxAudioSelectable > 0) {
                 numItems++;
             } else {
-                if (mGlobalSpec.onMainListener != null){
+                if (mGlobalSpec.onMainListener != null) {
                     mGlobalSpec.onMainListener.onOpenFail("录音已经达到上限");
-                }else{
+                } else {
                     Toast.makeText(activity.getApplicationContext(), "录音已经达到上限", Toast.LENGTH_LONG).show();
                 }
             }
@@ -201,7 +208,8 @@ public void forResult(int requestCode) {
             fragment.startActivityForResult(intent, requestCode);
         } else {
             activity.startActivityForResult(intent, requestCode);
-//            activity.overridePendingTransition(R.anim.activity_open,0);
+            if (mGlobalSpec.isCutscenes)
+                activity.overridePendingTransition(R.anim.activity_open, 0);
         }
 
     }

diff --git a/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/GlobalSpec.java b/multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/GlobalSpec.java
@@ -34,8 +34,10 @@ public class GlobalSpec {
     public SaveStrategy videoStrategy; // 视频保存路径 参数1 true表示在共有目录，false表示存储在私有目录；参数2与 AndroidManifest中authorities值相同，用于适配7.0系统 必须设置
     public SaveStrategy audioStrategy; // 音频保存路径 参数1 true表示在共有目录，false表示存储在私有目录；参数2与 AndroidManifest中authorities值相同，用于适配7.0系统 必须设置
     public ImageEngine imageEngine;
+    public boolean isCutscenes;// 是否启动过场动画，只包括开始打开界面和关闭界面的过场动画
     public OnMainListener onMainListener;// 主界面的有关事件
 
+
     private GlobalSpec() {
     }
 
@@ -68,7 +70,7 @@ private void reset() {
         audioStrategy = null;
         hasInited = true;
         imageEngine = new GlideEngine();
-
+        isCutscenes = true;
     }
 
     private static final class InstanceHolder {

diff --git a/...ilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/api/GlobalSettingApi.java b/...ilibrary/src/main/java/com/zhongjh/albumcamerarecorder/settings/api/GlobalSettingApi.java
@@ -122,6 +122,13 @@ public interface GlobalSettingApi {
      */
     GlobalSetting imageEngine(ImageEngine imageEngine);
 
+    /**
+     * 设置是否启动过场动画 ，只包括开始打开界面和关闭界面的过场动画
+     * @param isCutscenes 是否启动
+     * @return
+     */
+    GlobalSetting isCutscenes(boolean isCutscenes);
+
     /**
      * 有关首页的一些事件
      * <p>

diff --git a/multilibrary/src/main/res/layout/fragment_matiss_zjh.xml b/multilibrary/src/main/res/layout/fragment_matiss_zjh.xml
@@ -135,15 +135,13 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/bottom_toolbar"
         android:layout_below="@id/toolbar"
         android:visibility="gone" />
 
     <FrameLayout
         android:id="@+id/empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@id/bottom_toolbar"
         android:layout_below="@id/toolbar"
         android:visibility="gone">