feat#415_权限
This commit is contained in:
parent
fa69f374b6
commit
7acd65cb7c
|
|
@ -25,6 +25,6 @@ android.nonTransitiveRClass=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.useDeprecatedNdk=true
|
android.useDeprecatedNdk=true
|
||||||
versionCode=109
|
versionCode=111
|
||||||
versionName=4.12.09
|
versionName=4.12.11
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -274,16 +274,17 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
dialog.show();
|
dialog.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getPermission() {
|
private void getPermission(boolean jump) {
|
||||||
permissionHelper.request(new PermissionHelper.PermissionCallback() {
|
permissionHelper.request(new PermissionHelper.PermissionCallback() {
|
||||||
@Override
|
@Override
|
||||||
public void onPermissionGranted() {
|
public void onPermissionGranted() {
|
||||||
|
|
||||||
Intent intent = new Intent();
|
if (jump){
|
||||||
intent.setClass(getActivity(), BindTwoDeviceActivity.class);
|
Intent intent = new Intent();
|
||||||
startActivity(intent);
|
intent.setClass(getActivity(), BindTwoDeviceActivity.class);
|
||||||
AnimationUtil.startAnimation(getActivity());
|
startActivity(intent);
|
||||||
|
AnimationUtil.startAnimation(getActivity());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -317,7 +318,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
public void onClick(
|
public void onClick(
|
||||||
DialogInterface dialog,
|
DialogInterface dialog,
|
||||||
int which) {
|
int which) {
|
||||||
getPermission();
|
getPermission(jump);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
|
dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() {
|
||||||
|
|
@ -1604,7 +1605,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
private void addDevice(){
|
private void addDevice(){
|
||||||
if (ContextCompat.checkSelfPermission(requireActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION)
|
if (ContextCompat.checkSelfPermission(requireActivity(), android.Manifest.permission.ACCESS_FINE_LOCATION)
|
||||||
!= PackageManager.PERMISSION_GRANTED || BuildConfig.show) {
|
!= PackageManager.PERMISSION_GRANTED || BuildConfig.show) {
|
||||||
showPermissionHint();
|
showPermissionHint(true);
|
||||||
}else {
|
}else {
|
||||||
Intent intentx = new Intent();
|
Intent intentx = new Intent();
|
||||||
intentx.setClass(requireActivity(), BindTwoDeviceActivity.class);
|
intentx.setClass(requireActivity(), BindTwoDeviceActivity.class);
|
||||||
|
|
@ -1937,6 +1938,11 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
L.i("jjjia-----------蓝牙不可用---");
|
L.i("jjjia-----------蓝牙不可用---");
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
|
boolean first = SPUtil.getInstance(requireContext()).getBoolean("firstx",false);
|
||||||
|
if (!first){
|
||||||
|
showPermissionHint(false);
|
||||||
|
SPUtil.getInstance(requireContext()).putBoolean("firstx",false);
|
||||||
|
}
|
||||||
L.i("jjjia-----------没有扫描权限---");
|
L.i("jjjia-----------没有扫描权限---");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1952,16 +1958,16 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
|
||||||
private int currentIndex = 0;
|
private int currentIndex = 0;
|
||||||
|
|
||||||
|
|
||||||
private void showPermissionHint(){
|
private void showPermissionHint(boolean jump){
|
||||||
|
|
||||||
IosAlertDialog openDialog = new IosAlertDialog(getContext()).builder();
|
IosAlertDialog openDialog = new IosAlertDialog(requireContext()).builder();
|
||||||
openDialog.setCancelable(true);
|
openDialog.setCancelable(true);
|
||||||
openDialog.setTitle("申请权限目的说明");
|
openDialog.setTitle("申请权限目的说明");
|
||||||
openDialog.setMessage("添加设备,需要先获取位置信息,才能获取附近wifi信息或智能设备,进行配网连接您的设备,是否允许申请位置权限和蓝牙权限?");
|
openDialog.setMessage(jump?"APP首次绑定设备需要访问位置权限和蓝牙使用权限,在稍后弹出的权限使用对话框中请点击确定,并打开手机蓝牙。":"添加设备,需要先获取位置信息,才能获取附近wifi信息或智能设备,进行配网连接您的设备,是否允许申请位置权限和蓝牙权限?");
|
||||||
openDialog.setPositiveButton("继续", new View.OnClickListener() {
|
openDialog.setPositiveButton("继续", new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
getPermission();
|
getPermission(jump);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
openDialog.setNegativeButton("取消", new View.OnClickListener() {
|
openDialog.setNegativeButton("取消", new View.OnClickListener() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue