diff --git a/gradle.properties b/gradle.properties index 334992c02..4840e6faa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,5 +26,5 @@ android.enableJetifier=true android.useAndroidX=true android.useDeprecatedNdk=true -versionCode=45 -versionName=4.11.5 \ No newline at end of file +versionCode=100 +versionName=4.12.0 \ 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 036179e2e..d933e2244 100644 --- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java @@ -47,7 +47,6 @@ import com.ifish.utils.AppUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.NetWork; import com.ifish.utils.Commons.Text; -import com.ifish.utils.GlideEngine; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; import com.ifish.utils.L; @@ -59,16 +58,7 @@ import com.ifish.view.picture.PictureSelectBean; import com.ifish.view.picture.PictureSelectorUtil; import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.config.PictureConfig; -import com.luck.picture.lib.config.SelectMimeType; -import com.luck.picture.lib.config.SelectModeConfig; -import com.luck.picture.lib.engine.CropEngine; -import com.luck.picture.lib.engine.CropFileEngine; import com.luck.picture.lib.entity.LocalMedia; -import com.luck.picture.lib.interfaces.OnResultCallbackListener; -import com.squareup.picasso.Picasso; -import com.yalantis.ucrop.UCrop; -import com.yalantis.ucrop.UCropImageEngine; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -634,59 +624,52 @@ 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(); } }); } @@ -695,25 +678,32 @@ 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 dialog = new IosAlertDialog(this).builder(); - dialog.setCancelable(false); - dialog.setTitle("权限申请理由"); - dialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - dialog.setNegativeButton("拒绝", view -> { - }); - dialog.setPositiveButton("申请", view -> - { - if (permissionHelper.checkSelfPermission(permission)) { - gallery(); - } else { + openDialog = new IosAlertDialog(MineActivity.this).builder(); + openDialog.setCancelable(true); + openDialog.setTitle("申请权限目的说明"); + openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); + openDialog.setPositiveButtonx("继续", new View.OnClickListener() { + @Override + public void onClick(View view) { getPermission(); } }); - dialog.show(); + + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + } + }); + 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 c8d3fc26c..96e394149 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; @@ -1982,24 +1983,25 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi // } private void showPermissionHint(){ - IosAlertDialog dialog = new IosAlertDialog(getContext()).builder(); - dialog.setCancelable(false); - dialog.setTitle("权限申请理由"); - dialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息，进行配网连接您的设备，是否允许申请位置权限？"); - dialog.setNegativeButton("拒绝", view -> { - }); - dialog.setPositiveButton("允许", view -> { - if (permissionHelper.checkSelfPermission(permission)) { - Intent intent = new Intent(); - intent.setClass(getContext(), BindTwoDeviceActivity.class); - startActivity(intent); - AnimationUtil.startAnimation(getActivity()); - }else { + 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(); } }); - dialog.show(); + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + + 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 36eb0d484..faba586d3 100644 --- a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java @@ -277,15 +277,24 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment { String[] permission; private void showPermissionHint(){ - IosAlertDialog dialog = new IosAlertDialog(getContext()).builder(); - dialog.setCancelable(false); - dialog.setTitle("权限申请理由"); - dialog.setMessage("上传手机图片，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？"); - dialog.setNegativeButton("拒绝", view -> { + 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(); + } }); - dialog.setPositiveButton("申请", view -> getPermission()); - dialog.show(); + openDialog.setNegativeButton("取消", new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + openDialog.show(); } private void 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;