相机拍照后数据处理

吴奎庆
1 parent 98e9df58
Showing 6 changed files with 68 additions and 46 deletions
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPreviewView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaActivity.java
lib_media/src/main/java/com/cnlive/media/ui/fragment/MediaPickerFragment.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2.2",
+            version: "1.0.2.3",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -196,14 +196,14 @@ public class MediaPickerFragmentView implements MvpView {
                 mediaActivity.allMedias.get(mediaActivity.allMedias.indexOf(select)).setSelect(true);
             }
         }
-        List<Media> listMedias = medias.get(0).getMedias();
+//        List<Media> listMedias = medias.get(0).getMedias();
         if (mediaActivity.needCamera && medias.get(0) != null && medias.get(0).getMedias() != null
                 && medias.get(0).getMedias().get(0) != null && medias.get(0).getMedias().get(0).mediaType != 0) {
-            listMedias.add(0, new Media(0));
+            mediaActivity.allMedias.add(0, new Media(0));
         }
         if (mFragment.mMediaAdapter == null)
             mFragment.mMediaAdapter = new MediaAdapter(mFragment.getActivity(), mediaActivity.showTime, mediaActivity.mOptions);
-        mFragment.mMediaAdapter.updateItems(listMedias);
+        mFragment.mMediaAdapter.updateItems(mediaActivity.allMedias);
     }
     public void showPrew(MediaActivity mActivity) {
@@ -32,12 +32,16 @@ public class MediaPreviewView implements MvpView {
     public void initView(MediaActivity mActivity) {
         if (mFragment.isPre) {
-            mFragment. mediaPreviewAdapter = new MediaPreviewAdapter(mActivity, mActivity.selects);
+            mFragment.mediaPreviewAdapter = new MediaPreviewAdapter(mActivity, mActivity.selects);
             mFragment.binding.viewpager.setAdapter(mFragment.mediaPreviewAdapter);
             mFragment.binding.viewpager.setCurrentItem(0, false);
             mFragment.preMedias = mActivity.selects;
         } else {
-            mFragment.preMedias = mActivity.allMedias;
+
+            if (mFragment.preMedias.size() == 0) mFragment.preMedias.addAll(mActivity.allMedias);
+            if (mFragment.preMedias != null && mFragment.preMedias.size() > 0 && mFragment.preMedias.get(0).mediaType == 0) {
+                mFragment.preMedias.remove(0);
+            }
             mFragment.mediaPreviewAdapter = new MediaPreviewAdapter(mActivity, mFragment.preMedias);
             if (mFragment.mMedia == null) {
                 currentPosition = 0;
@@ -227,32 +227,6 @@ public class MediaView implements MvpView {
         }
     }
-    /**
-     * 展示选中状态
-     *
-     * @param media
-     */
-    public void showPrew(Media media) {
-
-        if (mActivity.isPre) {
-            String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.selects.indexOf(media) + 1, mActivity.selects.size());
-            barTitle.setText(barTitleText);
-            checkLayout.setVisibility(View.GONE);
-        } else {
-            String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media) + 1, mActivity.allMedias.size());
-            barTitle.setText(barTitleText);
-            checkLayout.setVisibility(View.VISIBLE);
-        }
-
-        if (media.isSelect()) {
-            checkImage.setImageResource(R.drawable.xc_xuanzhong);
-        } else {
-            checkImage.setImageResource(R.drawable.xc_weixuan);
-        }
-        if (previewBottomAdapter != null) {
-            previewBottomAdapter.updateBgState(mActivity.selects.indexOf(media));
-        }
-    }
     /**
      * 展示底部预览
@@ -442,20 +416,54 @@ public class MediaView implements MvpView {
     }
+//    /**
+//     * 预览页面滑动
+//     *
+//     * @param media
+//     */
+//    public void showSelectPrew(Media media) {
+//        if (mActivity.isPre) {
+//            String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.selects.indexOf(media) + 1, mActivity.selects.size());
+//            barTitle.setText(barTitleText);
+//            checkLayout.setVisibility(View.GONE);
+//        } else {
+//            String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media) + 1, mActivity.allMedias.size());
+//            barTitle.setText(barTitleText);
+//            checkLayout.setVisibility(View.VISIBLE);
+//        }
+//
+//        if (media.isSelect()) {
+//            checkImage.setImageResource(R.drawable.xc_xuanzhong);
+//        } else {
+//            checkImage.setImageResource(R.drawable.xc_weixuan);
+//        }
+//
+//        if (previewBottomAdapter != null) {
+//            previewBottomAdapter.updateBgState(mActivity.selects.indexOf(media));
+//        }
+//    }
+
     /**
-     * 预览页面滑动
+     * 展示选中状态
      *
      * @param media
      */
-    public void showSelectPrew(Media media) {
+    public void showPrew(Media media) {
         if (mActivity.isPre) {
             String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.selects.indexOf(media) + 1, mActivity.selects.size());
             barTitle.setText(barTitleText);
             checkLayout.setVisibility(View.GONE);
         } else {
-            String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media) + 1, mActivity.allMedias.size());
-            barTitle.setText(barTitleText);
-            checkLayout.setVisibility(View.VISIBLE);
+            if (mActivity.allMedias.get(0).mediaType==0) {
+                String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media), mActivity.allMedias.size() - 1);
+                barTitle.setText(barTitleText);
+                checkLayout.setVisibility(View.VISIBLE);
+            } else {
+                String barTitleText = String.format(mActivity.getResources().getString(R.string.btn_bar_title), mActivity.allMedias.indexOf(media) + 1, mActivity.allMedias.size());
+                barTitle.setText(barTitleText);
+                checkLayout.setVisibility(View.VISIBLE);
+            }
+
         }
         if (media.isSelect()) {
@@ -463,7 +471,6 @@ public class MediaView implements MvpView {
         } else {
             checkImage.setImageResource(R.drawable.xc_weixuan);
         }
-
         if (previewBottomAdapter != null) {
             previewBottomAdapter.updateBgState(mActivity.selects.indexOf(media));
         }
@@ -570,4 +577,10 @@ public class MediaView implements MvpView {
                 });
     }
+    public void processFolderSize(Media media) {
+        if (media == null || mActivity.mediasList == null || mActivity.mediasList.size() == 0) {
+            return;
+        }
+        mActivity.mediasList.get(0).getMedias().add(0, media);
+    }
 }
@@ -217,12 +217,14 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     public void update(Observable o, Object arg) {
         if (o instanceof MediaAddObservable) {
             Media media = (Media) arg;
+            //拍照后添加的逻辑
             if (media != null) {
                 Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.frame);
                 if (currentFragment instanceof MediaPickerFragment) {
                     MediaPickerFragment mediaPickerFragment = (MediaPickerFragment) currentFragment;
                     mediaPickerFragment.addMedia(media);
                     getMvpView().setSingleMode(media);
+                    getMvpView().processFolderSize(media);
                 }
             }
@@ -242,7 +244,7 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
         } else if (o instanceof MediaPageSelectStateObservable) {
             Media media = (Media) arg;
             if (media != null) {
-                if (getMvpView() != null) getMvpView().showSelectPrew(media);
+                if (getMvpView() != null) getMvpView().showPrew(media);
             }
         } else if (o instanceof MediaOpenActivityObservable) {
             MediaOpenInfo info = (MediaOpenInfo) arg;
@@ -88,12 +88,14 @@ public class MediaPickerFragment extends MvpBindingFragment&lt;MediaPickerFragmentV
         }
     }
-    public void addMedia(Media media){
-        if (media!=null&&mMediaAdapter!=null){
-            if (mActivity.mOptions.isNeedCamera()){
-                mMediaAdapter.addItem(1,media);
-            }else {
-                mMediaAdapter.addItem(0,media);
+    public void addMedia(Media media) {
+        if (media != null && mMediaAdapter != null) {
+            if (mActivity.mOptions.isNeedCamera()) {
+                mActivity.allMedias.add(1, media);
+                mMediaAdapter.addItem(1, media);
+            } else {
+                mActivity.allMedias.add(0, media);
+                mMediaAdapter.addItem(0, media);
             }
         }
     }
@@ -115,7 +117,8 @@ public class MediaPickerFragment extends MvpBindingFragment&lt;MediaPickerFragmentV
     public void update(Observable o, Object arg) {
         if (o instanceof SelectStateUpdateObservable) {
             Media isUpdateMedia = (Media) arg;
-            if (getMvpView() != null && isUpdateMedia!=null) getMvpView().selectDateUpdate(mActivity,isUpdateMedia);
+            if (getMvpView() != null && isUpdateMedia != null)
+                getMvpView().selectDateUpdate(mActivity, isUpdateMedia);
         }
     }
 }