This commit is contained in:
parent
b86595901b
commit
10d0be4df4
|
|
@ -54,6 +54,7 @@ import com.ifish.utils.L;
|
||||||
import com.ifish.utils.SPUtil;
|
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.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;
|
||||||
|
|
@ -289,11 +290,7 @@ public class MineActivity extends BaseActivity {
|
||||||
|
|
||||||
|
|
||||||
private void changeHead() {
|
private void changeHead() {
|
||||||
if (!permissionHelper.checkSelfPermission(permission)) {
|
showPermissionHint();
|
||||||
showPermissionHint();
|
|
||||||
} else {
|
|
||||||
gallery();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void changeSex() {
|
private void changeSex() {
|
||||||
|
|
@ -639,7 +636,7 @@ public class MineActivity extends BaseActivity {
|
||||||
public void onIndividualPermissionGranted(String[] grantedPermission) {
|
public void onIndividualPermissionGranted(String[] grantedPermission) {
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
|
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setMessage("请先同意app获取权限");
|
dialog.setMessage("设置头像,请先同意app获取存储和相机权限");
|
||||||
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(
|
public void onClick(
|
||||||
|
|
@ -660,7 +657,7 @@ public class MineActivity extends BaseActivity {
|
||||||
public void onPermissionDenied() {
|
public void onPermissionDenied() {
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
|
AlertDialog.Builder dialog = new AlertDialog.Builder(MineActivity.this);
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setMessage("请先同意app获取权限");
|
dialog.setMessage("设置头像,请先同意app获取存储和相机权限");
|
||||||
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(
|
public void onClick(
|
||||||
|
|
@ -683,7 +680,7 @@ public class MineActivity extends BaseActivity {
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("温馨提示");
|
dialog.setTitle("温馨提示");
|
||||||
// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app");
|
// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app");
|
||||||
dialog.setMessage("请到应用信息页面-权限管理-打开图片和相机权限");
|
dialog.setMessage("为了能设置头像,请到应用信息页面-权限管理-打开图片和相机权限");
|
||||||
dialog.setPositiveButton("去开启", (dialog1, which) -> {
|
dialog.setPositiveButton("去开启", (dialog1, which) -> {
|
||||||
AppUtil.toAuthority(MineActivity.this);
|
AppUtil.toAuthority(MineActivity.this);
|
||||||
});
|
});
|
||||||
|
|
@ -702,16 +699,20 @@ public class MineActivity extends BaseActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showPermissionHint(){
|
private void showPermissionHint(){
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(this, AlertDialog.THEME_HOLO_LIGHT);
|
IosAlertDialog dialog = new IosAlertDialog(this).builder();
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("提示");
|
dialog.setTitle("权限申请理由");
|
||||||
dialog.setMessage("设置头像,需要从手机相册中选择图片或使用手机相机拍照进行上传设置,访问相册和相机拍照app需要申请相机和相册存储权限,是否允许申请?");
|
dialog.setMessage("设置头像,需要从手机相册中选择图片或使用手机相机拍照进行上传设置,访问相册和相机拍照app需要申请相机和相册存储权限,是否允许申请?");
|
||||||
dialog.setNegativeButton("拒绝", (arg0, arg1) -> {
|
dialog.setNegativeButton("拒绝", view -> {
|
||||||
arg0.dismiss();
|
|
||||||
|
|
||||||
});
|
});
|
||||||
dialog.setPositiveButton("申请", (dialog1, which) -> {
|
dialog.setPositiveButton("申请", view ->
|
||||||
getPermission();
|
{
|
||||||
|
if (permissionHelper.checkSelfPermission(permission)) {
|
||||||
|
gallery();
|
||||||
|
} else {
|
||||||
|
getPermission();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,7 @@ import com.ifish.utils.SPUtil;
|
||||||
import com.ifish.utils.ScreenUtil;
|
import com.ifish.utils.ScreenUtil;
|
||||||
import com.ifish.utils.ToastUtil;
|
import com.ifish.utils.ToastUtil;
|
||||||
import com.ifish.utils.UnreadCount;
|
import com.ifish.utils.UnreadCount;
|
||||||
|
import com.ifish.view.IosAlertDialog;
|
||||||
import com.ifish.view.LevelDialog;
|
import com.ifish.view.LevelDialog;
|
||||||
import com.ifish.view.MyBGARefreshLayout;
|
import com.ifish.view.MyBGARefreshLayout;
|
||||||
import com.ifish.view.MyListView;
|
import com.ifish.view.MyListView;
|
||||||
|
|
@ -225,22 +226,40 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
|
|
||||||
private void toOpenNotifications(){
|
private void toOpenNotifications(){
|
||||||
|
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
|
// AlertDialog.Builder dialog = new AlertDialog.Builder(getContext());
|
||||||
|
// dialog.setCancelable(false);
|
||||||
|
// dialog.setTitle("温馨提示");
|
||||||
|
// dialog.setMessage("您开启通知权限,通知权限被关闭后,重要服务通知均无法正常触达通知您,是否去开启通知权限?");
|
||||||
|
// dialog.setPositiveButton("去开启", new DialogInterface.OnClickListener() {
|
||||||
|
// @Override
|
||||||
|
// public void onClick(
|
||||||
|
// DialogInterface dialog,
|
||||||
|
// int which) {
|
||||||
|
// PushManager.getInstance().openNotification(requireContext());
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
|
||||||
|
// @Override
|
||||||
|
// public void onClick(DialogInterface dialog, int which) {
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// dialog.show();
|
||||||
|
|
||||||
|
IosAlertDialog dialog = new IosAlertDialog(getContext()).builder();
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("温馨提示");
|
dialog.setTitle("权限申请理由");
|
||||||
dialog.setMessage("您开启通知权限,通知权限被关闭后,重要服务通知均无法正常触达通知您,是否去开启通知权限?");
|
dialog.setMessage("您开启通知权限,通知权限被关闭后,重要服务通知均无法正常触达通知您,是否去开启通知权限?");
|
||||||
dialog.setPositiveButton("去开启", new DialogInterface.OnClickListener() {
|
dialog.setNegativeButton("拒绝", new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(
|
public void onClick(View view) {
|
||||||
DialogInterface dialog,
|
|
||||||
int which) {
|
|
||||||
PushManager.getInstance().openNotification(requireContext());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
|
dialog.setPositiveButton("去开启", new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(View view) {
|
||||||
|
PushManager.getInstance().openNotification(requireContext());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialog.show();
|
dialog.show();
|
||||||
|
|
@ -1575,15 +1594,9 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
// jiablue
|
// jiablue
|
||||||
// EventBean eventBean = new EventBean(EventBean.BLUETOOTH_STOP_SCAN);
|
// EventBean eventBean = new EventBean(EventBean.BLUETOOTH_STOP_SCAN);
|
||||||
// EventBus.getDefault().post(eventBean);
|
// EventBus.getDefault().post(eventBean);
|
||||||
|
showPermissionHint();
|
||||||
|
|
||||||
|
|
||||||
if (!permissionHelper.checkSelfPermission(permission)) {
|
|
||||||
showPermissionHint();
|
|
||||||
}else {
|
|
||||||
intent.setClass(getActivity(), BindTwoDeviceActivity.class);
|
|
||||||
startActivity(intent);
|
|
||||||
AnimationUtil.startAnimation(getActivity());
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case R.id.tv_explain: //我的设备---查看说明书
|
case R.id.tv_explain: //我的设备---查看说明书
|
||||||
/*intent.setClass(getActivity(), WebViewActivity.class);
|
/*intent.setClass(getActivity(), WebViewActivity.class);
|
||||||
|
|
@ -1969,16 +1982,22 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
// }
|
// }
|
||||||
|
|
||||||
private void showPermissionHint(){
|
private void showPermissionHint(){
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(requireContext(), AlertDialog.THEME_HOLO_LIGHT);
|
IosAlertDialog dialog = new IosAlertDialog(getContext()).builder();
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("提示");
|
dialog.setTitle("权限申请理由");
|
||||||
dialog.setMessage("添加设备,需要先获取位置信息,才能获取附近wifi信息,进行配网连接您的设备,是否允许申请位置权限?");
|
dialog.setMessage("添加设备,需要先获取位置信息,才能获取附近wifi信息,进行配网连接您的设备,是否允许申请位置权限?");
|
||||||
dialog.setNegativeButton("拒绝", (arg0, arg1) -> {
|
dialog.setNegativeButton("拒绝", view -> {
|
||||||
arg0.dismiss();
|
|
||||||
|
|
||||||
});
|
});
|
||||||
dialog.setPositiveButton("允许", (dialog1, which) -> {
|
dialog.setPositiveButton("允许", view -> {
|
||||||
getPermission();
|
if (permissionHelper.checkSelfPermission(permission)) {
|
||||||
|
Intent intent = new Intent();
|
||||||
|
intent.setClass(getContext(), BindTwoDeviceActivity.class);
|
||||||
|
startActivity(intent);
|
||||||
|
AnimationUtil.startAnimation(getActivity());
|
||||||
|
}else {
|
||||||
|
getPermission();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ import com.ifish.utils.HttpListener;
|
||||||
import com.ifish.utils.HttpManager;
|
import com.ifish.utils.HttpManager;
|
||||||
import com.ifish.utils.L;
|
import com.ifish.utils.L;
|
||||||
import com.ifish.utils.ToastUtil;
|
import com.ifish.utils.ToastUtil;
|
||||||
|
import com.ifish.view.IosAlertDialog;
|
||||||
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;
|
||||||
|
|
@ -276,17 +277,14 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment {
|
||||||
String[] permission;
|
String[] permission;
|
||||||
|
|
||||||
private void showPermissionHint(){
|
private void showPermissionHint(){
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity(), AlertDialog.THEME_HOLO_LIGHT);
|
IosAlertDialog dialog = new IosAlertDialog(getContext()).builder();
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("提示");
|
dialog.setTitle("权限申请理由");
|
||||||
dialog.setMessage("设置头像,需要从手机相册中选择图片或使用手机相机拍照进行上传设置,访问相册和相机拍照app需要申请相机和相册存储权限,是否允许申请?");
|
dialog.setMessage("上传手机图片,需要从手机相册中选择图片或使用手机相机拍照进行上传设置,访问相册和相机拍照app需要申请相机和相册存储权限,是否允许申请?");
|
||||||
dialog.setNegativeButton("拒绝", (arg0, arg1) -> {
|
dialog.setNegativeButton("拒绝", view -> {
|
||||||
arg0.dismiss();
|
|
||||||
|
|
||||||
});
|
});
|
||||||
dialog.setPositiveButton("申请", (dialog1, which) -> {
|
dialog.setPositiveButton("申请", view -> getPermission());
|
||||||
getPermission();
|
|
||||||
});
|
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -301,7 +299,7 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment {
|
||||||
public void onIndividualPermissionGranted(String[] grantedPermission) {
|
public void onIndividualPermissionGranted(String[] grantedPermission) {
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity());
|
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity());
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setMessage("请先同意app获取权限");
|
dialog.setMessage("上传图片,请先同意app获取存储和相机权限");
|
||||||
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(
|
public void onClick(
|
||||||
|
|
@ -322,7 +320,7 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment {
|
||||||
public void onPermissionDenied() {
|
public void onPermissionDenied() {
|
||||||
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity());
|
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity());
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setMessage("请先同意app获取权限");
|
dialog.setMessage("上传图片,请先同意app获取存储和相机权限");
|
||||||
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
dialog.setPositiveButton("确定", new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(
|
public void onClick(
|
||||||
|
|
@ -345,7 +343,7 @@ public class ShopsCheckUserPhotoFragment extends BaseFragment {
|
||||||
dialog.setCancelable(false);
|
dialog.setCancelable(false);
|
||||||
dialog.setTitle("温馨提示");
|
dialog.setTitle("温馨提示");
|
||||||
// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app");
|
// dialog.setMessage("请到应用管理-爱鱼奇-应用权限页面开启权限后重新打开app");
|
||||||
dialog.setMessage("请到应用信息页面-权限管理-打开图片和相机权限");
|
dialog.setMessage("上传图片,请到应用信息页面-权限管理-打开图片和相机权限");
|
||||||
dialog.setPositiveButton("去开启", (dialog1, which) -> {
|
dialog.setPositiveButton("去开启", (dialog1, which) -> {
|
||||||
AppUtil.toAuthority(getActivity());
|
AppUtil.toAuthority(getActivity());
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue