|
|
@ -14,6 +14,8 @@ import android.provider.Settings; |
|
|
|
import android.support.annotation.Nullable; |
|
|
|
import android.support.design.widget.Snackbar; |
|
|
|
import android.support.v4.app.ActivityCompat; |
|
|
|
import android.support.v4.content.FileProvider; |
|
|
|
import android.util.Log; |
|
|
|
import android.view.LayoutInflater; |
|
|
|
import android.view.View; |
|
|
|
import android.view.ViewGroup; |
|
|
@ -26,13 +28,19 @@ import com.gmeremit.online.gmeremittance_native.R; |
|
|
|
import com.gmeremit.online.gmeremittance_native.base.BaseFragment; |
|
|
|
import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener; |
|
|
|
import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface; |
|
|
|
import com.gmeremit.online.gmeremittance_native.kycV2.view.KYCFormV2Activity; |
|
|
|
import com.gmeremit.online.gmeremittance_native.user_profile.view.ProfileActivity; |
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.other.DisplayUtils; |
|
|
|
import com.gmeremit.online.gmeremittance_native.utils.other.Utility; |
|
|
|
import com.yalantis.ucrop.UCrop; |
|
|
|
|
|
|
|
import java.io.ByteArrayOutputStream; |
|
|
|
import java.io.File; |
|
|
|
import java.io.FileNotFoundException; |
|
|
|
import java.io.FileOutputStream; |
|
|
|
import java.io.IOException; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
import butterknife.BindView; |
|
|
|
import butterknife.ButterKnife; |
|
|
@ -40,6 +48,8 @@ import butterknife.OnClick; |
|
|
|
import io.reactivex.Observable; |
|
|
|
import io.reactivex.disposables.CompositeDisposable; |
|
|
|
|
|
|
|
import static android.app.Activity.RESULT_OK; |
|
|
|
|
|
|
|
public class KYCView3Fragment extends BaseFragment implements View.OnClickListener, KYCV2PresenterInterface.KYCV2ContractInterface.KYCView3ContractInterface { |
|
|
|
|
|
|
|
public static final int FRONT_REGID = 1; |
|
|
@ -73,7 +83,6 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen |
|
|
|
|
|
|
|
Bitmap frontBitmap, backtBitmap, passbookBitmap, passportBitmap, selfieBitmap; |
|
|
|
|
|
|
|
Uri imageUriFront; |
|
|
|
|
|
|
|
|
|
|
|
@BindView(R.id.btn_submit) |
|
|
@ -81,6 +90,8 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen |
|
|
|
|
|
|
|
|
|
|
|
CompositeDisposable compositeDisposable = null; |
|
|
|
private Uri photoURI=null; |
|
|
|
private Uri croppedFileUri=null; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@ -128,13 +139,50 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen |
|
|
|
} |
|
|
|
|
|
|
|
public void takeAPicture(int requestCode, int i) { |
|
|
|
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); |
|
|
|
intent.putExtra(MediaStore.EXTRA_OUTPUT, imageUriFront); |
|
|
|
intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1); |
|
|
|
intent.putExtra("android.intent.extras.CAMERA_FACING", i); |
|
|
|
startActivityForResult(intent, requestCode); |
|
|
|
// Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); |
|
|
|
// intent.putExtra(MediaStore.EXTRA_OUTPUT, imageUriFront); |
|
|
|
// intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1); |
|
|
|
// intent.putExtra("android.intent.extras.CAMERA_FACING", i); |
|
|
|
// startActivityForResult(intent, requestCode); |
|
|
|
takeAPictureV2(requestCode); |
|
|
|
} |
|
|
|
|
|
|
|
private void takeAPictureV2(int requestCode) { |
|
|
|
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); |
|
|
|
if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) { |
|
|
|
File photoFile = null; |
|
|
|
try { |
|
|
|
photoFile = createImageFile(); |
|
|
|
} catch (IOException ex) { |
|
|
|
// Error occurred while creating the File |
|
|
|
} |
|
|
|
// Continue only if the File was successfully created |
|
|
|
if (photoFile != null) { |
|
|
|
photoURI = FileProvider.getUriForFile(getActivity(), |
|
|
|
"com.gmeremit.online.gmeremittance_native.fileprovider", |
|
|
|
photoFile); |
|
|
|
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI); |
|
|
|
startActivityForResult(takePictureIntent, requestCode); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private File createImageFile() throws IOException { |
|
|
|
// Create an image file name |
|
|
|
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date()); |
|
|
|
String imageFileName = "JPEG_" + timeStamp + "_"; |
|
|
|
File storageDir = getActivity().getExternalFilesDir(Environment.DIRECTORY_PICTURES); |
|
|
|
File image = File.createTempFile( |
|
|
|
imageFileName, /* prefix */ |
|
|
|
".jpg", /* suffix */ |
|
|
|
storageDir /* directory */ |
|
|
|
); |
|
|
|
|
|
|
|
// Save a file: path for use with ACTION_VIEW intents |
|
|
|
|
|
|
|
return image; |
|
|
|
} |
|
|
|
|
|
|
|
private void galleryIntent(int requestCode) { |
|
|
|
Intent intent = new Intent(); |
|
|
|
intent.setType("image/*"); |
|
|
@ -269,27 +317,86 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
// |
|
|
|
// @Override |
|
|
|
// public void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
|
// super.onActivityResult(requestCode, resultCode, data); |
|
|
|
// Bitmap bitmap; |
|
|
|
// try { |
|
|
|
// if (requestCode == SELFIE_REGID_CAMERA || |
|
|
|
// requestCode == FRONT_REGID_CAMERA || |
|
|
|
// requestCode == BACK_REGID_CAMERA || |
|
|
|
// requestCode == PASSBOOKREQ_CAMERA || |
|
|
|
// requestCode == PASSPORTREQ_CAMERA) |
|
|
|
// bitmap = (Bitmap) data.getExtras().get("data"); |
|
|
|
// else |
|
|
|
// bitmap = createBitmapFromGallerData(data); |
|
|
|
// } catch (NullPointerException ex) { |
|
|
|
// ex.printStackTrace(); |
|
|
|
// return; |
|
|
|
// } |
|
|
|
// ((KYCV2ActionListener) getActivity()).getPresenter().checkImageStatus(requestCode, resultCode, bitmap); |
|
|
|
// } |
|
|
|
|
|
|
|
@Override |
|
|
|
public void onActivityResult(int requestCode, int resultCode, Intent data) { |
|
|
|
super.onActivityResult(requestCode, resultCode, data); |
|
|
|
Bitmap bitmap; |
|
|
|
try { |
|
|
|
if (requestCode == SELFIE_REGID_CAMERA || |
|
|
|
requestCode == FRONT_REGID_CAMERA || |
|
|
|
requestCode == BACK_REGID_CAMERA || |
|
|
|
requestCode == PASSBOOKREQ_CAMERA || |
|
|
|
requestCode == PASSPORTREQ_CAMERA) |
|
|
|
bitmap = (Bitmap) data.getExtras().get("data"); |
|
|
|
else |
|
|
|
bitmap = createBitmapFromGallerData(data); |
|
|
|
requestCode == PASSPORTREQ_CAMERA) { |
|
|
|
|
|
|
|
//TODO uri is available from camera |
|
|
|
requestToCropImage(); |
|
|
|
} |
|
|
|
else if(requestCode== UCrop.REQUEST_CROP) |
|
|
|
{ |
|
|
|
if(resultCode==RESULT_OK){ |
|
|
|
//TODO create a thumbnail maintaining current aspect ratio and save the uri for later sending to server |
|
|
|
} |
|
|
|
frontRegIdImage.setImageBitmap(createBitmapFromUri(croppedFileUri)); |
|
|
|
else |
|
|
|
Log.d("IMAGE_FILE", UCrop.getError(data).getMessage()); |
|
|
|
} |
|
|
|
else { |
|
|
|
//TODO uri is available from gallery |
|
|
|
photoURI = data.getData(); |
|
|
|
requestToCropImage(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (NullPointerException ex) { |
|
|
|
ex.printStackTrace(); |
|
|
|
return; |
|
|
|
Log.d("IMAGE_FILE", ex.getMessage()); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void requestToCropImage() |
|
|
|
{ |
|
|
|
try { |
|
|
|
|
|
|
|
croppedFileUri=Uri.fromFile(createImageFile()); |
|
|
|
UCrop cropper= UCrop.of(photoURI, croppedFileUri) |
|
|
|
.withAspectRatio(16, 9) |
|
|
|
.withMaxResultSize(400, 400); |
|
|
|
|
|
|
|
cropper= DisplayUtils.advancedConfig(getActivity(), cropper); |
|
|
|
cropper.start(getActivity(),this); |
|
|
|
} |
|
|
|
catch (Exception e) |
|
|
|
{ |
|
|
|
Log.d("IMAGE_FILE", e.getMessage()); |
|
|
|
|
|
|
|
} |
|
|
|
((KYCV2ActionListener) getActivity()).getPresenter().checkImageStatus(requestCode, resultCode, bitmap); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private Bitmap createBitmapFromGallerData(Intent data) { |
|
|
|
|
|
|
|
Bitmap bm = null; |
|
|
@ -320,6 +427,20 @@ public class KYCView3Fragment extends BaseFragment implements View.OnClickListen |
|
|
|
} |
|
|
|
return bm; |
|
|
|
} |
|
|
|
private Bitmap createBitmapFromUri(Uri data) { |
|
|
|
|
|
|
|
Bitmap bm = null; |
|
|
|
if (data != null) { |
|
|
|
try { |
|
|
|
bm = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver(), data); |
|
|
|
} catch (IOException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return bm; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@OnClick(R.id.selfieImage_layout) |
|
|
|