Skip to content

F
flutter_plugin
Commit 3636de24 authored by 林生雨's avatar 林生雨
Browse files
Options

commit

parent 703b4906
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 46 deletions
.idea/workspace.xml
View file @ 3636de24
This diff is collapsed.
android/src/main/java/com/example/gengmei_flutter_plugin/ImagePlugin/repository/ImageRespository.kt
View file @ 3636de24
......@@ -3,7 +3,9 @@ package com.example.myimagepicker.repository
import android.content.Context
import android.graphics.BitmapFactory
import android.os.Environment
import android.provider.MediaStore
import android.util.Log
import com.example.gengmei_flutter_plugin.utils.MyUtil
import com.example.gengmei_flutter_plugin.utils.MyUtil.Companion.getFileFullName
import com.example.gengmei_flutter_plugin.utils.MyUtil.Companion.getFileName
import com.example.gengmei_flutter_plugin.utils.MyUtil.Companion.getImageCacheDir
......@@ -11,6 +13,7 @@ import com.example.myimagepicker.bean.MediaFile
import com.example.myimagepicker.bean.MediaFolder
import com.example.myimagepicker.luban.Luban
import com.example.myimagepicker.repository.local.ImageScanner
import com.example.myimagepicker.repository.local.VideoScanner
import io.reactivex.Observable
import io.reactivex.ObservableOnSubscribe
import io.reactivex.android.schedulers.AndroidSchedulers
......@@ -35,7 +38,6 @@ class ImageRespository {
var finishOneTask = false
val fileDir = Environment.getExternalStorageDirectory().absolutePath + "/GMAlbum/.album";
//: HashMap<String, ArrayList<HashMap<String, Any>>>
fun scanPhoneImage(context: Context): Observable<HashMap<String, ArrayList<HashMap<String, Any>>>> {
......@@ -48,10 +50,15 @@ class ImageRespository {
.subscribeOn(Schedulers.computation()).observeOn(AndroidSchedulers.mainThread())
}
return Observable.create(ObservableOnSubscribe<HashMap<String, ArrayList<HashMap<String, Any>>>> {
it.onNext(getFinalMap(context, ImageScanner(context).queryMedia()))
// val images = ArrayList<MediaFile>()
val images = ImageScanner(context).queryMedia()
val videos = VideoScanner(context).queryMedia()
images.addAll(videos)
it.onNext(getFinalMap(context, images))
}).subscribeOn(Schedulers.computation()).observeOn(AndroidSchedulers.mainThread())
}
fun savePreviewImg(context: Context, listener: savePreviewListener) {
val needSize = recordImageListMap.size;
var currentSize = 0;
......@@ -62,11 +69,16 @@ class ImageRespository {
val realPath = it["realPath"] as String
if (any == null) {
globalThreadPool.execute {
if (it["isVideo"] == "T") {
it["path"] = MyUtil.saveVideoImg("${fileDir}/${getFileName(realPath)!!}.png",
realPath, MediaStore.Images.Thumbnails.MICRO_KIND, 220, 220)
} else {
val get = Luban.with(context).setTargetDir(fileDir)
.setName(getFileName(realPath)!!)
.get(realPath);
it["path"] = get.absolutePath;
}
//getImageCacheDir(context, Luban.DEFAULT_DISK_CACHE_DIR)!!.absolutePath
val get = Luban.with(context).setTargetDir(fileDir)
.setName(getFileName(realPath)!!)
.get(realPath);
it["path"] = get.absolutePath;
synchronized(this) {
currentSize++;
noPathSize++;
......@@ -158,6 +170,14 @@ class ImageRespository {
it.realPath?.run {
itemMap.put("realPath", this)
}
it.isVideo?.run {
if (this) {
itemMap.put("isVideo", "T")
itemMap.put("during", "${it.duration}")
} else {
itemMap.put("isVideo", "F")
}
}
imageListMap.add(itemMap)
}
synchronized(this) {
......@@ -177,14 +197,29 @@ class ImageRespository {
finalList[this as String] = ArrayList<HashMap<String, Any>>()
if (it["path"] == null) {
val realPath = it["realPath"] as String
val get = Luban.with(context).setTargetDir(
fileDir
// getImageCacheDir(context, Luban.DEFAULT_DISK_CACHE_DIR)!!.absolutePath
)
.setName(getFileName(realPath)!!)
.get(realPath);
it["path"] = get.absolutePath
Log.e("lsy", "封面照片 ${get.absolutePath}");
if (it["isVideo"] == "T") {
it["path"] = MyUtil.saveVideoImg("${fileDir}/${getFileName(realPath)!!}.png",
realPath, MediaStore.Images.Thumbnails.MINI_KIND, 300, 300)
} else {
val png = File("${fileDir}/${getFileName(realPath)!!}.png")
val jpg = File("${fileDir}/${getFileName(realPath)!!}.jpg")
val jpeg = File("${fileDir}/${getFileName(realPath)!!}.jpeg")
if (png.exists()) {
it["path"] = png.absolutePath
} else if (jpg.exists()) {
it["path"] = jpg.absolutePath
} else if (jpeg.exists()) {
it["path"] = jpeg.absolutePath
} else {
val get = Luban.with(context).setTargetDir(
fileDir
)
.setName(getFileName(realPath)!!)
.get(realPath);
it["path"] = get.absolutePath
Log.e("lsy", "封面照片 ${get.absolutePath}");
}
}
}
finalList[this]!!.add(it);
} else {
......
android/src/main/java/com/example/gengmei_flutter_plugin/ImagePlugin/repository/bean/MediaFile.kt
View file @ 3636de24
......@@ -15,5 +15,6 @@ data class MediaFile(
var size: Long = 0,
var isBigIm: Boolean = false,
var bigScare: Float = 0f,
var realPath: String? = null
var realPath: String? = null,
var isVideo: Boolean? = null
)
android/src/main/java/com/example/gengmei_flutter_plugin/ImagePlugin/repository/local/ImageScanner.kt
View file @ 3636de24
......@@ -60,6 +60,7 @@ class ImageScanner(var context: Context) : AbsMediaScanner<MediaFile>(context) {
mediaFile.dateToken = dateToken
mediaFile.size = size
mediaFile.realPath = path
mediaFile.isVideo = false
val dir = Environment.getExternalStorageDirectory().absolutePath + "/GMAlbum/.album";
// val dir = getImageCacheDir(context, Luban.DEFAULT_DISK_CACHE_DIR)!!.absolutePath;
val tempFilePngString = dir + "/" + getFileName(path)!! + ".png";
......
android/src/main/java/com/example/gengmei_flutter_plugin/ImagePlugin/repository/local/VideoScanner.kt
View file @ 3636de24
......@@ -3,8 +3,11 @@ package com.example.myimagepicker.repository.local
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.os.Environment
import android.provider.MediaStore
import com.example.gengmei_flutter_plugin.utils.MyUtil
import com.example.myimagepicker.bean.MediaFile
import java.io.File
/**
* Created by lsy
......@@ -19,16 +22,19 @@ class VideoScanner(private val mContext: Context) : AbsMediaScanner<MediaFile>(m
override val projection: Array<String>
get() =
arrayOf(MediaStore.Video.Media.DATA, MediaStore.Video.Media.MIME_TYPE, MediaStore.Video.Media.BUCKET_ID, MediaStore.Video.Media.BUCKET_DISPLAY_NAME, MediaStore.Video.Media.DURATION, MediaStore.Video.Media.DATE_TAKEN)
arrayOf(MediaStore.Video.Media.DATA, MediaStore.Video.Media.MIME_TYPE, MediaStore.Video.Media.BUCKET_ID, MediaStore.Video.Media.BUCKET_DISPLAY_NAME, MediaStore.Video.Media.DURATION, MediaStore.Video.Media.DATE_TAKEN, MediaStore.Images.Media.SIZE
)
override val order: String
get() = MediaStore.Video.Media.DATE_TAKEN + " desc"
override val selectionArgs: Array<String>?
get() = null
// get() = null
get() = arrayOf("video/mp4", "video/avi")
override val selection: String
get() = ""
get() = (MediaStore.Video.Media.MIME_TYPE + "=? or "
+ MediaStore.Video.Media.MIME_TYPE + "=?")
/**
......@@ -47,12 +53,31 @@ class VideoScanner(private val mContext: Context) : AbsMediaScanner<MediaFile>(m
val dateToken = cursor.getLong(cursor.getColumnIndex(MediaStore.Video.Media.DATE_TAKEN))
val mediaFile = MediaFile()
mediaFile.path = path
mediaFile.realPath = path
mediaFile.mime = mime
mediaFile.folderId = folderId
mediaFile.folderName = folderName
mediaFile.duration = duration
mediaFile.dateToken = dateToken
mediaFile.isVideo=true
val dir = Environment.getExternalStorageDirectory().absolutePath + "/GMAlbum/.album"
// val dir = getImageCacheDir(context, Luban.DEFAULT_DISK_CACHE_DIR)!!.absolutePath;
val tempFilePngString = dir + "/" + MyUtil.getFileName(path)!! + ".png";
val tempFilePngExists = File(tempFilePngString).exists()
if (tempFilePngExists) {
mediaFile.path = tempFilePngString;
}
val tempFileJpgString = dir + "/" + MyUtil.getFileName(path)!! + ".jpg";
val tempFileJpgExists = File(tempFileJpgString).exists()
if (tempFileJpgExists) {
mediaFile.path = tempFileJpgString;
}
val tempFileJpegString = dir + "/" + MyUtil.getFileName(path)!! + ".jpeg"
val tempFileJpegExists = File(tempFileJpegString).exists()
if (tempFileJpegExists) {
mediaFile.path = tempFileJpegString;
}
return mediaFile
}
......
android/src/main/java/com/example/gengmei_flutter_plugin/utils/MyUtil.kt
View file @ 3636de24
......@@ -4,6 +4,12 @@ import android.content.Context
import android.util.Log
import com.example.myimagepicker.luban.Luban
import java.io.File
import android.media.ThumbnailUtils
import android.graphics.Bitmap
import android.util.DebugUtils
import java.io.FileOutputStream
import java.lang.Exception
/**
* @author lsy
......@@ -13,7 +19,7 @@ import java.io.File
class MyUtil {
companion object{
companion object {
fun getImageCacheDir(context: Context, cacheName: String): File? {
val cacheDir = context.externalCacheDir
if (cacheDir != null) {
......@@ -49,5 +55,28 @@ class MyUtil {
null
}
}
fun saveVideoImg(filePath: String, videoPath: String, kind: Int, width: Int, height: Int): String {
val file = File(filePath);
var bitmap: Bitmap? = null
// 获取视频的缩略图
bitmap = ThumbnailUtils.createVideoThumbnail(videoPath, kind)
if (width > 0 && height > 0) {
bitmap = ThumbnailUtils.extractThumbnail(bitmap, width, height,
ThumbnailUtils.OPTIONS_RECYCLE_INPUT)
}
try {
val out = FileOutputStream(file)
bitmap.compress(Bitmap.CompressFormat.PNG, 80, out)
out.flush()
out.close()
bitmap.recycle()
} catch (e: Exception) {
e.printStackTrace()
}
return filePath
}
}
}
example/pubspec.lock
View file @ 3636de24
......@@ -5,35 +5,35 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.2.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.2"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.14.11"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.2"
flutter:
......@@ -57,44 +57,44 @@ packages:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.12.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.6"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.6.2"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.7.0"
quiver:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.3"
rxdart:
dependency: "direct main"
description:
name: rxdart
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.22.3"
version: "0.22.4"
sky_engine:
dependency: transitive
description: flutter
......@@ -104,56 +104,56 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.5.5"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.9.3"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.2.5"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.6"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.8"
sdks:
......
gengmei_flutter_plugin.iml
View file @ 3636de24
......@@ -17,7 +17,6 @@
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/example/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/example/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/example/build" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/gengmei_flutter_plugin/example/ios/Flutter/App.framework/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
......
ios/Classes/GengmeiFlutterPlugin.m
View file @ 3636de24
......@@ -413,6 +413,11 @@ bool isRunning=false;
self.nowSize++;
NSMutableDictionary* queryItemDict = [NSMutableDictionary dictionary];
[queryItemDict setObject:tmpPath forKey:@"path"];
if(assets.mediaType==PHAssetMediaTypeVideo){
[queryItemDict setObject:@"T" forKey:@"isVideo"];
}else{
[queryItemDict setObject:@"F" forKey:@"isVideo"];
}
NSMutableArray * arr=self.finalMap[docName];
if (arr==nil) {
self.finalMap[docName]=[NSMutableArray array];
......@@ -460,6 +465,11 @@ bool isRunning=false;
NSMutableDictionary* queryItemDict = [NSMutableDictionary dictionary];
[queryItemDict setObject:tmpPath forKey:@"path"];
[queryItemDict setObject:imgName forKey:@"name"];
if(assets.mediaType==PHAssetMediaTypeVideo){
[queryItemDict setObject:@"T" forKey:@"isVideo"];
}else{
[queryItemDict setObject:@"F" forKey:@"isVideo"];
}
NSMutableArray * arr=self.finalMap[docName];
self.nowSize++;
if (arr==nil) {
......@@ -507,8 +517,21 @@ bool isRunning=false;
__block NSString *tmpPath=[cacheDirectory stringByAppendingPathComponent:imgName];
if ([fileManager fileExistsAtPath:realPath]==YES){
self.nowSize++;
if(assets.mediaType==PHAssetMediaTypeVideo){
PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
options.version = PHImageRequestOptionsVersionCurrent;
options.networkAccessAllowed = true;
options.deliveryMode = PHVideoRequestOptionsDeliveryModeAutomatic;
[[PHImageManager defaultManager]requestAVAssetForVideo:assets options:options resultHandler:^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) {
}];
}else{
}
NSLog(@"!!!REAL IS EXIE!! %@",realPath);
NSMutableArray<NSMutableDictionary<NSString*,NSObject*>*>* array=self.finalMap[docName];
for (int x=0; x<[array count]; x++) {
NSMutableDictionary<NSString*,NSObject*>* map=[array objectAtIndex:x];
NSString* index=[map objectForKey:@"path"];
......
lib/ScanImagePlugn.dart
View file @ 3636de24
......@@ -11,12 +11,13 @@ class ScanImagePlugn {
Map<String, List<ScanImageItem>> newMap = new Map();
images.forEach((k, v) {
List<ScanImageItem> tempList = new List();
print("-------UP ${k} ${tempList.length}");
for (var item in v) {
ScanImageItem scanImageItem = new ScanImageItem();
scanImageItem.path = item["path"];
scanImageItem.size = item["size"];
scanImageItem.realPath = item["realPath"];
scanImageItem.path = item["path"] ?? "";
scanImageItem.size = item["size"] ?? "";
scanImageItem.realPath = item["realPath"] ?? "";
scanImageItem.isVideo = item["isVideo"] == "T" ? true : false;
scanImageItem.during = item["during"] ?? "";
tempList.add(scanImageItem);
}
newMap.putIfAbsent(k, () => tempList);
......@@ -38,6 +39,7 @@ class ScanImagePlugn {
class ScanImageItem {
String path;
String realPath;
String during;
bool isVideo;
int size;
bool isSelected = false;
}
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