@hotta/react-native-imagepicker 0.1.8 → 0.2.2

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

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
 import com.luck.picture.lib.basic.PictureSelector
+import com.luck.picture.lib.config.InjectResourceSource
 import com.luck.picture.lib.config.SelectMimeType
 import com.luck.picture.lib.config.SelectModeConfig
 import com.luck.picture.lib.entity.LocalMedia
@@ -69,6 +70,15 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
             .setMaxSelectNum(1)
             .isDisplayCamera(isCamera)
             .setSelectorUIStyle(getNoCountStyle())
+            .setInjectLayoutResourceListener { _, resourceSource ->
+                when (resourceSource) {
+                    InjectResourceSource.MAIN_SELECTOR_LAYOUT_RESOURCE ->
+                        R.layout.image_picker_fragment_selector
+                    InjectResourceSource.MAIN_ITEM_VIDEO_LAYOUT_RESOURCE ->
+                        R.layout.image_picker_item_grid_video
+                    else -> InjectResourceSource.DEFAULT_LAYOUT_RESOURCE
+                }
+            }
             .setImageEngine(imageEngine)
             .forResult(object : OnResultCallbackListener<LocalMedia> {
                 override fun onResult(localMediaList: ArrayList<LocalMedia?>?) {
@@ -92,9 +102,15 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
                 // 隐藏选择后的数字/角标索引
                 isSelectNumberStyle = false
                 isPreviewSelectNumberStyle = false
-//                selectBackground = android.R.color.transparent
+                // 预览页点击“下一步”时，自动选择当前视频并返回
+                isCompleteSelectRelativeTop = true
+                // 隐藏列表页和预览页的勾选按钮
+                selectBackground = android.R.color.transparent
+                previewSelectBackground = android.R.color.transparent
                 selectText = "下一步"
                 selectTextColor = Color.WHITE
+                selectNormalText = "下一步"
+                selectNormalTextColor = Color.WHITE
             }
             bottomBarStyle = BottomNavBarStyle().apply {
                 isCompleteCountTips = false
@@ -102,8 +118,8 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
                 bottomPreviewSelectText = "" // 选中文件后的文字设为空
 
                 // （可选保障）为了防止有默认的点击态背景，你可以顺手把它的颜色也设为透明
-                bottomPreviewNormalTextColor = android.R.color.transparent
-                bottomPreviewSelectTextColor = android.R.color.transparent
+                bottomPreviewNormalTextColor = Color.WHITE
+                bottomPreviewSelectTextColor = Color.WHITE
             }
 
             titleBarStyle = TitleBarStyle().apply {

package/android/src/main/res/layout/image_picker_fragment_selector.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.luck.picture.lib.widget.RecyclerPreloadView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:overScrollMode="never"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_nar_bar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_bar" />
+
+    <com.luck.picture.lib.widget.MediumBoldTextView
+        android:id="@+id/tv_current_data_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:alpha="0"
+        android:background="@color/ps_color_99_black"
+        android:gravity="center_vertical"
+        android:paddingStart="10dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        android:textColor="@color/ps_color_white"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_bar" />
+
+    <com.luck.picture.lib.widget.TitleBar
+        android:id="@+id/title_bar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.luck.picture.lib.widget.BottomNavBar
+        android:id="@+id/bottom_nar_bar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <!-- The list page only needs Cancel; Next is shown on the preview page. -->
+    <com.luck.picture.lib.widget.CompleteSelectView
+        android:id="@+id/ps_complete_select"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+    <com.luck.picture.lib.widget.MediumBoldTextView
+        android:id="@+id/tv_data_empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:lineSpacingExtra="3dp"
+        android:text="@string/ps_empty"
+        android:textColor="@color/ps_color_aab2bd"
+        android:textSize="14sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

package/android/src/main/res/layout/image_picker_item_grid_video.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.luck.picture.lib.widget.SquareRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/ivPicture"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <!-- PictureSelector requires these views, but zero size removes the select control and hit area. -->
+    <com.luck.picture.lib.widget.MediumBoldTextView
+        android:id="@+id/tvCheck"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <View
+        android:id="@+id/btnCheck"
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
+
+    <com.luck.picture.lib.widget.MediumBoldTextView
+        android:id="@+id/tv_duration"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/ps_ic_shadow_bg"
+        android:drawableLeft="@drawable/ps_ic_video"
+        android:drawablePadding="5dp"
+        android:gravity="center_vertical"
+        android:paddingLeft="5dp"
+        android:text="00:00"
+        android:textColor="@color/ps_color_white"
+        android:textSize="11sp" />
+
+</com.luck.picture.lib.widget.SquareRelativeLayout>

package/ios/NativeImagePicker.mm

@@ -7,6 +7,8 @@
 @interface NativeImagePicker ()
 
 @property (nonatomic, strong) UIImagePickerController *imagePickerVc;
+
+@property (nonatomic, strong) NSDictionary *pickOptions;
 /**
  保存Promise的resolve block
  */
@@ -25,9 +27,6 @@
 @property (nonatomic, strong) NSMutableArray *selectedAssets;
 @end
 @implementation NativeImagePicker
-{
-    std::optional<JS::NativeImagePicker::ImagePickerOption> _cameraOptions;
-}
 
 - (instancetype)init {
     self = [super init];
@@ -52,26 +51,26 @@
     _selectedAssets = nil;
 }
 
-- (void)asyncShowImagePicker:(JS::NativeImagePicker::ImagePickerOption &)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
-    _cameraOptions = options;
+- (void)asyncShowImagePicker:(NSDictionary *)options resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    self.pickOptions = 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 {
+- (void)asyncShowVideoPicker:(NSDictionary *)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();
+- (void)openVideoPickerWithOptions:(NSDictionary *)options {
+    NSInteger videoCount = [options sy_integerForKey:@"videoCount"];
+    BOOL isCamera = [options sy_boolForKey:@"isCamera"];
+    BOOL sortAscendingByModificationDate = [options sy_boolForKey:@"sortAscendingByModificationDate"];
+    BOOL showSelectedIndex = [options sy_boolForKey:@"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];
@@ -91,22 +90,21 @@
     }
 
     __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];
-                }];
-            }
+    // 使用专门的视频回调
+    [imagePickerVc setDidFinishPickingVideoHandle:^(UIImage *coverImage, PHAsset *asset) {
+      
+        [[TZImageManager manager] getVideoOutputPathWithAsset:asset presetName:AVAssetExportPresetPassthrough success:^(NSString *outputPath) {
+            // 构建单个结果
+            NSDictionary *result = [self handleVideoPickerData:outputPath asset:asset];
+            
+            // 隐藏 HUD 并回调
+            [self invokeSuccessWithResult:@[result]];
+            [weakPickerVc dismissViewControllerAnimated:YES completion:nil];
+            
+        } failure:^(NSString *errorMessage, NSError *error) {
+            [self invokeError];
+            [weakPickerVc dismissViewControllerAnimated:YES completion:nil];
         }];
-        [weakPickerVc hideProgressHUD];
     }];
 
     [imagePickerVc setImagePickerControllerDidCancelHandle:^{
@@ -119,7 +117,7 @@
 
 - (void)openImagePicker {
     // 照片最大可选张数
-    NSInteger imageCount = _cameraOptions->imageCount();
+    NSInteger imageCount = [self.pickOptions sy_integerForKey:@"imageCount"];
     // 显示内部拍照按钮
     BOOL isCamera        = [self.pickOptions sy_boolForKey:@"isCamera"];
     BOOL isCrop          = [self.pickOptions sy_boolForKey:@"isCrop"];
@@ -408,7 +406,7 @@
     NSData *writeData = nil;
     NSMutableString *filePath = [NSMutableString string];
     BOOL isPNG = [fileExtension hasSuffix:@"PNG"] || [fileExtension hasSuffix:@"png"];
-    BOOL compressFocusAlpha = _cameraOptions->compressFocusAlpha();
+    BOOL compressFocusAlpha = [self.pickOptions sy_boolForKey:@"compressFocusAlpha"];
     
     if (isGIF) {
         image = [UIImage sd_tz_animatedGIFWithData:data];
@@ -470,7 +468,7 @@
     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[@"duration"] = @((long long)(asset.duration));
     video[@"mime"] = @"video/mp4";
     video[@"filename"] = [asset valueForKey:@"filename"];
     video[@"localIdentifier"] = asset.localIdentifier;

package/lib/module/index.js

@@ -1,16 +1,14 @@
 "use strict";
 
-import NativeImagePicker, { defaultOptions } from "./NativeImagePicker.js";
+import NativeImagePicker from "./NativeImagePicker.js";
 const HTNativeImagePicker = (() => {
   return {
-    asyncShowImagePicker: options => {
-      const _options = {
-        ...defaultOptions,
-        ...options
-      };
-      return NativeImagePicker.asyncShowImagePicker(_options);
-    },
-    asyncShowVideoPicker: options => {
+    asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker,
+    asyncShowVideoPicker: NativeImagePicker.asyncShowVideoPicker
+  };
+})();
+export default HTNativeImagePicker;
+//# sourceMappingURL=index.js.map  asyncShowVideoPicker: options => {
       const _options = {
         ...defaultOptions,
         ...options

package/package.json

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