调整App内获取授权的位置
This commit is contained in:
@@ -122,25 +122,29 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
|
||||
switch (v.getId()){
|
||||
|
||||
case R.id.img_scan:
|
||||
//检测有无相机权限
|
||||
String readPermission = Manifest.permission.CAMERA;
|
||||
if(!hasRecordPermission(readPermission)){
|
||||
getPermissionRequst(readPermission,
|
||||
getString(R.string.permission_request_title),
|
||||
getString(R.string.camera_permission_scan_desc),
|
||||
REQUEST_EVENT_CODE_10001);
|
||||
if(checkBluetoothPermissions()){
|
||||
//检测有无相机权限
|
||||
String readPermission = Manifest.permission.CAMERA;
|
||||
if(!hasRecordPermission(readPermission)){
|
||||
getPermissionRequst(readPermission,
|
||||
getString(R.string.permission_request_title),
|
||||
getString(R.string.camera_permission_scan_desc),
|
||||
REQUEST_EVENT_CODE_10001);
|
||||
}else{
|
||||
scanQrcode();
|
||||
}
|
||||
}else{
|
||||
scanQrcode();
|
||||
goTo(mContext, PermissionActivity.class,null);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case R.id.img_add:
|
||||
String permission = Manifest.permission.ACCESS_FINE_LOCATION;
|
||||
boolean hasPermission = hasRecordPermission(permission);
|
||||
if(!hasPermission){
|
||||
goTo(mContext, PermissionActivity.class,null);
|
||||
}else{
|
||||
if(checkBluetoothPermissions()){
|
||||
goTo(mContext, AddDeviceActivity_copy.class,null);
|
||||
}else{
|
||||
goTo(mContext, PermissionActivity.class,null);
|
||||
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -276,6 +280,26 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
|
||||
checkBluetoothAndProceed();
|
||||
break;
|
||||
|
||||
case 303:
|
||||
//目前该设备,不属于该用户,需要提示解绑
|
||||
showDialogtext(null,
|
||||
false,
|
||||
false,
|
||||
getString(R.string.tip_text),
|
||||
getString(R.string.device_binding_conflict_message),
|
||||
"",
|
||||
"",
|
||||
new OnDialogClick() {
|
||||
@Override
|
||||
public void onCancelClick() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfirmClick() {
|
||||
}
|
||||
});
|
||||
break;
|
||||
|
||||
case 304:
|
||||
//该设备目前在线,已经在mqtt注册,但是没有绑定用户,需要跳转到绑定页面
|
||||
Bundle bundleNoBind = new Bundle();
|
||||
@@ -314,19 +338,12 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
|
||||
Manifest.permission.ACCESS_FINE_LOCATION
|
||||
};
|
||||
if (!hasRecordPermission(permissions)) {
|
||||
getMorePermissionRequst(permissions,
|
||||
"蓝牙权限申请",
|
||||
"智能浇水需要您的授权,获取蓝牙权限添加设备",
|
||||
REQUEST_EVENT_CODE_BLUETOOTH_PERMISSION);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
// Android 12 以下需要位置权限
|
||||
if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION)
|
||||
!= PackageManager.PERMISSION_GRANTED) {
|
||||
requestPermissions(new String[]{
|
||||
Manifest.permission.ACCESS_FINE_LOCATION
|
||||
}, REQUEST_EVENT_CODE_BLUETOOTH_PERMISSION);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -397,14 +414,14 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
|
||||
@Override
|
||||
public void onPermissionsGranted(int requestCode, @NonNull List<String> perms) {
|
||||
hidePermissionDialog();
|
||||
if (requestCode == REQUEST_EVENT_CODE_10001) {
|
||||
scanQrcode();
|
||||
} else if (requestCode == REQUEST_EVENT_CODE_BLUETOOTH_PERMISSION) {
|
||||
// 蓝牙权限获取成功,检查蓝牙状态
|
||||
if (initBluetooth()) {
|
||||
goToDeviceProvisioning();
|
||||
}
|
||||
}
|
||||
// if (requestCode == REQUEST_EVENT_CODE_10001) {
|
||||
// scanQrcode();
|
||||
// } else if (requestCode == REQUEST_EVENT_CODE_BLUETOOTH_PERMISSION) {
|
||||
// // 蓝牙权限获取成功,检查蓝牙状态
|
||||
// if (initBluetooth()) {
|
||||
// goToDeviceProvisioning();
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -461,4 +478,5 @@ public class IndexFragment extends BaseFragment<IndexFragmentLayoutBinding, Inde
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user