Unverified Commit 68c3893b authored by 少言's avatar 少言 Committed by GitHub

Merge pull request #91 from NikiLee2016/branch-base64

Branch base64
parents 49a9ddd0 031d0910
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.reactlibrary"> package="com.reactlibrary">
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
<application> <application>
</application> </application>
......
...@@ -205,9 +205,19 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule { ...@@ -205,9 +205,19 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule {
private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() { private final ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
@Override @Override
public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) { public void onActivityResult(Activity activity, int requestCode, int resultCode, final Intent data) {
switch (requestCode) { if(requestCode == PictureConfig.CHOOSE_REQUEST){
case PictureConfig.CHOOSE_REQUEST: new Thread(new Runnable() {
@Override
public void run() {
onGetResult(data);
}
}).run();
}
}
};
private void onGetResult(Intent data){
List<LocalMedia> tmpSelectList = PictureSelector.obtainMultipleResult(data); List<LocalMedia> tmpSelectList = PictureSelector.obtainMultipleResult(data);
boolean isRecordSelected = cameraOptions.getBoolean("isRecordSelected"); boolean isRecordSelected = cameraOptions.getBoolean("isRecordSelected");
if (!tmpSelectList.isEmpty() && isRecordSelected) { if (!tmpSelectList.isEmpty() && isRecordSelected) {
...@@ -263,7 +273,6 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule { ...@@ -263,7 +273,6 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule {
} else { } else {
aImage.putString("original_uri", "file://" + media.getPath()); aImage.putString("original_uri", "file://" + media.getPath());
} }
imageList.pushMap(aImage); imageList.pushMap(aImage);
} }
if (tmpSelectList.isEmpty()) { if (tmpSelectList.isEmpty()) {
...@@ -272,8 +281,6 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule { ...@@ -272,8 +281,6 @@ public class RNSyanImagePickerModule extends ReactContextBaseJavaModule {
invokeSuccessWithResult(imageList); invokeSuccessWithResult(imageList);
} }
} }
}
};
/** /**
* 获取图片base64编码字符串 * 获取图片base64编码字符串
......
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