Merge the code submitted by guoyongxin

This commit is contained in:
yaw
2018-11-13 15:09:02 +08:00
parent a8703b7a8d
commit 45120722b7
3 changed files with 5 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-mediapicker-dmcsdk",
"version": "2.4.0",
"version": "2.4.2",
"description": "android ios mediaPicker support selection of multiple image and video",
"cordova": {
"id": "cordova-plugin-mediapicker-dmcsdk",

View File

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mediapicker-dmcsdk" version="2.3.9">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mediapicker-dmcsdk" version="2.4.2">
<name>MediaPicker</name>
<js-module name="MediaPicker" src="www/MediaPicker.js">
<clobbers target="window.MediaPicker"/>
</js-module>
<preference name="IOS_PHOTO_LIBRARY_USAGE_DESCRIPTION" />
<platform name="android">
<config-file parent="/*" target="res/xml/config.xml">
<feature name="MediaPicker">
@@ -25,6 +23,7 @@
<platform name="ios">
<preference name="IOS_PHOTO_LIBRARY_USAGE_DESCRIPTION" />
<config-file parent="/*" target="config.xml">
<feature name="MediaPicker">
<param name="ios-package" value="MediaPicker"/>

View File

@@ -204,8 +204,8 @@
options.predicate = [NSPredicate predicateWithFormat:@"mediaType == %ld", PHAssetMediaTypeVideo];
}
int defaultSelection = 0;
int i = 0;
int defaultSelection, i = 0; //CameraRoll
for (PHFetchResult *fetchResult in allAlbums) {
for (PHAssetCollection *collection in fetchResult) {
// PHCollectionList