steevedevops/photo_gallery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change DATE_TAKEN to DATE_ADDED of media column

Browse Source
This commit is contained in:
Wenqi Li 2023-05-06 03:06:28 +08:00
parent 702ae7a5e3
commit 090d9e00e9
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
android/src/main/kotlin/com/morbit/photogallery/PhotoGalleryPlugin.kt
View File

@ -63,7 +63,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
MediaStore.Images.Media.SIZE, MediaStore.Images.Media.SIZE,
MediaStore.Images.Media.ORIENTATION, MediaStore.Images.Media.ORIENTATION,
MediaStore.Images.Media.MIME_TYPE, MediaStore.Images.Media.MIME_TYPE,
MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED,
MediaStore.Images.Media.DATE_MODIFIED MediaStore.Images.Media.DATE_MODIFIED
) )
@ -76,7 +76,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
MediaStore.Video.Media.SIZE, MediaStore.Video.Media.SIZE,
MediaStore.Video.Media.MIME_TYPE, MediaStore.Video.Media.MIME_TYPE,
MediaStore.Video.Media.DURATION, MediaStore.Video.Media.DURATION,
MediaStore.Video.Media.DATE_TAKEN, MediaStore.Video.Media.DATE_ADDED,
MediaStore.Video.Media.DATE_MODIFIED MediaStore.Video.Media.DATE_MODIFIED
) )
} }
@ -308,7 +308,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
putStringArray( putStringArray(
android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS, android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS,
arrayOf( arrayOf(
MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED,
MediaStore.Images.Media.DATE_MODIFIED MediaStore.Images.Media.DATE_MODIFIED
) )
) )
@ -330,9 +330,9 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
) )
} else { } else {
val orderBy = if (newest) { val orderBy = if (newest) {
"${MediaStore.Images.Media.DATE_TAKEN} DESC, ${MediaStore.Images.Media.DATE_MODIFIED} DESC" "${MediaStore.Images.Media.DATE_ADDED} DESC, ${MediaStore.Images.Media.DATE_MODIFIED} DESC"
} else { } else {
"${MediaStore.Images.Media.DATE_TAKEN} ASC, ${MediaStore.Images.Media.DATE_MODIFIED} ASC" "${MediaStore.Images.Media.DATE_ADDED} ASC, ${MediaStore.Images.Media.DATE_MODIFIED} ASC"
} }
imageCursor = this.contentResolver.query( imageCursor = this.contentResolver.query(
MediaStore.Images.Media.EXTERNAL_CONTENT_URI, MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
@ -378,7 +378,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
putStringArray( putStringArray(
android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS, android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS,
arrayOf( arrayOf(
MediaStore.Video.Media.DATE_TAKEN, MediaStore.Video.Media.DATE_ADDED,
MediaStore.Video.Media.DATE_MODIFIED MediaStore.Video.Media.DATE_MODIFIED
) )
) )
@ -400,9 +400,9 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
) )
} else { } else {
val orderBy = if (newest) { val orderBy = if (newest) {
"${MediaStore.Images.Media.DATE_TAKEN} DESC, ${MediaStore.Images.Media.DATE_MODIFIED} DESC" "${MediaStore.Images.Media.DATE_ADDED} DESC, ${MediaStore.Images.Media.DATE_MODIFIED} DESC"
} else { } else {
"${MediaStore.Images.Media.DATE_TAKEN} ASC, ${MediaStore.Images.Media.DATE_MODIFIED} ASC" "${MediaStore.Images.Media.DATE_ADDED} ASC, ${MediaStore.Images.Media.DATE_MODIFIED} ASC"
} }
videoCursor = this.contentResolver.query( videoCursor = this.contentResolver.query(
MediaStore.Video.Media.EXTERNAL_CONTENT_URI, MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
@ -598,7 +598,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
putStringArray( putStringArray(
android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS, android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS,
arrayOf( arrayOf(
MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED,
MediaStore.Images.Media.DATE_MODIFIED MediaStore.Images.Media.DATE_MODIFIED
) )
) )
@ -620,7 +620,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
arrayOf(MediaStore.Images.Media._ID), arrayOf(MediaStore.Images.Media._ID),
if (albumId == allAlbumId) null else "${MediaStore.Images.Media.BUCKET_ID} = $albumId", if (albumId == allAlbumId) null else "${MediaStore.Images.Media.BUCKET_ID} = $albumId",
null, null,
MediaStore.Images.Media.DATE_TAKEN + " DESC LIMIT 1" MediaStore.Images.Media.DATE_ADDED + " DESC LIMIT 1"
) )
} }
@ -651,7 +651,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
putStringArray( putStringArray(
android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS, android.content.ContentResolver.QUERY_ARG_SORT_COLUMNS,
arrayOf( arrayOf(
MediaStore.Video.Media.DATE_TAKEN, MediaStore.Video.Media.DATE_ADDED,
MediaStore.Video.Media.DATE_MODIFIED MediaStore.Video.Media.DATE_MODIFIED
) )
) )
@ -673,7 +673,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
arrayOf(MediaStore.Video.Media._ID), arrayOf(MediaStore.Video.Media._ID),
if (albumId == allAlbumId) null else "${MediaStore.Video.Media.BUCKET_ID} = $albumId", if (albumId == allAlbumId) null else "${MediaStore.Video.Media.BUCKET_ID} = $albumId",
null, null,
MediaStore.Video.Media.DATE_TAKEN + " DESC LIMIT 1" MediaStore.Video.Media.DATE_ADDED + " DESC LIMIT 1"
) )
} }
@ -809,7 +809,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE) val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
val orientationColumn = cursor.getColumnIndex(MediaStore.Images.Media.ORIENTATION) val orientationColumn = cursor.getColumnIndex(MediaStore.Images.Media.ORIENTATION)
val mimeColumn = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE) val mimeColumn = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE)
val dateTakenColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_TAKEN) val dateAddedColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_ADDED)
val dateModifiedColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_MODIFIED) val dateModifiedColumn = cursor.getColumnIndex(MediaStore.Images.Media.DATE_MODIFIED)
val id = cursor.getLong(idColumn) val id = cursor.getLong(idColumn)
@ -820,9 +820,9 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
val size = cursor.getLong(sizeColumn) val size = cursor.getLong(sizeColumn)
val orientation = cursor.getLong(orientationColumn) val orientation = cursor.getLong(orientationColumn)
val mimeType = cursor.getString(mimeColumn) val mimeType = cursor.getString(mimeColumn)
var dateTaken: Long? = null var dateAdded: Long? = null
if (cursor.getType(dateTakenColumn) == FIELD_TYPE_INTEGER) { if (cursor.getType(dateAddedColumn) == FIELD_TYPE_INTEGER) {
dateTaken = cursor.getLong(dateTakenColumn) dateAdded = cursor.getLong(dateAddedColumn) * 1000
} }
var dateModified: Long? = null var dateModified: Long? = null
if (cursor.getType(dateModifiedColumn) == FIELD_TYPE_INTEGER) { if (cursor.getType(dateModifiedColumn) == FIELD_TYPE_INTEGER) {
@ -839,7 +839,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
"size" to size, "size" to size,
"orientation" to orientationDegree2Value(orientation), "orientation" to orientationDegree2Value(orientation),
"mimeType" to mimeType, "mimeType" to mimeType,
"creationDate" to dateTaken, "creationDate" to dateAdded,
"modifiedDate" to dateModified "modifiedDate" to dateModified
) )
} }
@ -853,7 +853,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
val sizeColumn = cursor.getColumnIndex(MediaStore.Video.Media.SIZE) val sizeColumn = cursor.getColumnIndex(MediaStore.Video.Media.SIZE)
val mimeColumn = cursor.getColumnIndex(MediaStore.Video.Media.MIME_TYPE) val mimeColumn = cursor.getColumnIndex(MediaStore.Video.Media.MIME_TYPE)
val durationColumn = cursor.getColumnIndex(MediaStore.Video.Media.DURATION) val durationColumn = cursor.getColumnIndex(MediaStore.Video.Media.DURATION)
val dateTakenColumn = cursor.getColumnIndex(MediaStore.Video.Media.DATE_TAKEN) val dateAddedColumn = cursor.getColumnIndex(MediaStore.Video.Media.DATE_ADDED)
val dateModifiedColumn = cursor.getColumnIndex(MediaStore.Video.Media.DATE_MODIFIED) val dateModifiedColumn = cursor.getColumnIndex(MediaStore.Video.Media.DATE_MODIFIED)
val id = cursor.getLong(idColumn) val id = cursor.getLong(idColumn)
@ -864,9 +864,9 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
val size = cursor.getLong(sizeColumn) val size = cursor.getLong(sizeColumn)
val mimeType = cursor.getString(mimeColumn) val mimeType = cursor.getString(mimeColumn)
val duration = cursor.getLong(durationColumn) val duration = cursor.getLong(durationColumn)
var dateTaken: Long? = null var dateAdded: Long? = null
if (cursor.getType(dateTakenColumn) == FIELD_TYPE_INTEGER) { if (cursor.getType(dateAddedColumn) == FIELD_TYPE_INTEGER) {
dateTaken = cursor.getLong(dateTakenColumn) dateAdded = cursor.getLong(dateAddedColumn) * 1000
} }
var dateModified: Long? = null var dateModified: Long? = null
if (cursor.getType(dateModifiedColumn) == FIELD_TYPE_INTEGER) { if (cursor.getType(dateModifiedColumn) == FIELD_TYPE_INTEGER) {
@ -883,7 +883,7 @@ class PhotoGalleryPlugin : FlutterPlugin, MethodCallHandler {
"size" to size, "size" to size,
"mimeType" to mimeType, "mimeType" to mimeType,
"duration" to duration, "duration" to duration,
"creationDate" to dateTaken, "creationDate" to dateAdded,
"modifiedDate" to dateModified "modifiedDate" to dateModified
) )
} }