Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加相册图片筛选功能,用户可以自定义筛选 #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions app/src/main/java/com/bilibili/boxing/impl/BoxingFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.bilibili.boxing.impl;

import android.graphics.BitmapFactory;
import android.util.Log;

import com.bilibili.boxing.loader.IBoxingMediaFilter;
import com.bilibili.boxing.model.entity.AlbumEntity;
import com.bilibili.boxing.model.entity.BaseMedia;

import java.util.Iterator;
import java.util.List;

/**
* @author jax
* @date 2018/1/5
* @description filter album images. sample for filter img width and height.
*/

public class BoxingFilter implements IBoxingMediaFilter {
private static final String TAG = "BoxingFilter";
private static final int MIN_WIDTH = 1280;
private static final int MIN_HEIGHT = 720;

@Override
public List<AlbumEntity> filterAlbum(List<AlbumEntity> albums) {
Iterator<AlbumEntity> entityIterator = albums.iterator();
while (entityIterator.hasNext()) {
AlbumEntity entity = entityIterator.next();
List<BaseMedia> medias = entity.mImageList;
entity.mImageList = filterMedia(medias);
if (entity.mImageList.size() <= 0) {
entityIterator.remove();
}
}
return albums;
}

@Override
public List<BaseMedia> filterMedia(List<BaseMedia> medias) {
if (medias != null) {
Iterator<BaseMedia> baseMediaIterator = medias.iterator();
while (baseMediaIterator.hasNext()) {
BaseMedia media = baseMediaIterator.next();
if (!checkWH(media)) {
baseMediaIterator.remove();
}
}
}
return medias;
}


private boolean checkWH(BaseMedia media) {
try {
String path = media.getPath();
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
BitmapFactory.decodeFile(path, options);
int w = options.outWidth;
int h = options.outHeight;
Log.d(TAG, "checkWH: w -->" + w + " ,h -->" + h);
return w > MIN_WIDTH && h > MIN_HEIGHT;
} catch (Exception e) {
Log.e(TAG, "checkWH: ", e);
}
return true;
}
}
9 changes: 9 additions & 0 deletions app/src/main/java/com/bilibili/boxing/ui/FirstActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@

import com.bilibili.boxing.AbsBoxingActivity;
import com.bilibili.boxing.Boxing;
import com.bilibili.boxing.BoxingMediaFilter;
import com.bilibili.boxing.BoxingMediaLoader;
import com.bilibili.boxing.demo.R;
import com.bilibili.boxing.impl.BoxingFilter;
import com.bilibili.boxing.model.BoxingManager;
import com.bilibili.boxing.model.config.BoxingConfig;
import com.bilibili.boxing.model.config.BoxingCropOption;
Expand Down Expand Up @@ -70,6 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {

findViewById(R.id.single_image_btn).setOnClickListener(this);
findViewById(R.id.single_image_btn_crop_btn).setOnClickListener(this);
findViewById(R.id.single_image_btn_filter_btn).setOnClickListener(this);
findViewById(R.id.multi_image_btn).setOnClickListener(this);
findViewById(R.id.video_btn).setOnClickListener(this);
findViewById(R.id.outside_bs_btn).setOnClickListener(this);
Expand Down Expand Up @@ -97,6 +100,7 @@ public void onClick(View v) {
@Override
public void onClick(View v) {
int id = v.getId();
BoxingMediaFilter.INSTANCE.init(null);
switch (id) {
case R.id.single_image_btn:
BoxingConfig singleImgConfig = new BoxingConfig(BoxingConfig.Mode.SINGLE_IMG).withMediaPlaceHolderRes(R.drawable.ic_boxing_default_image);
Expand All @@ -117,6 +121,11 @@ public void onClick(View v) {
.withMediaPlaceHolderRes(R.drawable.ic_boxing_default_image);
Boxing.of(singleCropImgConfig).withIntent(this, BoxingActivity.class).start(this, REQUEST_CODE);
break;
case R.id.single_image_btn_filter_btn:
BoxingMediaFilter.INSTANCE.init(new BoxingFilter());
BoxingConfig filterImgConfig = new BoxingConfig(BoxingConfig.Mode.SINGLE_IMG).withMediaPlaceHolderRes(R.drawable.ic_boxing_default_image);
Boxing.of(filterImgConfig).withIntent(this, BoxingActivity.class).start(this, COMPRESS_REQUEST_CODE);
break;
case R.id.multi_image_btn:
BoxingConfig config = new BoxingConfig(BoxingConfig.Mode.MULTI_IMG).needCamera(R.drawable.ic_boxing_camera_white).needGif();
Boxing.of(config).withIntent(this, BoxingActivity.class).start(this, REQUEST_CODE);
Expand Down
35 changes: 23 additions & 12 deletions app/src/main/res/layout/activity_first.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 Bilibili
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,15 +15,14 @@
~
-->

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.bilibili.boxing.ui.FirstActivity">

<include layout="@layout/layout_boxing_app_bar"/>
<include layout="@layout/layout_boxing_app_bar" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -43,7 +41,7 @@
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/boxing_pick_single_image"
android:textColor="@color/boxing_colorPrimaryDark"/>
android:textColor="@color/boxing_colorPrimaryDark" />

<TextView
android:id="@+id/single_image_btn_crop_btn"
Expand All @@ -56,7 +54,20 @@
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/boxing_pick_single_image_crop"
android:textColor="@color/boxing_colorPrimaryDark"/>
android:textColor="@color/boxing_colorPrimaryDark" />

<TextView
android:id="@+id/single_image_btn_filter_btn"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/boxing_activity_horizontal_margin"
android:layout_marginRight="@dimen/boxing_activity_horizontal_margin"
android:layout_weight="1"
android:background="@drawable/rect_color_primary"
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/boxing_pick_single_image_filter"
android:textColor="@color/boxing_colorPrimaryDark" />
</LinearLayout>

<LinearLayout
Expand All @@ -76,7 +87,7 @@
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/boxing_pick_multi_image"
android:textColor="@color/boxing_colorPrimaryDark"/>
android:textColor="@color/boxing_colorPrimaryDark" />

<TextView
android:id="@+id/video_btn"
Expand All @@ -89,7 +100,7 @@
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/boxing_pick_single_video"
android:textColor="@color/boxing_colorPrimaryDark"/>
android:textColor="@color/boxing_colorPrimaryDark" />

</LinearLayout>

Expand All @@ -104,17 +115,17 @@
android:gravity="center"
android:padding="@dimen/boxing_item_spacing"
android:text="@string/bottom_sheet"
android:textColor="@color/boxing_colorPrimaryDark"/>
android:textColor="@color/boxing_colorPrimaryDark" />

<android.support.v7.widget.RecyclerView
android:id="@+id/media_recycle_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/boxing_item_spacing"
android:layout_marginLeft="@dimen/boxing_activity_horizontal_margin"
android:layout_marginRight="@dimen/boxing_activity_horizontal_margin"
android:layout_marginTop="@dimen/boxing_item_spacing"
android:clickable="true"
android:visibility="gone"
tools:visibility="visible"/>
tools:visibility="visible" />

</LinearLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

import com.bilibili.boxing.AbsBoxingViewFragment;
import com.bilibili.boxing.Boxing;
import com.bilibili.boxing.BoxingMediaFilter;
import com.bilibili.boxing.model.BoxingManager;
import com.bilibili.boxing.model.config.BoxingConfig;
import com.bilibili.boxing.model.entity.AlbumEntity;
Expand Down Expand Up @@ -110,7 +111,7 @@ public void onRequestPermissionError(String[] permissions, Exception e) {
if (permissions[0].equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
Toast.makeText(getContext(), R.string.boxing_storage_permission_deny, Toast.LENGTH_SHORT).show();
showEmptyData();
} else if (permissions[0].equals(Manifest.permission.CAMERA)){
} else if (permissions[0].equals(Manifest.permission.CAMERA)) {
Toast.makeText(getContext(), R.string.boxing_camera_permission_deny, Toast.LENGTH_SHORT).show();
}
}
Expand Down Expand Up @@ -176,6 +177,7 @@ && isEmptyData(mMediaAdapter.getAllMedias())) {
return;
}
showData();
medias = BoxingMediaFilter.INSTANCE.filterMedia(medias);
mMediaAdapter.addAllData(medias);
checkSelectedMedia(medias, mMediaAdapter.getSelectedMedias());
}
Expand Down Expand Up @@ -204,6 +206,7 @@ public void showAlbum(@Nullable List<AlbumEntity> albums) {
mTitleTxt.setOnClickListener(null);
return;
}
albums = BoxingMediaFilter.INSTANCE.startFilter(albums);
mAlbumWindowAdapter.addAllData(albums);
}

Expand Down Expand Up @@ -319,9 +322,9 @@ private void showProgressDialog() {
mDialog.setIndeterminate(true);
mDialog.setMessage(getString(R.string.boxing_handling));
}
if (!mDialog.isShowing()) {
mDialog.show();
}
if (!mDialog.isShowing()) {
mDialog.show();
}
}

private void dismissProgressDialog() {
Expand Down
1 change: 1 addition & 0 deletions boxing-impl/src/main/res/values-en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="boxing_pick_single_video">Pick a video</string>
<string name="boxing_pick_multi_image">Pick pictures</string>
<string name="boxing_pick_single_image_crop">Pick a picture with crop</string>
<string name="boxing_pick_single_image_filter">Pick a picture with filter</string>
<string name="boxing_pick_single_image">Pick a picture</string>
<string name="boxing_video_title">videos</string>
<string name="boxing_storage_deny">Device storage read error or temporarily unavailable. Please try again later</string>
Expand Down
1 change: 1 addition & 0 deletions boxing-impl/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<string name="boxing_pick_single_video">视频单选</string>
<string name="boxing_pick_multi_image">图片多选</string>
<string name="boxing_pick_single_image_crop">图片单选加裁剪</string>
<string name="boxing_pick_single_image_filter">图片单选加筛选</string>
<string name="boxing_pick_single_image">图片单选</string>
<string name="boxing_video_title">视频相册</string>
<string name="boxing_finish">完成</string>
Expand Down
32 changes: 32 additions & 0 deletions boxing/src/main/java/com/bilibili/boxing/BoxingMediaFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.bilibili.boxing;

import com.bilibili.boxing.loader.IBoxingMediaFilter;
import com.bilibili.boxing.model.entity.AlbumEntity;
import com.bilibili.boxing.model.entity.BaseMedia;

import java.util.List;

/**
* @author jax
* @date 2018/1/5
* @description
*/

public enum BoxingMediaFilter {
INSTANCE;

private IBoxingMediaFilter filter;

public void init(IBoxingMediaFilter filter) {
this.filter = filter;
}

public List<AlbumEntity> startFilter(List<AlbumEntity> entities) {
return filter == null ? entities : filter.filterAlbum(entities);
}

public List<BaseMedia> filterMedia(List<BaseMedia> medias) {
return filter == null ? medias : filter.filterMedia(medias);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.bilibili.boxing.loader;

import com.bilibili.boxing.model.entity.AlbumEntity;
import com.bilibili.boxing.model.entity.BaseMedia;

import java.util.List;

/**
* @author jax
* @date 2018/1/5
* @description filter album images list.
*/

public interface IBoxingMediaFilter {

/**
* filter origin albums to new list.
*
* @param albums origin album image.
* @return last albumEntity list.
*/
List<AlbumEntity> filterAlbum(List<AlbumEntity> albums);

/**
* filter media to new list.
*
* @param medias origin medias.
* @return filter medias
*/
List<BaseMedia> filterMedia(List<BaseMedia> medias);

}