diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java index 097dac7..6b0a676 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/StaySubmitAdapter.java @@ -22,9 +22,10 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Vector; public class StaySubmitAdapter extends RecyclerView.Adapter { - private List allRoad = new ArrayList<>(); + private Vector allRoad = new Vector<>(); private Context context; public StaySubmitAdapter(Context context) { @@ -55,15 +56,17 @@ public class StaySubmitAdapter extends RecyclerView.Adapter width) { - DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(intentPanorama, 100); - return false; - } - }); - } else { - - String takePhotoPath1 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); - ivAttestation1.setTag(takePhotoPath1); - ivAttestation1.setImageBitmap(bitmap);//显示图像 - ivHera1.setVisibility(View.GONE); - tvCard1.setVisibility(View.GONE); - } + String takePhotoPath1 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); + ivAttestation1.setTag(takePhotoPath1); + ivAttestation1.setImageBitmap(bitmap);//显示图像 + ivHera1.setVisibility(View.GONE); + tvCard1.setVisibility(View.GONE); +// int height = bitmap.getHeight(); +// int width = bitmap.getWidth(); +// if (height > width) { +// DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; +// MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { +// @Override +// public boolean onClick(BaseDialog baseDialog, View v) { +// Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); +// startActivityForResult(intentPanorama, 100); +// return false; +// } +// }); +// } } if (requestCode == 200 && resultCode == RESULT_OK) { Bundle extras = data.getExtras();//从Intent中获取附加值 Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像 - int height = bitmap.getHeight(); - int width = bitmap.getWidth(); - if (height > width) { - DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(intentPanorama, 200); - return false; - } - }); - } else { - String takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); - ivAttestation2.setTag(takePhotoPath2); - ivAttestation2.setImageBitmap(bitmap);//显示图像 - ivHera2.setVisibility(View.GONE); - tvCard2.setVisibility(View.GONE); - } + String takePhotoPath2 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); + ivAttestation2.setTag(takePhotoPath2); + ivAttestation2.setImageBitmap(bitmap);//显示图像 + ivHera2.setVisibility(View.GONE); + tvCard2.setVisibility(View.GONE); +// int height = bitmap.getHeight(); +// int width = bitmap.getWidth(); +// if (height > width) { +// DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; +// MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { +// @Override +// public boolean onClick(BaseDialog baseDialog, View v) { +// Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); +// startActivityForResult(intentPanorama, 200); +// return false; +// } +// }); +// } } if (requestCode == 300 && resultCode == RESULT_OK) { Bundle extras = data.getExtras();//从Intent中获取附加值 Bitmap bitmap = (Bitmap) extras.get("data");//从附加值中获取返回的图像 - int height = bitmap.getHeight(); - int width = bitmap.getWidth(); - if (height > width) { - DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; - MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { - @Override - public boolean onClick(BaseDialog baseDialog, View v) { - Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); - startActivityForResult(intentPanorama, 300); - return false; - } - }); - } else { - String takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); - ivAttestation3.setTag(takePhotoPath3); - ivAttestation3.setImageBitmap(bitmap);//显示图像 - ivHera3.setVisibility(View.GONE); - tvCard3.setVisibility(View.GONE); - } + String takePhotoPath3 = PhotoPathUtil.getTakePhotoPath(data, "a", ""); + ivAttestation3.setTag(takePhotoPath3); + ivAttestation3.setImageBitmap(bitmap);//显示图像 + ivHera3.setVisibility(View.GONE); + tvCard3.setVisibility(View.GONE); +// int height = bitmap.getHeight(); +// int width = bitmap.getWidth(); +// if (height > width) { +// DialogSettings.style = DialogSettings.STYLE.STYLE_KONGZUE; +// MessageDialog.show((AppCompatActivity) getContext(), "提示", "请重新拍照,要求横屏拍照", "确定").setOkButton(new OnDialogButtonClickListener() { +// @Override +// public boolean onClick(BaseDialog baseDialog, View v) { +// Intent intentPanorama = new Intent("android.media.action.IMAGE_CAPTURE"); +// startActivityForResult(intentPanorama, 300); +// return false; +// } +// }); +// } else { +// +// } } } - } diff --git a/app/src/main/res/layout/withdraw_fragment.xml b/app/src/main/res/layout/withdraw_fragment.xml index 5c8eb12..c082689 100644 --- a/app/src/main/res/layout/withdraw_fragment.xml +++ b/app/src/main/res/layout/withdraw_fragment.xml @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawableRight="@drawable/ic_baseline_navigate" - android:text="提现纪录" + android:text="提现记录" app:layout_constraintBottom_toBottomOf="@+id/tv_unit" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tv_unit" />