diff --git a/iFish7/build.gradle b/iFish7/build.gradle index 1f39b9447..5a02182ad 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -185,7 +185,6 @@ dependencies { implementation 'io.github.lucksiege:pictureselector:v3.11.2' // 图片压缩 (按需引入) implementation 'io.github.lucksiege:compress:v3.11.2' - // 图片裁剪 (按需引入) implementation 'io.github.lucksiege:ucrop:v3.11.2' } \ No newline at end of file diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index d71aacafa..573c9dcd5 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -295,28 +295,6 @@ public class MineActivity extends BaseActivity { } else { gallery(); } - -// final Dialog dialogHead = new Dialog(MineActivity.this, R.style.HOLOMyDialogs); -// dialogHead.show(); -// Window window = dialogHead.getWindow(); -// window.setContentView(R.layout.dialog_cramer); -// RelativeLayout rl_png = (RelativeLayout) window.findViewById(R.id.rl_man); -// RelativeLayout rl_cramera = (RelativeLayout) window.findViewById(R.id.rl_woman); -// rl_png.setOnClickListener(new OnClickListener() { -// @Override -// public void onClick(View v) { -// -// dialogHead.dismiss(); -// } -// }); -// rl_cramera.setOnClickListener(new OnClickListener() { -// @Override -// public void onClick(View v) { -// camera(); -// dialogHead.dismiss(); -// } -// }); - } private void changeSex() { @@ -338,28 +316,20 @@ public class MineActivity extends BaseActivity { iv_man.setVisibility(View.GONE); iv_woman.setVisibility(View.GONE); } - rl_man.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - if (iv_man.getVisibility() == View.VISIBLE) {//如果同样的性别 则不发请求 - dialog.cancel(); - } else { - dialog.cancel(); - updateUser("1");//男 - } + rl_man.setOnClickListener(v -> { + if (iv_man.getVisibility() == View.VISIBLE) {//如果同样的性别 则不发请求 + dialog.cancel(); + } else { + dialog.cancel(); + updateUser("1");//男 } }); - rl_woman.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - if (iv_woman.getVisibility() == View.VISIBLE) {//如果同样的性别 则不发请求 - dialog.cancel(); - } else { - dialog.cancel(); - updateUser("0");//女 - } + rl_woman.setOnClickListener(v -> { + if (iv_woman.getVisibility() == View.VISIBLE) {//如果同样的性别 则不发请求 + dialog.cancel(); + } else { + dialog.cancel(); + updateUser("0");//女 } }); } @@ -525,11 +495,6 @@ public class MineActivity extends BaseActivity { * 从相册获取 */ public void gallery() { -// // 激活系统图库，选择一张图片 -// Intent intent = new Intent(Intent.ACTION_PICK); -// intent.setType("image/*"); -// startActivityForResult(intent, PHOTO_REQUEST_GALLERY); - if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.R){ if (!Environment.isExternalStorageManager()){ Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION); @@ -541,10 +506,9 @@ public class MineActivity extends BaseActivity { }else { selectPic(); } - - } + private void selectPic(){ PictureSelectBean bean = new PictureSelectBean(); bean.setCircle(true); @@ -570,12 +534,15 @@ public class MineActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - - if (resultCode == RESULT_OK){ - if (requestCode==1024 && Build.VERSION.SDK_INT >=Build.VERSION_CODES.R){ + L.i("jjia---------"+requestCode); + L.i("jjia---------"+resultCode); + if (requestCode == 1024 && Build.VERSION.SDK_INT >=Build.VERSION_CODES.R){ + if (Environment.isExternalStorageManager()){ selectPic(); - }else - if (requestCode== PictureConfig.CHOOSE_REQUEST){ + } + + }else if (resultCode == RESULT_OK){ + if (requestCode== PictureConfig.CHOOSE_REQUEST){ ArrayList selectList = PictureSelector.obtainSelectorList(data); if (selectList!=null && selectList.size()>0){ LocalMedia localMedia = selectList.get(0); @@ -623,43 +590,6 @@ public class MineActivity extends BaseActivity { } } } - -// if (requestCode == PHOTO_REQUEST_GALLERY) { -// if (data != null) { -// // 得到图片的全路径 -// Uri uri = data.getData(); -// crop(uri); -// } -// -// } else if (requestCode == PHOTO_REQUEST_CAMERA) { -// if (hasSdcard()) { -// tempFile = new File(Environment.getExternalStorageDirectory(), -// PHOTO_FILE_NAME); -// crop(UriForFile.getUriForFile(MineActivity.this, tempFile)); -// } else { -// ToastUtil.show(MineActivity.this, "未找到存储卡 无法存储照片"); -// } -// -// } else if (requestCode == PHOTO_REQUEST_CUT) { -// try { -// bitmap = data.getParcelableExtra("data"); -// this.iv_head.setImageBitmap(bitmap); -// if (!hasSdcard()) {//未找到SD卡 -// ToastUtil.show(MineActivity.this, "未找到存储卡 无法存储照片"); -// return; -// } -// saveFile = saveFile(bitmap, PHOTO_FILE_NAME);//bitmap文件转成file -// if (tempFile != null) { -// boolean delete = tempFile.delete(); -// System.out.println("delete = " + delete); -// } -// upload(bitmap); -// } catch (Exception e) { -// System.out.println(e); -// ToastUtil.show(MineActivity.this, "未找到图片 请重试"); -// } -// } - } /** @@ -683,26 +613,6 @@ public class MineActivity extends BaseActivity { return myCaptureFile; } - /** - * 剪切图片 - */ - private void crop(Uri uri) { - // 裁剪图片意图 - Intent intent = new Intent("com.android.camera.action.CROP"); - intent.setDataAndType(uri, "image/*"); - intent.putExtra("crop", "true"); - // 裁剪框的比例，1：1 - intent.putExtra("aspectX", 1); - intent.putExtra("aspectY", 1); - // 裁剪后输出图片的尺寸大小 - intent.putExtra("outputX", 250); - intent.putExtra("outputY", 250); - // 图片格式 - intent.putExtra("outputFormat", "JPEG"); - intent.putExtra("noFaceDetection", true);// 取消人脸识别 - intent.putExtra("return-data", true);// true:不返回uri，false：返回uri - startActivityForResult(intent, PHOTO_REQUEST_CUT); - } private boolean hasSdcard() {//判断有无SD卡 if (Environment.getExternalStorageState().equals( @@ -723,8 +633,7 @@ public class MineActivity extends BaseActivity { permissionHelper.request(new PermissionHelper.PermissionCallback() { @Override public void onPermissionGranted() { - - + gallery(); } @Override @@ -802,7 +711,7 @@ public class MineActivity extends BaseActivity { arg0.dismiss(); }); - dialog.setPositiveButton("允许", (dialog1, which) -> { + dialog.setPositiveButton("申请", (dialog1, which) -> { getPermission(); }); dialog.show(); diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index a5a06de69..e5857515b 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -223,6 +223,13 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi public void onPermissionGranted() { + + + Intent intent = new Intent(); + intent.setClass(getActivity(), BindTwoDeviceActivity.class); + startActivity(intent); + AnimationUtil.startAnimation(getActivity()); + } @Override