@hotta/react-native-imagepicker 0.1.4 → 0.1.6

package/README.md

@@ -11,13 +11,13 @@ This is a fork of  [react-native-syan-image-picker](https://github.com/syanbo/re
 ### 安装
 
 ```
-yarn add @hotta/react-native-imagepicker@0.1.3
+yarn add @hotta/react-native-imagepicker
 ```
 
 ### 使用方法
 
 ```
-import HTImagePicker from '@ht/react-native-image-picker/src';
+import HTImagePicker from '@hotta/react-native-imagepicker';
 const options: any = {
       mediaType: 'photo',
       sortOrder: 'asc',

package/android/src/main/java/com/htreactnative/imagepicker/NativeImagePickerModule.kt

@@ -50,6 +50,53 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
             })
     }
 
+    override fun asyncShowVideoPicker(
+        options: ReadableMap?,
+        promise: Promise?
+    ) {
+        pickerOptions = options;
+        val videoCount = options?.getInt("videoCount") ?: 1
+        PictureSelector.create(reactApplicationContext.currentActivity)
+            .openGallery(SelectMimeType.ofVideo())
+            .setMaxSelectNum(videoCount)
+            .setImageEngine(imageEngine)
+            .forResult(object : OnResultCallbackListener<LocalMedia> {
+                override fun onResult(localMediaList: ArrayList<LocalMedia?>?) {
+                    var data = WritableNativeArray()
+                    localMediaList?.forEach { media -> media?.let {
+                        data.pushMap(getVideoResult(media))
+                    } }
+                    promise?.resolve(data)
+                }
+
+                override fun onCancel() {
+
+                }
+
+            })
+    }
+
+    private fun getVideoResult(media: LocalMedia): WritableMap {
+        val videoMap: WritableMap = WritableNativeMap()
+        var path: String = media.path
+        val isAndroidQ = SdkVersionUtils.isQ()
+        val isAndroidR = SdkVersionUtils.isR()
+        if (isAndroidQ) {
+            path = media.availablePath
+        }
+        if (isAndroidR) {
+            path = media.realPath;
+        }
+        videoMap.putString("path", "file://$path")
+        videoMap.putString("mime", media.mimeType ?: "video/mp4")
+        videoMap.putDouble("width", media.width.toDouble())
+        videoMap.putDouble("height", media.height.toDouble())
+        videoMap.putDouble("duration", media.duration * 1000.0)
+        videoMap.putInt("size", media.size)
+        videoMap.putString("filename", media.fileName)
+        return videoMap
+    }
+
     private fun getImageResult(media: LocalMedia): WritableMap {
         val imageMap: WritableMap = WritableNativeMap()
         var path: String = media.path

package/ios/NativeImagePicker.mm

@@ -7,8 +7,6 @@
 @interface NativeImagePicker ()
 
 @property (nonatomic, strong) UIImagePickerController *imagePickerVc;
-@property (nonatomic, strong) NSDictionary *pickOptions;
-
 /**
  保存Promise的resolve block
  */
@@ -27,7 +25,9 @@
 @property (nonatomic, strong) NSMutableArray *selectedAssets;
 @end
 @implementation NativeImagePicker
-
+{
+    std::optional<JS::NativeImagePicker::ImagePickerOption> _cameraOptions;
+}
 
 - (instancetype)init {
     self = [super init];
@@ -52,31 +52,88 @@
     _selectedAssets = nil;
 }
 
-- (void)asyncShowImagePicker:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-    self.pickOptions = options;
+- (void)asyncShowImagePicker:(JS::NativeImagePicker::ImagePickerOption &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    _cameraOptions = options;
     self.resolveBlock = resolve;
     self.rejectBlock = reject;
     self.callback = nil;
     [self openImagePicker];
 }
 
+- (void)asyncShowVideoPicker:(JS::NativeImagePicker::VideoPickerOption &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    self.resolveBlock = resolve;
+    self.rejectBlock = reject;
+    self.callback = nil;
+    [self openVideoPickerWithOptions:options];
+}
+
+- (void)openVideoPickerWithOptions:(JS::NativeImagePicker::VideoPickerOption &)options {
+    NSInteger videoCount = options.videoCount();
+    BOOL isCamera = options.isCamera();
+    BOOL sortAscendingByModificationDate = options.sortAscendingByModificationDate();
+    BOOL showSelectedIndex = options.showSelectedIndex();
+
+    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:videoCount delegate:self];
+    imagePickerVc.iconThemeColor = [UIColor colorWithRed:255.0/255.0 green:177.0/255.0 blue:82.0/255.0 alpha:1.0];
+    imagePickerVc.maxImagesCount = videoCount;
+    imagePickerVc.allowPickingImage = NO;
+    imagePickerVc.allowPickingVideo = YES;
+    imagePickerVc.allowTakeVideo = isCamera;
+    imagePickerVc.allowTakePicture = NO;
+    imagePickerVc.allowPickingGif = NO;
+    imagePickerVc.allowCrop = NO;
+    imagePickerVc.showSelectedIndex = showSelectedIndex;
+    imagePickerVc.sortAscendingByModificationDate = sortAscendingByModificationDate;
+    imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
+
+    if (videoCount == 1) {
+        imagePickerVc.showSelectBtn = NO;
+    }
+
+    __weak TZImagePickerController *weakPickerVc = imagePickerVc;
+    [imagePickerVc setDidFinishPickingPhotosWithInfosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto, NSArray<NSDictionary *> *infos) {
+        [weakPickerVc showProgressHUD];
+        NSMutableArray *videoResults = [NSMutableArray array];
+        [assets enumerateObjectsUsingBlock:^(PHAsset * _Nonnull asset, NSUInteger idx, BOOL * _Nonnull stop) {
+            if (asset.mediaType == PHAssetMediaTypeVideo) {
+                [[TZImageManager manager] getVideoOutputPathWithAsset:asset presetName:AVAssetExportPresetHighestQuality success:^(NSString *outputPath) {
+                    [videoResults addObject:[self handleVideoPickerData:outputPath asset:asset]];
+                    if ([videoResults count] == [assets count]) {
+                        [self invokeSuccessWithResult:videoResults];
+                    }
+                } failure:^(NSString *errorMessage, NSError *error) {
+                    [self invokeError];
+                }];
+            }
+        }];
+        [weakPickerVc hideProgressHUD];
+    }];
+
+    [imagePickerVc setImagePickerControllerDidCancelHandle:^{
+        [self invokeError];
+        [weakPickerVc hideProgressHUD];
+    }];
+
+    [[self topViewController] presentViewController:imagePickerVc animated:YES completion:nil];
+}
+
 - (void)openImagePicker {
     // 照片最大可选张数
-    NSInteger imageCount = [self.pickOptions sy_integerForKey:@"imageCount"];
+    NSInteger imageCount = _cameraOptions->imageCount();
     // 显示内部拍照按钮
-    BOOL isCamera        = [self.pickOptions sy_boolForKey:@"isCamera"];
-    BOOL isCrop          = [self.pickOptions sy_boolForKey:@"isCrop"];
-    BOOL isGif           = [self.pickOptions sy_boolForKey:@"isGif"];
-    BOOL showCropCircle  = [self.pickOptions sy_boolForKey:@"showCropCircle"];
-    BOOL isRecordSelected = [self.pickOptions sy_boolForKey:@"isRecordSelected"];
-    BOOL allowPickingOriginalPhoto = [self.pickOptions sy_boolForKey:@"allowPickingOriginalPhoto"];
-    BOOL allowPickingMultipleVideo = [self.pickOptions sy_boolForKey:@"allowPickingMultipleVideo"];
-    BOOL sortAscendingByModificationDate = [self.pickOptions sy_boolForKey:@"sortAscendingByModificationDate"];
-    BOOL showSelectedIndex = [self.pickOptions sy_boolForKey:@"showSelectedIndex"];
-    NSInteger CropW      = [self.pickOptions sy_integerForKey:@"CropW"];
-    NSInteger CropH      = [self.pickOptions sy_integerForKey:@"CropH"];
-    NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
-    NSInteger   quality  = [self.pickOptions sy_integerForKey:@"quality"];
+    BOOL isCamera        = _cameraOptions->isCamera();
+    BOOL isCrop          = _cameraOptions->isCrop();
+    BOOL isGif           = _cameraOptions->isGif();
+    BOOL showCropCircle  = _cameraOptions->showCropCircle();
+    BOOL isRecordSelected = _cameraOptions->isRecordSelected();
+    BOOL allowPickingOriginalPhoto = _cameraOptions->allowPickingOriginalPhoto();
+    BOOL allowPickingMultipleVideo = _cameraOptions->allowPickingMultipleVideo();
+    BOOL sortAscendingByModificationDate = _cameraOptions->sortAscendingByModificationDate();
+    BOOL showSelectedIndex = _cameraOptions->showSelectedIndex();
+    NSInteger CropW      = _cameraOptions->CropW();
+    NSInteger CropH      = _cameraOptions->CropH();
+    NSInteger circleCropRadius = _cameraOptions->circleCropRadius();
+    NSInteger   quality  = _cameraOptions->quality();
 
     TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:imageCount delegate:self];
     imagePickerVc.iconThemeColor = [UIColor colorWithRed:255.0/255.0 green:177.0/255.0 blue:82.0/255.0 alpha:1.0];
@@ -208,12 +265,12 @@
                     [tzImagePickerVc hideProgressHUD];
 
                     TZAssetModel *assetModel = [[TZImageManager manager] createModelWithAsset:asset];
-                    BOOL isCrop          = [self.pickOptions sy_boolForKey:@"isCrop"];
-                    BOOL showCropCircle  = [self.pickOptions sy_boolForKey:@"showCropCircle"];
-                    NSInteger CropW      = [self.pickOptions sy_integerForKey:@"CropW"];
-                    NSInteger CropH      = [self.pickOptions sy_integerForKey:@"CropH"];
-                    NSInteger circleCropRadius = [self.pickOptions sy_integerForKey:@"circleCropRadius"];
-                    NSInteger quality = [self.pickOptions sy_integerForKey:@"quality"];
+                    BOOL isCrop          = self->_cameraOptions->isCrop();
+                    BOOL showCropCircle  = self->_cameraOptions->showCropCircle();
+                    NSInteger CropW      = self->_cameraOptions->CropW();
+                    NSInteger CropH      = self->_cameraOptions->CropH();
+                    NSInteger circleCropRadius = self->_cameraOptions->circleCropRadius();
+                    NSInteger   quality = self->_cameraOptions->quality();
 
                     if (isCrop) {
                         TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
@@ -253,7 +310,7 @@
 }
 
 - (BOOL)isAssetCanSelect:(PHAsset *)asset {
-    BOOL allowPickingGif = [self.pickOptions sy_boolForKey:@"isGif"];
+    BOOL allowPickingGif = _cameraOptions->isGif();
     BOOL isGIF = [[TZImageManager manager] getAssetType:asset] == TZAssetModelMediaTypePhotoGif;
     if (!allowPickingGif && isGIF) {
         return NO;
@@ -311,7 +368,7 @@
     NSString *fileExtension    = [filename pathExtension];
     NSMutableString *filePath = [NSMutableString string];
     BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
-    BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
+    BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
     
     if (isPNG) {
         [filePath appendString:[NSString stringWithFormat:@"%@SyanImageCaches/%@", NSTemporaryDirectory(), filename]];
@@ -328,7 +385,7 @@
     NSInteger size = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
     photo[@"size"] = @(size);
     photo[@"mediaType"] = @(phAsset.mediaType);
-    if ([self.pickOptions sy_boolForKey:@"enableBase64"]) {
+    if (_cameraOptions->enableBase64()) {
         if(isPNG){
             photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
         }else{
@@ -350,7 +407,7 @@
     NSData *writeData = nil;
     NSMutableString *filePath = [NSMutableString string];
     BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
-    BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
+    BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
     
     if (isGIF) {
         image = [UIImage sd_tz_animatedGIFWithData:data];
@@ -374,7 +431,7 @@
     NSInteger size      = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:nil].fileSize;
     photo[@"size"]      = @(size);
     photo[@"mediaType"] = @(phAsset.mediaType);
-    if ([self.pickOptions sy_boolForKey:@"enableBase64"] && !isGIF) {
+    if (_cameraOptions->enableBase64() && !isGIF) {
         if(isPNG){
             photo[@"base64"] = [NSString stringWithFormat:@"data:image/png;base64,%@", [writeData base64EncodedStringWithOptions:0]];
         }else{
@@ -385,7 +442,7 @@
     return photo;
 }
 
-/// 处理视频数据
+/// 处理视频数据 (混合选择模式)
 - (NSDictionary *)handleVideoData:(NSString *)outputPath asset:(PHAsset *)asset coverImage:(UIImage *)coverImage quality:(CGFloat)quality {
     NSMutableDictionary *video = [NSMutableDictionary dictionary];
     video[@"uri"] = outputPath;
@@ -405,6 +462,26 @@
     return video;
 }
 
+/// 处理视频数据 (纯视频选择模式，返回格式兼容 react-native-image-crop-picker)
+- (NSDictionary *)handleVideoPickerData:(NSString *)outputPath asset:(PHAsset *)asset {
+    NSMutableDictionary *video = [NSMutableDictionary dictionary];
+    video[@"path"] = [NSString stringWithFormat:@"file://%@", outputPath];
+    video[@"size"] = @([[[NSFileManager defaultManager] attributesOfItemAtPath:outputPath error:nil] fileSize]);
+    video[@"width"] = @(asset.pixelWidth);
+    video[@"height"] = @(asset.pixelHeight);
+    video[@"duration"] = @((long long)(asset.duration * 1000));
+    video[@"mime"] = @"video/mp4";
+    video[@"filename"] = [asset valueForKey:@"filename"];
+    video[@"localIdentifier"] = asset.localIdentifier;
+    video[@"sourceURL"] = [NSString stringWithFormat:@"assets-library://asset/asset.mov?id=%@&ext=mov", asset.localIdentifier];
+    // modificationDate
+    if (asset.modificationDate) {
+        video[@"modificationDate"] = [NSString stringWithFormat:@"%.0f", [asset.modificationDate timeIntervalSince1970]];
+    }
+
+    return video;
+}
+
 /// 创建SyanImageCaches缓存目录
 - (BOOL)createDir {
     NSString * path = [NSString stringWithFormat:@"%@SyanImageCaches", NSTemporaryDirectory()];;

package/lib/module/NativeImagePicker.js

@@ -58,5 +58,14 @@ export const defaultOptions = {
   // 对照片排序，按修改时间升序，默认是YES。如果设置为NO,最新的照片会显示在最前面，内部的拍照按钮会排在第一个
   showSelectedIndex: false // 是否显示序号， 默认不显示
 };
+export const defaultVideoOptions = {
+  videoCount: 1,
+  isCamera: true,
+  MaxSecond: 180,
+  MinSecond: 1,
+  videoMaximumDuration: 600,
+  sortAscendingByModificationDate: true,
+  showSelectedIndex: false
+};
 export default TurboModuleRegistry.getEnforcing('NativeImagePicker');
 //# sourceMappingURL=NativeImagePicker.js.map

package/lib/module/NativeImagePicker.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","Dimensions","width","get","defaultOptions","imageCount","isRecordSelected","isCamera","isCrop","CropW","CropH","isGif","showCropCircle","circleCropRadius","showCropFrame","showCropGrid","freeStyleCropEnabled","rotateEnabled","scaleEnabled","compress","compressFocusAlpha","minimumCompressSize","quality","enableBase64","allowPickingOriginalPhoto","allowPickingMultipleVideo","videoMaximumDuration","isWeChatStyle","sortAscendingByModificationDate","showSelectedIndex","getEnforcing"],"sourceRoot":"../../src","sources":["NativeImagePicker.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AACpE,SAASC,UAAU,QAAQ,cAAc;AAyCzC,MAAM;EAAEC;AAAM,CAAC,GAAGD,UAAU,CAACE,GAAG,CAAC,QAAQ,CAAC;;AAE1C;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAG;EAC1BC,UAAU,EAAE,CAAC;EAAc;EAC3BC,gBAAgB,EAAE,KAAK;EAAI;EAC3BC,QAAQ,EAAE,IAAI;EAAa;EAC3BC,MAAM,EAAE,KAAK;EAAc;EAC3BC,KAAK,EAAE,CAAC,EAAEP,KAAK,GAAG,GAAG,CAAC;EAAK;EAC3BQ,KAAK,EAAE,CAAC,EAAER,KAAK,GAAG,GAAG,CAAC;EAAK;EAC3BS,KAAK,EAAE,KAAK;EAAe;EAC3BC,cAAc,EAAE,KAAK;EAAM;EAC3BC,gBAAgB,EAAE,CAAC,EAAEX,KAAK,GAAG,CAAC,CAAC;EAAE;EACjCY,aAAa,EAAE,IAAI;EAAQ;EAC3BC,YAAY,EAAE,KAAK;EAAQ;EAC3BC,oBAAoB,EAAE,KAAK;EAAE;EAC7BC,aAAa,EAAE,IAAI;EAAQ;EAC3BC,YAAY,EAAE,IAAI;EAAS;EAC3BC,QAAQ,EAAE,IAAI;EACdC,kBAAkB,EAAC,KAAK;EAAI;EAC5BC,mBAAmB,EAAE,GAAG;EAAG;EAC3BC,OAAO,EAAE,EAAE;EAAgB;EAC3BC,YAAY,EAAE,KAAK;EAAQ;EAC3BC,yBAAyB,EAAE,KAAK;EAChCC,yBAAyB,EAAE,KAAK;EAAE;EAClCC,oBAAoB,EAAE,EAAE,GAAG,EAAE;EAAE;EAC/BC,aAAa,EAAE,KAAK;EAAO;EAC3BC,+BAA+B,EAAE,IAAI;EAAE;EACvCC,iBAAiB,EAAE,KAAK,CAAE;AAC9B,CAAC;AAKD,eAAe7B,mBAAmB,CAAC8B,YAAY,CAAO,mBAAmB,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","Dimensions","width","get","defaultOptions","imageCount","isRecordSelected","isCamera","isCrop","CropW","CropH","isGif","showCropCircle","circleCropRadius","showCropFrame","showCropGrid","freeStyleCropEnabled","rotateEnabled","scaleEnabled","compress","compressFocusAlpha","minimumCompressSize","quality","enableBase64","allowPickingOriginalPhoto","allowPickingMultipleVideo","videoMaximumDuration","isWeChatStyle","sortAscendingByModificationDate","showSelectedIndex","defaultVideoOptions","videoCount","MaxSecond","MinSecond","getEnforcing"],"sourceRoot":"../../src","sources":["NativeImagePicker.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AACpE,SAASC,UAAU,QAAQ,cAAc;AAyCzC,MAAM;EAAEC;AAAM,CAAC,GAAGD,UAAU,CAACE,GAAG,CAAC,QAAQ,CAAC;;AAE1C;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAG;EAC1BC,UAAU,EAAE,CAAC;EAAc;EAC3BC,gBAAgB,EAAE,KAAK;EAAI;EAC3BC,QAAQ,EAAE,IAAI;EAAa;EAC3BC,MAAM,EAAE,KAAK;EAAc;EAC3BC,KAAK,EAAE,CAAC,EAAEP,KAAK,GAAG,GAAG,CAAC;EAAK;EAC3BQ,KAAK,EAAE,CAAC,EAAER,KAAK,GAAG,GAAG,CAAC;EAAK;EAC3BS,KAAK,EAAE,KAAK;EAAe;EAC3BC,cAAc,EAAE,KAAK;EAAM;EAC3BC,gBAAgB,EAAE,CAAC,EAAEX,KAAK,GAAG,CAAC,CAAC;EAAE;EACjCY,aAAa,EAAE,IAAI;EAAQ;EAC3BC,YAAY,EAAE,KAAK;EAAQ;EAC3BC,oBAAoB,EAAE,KAAK;EAAE;EAC7BC,aAAa,EAAE,IAAI;EAAQ;EAC3BC,YAAY,EAAE,IAAI;EAAS;EAC3BC,QAAQ,EAAE,IAAI;EACdC,kBAAkB,EAAC,KAAK;EAAI;EAC5BC,mBAAmB,EAAE,GAAG;EAAG;EAC3BC,OAAO,EAAE,EAAE;EAAgB;EAC3BC,YAAY,EAAE,KAAK;EAAQ;EAC3BC,yBAAyB,EAAE,KAAK;EAChCC,yBAAyB,EAAE,KAAK;EAAE;EAClCC,oBAAoB,EAAE,EAAE,GAAG,EAAE;EAAE;EAC/BC,aAAa,EAAE,KAAK;EAAO;EAC3BC,+BAA+B,EAAE,IAAI;EAAE;EACvCC,iBAAiB,EAAE,KAAK,CAAE;AAC9B,CAAC;AAqBD,OAAO,MAAMC,mBAAmB,GAAG;EAC/BC,UAAU,EAAE,CAAC;EACbxB,QAAQ,EAAE,IAAI;EACdyB,SAAS,EAAE,GAAG;EACdC,SAAS,EAAE,CAAC;EACZP,oBAAoB,EAAE,GAAG;EACzBE,+BAA+B,EAAE,IAAI;EACrCC,iBAAiB,EAAE;AACvB,CAAC;AAOD,eAAe7B,mBAAmB,CAACkC,YAAY,CAAO,mBAAmB,CAAC","ignoreList":[]}

package/lib/typescript/src/NativeImagePicker.d.ts

@@ -68,8 +68,36 @@ export declare const defaultOptions: {
     sortAscendingByModificationDate: boolean;
     showSelectedIndex: boolean;
 };
+export type VideoPickerOption = {
+    videoCount: number;
+    isCamera: boolean;
+    MaxSecond: number;
+    MinSecond: number;
+    videoMaximumDuration: number;
+    sortAscendingByModificationDate: boolean;
+    showSelectedIndex: boolean;
+};
+interface SelectedVideo {
+    path: string;
+    size: number;
+    width: number;
+    height: number;
+    duration: number | null;
+    mime: string;
+    filename?: string;
+}
+export declare const defaultVideoOptions: {
+    videoCount: number;
+    isCamera: boolean;
+    MaxSecond: number;
+    MinSecond: number;
+    videoMaximumDuration: number;
+    sortAscendingByModificationDate: boolean;
+    showSelectedIndex: boolean;
+};
 export interface Spec extends TurboModule {
-    asyncShowImagePicker(options: Object): Promise<Array<SelectedPhoto>>;
+    asyncShowImagePicker(options: ImagePickerOption): Promise<Array<SelectedPhoto>>;
+    asyncShowVideoPicker(options: VideoPickerOption): Promise<Array<SelectedVideo>>;
 }
 declare const _default: Spec;
 export default _default;

package/lib/typescript/src/NativeImagePicker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeImagePicker.d.ts","sourceRoot":"","sources":["../../../src/NativeImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAC,OAAO,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,yBAAyB,EAAE,OAAO,CAAC;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B,EAAE,OAAO,CAAA;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAC,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,MAAM,CAAA;CACd;AAGH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B1B,CAAC;AACF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CACrE;;AAED,wBAA2E"}
+{"version":3,"file":"NativeImagePicker.d.ts","sourceRoot":"","sources":["../../../src/NativeImagePicker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAC,OAAO,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,yBAAyB,EAAE,OAAO,CAAC;IACnC,yBAAyB,EAAE,OAAO,CAAC;IACnC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;IACvB,+BAA+B,EAAE,OAAO,CAAA;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAA;AAEH,MAAM,WAAW,aAAa;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAC,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,MAAM,CAAA;CACd;AAGH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;CA0B1B,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,+BAA+B,EAAE,OAAO,CAAC;IACzC,iBAAiB,EAAE,OAAO,CAAC;CAC9B,CAAA;AAED,UAAU,aAAa;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAA;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,oBAAoB,CAAC,OAAO,EAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IAC/E,oBAAoB,CAAC,OAAO,EAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CAChF;;AAED,wBAA2E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotta/react-native-imagepicker",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "@hotta/react-native-imagepicker",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/NativeImagePicker.ts

@@ -31,7 +31,7 @@ export type ImagePickerOption = {
     showSelectedIndex: boolean, // 是否显示序号， 默认不显示
   }
 
-  export interface SelectedPhoto {
+export interface SelectedPhoto {
     width: number, 	 //图片宽度
     height: number,  	//图片高度
     uri: string,	  //图片路径
@@ -72,8 +72,39 @@ export const defaultOptions = {
     sortAscendingByModificationDate: true, // 对照片排序，按修改时间升序，默认是YES。如果设置为NO,最新的照片会显示在最前面，内部的拍照按钮会排在第一个
     showSelectedIndex: false, // 是否显示序号， 默认不显示
 };
+export type VideoPickerOption = {
+    videoCount: number,          // 最大选择视频数目，默认1
+    isCamera: boolean,           // 是否允许录制视频，默认true
+    MaxSecond: number,           // 选择视频最大时长，默认是180秒
+    MinSecond: number,           // 选择视频最小时长，默认是1秒
+    videoMaximumDuration: number, // 视频最大录制时长，默认是600秒
+    sortAscendingByModificationDate: boolean, // 按修改时间升序，默认是YES
+    showSelectedIndex: boolean,  // 是否显示序号，默认不显示
+}
+
+interface SelectedVideo {
+    path: string,           // 视频路径
+    size: number,           // 文件大小，单位为字节
+    width: number,          // 视频宽度
+    height: number,         // 视频高度
+    duration: number | null, // 视频时长，单位毫秒
+    mime: string,           // 视频mime类型，如 "video/mp4"
+    filename?: string,      // 视频文件名
+}
+
+export const defaultVideoOptions = {
+    videoCount: 1,
+    isCamera: true,
+    MaxSecond: 180,
+    MinSecond: 1,
+    videoMaximumDuration: 600,
+    sortAscendingByModificationDate: true,
+    showSelectedIndex: false,
+}
+
 export interface Spec extends TurboModule {
-  asyncShowImagePicker(options:Object): Promise<Array<SelectedPhoto>>;
+  asyncShowImagePicker(options:ImagePickerOption): Promise<Array<SelectedPhoto>>;
+  asyncShowVideoPicker(options:VideoPickerOption): Promise<Array<SelectedVideo>>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('NativeImagePicker');

package/src/index.tsx

@@ -0,0 +1,10 @@
+import NativeImagePicker from './NativeImagePicker';
+
+const HTNativeImagePicker = (() => {
+  return {
+    asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker,
+    asyncShowVideoPicker: NativeImagePicker.asyncShowVideoPicker,
+  };
+})()
+
+export default HTNativeImagePicker