root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并处理

This commit is contained in:
jia 2025-01-07 18:08:35 +08:00
parent 694373a0a4 3eeea49fda
commit a9ed698358
3 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
iFish7/src/main/java/com/ifish/activity/MineActivity.java
View File

@ -55,6 +55,7 @@ import com.ifish.utils.SPUtil;
import com.ifish.utils.ToastUtil; import com.ifish.utils.ToastUtil;
import com.ifish.view.CircleImageView; import com.ifish.view.CircleImageView;
import com.ifish.view.IosAlertDialog; import com.ifish.view.IosAlertDialog;
import com.ifish.view.SelectorImageView;
import com.ifish.view.picture.PictureSelectBean; import com.ifish.view.picture.PictureSelectBean;
import com.ifish.view.picture.PictureSelectorUtil; import com.ifish.view.picture.PictureSelectorUtil;
import com.luck.picture.lib.basic.PictureSelector; import com.luck.picture.lib.basic.PictureSelector;
@ -634,59 +635,63 @@ public class MineActivity extends BaseActivity {
@Override @Override
public void onIndividualPermissionGranted(String[] grantedPermission) { public void onIndividualPermissionGranted(String[] grantedPermission) {
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this); //<<<<<<< HEAD
dialog.setCancelable(false); // AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
dialog.setMessage("设置头像，请先同意app获取存储和相机权限"); // dialog.setCancelable(false);
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { // dialog.setMessage("设置头像，请先同意app获取存储和相机权限");
@Override // dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
public void onClick( // @Override
DialogInterface dialog, // public void onClick(
int which) { // DialogInterface dialog,
// int which) {
//=======
//>>>>>>> feature-online
}
});
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
dialog.show();
} }
@Override @Override
public void onPermissionDenied() { public void onPermissionDenied() {
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
dialog.setCancelable(false);
dialog.setMessage("设置头像，请先同意app获取存储和相机权限"); IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder();
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() { openDialog.setCancelable(true);
openDialog.setTitle("申请权限目的说明");
openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？");
openDialog.setPositiveButton("继续", new View.OnClickListener() {
@Override @Override
public void onClick( public void onClick(View view) {
DialogInterface dialog,
int which) {
getPermission(); getPermission();
} }
}); });
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { openDialog.setNegativeButton("取消", new View.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(View view) {
} }
}); });
dialog.show(); openDialog.show();
} }
@Override @Override
public void onPermissionDeniedBySystem() { public void onPermissionDeniedBySystem() {
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
dialog.setCancelable(false); IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder();
dialog.setTitle("温馨提示"); openDialog.setCancelable(true);
// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app"); openDialog.setTitle("温馨提示");
dialog.setMessage("为了能设置头像，请到应用信息页面-权限管理-打开图片和相机权限"); openDialog.setMessage("设置头像，需要从相册中选择并上传，如需使用此功能，请到应用信息页面-权限管理-打开图片和相机权限");
dialog.setPositiveButton("去开启", (dialog1, which) -> { openDialog.setPositiveButton("继续", new View.OnClickListener() {
AppUtil.toAuthority(MineActivity.this); @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(){ private void showPermissionHint(){
IosAlertDialog dialog = new IosAlertDialog(this).builder();
dialog.setCancelable(false);
dialog.setTitle("权限申请理由");
dialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？");
dialog.setNegativeButton("拒绝", view -> {
});
dialog.setPositiveButton("申请", view -> IosAlertDialog openDialog = new IosAlertDialog(MineActivity.this).builder();
{ openDialog.setCancelable(true);
if (permissionHelper.checkSelfPermission(permission)) { openDialog.setTitle("申请权限目的说明");
openDialog.setMessage("设置头像，需要从手机相册中选择图片或使用手机相机拍照进行上传设置，访问相册和相机拍照app需要申请相机和相册存储权限，是否允许申请？");
openDialog.setPositiveButton("继续", new View.OnClickListener() {
@Override
public void onClick(View view) {
if (permissionHelper.checkSelfPermission(permission)) {
gallery(); gallery();
} else { }else{
getPermission(); getPermission();
}
} }
}); });
dialog.show(); openDialog.setNegativeButton("取消", new View.OnClickListener() {
@Override
public void onClick(View view) {
}
});
openDialog.show();
} }
} }

29
iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
View File

@ -63,6 +63,7 @@ import com.clj.fastble.data.BleScanState;
import com.ifish.activity.BindTwoDeviceActivity; import com.ifish.activity.BindTwoDeviceActivity;
import com.ifish.activity.DeviceInstructionActivity; import com.ifish.activity.DeviceInstructionActivity;
import com.ifish.activity.InformationListActivity; import com.ifish.activity.InformationListActivity;
import com.ifish.activity.MineActivity;
import com.ifish.activity.MonitorActivity; import com.ifish.activity.MonitorActivity;
import com.ifish.activity.MyGoldActivity; import com.ifish.activity.MyGoldActivity;
import com.ifish.activity.MyLevelValueActivity; import com.ifish.activity.MyLevelValueActivity;
@ -1987,24 +1988,24 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
} }
private void showPermissionHint(){ private void showPermissionHint(){
IosAlertDialog dialog = new IosAlertDialog(getContext()).builder();
dialog.setCancelable(false);
dialog.setTitle("权限申请理由");
dialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息，进行配网连接您的设备，是否允许申请位置权限？");
dialog.setNegativeButton("拒绝", view -> {
}); IosAlertDialog openDialog = new IosAlertDialog(getContext()).builder();
dialog.setPositiveButton("允许", view -> { openDialog.setCancelable(true);
if (permissionHelper.checkSelfPermission(permission)) { openDialog.setTitle("申请权限目的说明");
Intent intent = new Intent(); openDialog.setMessage("添加设备，需要先获取位置信息，才能获取附近wifi信息，进行配网连接您的设备，是否允许申请位置权限？");
intent.setClass(getContext(), BindTwoDeviceActivity.class); openDialog.setPositiveButton("继续", new View.OnClickListener() {
startActivity(intent); @Override
AnimationUtil.startAnimation(getActivity()); public void onClick(View view) {
}else {
getPermission(); getPermission();
} }
}); });
dialog.show(); openDialog.setNegativeButton("取消", new View.OnClickListener() {
@Override
public void onClick(View view) {
}
});
openDialog.show();
} }
public void showDevice(){ public void showDevice(){
// 检测页面 // 检测页面

24
iFish7/src/main/java/com/ifish/fragment/ShopsCheckUserPhotoFragment.java
View File

@ -277,15 +277,25 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment {
String[] permission; String[] permission;
private void showPermissionHint(){ 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()); openDialog.setNegativeButton("取消", new View.OnClickListener() {
dialog.show(); @Override
public void onClick(View view) {
}
});
openDialog.show();
} }
private void getPermission() { private void getPermission() {