diff --git a/iFish7/src/main/java/com/ifish/activity/MineActivity.java b/iFish7/src/main/java/com/ifish/activity/MineActivity.java
index 036179e2e..ecf065456 100644
--- a/iFish7/src/main/java/com/ifish/activity/MineActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/MineActivity.java
@@ -55,6 +55,7 @@ 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;
@@ -634,59 +635,63 @@ 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) {
+//<<<<<<< HEAD
+//                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) {
+//=======
+//>>>>>>> feature-online
 
-                    }
-                });
-                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();
             }
         });
     }
@@ -699,21 +704,29 @@ public class MineActivity extends BaseActivity {
     }
 
     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)) {
+
+        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) {
+                if (permissionHelper.checkSelfPermission(permission)) {
                 gallery();
-            } else {
-                getPermission();
+            }else{
+                    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 963f052ee..247fc7e42 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -63,6 +63,7 @@ import com.clj.fastble.data.BleScanState;
 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;
@@ -1987,24 +1988,24 @@ 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..a25086644 100644
--- a/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java
@@ -277,15 +277,25 @@ 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() {