From 3eeea49fda7e158c39b2a4b09660ccf978cff1d3 Mon Sep 17 00:00:00 2001 From: jia Date: Tue, 7 Jan 2025 17:50:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/activity/MineActivity.java | 88 +++++++++---------- .../com/ifish/fragment/DeviceFragment.java | 27 +++--- .../fragment/ShopsCheckUserPhotoFragment.java | 26 +++--- 3 files changed, 77 insertions(+), 64 deletions(-) diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index 50107599b..bfa951456 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -54,6 +54,8 @@ import com.ifish.utils.L; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.CircleImageView; +import com.ifish.view.IosAlertDialog; +import com.ifish.view.SelectorImageView; import com.ifish.view.picture.PictureSelectBean; import com.ifish.view.picture.PictureSelectorUtil; import com.luck.picture.lib.basic.PictureSelector; @@ -637,59 +639,50 @@ public class MineActivity extends BaseActivity { @Override public void onIndividualPermissionGranted(String[] grantedPermission) { - AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this); - dialog.setCancelable(false); - dialog.setMessage("请先同意app获取权限"); - dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { - @Override - public void onClick( - DialogInterface dialog, - int which) { - } - }); - dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - dialog.show(); } @Override public void onPermissionDenied() { - AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this); - dialog.setCancelable(false); - dialog.setMessage("请先同意app获取权限"); - dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { + + IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("申请权限目的说明"); + openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); + openDialog.setPositiveButton("继续", new View.OnClickListener() { @Override - public void onClick( - DialogInterface dialog, - int which) { + public void onClick(View view) { getPermission(); } }); - dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { + openDialog.setNegativeButton("取消", new View.OnClickListener() { @Override - public void onClick(DialogInterface dialog, int which) { + public void onClick(View view) { + } }); - dialog.show(); + openDialog.show(); } @Override public void onPermissionDeniedBySystem() { - AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this); - dialog.setCancelable(false); - dialog.setTitle("温馨提示"); -// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app"); - dialog.setMessage("请到应用信息页面-权限管理-打开图片和相机权限"); - dialog.setPositiveButton("去开启", (dialog1, which) -> { - AppUtil.toAuthority(MineActivity.this); + IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("温馨提示"); + openDialog.setMessage("设置头像，需要从相册中选择并上传，如需使用此功能，请到应用信息页面-权限管理-打开图片和相机权限"); + openDialog.setPositiveButton("继续", new View.OnClickListener() { + @Override + public void onClick(View view) { + AppUtil.toAuthority(MineActivity.this); + } }); - dialog.setNegativeButton("取消", (dialog12, which) -> { + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + + } }); - dialog.show(); + openDialog.show(); } }); } @@ -702,17 +695,24 @@ public class MineActivity extends BaseActivity { } private void showPermissionHint(){ - AlertDialog.Builder dialog = new AlertDialog.Builder(this, AlertDialog.THEME_HOLO_LIGHT); - dialog.setCancelable(false); - dialog.setTitle("提示"); - dialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - dialog.setNegativeButton("拒绝", (arg0, arg1) -> { - arg0.dismiss(); + IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("申请权限目的说明"); + openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); + openDialog.setPositiveButton("继续", new View.OnClickListener() { + @Override + public void onClick(View view) { + getPermission(); + } }); - dialog.setPositiveButton("申请", (dialog1, which) -> { - getPermission(); + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + + } }); - dialog.show(); + openDialog.show(); + } } diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 25580c922..b2badfd98 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -60,6 +60,7 @@ import com.bumptech.glide.Glide; import com.ifish.activity.BindTwoDeviceActivity; import com.ifish.activity.DeviceInstructionActivity; import com.ifish.activity.InformationListActivity; +import com.ifish.activity.MineActivity; import com.ifish.activity.MonitorActivity; import com.ifish.activity.MyGoldActivity; import com.ifish.activity.MyLevelValueActivity; @@ -110,6 +111,7 @@ import com.ifish.utils.SPUtil; import com.ifish.utils.ScreenUtil; import com.ifish.utils.ToastUtil; import com.ifish.utils.UnreadCount; +import com.ifish.view.IosAlertDialog; import com.ifish.view.LevelDialog; import com.ifish.view.MyBGARefreshLayout; import com.ifish.view.MyListView; @@ -1941,18 +1943,23 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi // } private void showPermissionHint(){ - AlertDialog.Builder dialog = new AlertDialog.Builder(requireContext(), AlertDialog.THEME_HOLO_LIGHT); - dialog.setCancelable(false); - dialog.setTitle("提示"); - dialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息，进行配网连接您的设备，是否允许申请位置权限？"); - dialog.setNegativeButton("拒绝", (arg0, arg1) -> { - arg0.dismiss(); + IosAlertDialog openDialog = new IosAlertDialog(getContext()).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("申请权限目的说明"); + openDialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息，进行配网连接您的设备，是否允许申请位置权限？"); + openDialog.setPositiveButton("继续", new View.OnClickListener() { + @Override + public void onClick(View view) { + getPermission(); + } + }); + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + } }); - dialog.setPositiveButton("允许", (dialog1, which) -> { - getPermission(); - }); - dialog.show(); + openDialog.show(); } public void showDevice(){ // 检测页面 diff --git a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java index 252c6d3ed..91c4a519f 100644 --- a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java @@ -39,6 +39,7 @@ import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; import com.ifish.utils.L; import com.ifish.utils.ToastUtil; +import com.ifish.view.IosAlertDialog; import com.ifish.view.picture.PictureSelectBean; import com.ifish.view.picture.PictureSelectorUtil; import com.luck.picture.lib.basic.PictureSelector; @@ -276,18 +277,23 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment { String[] permission; private void showPermissionHint(){ - AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT); - dialog.setCancelable(false); - dialog.setTitle("提示"); - dialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - dialog.setNegativeButton("拒绝", (arg0, arg1) -> { - arg0.dismiss(); + IosAlertDialog openDialog = new IosAlertDialog(getContext()).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("申请权限目的说明"); + openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); + openDialog.setPositiveButton("继续", new View.OnClickListener() { + @Override + public void onClick(View view) { + getPermission(); + } + }); + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + } }); - dialog.setPositiveButton("申请", (dialog1, which) -> { - getPermission(); - }); - dialog.show(); + openDialog.show(); } private void getPermission() { From 65f4c1ce4069f6e9878f364b4c55412692c34852 Mon Sep 17 00:00:00 2001 From: jia Date: Fri, 10 Jan 2025 23:53:18 +0800 Subject: [PATCH 2/2] online vivo --- .../java/com/ifish/activity/MineActivity.java | 8 ++++++-- .../java/com/ifish/view/IosAlertDialog.java | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java index bfa951456..4a6af1d4f 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -691,16 +691,20 @@ public class MineActivity extends BaseActivity { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (permissionHelper != null) { permissionHelper.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (openDialog!=null && permissionHelper.checkSelfPermission(permission)){ + openDialog.dismiss(); + } } } + IosAlertDialog openDialog; private void showPermissionHint(){ - IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog = new IosAlertDialog(MineActivity.this).builder(); openDialog.setCancelable(true); openDialog.setTitle("申请权限目的说明"); openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - openDialog.setPositiveButton("继续", new View.OnClickListener() { + openDialog.setPositiveButtonx("继续", new View.OnClickListener() { @Override public void onClick(View view) { getPermission(); diff --git a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java index cddbd37db..66d6665b1 100644 --- a/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java +++ b/iFish7/src/main/java/com/ifish/view/IosAlertDialog.java @@ -187,6 +187,23 @@ public class IosAlertDialog { return this; } + public IosAlertDialog setPositiveButtonx(String text, + final View.OnClickListener listener) { + showPosBtn = true; + if ("".equals(text)) { + btn_pos.setText("确认"); + } else { + btn_pos.setText(text); + } + btn_pos.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + listener.onClick(v); + } + }); + return this; + } + public IosAlertDialog setNegativeButton(String text, final View.OnClickListener listener) { showNegBtn = true;