@hotta/react-native-imagepicker 0.1.6 → 0.1.7

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

@@ -1,6 +1,7 @@
 package com.htreactnative.imagepicker
 
 import android.graphics.BitmapFactory
+import android.graphics.Color
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
@@ -10,8 +11,13 @@ 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.SelectMimeType
+import com.luck.picture.lib.config.SelectModeConfig
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
+import com.luck.picture.lib.style.BottomNavBarStyle
+import com.luck.picture.lib.style.PictureSelectorStyle
+import com.luck.picture.lib.style.SelectMainStyle
+import com.luck.picture.lib.style.TitleBarStyle
 import com.luck.picture.lib.utils.SdkVersionUtils
 import java.io.File
 import java.util.ArrayList
@@ -44,7 +50,7 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
                 }
 
                 override fun onCancel() {
-
+                    promise?.reject("", "取消")
                 }
 
             })
@@ -56,9 +62,13 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
     ) {
         pickerOptions = options;
         val videoCount = options?.getInt("videoCount") ?: 1
+        val isCamera = options?.getBoolean("isCamera") ?: false
         PictureSelector.create(reactApplicationContext.currentActivity)
             .openGallery(SelectMimeType.ofVideo())
-            .setMaxSelectNum(videoCount)
+            .setSelectionMode(SelectModeConfig.SINGLE)
+            .setMaxSelectNum(1)
+            .isDisplayCamera(isCamera)
+            .setSelectorUIStyle(getNoCountStyle())
             .setImageEngine(imageEngine)
             .forResult(object : OnResultCallbackListener<LocalMedia> {
                 override fun onResult(localMediaList: ArrayList<LocalMedia?>?) {
@@ -70,12 +80,39 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
                 }
 
                 override fun onCancel() {
-
+                    promise?.reject("", "取消")
                 }
 
             })
     }
 
+    private fun getNoCountStyle(): PictureSelectorStyle {
+        return PictureSelectorStyle().apply {
+            selectMainStyle = SelectMainStyle().apply {
+                // 隐藏选择后的数字/角标索引
+                isSelectNumberStyle = false
+                isPreviewSelectNumberStyle = false
+//                selectBackground = android.R.color.transparent
+                selectText = "下一步"
+                selectTextColor = Color.WHITE
+            }
+            bottomBarStyle = BottomNavBarStyle().apply {
+                isCompleteCountTips = false
+                bottomPreviewNormalText = "" // 未选中任何文件时的文字设为空
+                bottomPreviewSelectText = "" // 选中文件后的文字设为空
+
+                // （可选保障）为了防止有默认的点击态背景，你可以顺手把它的颜色也设为透明
+                bottomPreviewNormalTextColor = android.R.color.transparent
+                bottomPreviewSelectTextColor = android.R.color.transparent
+            }
+
+            titleBarStyle = TitleBarStyle().apply {
+
+            }
+
+        }
+    }
+
     private fun getVideoResult(media: LocalMedia): WritableMap {
         val videoMap: WritableMap = WritableNativeMap()
         var path: String = media.path
@@ -92,7 +129,7 @@ class NativeImagePickerModule(reactContext: ReactApplicationContext) :
         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.putLong("size", media.size)
         videoMap.putString("filename", media.fileName)
         return videoMap
     }

package/lib/module/index.js

@@ -1,15 +1,10 @@
 "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);
-    }
+    asyncShowImagePicker: NativeImagePicker.asyncShowImagePicker,
+    asyncShowVideoPicker: NativeImagePicker.asyncShowVideoPicker
   };
 })();
 export default HTNativeImagePicker;

package/lib/module/index.js.map

@@ -1 +1,2 @@
-{"version":3,"names":["NativeImagePicker","defaultOptions","HTNativeImagePicker","asyncShowImagePicker","options","_options"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA,OAAOA,iBAAiB,IAAIC,cAAc,QAAoD,wBAAqB;AAEnH,MAAMC,mBAAmB,GAAG,CAAC,MAAM;EACjC,OAAO;IACLC,oBAAoB,EAAGC,OAA0B,IAAM;MACrD,MAAMC,QAAQ,GAAG;QAAE,GAAGJ,cAAc;QAAE,GAAGG;MAAQ,CAAC;MAClD,OAAOJ,iBAAiB,CAACG,oBAAoB,CAACE,QAAQ,CAAC;IACzD;EACF,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeH,mBAAmB","ignoreList":[]}
+{"version":3,"names":["NativeImagePicker","HTNativeImagePicker","asyncShowImagePicker","asyncShowVideoPicker"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,iBAAiB,MAAM,wBAAqB;AAEnD,MAAMC,mBAAmB,GAAG,CAAC,MAAM;EACjC,OAAO;IACLC,oBAAoB,EAAEF,iBAAiB,CAACE,oBAAoB;IAC5DC,oBAAoB,EAAEH,iBAAiB,CAACG;EAC1C,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeF,mBAAmB","ignoreList":[]}
+AClD,OAAOJ,iBAAiB,CAACG,oBAAoB,CAACE,QAAQ,CAAC;IACzD,CAAC;IACDC,oBAAoB,EAAGF,OAA0B,IAAM;MACrD,MAAMC,QAAQ,GAAG;QAAE,GAAGJ,cAAc;QAAE,GAAGG;MAAQ,CAAC;MAClD,OAAOJ,iBAAiB,CAACM,oBAAoB,CAACD,QAAQ,CAAC;IACzD;EACF,CAAC;AACH,CAAC,EAAE,CAAC;AAEJ,eAAeH,mBAAmB","ignoreList":[]}

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

@@ -70,14 +70,14 @@ export declare const defaultOptions: {
 };
 export type VideoPickerOption = {
     videoCount: number;
-    isCamera: boolean;
-    MaxSecond: number;
-    MinSecond: number;
-    videoMaximumDuration: number;
-    sortAscendingByModificationDate: boolean;
-    showSelectedIndex: boolean;
+    isCamera?: boolean;
+    MaxSecond?: number;
+    MinSecond?: number;
+    videoMaximumDuration?: number;
+    sortAscendingByModificationDate?: boolean;
+    showSelectedIndex?: boolean;
 };
-interface SelectedVideo {
+export interface SelectedVideo {
     path: string;
     size: number;
     width: number;

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;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"}
+{"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,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAA;AAED,MAAM,WAAW,aAAa;IAC1B,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/lib/typescript/src/index.d.ts

@@ -1,7 +1,8 @@
-import { type ImagePickerOption, type SelectedPhoto } from './NativeImagePicker';
+import { type ImagePickerOption, type SelectedPhoto, type VideoPickerOption } from './NativeImagePicker';
 export type { SelectedPhoto, ImagePickerOption };
 declare const HTNativeImagePicker: {
     asyncShowImagePicker: (options: ImagePickerOption) => Promise<SelectedPhoto[]>;
+    asyncShowVideoPicker: (options: VideoPickerOption) => Promise<import("./NativeImagePicker").SelectedVideo[]>;
 };
 export default HTNativeImagePicker;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAA0B,EAAkB,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpH,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;AACjD,QAAA,MAAM,mBAAmB;oCAEW,iBAAiB;CAKjD,CAAA;AAEJ,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAA0B,EAExB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,MAAM,qBAAqB,CAAC;AAC9B,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;AACjD,QAAA,MAAM,mBAAmB;oCAEW,iBAAiB;oCAIjB,iBAAiB;CAKjD,CAAA;AAEJ,eAAe,mBAAmB,CAAA"}

package/package.json

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

package/src/NativeImagePicker.ts

@@ -74,15 +74,15 @@ export const defaultOptions = {
 };
 export type VideoPickerOption = {
     videoCount: number,          // 最大选择视频数目，默认1
-    isCamera: boolean,           // 是否允许录制视频，默认true
-    MaxSecond: number,           // 选择视频最大时长，默认是180秒
-    MinSecond: number,           // 选择视频最小时长，默认是1秒
-    videoMaximumDuration: number, // 视频最大录制时长，默认是600秒
-    sortAscendingByModificationDate: boolean, // 按修改时间升序，默认是YES
-    showSelectedIndex: boolean,  // 是否显示序号，默认不显示
+    isCamera?: boolean,           // 是否允许录制视频，默认true
+    MaxSecond?: number,           // 选择视频最大时长，默认是180秒
+    MinSecond?: number,           // 选择视频最小时长，默认是1秒
+    videoMaximumDuration?: number, // 视频最大录制时长，默认是600秒
+    sortAscendingByModificationDate?: boolean, // 按修改时间升序，默认是YES
+    showSelectedIndex?: boolean,  // 是否显示序号，默认不显示
 }
 
-interface SelectedVideo {
+export interface SelectedVideo {
     path: string,           // 视频路径
     size: number,           // 文件大小，单位为字节
     width: number,          // 视频宽度

package/src/index.ts

@@ -1,11 +1,20 @@
-import NativeImagePicker, { defaultOptions, type ImagePickerOption, type SelectedPhoto } from './NativeImagePicker';
+import NativeImagePicker, { 
+  defaultOptions, 
+  type ImagePickerOption, 
+  type SelectedPhoto,
+  type VideoPickerOption
+ } from './NativeImagePicker';
 export type { SelectedPhoto, ImagePickerOption };
 const HTNativeImagePicker = (() => {
   return {
     asyncShowImagePicker: (options: ImagePickerOption ) => {
       const _options = { ...defaultOptions, ...options }
       return NativeImagePicker.asyncShowImagePicker(_options)
-    } 
+    },
+    asyncShowVideoPicker: (options: VideoPickerOption ) => {
+      const _options = { ...defaultOptions, ...options }
+      return NativeImagePicker.asyncShowVideoPicker(_options)
+    },
   };
 })()