commit

liyun1030 · Apr 5, 2022 · 10ccada · 10ccada
1 parent 3b09f9c
commit 10ccada
Showing 1 changed file with 2 additions and 46 deletions.
diff --git a/selector/src/main/java/com/luck/picture/lib/PictureSelectorPreviewFragment.java b/selector/src/main/java/com/luck/picture/lib/PictureSelectorPreviewFragment.java
@@ -53,9 +53,7 @@
 import com.luck.picture.lib.decoration.WrapContentLinearLayoutManager;
 import com.luck.picture.lib.dialog.PictureCommonDialog;
 import com.luck.picture.lib.entity.LocalMedia;
-import com.luck.picture.lib.entity.LocalMediaFolder;
 import com.luck.picture.lib.interfaces.OnCallbackListener;
-import com.luck.picture.lib.interfaces.OnQueryAlbumListener;
 import com.luck.picture.lib.interfaces.OnQueryDataResultListener;
 import com.luck.picture.lib.loader.LocalMediaLoader;
 import com.luck.picture.lib.loader.LocalMediaPageLoader;
@@ -268,6 +266,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mAnimViews.add(completeSelectView);
         mAnimViews.add(bottomNarBar);
         initTitleBar();
+        initViewPagerData(mData);
         iniMagicalView();
         if (isExternalPreview) {
             externalPreviewStyle();
@@ -277,7 +276,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             initPreviewSelectGallery((ViewGroup) view);
             initComplete();
         }
-        initViewPagerData(mData);
     }
 
     private void setMagicalViewBackgroundColor() {
@@ -501,47 +499,6 @@ protected void initLoader() {
         }
     }
 
-    /**
-     * 加载数据
-     */
-    private void loadData(int pageSize) {
-        if (config.isOnlySandboxDir) {
-            if (PictureSelectionConfig.loaderDataEngine != null) {
-                PictureSelectionConfig.loaderDataEngine.loadOnlyInAppDirAllMediaData(getContext(),
-                        new OnQueryAlbumListener<LocalMediaFolder>() {
-                            @Override
-                            public void onComplete(LocalMediaFolder folder) {
-                                handleLoadData(folder.getData());
-                            }
-                        });
-            } else {
-                mLoader.loadOnlyInAppDirAllMedia(new OnQueryAlbumListener<LocalMediaFolder>() {
-                    @Override
-                    public void onComplete(LocalMediaFolder folder) {
-                        handleLoadData(folder.getData());
-                    }
-                });
-            }
-        } else {
-            if (PictureSelectionConfig.loaderDataEngine != null) {
-                PictureSelectionConfig.loaderDataEngine.loadFirstPageMediaData(getContext(),
-                        mBucketId, 1, pageSize, new OnQueryDataResultListener<LocalMedia>() {
-                            @Override
-                            public void onComplete(ArrayList<LocalMedia> result, boolean isHasMore) {
-                                handleLoadData(result);
-                            }
-                        });
-            } else {
-                mLoader.loadFirstPageMedia(mBucketId, pageSize, new OnQueryDataResultListener<LocalMedia>() {
-                    @Override
-                    public void onComplete(ArrayList<LocalMedia> result, boolean isHasMore) {
-                        handleLoadData(result);
-                    }
-                });
-            }
-        }
-    }
-
     private void handleLoadData(ArrayList<LocalMedia> result) {
         if (ActivityCompatHelper.isDestroy(getActivity())) {
             return;
@@ -634,8 +591,8 @@ private void initComplete() {
                 layoutParams.rightMargin = selectMainStyle.getPreviewSelectMarginRight();
             }
         }
-
         completeSelectView.setCompleteSelectViewStyle();
+        completeSelectView.setSelectedChange(true);
         if (selectMainStyle.isCompleteSelectRelativeTop()) {
             if (completeSelectView.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
                 ((ConstraintLayout.LayoutParams) completeSelectView
@@ -1122,7 +1079,6 @@ private void initViewPagerData(ArrayList<LocalMedia> data) {
         bottomNarBar.isDisplayEditor(PictureMimeType.isHasVideo(media.getMimeType())
                 || PictureMimeType.isHasAudio(media.getMimeType()));
         tvSelected.setSelected(SelectedManager.getSelectedResult().contains(data.get(viewPager.getCurrentItem())));
-        completeSelectView.setSelectedChange(true);
         viewPager.registerOnPageChangeCallback(pageChangeCallback);
         viewPager.setPageTransformer(new MarginPageTransformer(DensityUtil.dip2px(getContext(), 3)));
         sendChangeSubSelectPositionEvent(false);