Commit 1b4e8b61 by zhengnw@sobot.com

album 1.0.3

parent c4706238
...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) { ...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext { ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名 PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'album' //项目名 PUBLISH_ARTIFACT_ID = 'album' //项目名
PUBLISH_VERSION = '1.0.2' //版本号 PUBLISH_VERSION = '1.0.3' //版本号
} }
......
...@@ -133,26 +133,12 @@ public class AlbumActivity extends SobotBaseActivity implements ...@@ -133,26 +133,12 @@ public class AlbumActivity extends SobotBaseActivity implements
mMediaReadTask.execute(); mMediaReadTask.execute();
} }
}*/ }*/
//是否是获取了选取部分的图片
if(ContextCompat.checkSelfPermission(AlbumActivity.this,Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)==PackageManager.PERMISSION_GRANTED) {
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
ArrayList<AlbumFile> checkedList = getIntent().getParcelableArrayListExtra(SobotAlbum.KEY_INPUT_CHECKED_LIST);
MediaReader mediaReader = new MediaReader(AlbumActivity.this, sSizeFilter, sMimeFilter, sDurationFilter, mFilterVisibility);
mMediaReadTask = new MediaReadTask(mFunction, checkedList, mediaReader, AlbumActivity.this);
mMediaReadTask.execute();
}
}, 2000);
}else{
ArrayList<AlbumFile> checkedList = getIntent().getParcelableArrayListExtra(SobotAlbum.KEY_INPUT_CHECKED_LIST); ArrayList<AlbumFile> checkedList = getIntent().getParcelableArrayListExtra(SobotAlbum.KEY_INPUT_CHECKED_LIST);
MediaReader mediaReader = new MediaReader(AlbumActivity.this, sSizeFilter, sMimeFilter, sDurationFilter, mFilterVisibility); MediaReader mediaReader = new MediaReader(AlbumActivity.this, sSizeFilter, sMimeFilter, sDurationFilter, mFilterVisibility);
mMediaReadTask = new MediaReadTask(mFunction, checkedList, mediaReader, AlbumActivity.this); mMediaReadTask = new MediaReadTask(mFunction, checkedList, mediaReader, AlbumActivity.this);
mMediaReadTask.execute(); mMediaReadTask.execute();
} }
}
private void initializeArgument() { private void initializeArgument() {
Bundle argument = getIntent().getExtras(); Bundle argument = getIntent().getExtras();
assert argument != null; assert argument != null;
......
...@@ -96,9 +96,7 @@ public class MediaReader { ...@@ -96,9 +96,7 @@ public class MediaReader {
null); null);
if (cursor != null) { if (cursor != null) {
if(cursor.moveToFirst()){
SobotLogUtils.d("======图片总数======="+cursor.getCount()); SobotLogUtils.d("======图片总数======="+cursor.getCount());
}
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
String path = cursor.getString(0); String path = cursor.getString(0);
String bucketName = cursor.getString(1); String bucketName = cursor.getString(1);
...@@ -184,11 +182,7 @@ public class MediaReader { ...@@ -184,11 +182,7 @@ public class MediaReader {
null); null);
SobotLogUtils.d("======scanVideoFile======="+(cursor==null)); SobotLogUtils.d("======scanVideoFile======="+(cursor==null));
if (cursor != null) { if (cursor != null) {
if(cursor.moveToFirst()){
SobotLogUtils.d("======视频总数======="+cursor.getCount()); SobotLogUtils.d("======视频总数======="+cursor.getCount());
}else{
SobotLogUtils.d("======未找到任何视频======="+cursor.getCount());
}
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
String path = cursor.getString(0); String path = cursor.getString(0);
String bucketName = cursor.getString(1); String bucketName = cursor.getString(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment