diff --git a/app/src/main/java/com/zj365/dc/activity/CalorieAnalyzeAct.kt b/app/src/main/java/com/zj365/dc/activity/CalorieAnalyzeAct.kt index b2e8788..830689b 100644 --- a/app/src/main/java/com/zj365/dc/activity/CalorieAnalyzeAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/CalorieAnalyzeAct.kt @@ -14,9 +14,11 @@ import com.xty.base.vm.BaseVm import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.picture.PictureUtils +import com.xty.common.util.JumpPermissionManagement import com.zj365.dc.databinding.ActCalorieAnalyzeBinding import com.zj365.dc.vm.DietManagementVm import com.zj365.health.R +import com.zj365.health.weight.DialogTip import com.zj365.mime.weight.FactorySettingDialog import pub.devrel.easypermissions.EasyPermissions @@ -85,17 +87,29 @@ class CalorieAnalyzeAct : BaseVmAct() , EasyPermissions.PermissionCallba Manifest.permission.READ_EXTERNAL_STORAGE)){ PictureUtils.openTheCamera(this, PictureMimeType.ofImage()) }else{ - FactorySettingDialog( - this, - "中健365需要相机存储权限，以便您上传图片分析菜谱" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00012, - Manifest.permission.CAMERA, - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE) - }.show() - + if(EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE)){ + DialogTip( + this, + "中健365需要相机存储权限，以便您上传图片分析菜谱" + ) { + JumpPermissionManagement.GoToSetting(this@CalorieAnalyzeAct) + }.show() + + }else { + FactorySettingDialog( + this, + "中健365需要相机存储权限，以便您上传图片分析菜谱" + ) { + EasyPermissions.requestPermissions( + this, "", + 0x00012, + Manifest.permission.CAMERA, + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE + ) + }.show() + } } dialog.dismiss() @@ -106,14 +120,31 @@ class CalorieAnalyzeAct : BaseVmAct() , EasyPermissions.PermissionCallba Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE)){ PictureUtils.openCamera(this, PictureMimeType.ofImage(),9) }else{ - FactorySettingDialog( - this, - "中健365需要相机存储权限，以便您上传图片分析菜谱" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE) - }.show() + + if(EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE)){ + + DialogTip( + this, + "中健365需要相机存储权限，以便您上传图片分析菜谱" + ) { + JumpPermissionManagement.GoToSetting(this@CalorieAnalyzeAct) + }.show() + + }else{ + FactorySettingDialog( + this, + "中健365需要相机存储权限，以便您上传图片分析菜谱" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE) + }.show() + + } + + + } diff --git a/app/src/main/java/com/zj365/dc/activity/DeviceActiveAct.kt b/app/src/main/java/com/zj365/dc/activity/DeviceActiveAct.kt index 86c3f0b..fff6e20 100644 --- a/app/src/main/java/com/zj365/dc/activity/DeviceActiveAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/DeviceActiveAct.kt @@ -30,6 +30,7 @@ import com.xty.common.event.BluetoothEvent import com.xty.common.event.MyInfoEvent import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.xqr_code.XQRCodeAct @@ -249,14 +250,25 @@ class DeviceActiveAct : BaseVmAct() , EasyPermissions.PermissionCa com.zj365.health.R.style.XQRCodeTheme_Custom ) }else{ - DialogTip( - this, - "中健365需要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@DeviceActiveAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } diff --git a/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt index 1a84bdc..7b4162a 100644 --- a/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt @@ -11,6 +11,7 @@ import com.xty.common.LogUtils import com.xty.common.arouter.ARouterUrl import com.xty.common.event.BindDevEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.xqr_code.XQRCodeAct import com.xuexiang.xqrcode.XQRCode import com.zj365.dc.databinding.ActBinderDeviceOneKeyBinding @@ -45,8 +46,10 @@ class OneKeyBinderDeviceAct : BaseVmAct() , EasyPermissio startScan() } binding.tvBackHome.setOnClickListener { + // finish() + RxActivityTool.finishActivity(OneKeyBinderDeviceAct::class.java) RxActivityTool.finishActivity(DeviceChoiceAct::class.java) - finish() + } } @@ -63,14 +66,25 @@ class OneKeyBinderDeviceAct : BaseVmAct() , EasyPermissio R.style.XQRCodeTheme_Custom ) }else{ - DialogTip( - this, - "中健365需要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@OneKeyBinderDeviceAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"中健365需要相机权限，以便您使用扫一扫功能", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } } @@ -112,6 +126,7 @@ class OneKeyBinderDeviceAct : BaseVmAct() , EasyPermissio } override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + LogUtils.e(TAG,"onPermissionsGranted") XQRCodeAct.start( this@OneKeyBinderDeviceAct, XQRCodeAct.QRCODE_AGREEMENT, @@ -120,9 +135,11 @@ class OneKeyBinderDeviceAct : BaseVmAct() , EasyPermissio } override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + LogUtils.e(TAG,"onPermissionsDenied") } override fun onRationaleAccepted(requestCode: Int) { + LogUtils.e(TAG,"onRationaleAccepted") XQRCodeAct.start( this@OneKeyBinderDeviceAct, XQRCodeAct.QRCODE_AGREEMENT, @@ -131,5 +148,6 @@ class OneKeyBinderDeviceAct : BaseVmAct() , EasyPermissio } override fun onRationaleDenied(requestCode: Int) { + LogUtils.e(TAG,"onRationaleDenied") } } \ No newline at end of file diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index 4b577f0..6863f64 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -47,6 +47,7 @@ import com.xty.common.onEventObject import com.xty.common.setImageUser import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.weight.CenterImageSpan import com.xty.common.work.MyWorkManger import com.xty.network.MyRetrofit @@ -502,14 +503,25 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } }else{ - FactorySettingDialog( - requireContext(), - "中健365需要定位权限，以便您获取天气信息" - ) { - EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限", - 0x00022, - Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); - }.show() + if (EasyPermissions.somePermissionDenied(requireActivity(), Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION)){ + DialogTip( + requireContext(), + "中健365需要定位权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(requireActivity()) + }.show() + }else{ + FactorySettingDialog( + requireContext(), + "中健365需要定位权限，以便您获取天气信息" + ) { + EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限", + 0x00022, + Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION); + }.show() + } + } diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 28189cd..547e5c0 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -20,6 +20,7 @@ import com.xty.common.event.LoginOutEvent import com.xty.common.event.MyInfoEvent import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.network.model.InviteCustodyBean @@ -479,14 +480,24 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ Manifest.permission.CALL_PHONE)){ startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365"))) }else{ - FactorySettingDialog( - requireContext(), - "中健365需要拨打电话权限，以便您联系客服功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CALL_PHONE) - }.show() + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CALL_PHONE)){ + DialogTip( + requireContext(), + "中健365需要拨打电话权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(requireActivity()) + }.show() + }else{ + FactorySettingDialog( + requireContext(), + "中健365需要拨打电话权限，以便您联系客服功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CALL_PHONE) + }.show() + } } } diff --git a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt index 3e639f6..4ac83eb 100644 --- a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt +++ b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt @@ -11,6 +11,7 @@ import com.blankj.utilcode.util.GsonUtils import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram import com.tencent.mm.opensdk.openapi.WXAPIFactory import com.xty.base.act.BaseVmAct +import com.xty.base.dialog.CustomDialog import com.xty.network.model.ChooseAddressBean import com.xty.base.model.ChooseCouponBean import com.xty.base.model.CreateOrderBean @@ -24,6 +25,7 @@ import com.xty.common.LogUtils import com.xty.common.MMkvHelper import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager +import com.xty.common.util.JumpPermissionManagement import org.json.JSONObject import pub.devrel.easypermissions.EasyPermissions @@ -142,9 +144,32 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { Manifest.permission.CALL_PHONE)){ baseActivity.startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365"))) }else{ - EasyPermissions.requestPermissions(baseActivity,"", - 0x00011, - Manifest.permission.CALL_PHONE) + + if (EasyPermissions.somePermissionDenied(baseActivity, + Manifest.permission.CALL_PHONE)){ + CustomDialog( + baseActivity, + "温馨提示", + "中健365需要拨打电话权限,需要打开设置页面么?",{ + JumpPermissionManagement.GoToSetting(baseActivity) + } + ) { + + }.show() + }else{ + CustomDialog( + baseActivity, + "温馨提示", + "中健365需要拨打电话权限，以便您联系客服功能",{ + EasyPermissions.requestPermissions(baseActivity,"", + 0x00011, + Manifest.permission.CALL_PHONE) + } + ) { + + }.show() + } + } } diff --git a/base/src/main/res/layout/dialog_tip.xml b/base/src/main/res/layout/dialog_tip.xml index c1b7ec7..24348a3 100644 --- a/base/src/main/res/layout/dialog_tip.xml +++ b/base/src/main/res/layout/dialog_tip.xml @@ -53,7 +53,7 @@ android:paddingTop="@dimen/dp_10" android:paddingBottom="@dimen/dp_10" android:text="@string/refuse" - android:textColor="@color/col_455" + android:textColor="@color/col_02c" android:textSize="@dimen/sp_16" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/mTvConfirm" diff --git a/base/src/main/res/layout/dialog_tip_delete.xml b/base/src/main/res/layout/dialog_tip_delete.xml index bf496f5..7d6b83c 100644 --- a/base/src/main/res/layout/dialog_tip_delete.xml +++ b/base/src/main/res/layout/dialog_tip_delete.xml @@ -52,7 +52,7 @@ android:paddingTop="@dimen/dp_10" android:paddingBottom="@dimen/dp_10" android:text="@string/cancel" - android:textColor="@color/col_02b" + android:textColor="@color/col_02c" android:textSize="@dimen/sp_16" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/mTvConfirm" diff --git a/common/src/main/java/com/xty/common/util/JumpPermissionManagement.java b/common/src/main/java/com/xty/common/util/JumpPermissionManagement.java new file mode 100644 index 0000000..408f5e1 --- /dev/null +++ b/common/src/main/java/com/xty/common/util/JumpPermissionManagement.java @@ -0,0 +1,196 @@ +package com.xty.common.util; + +import android.app.Activity; +import android.content.ComponentName; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.provider.Settings; + +import com.xty.common.LogUtils; + +public class JumpPermissionManagement { + private static final String TAG = "JumpPermissionManagement"; + + /** + * Build.MANUFACTURER + */ + private static final String MANUFACTURER_HUAWEI = "HUAWEI";//华为 + private static final String MANUFACTURER_MEIZU = "Meizu";//魅族 + private static final String MANUFACTURER_XIAOMI = "Xiaomi";//小米 + private static final String MANUFACTURER_SONY = "Sony";//索尼 + private static final String MANUFACTURER_OPPO = "OPPO";//oppo + private static final String MANUFACTURER_LG = "LG"; + private static final String MANUFACTURER_VIVO = "vivo";//vivo + private static final String MANUFACTURER_SAMSUNG = "samsung";//三星 + private static final String MANUFACTURER_ZTE = "ZTE";//中兴 + private static final String MANUFACTURER_YULONG = "YuLong";//酷派 + private static final String MANUFACTURER_LENOVO = "LENOVO";//联想 + + /** + * 此函数可以自己定义 + * @param activity + */ + public static void GoToSetting(Activity activity){ + switch (Build.MANUFACTURER){ + case MANUFACTURER_HUAWEI: + Huawei(activity); + break; + case MANUFACTURER_MEIZU: + Meizu(activity); + break; + case MANUFACTURER_XIAOMI: + Xiaomi(activity); + break; + case MANUFACTURER_SONY: + Sony(activity); + break; + case MANUFACTURER_OPPO: + OPPO(activity); + break; + case MANUFACTURER_LG: + LG(activity); + break; + default: + ApplicationInfo(activity); + // LogUtils.e("goToSetting", "目前暂不支持此系统"); + break; + } + } + + public static void Huawei(Activity activity) { + try { + Intent intent = new Intent(); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("packageName", activity.getApplicationInfo().packageName); + ComponentName comp = new ComponentName("com.huawei.systemmanager", "com.huawei.permissionmanager.ui.MainActivity"); + intent.setComponent(comp); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + public static void Meizu(Activity activity) { + try { + Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC"); + intent.addCategory(Intent.CATEGORY_DEFAULT); + intent.putExtra("packageName", activity.getPackageName()); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + public static void Xiaomi(Activity activity) { + try { + Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR"); + intent.putExtra("extra_pkgname", activity.getPackageName()); + ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity"); + intent.setComponent(componentName); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + public static void Sony(Activity activity) { + try { + Intent intent = new Intent(); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("packageName", activity.getPackageName()); + ComponentName comp = new ComponentName("com.sonymobile.cta", "com.sonymobile.cta.SomcCTAMainActivity"); + intent.setComponent(comp); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + public static void OPPO(Activity activity) { + try { + Intent intent = new Intent(); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("packageName", activity.getPackageName()); + // ComponentName comp = new ComponentName("com.color.safecenter", "com.color.safecenter.permission.PermissionManagerActivity"); + ComponentName comp = new ComponentName("com.coloros.securitypermission", "com.coloros.securitypermission.permission.PermissionAppAllPermissionActivity");//R11t 7.1.1 os-v3.2 + intent.setComponent(comp); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + public static void LG(Activity activity) { + try { + Intent intent = new Intent("android.intent.action.MAIN"); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("packageName", activity.getPackageName()); + ComponentName comp = new ComponentName("com.android.settings", "com.android.settings.Settings$AccessLockSummaryActivity"); + intent.setComponent(comp); + activity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + goIntentSetting(activity); + } + } + + /** + * 只能打开到自带安全软件 + * @param activity + */ + public static void _360(Activity activity) { + Intent intent = new Intent("android.intent.action.MAIN"); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("packageName", activity.getPackageName()); + ComponentName comp = new ComponentName("com.qihoo360.mobilesafe", "com.qihoo360.mobilesafe.ui.index.AppEnterActivity"); + intent.setComponent(comp); + activity.startActivity(intent); + } + + /** + * 应用信息界面 + * @param activity + */ + public static void ApplicationInfo(Activity activity){ + Intent localIntent = new Intent(); + localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + if (Build.VERSION.SDK_INT >= 9) { + localIntent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS"); + localIntent.setData(Uri.fromParts("package", activity.getPackageName(), null)); + } else if (Build.VERSION.SDK_INT <= 8) { + localIntent.setAction(Intent.ACTION_VIEW); + localIntent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails"); + localIntent.putExtra("com.android.settings.ApplicationPkgName", activity.getPackageName()); + } + activity.startActivity(localIntent); + } + + /** + * 系统设置界面 + * @param activity + */ + public static void SystemConfig(Activity activity) { + Intent intent = new Intent(Settings.ACTION_SETTINGS); + activity.startActivity(intent); + } + + /** + * 默认打开应用详细页 + */ + private static void goIntentSetting(Activity pActivity) { + Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + Uri uri = Uri.fromParts("package", pActivity.getPackageName(), null); + intent.setData(uri); + try { + pActivity.startActivity(intent); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt b/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt index ed51d7f..3060f76 100644 --- a/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt +++ b/health/src/main/java/com/zj365/health/act/DuihuanmaAct.kt @@ -10,6 +10,7 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.picture.PictureUtils import com.xty.common.util.CommonToastUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT @@ -65,14 +66,26 @@ class DuihuanmaAct : BaseVmAct() , EasyPermissions.PermissionCallba R.style.XQRCodeTheme_Custom ) }else{ - DialogTip( - this, - "中健365需要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@DuihuanmaAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } + } } diff --git a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt index 430e82a..7998965 100644 --- a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt @@ -11,6 +11,7 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.NSuanOpenEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT @@ -99,15 +100,26 @@ class NSuanOpenAct : BaseVmAct() , EasyPermissions.PermissionCallbacks R.style.XQRCodeTheme_Custom ) }else{ + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@NSuanOpenAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } - DialogTip( - this, - "中健365需要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() } } diff --git a/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt b/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt index 6a0e9d1..68e1711 100644 --- a/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt +++ b/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt @@ -16,6 +16,7 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.ReChangeEvent import com.xty.common.event.WxPayEvent +import com.xty.common.util.JumpPermissionManagement import com.xty.network.model.ShopOrderListBean import com.zj365.health.R import com.zj365.health.adapter.GoodsOrderAdapter @@ -112,9 +113,27 @@ class ShopOrderListAct : BaseListAct() { Manifest.permission.CALL_PHONE)){ startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365"))) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CALL_PHONE) + + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CALL_PHONE)){ + DialogTip( + this, + "中健365需要拨打电话权限，以便您联系客服功能" + ) { + JumpPermissionManagement.GoToSetting(this@ShopOrderListAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要拨打电话权限，以便您联系客服功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CALL_PHONE) + }.show() + } + } } } diff --git a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt index a48219f..c04989d 100644 --- a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt @@ -14,6 +14,7 @@ import com.xty.common.event.OpenOrRenewEvent import com.xty.common.event.XTangOpenEvent import com.xty.common.event.XTangUploadEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.util.PermissionUtils import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT @@ -78,15 +79,25 @@ class XTangOpenAct : BaseVmAct(), EasyPermissions.PermissionCallbacks , R.style.XQRCodeTheme_Custom ) }else{ - DialogTip( - this, - "中健365要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() - + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@XTangOpenAct) + }.show() + + }else{ + DialogTip( + this, + "中健365要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } } } diff --git a/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt b/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt index 3c4d4cc..5cf7a08 100644 --- a/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt +++ b/health/src/main/java/com/zj365/health/act/binddevice/BaseDeviceBindAct.kt @@ -8,6 +8,7 @@ import com.xty.common.LogUtils import com.xty.common.event.BindDevEvent import com.xty.common.event.WorkManagerEvent import com.xty.common.util.CommonToastUtils +import com.xty.common.util.JumpPermissionManagement import com.xty.common.xqr_code.XQRCodeAct import com.xty.common.xqr_code.XQRCodeAct.Companion.QRCODE_AGREEMENT import com.zj365.health.R @@ -57,15 +58,26 @@ open class BaseDeviceBindAct : BaseVmAct() , EasyPermission R.style.XQRCodeTheme_Custom ) }else{ + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA)){ + DialogTip( + this, + "中健365需要相机权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this@BaseDeviceBindAct) + }.show() + + }else{ + DialogTip( + this, + "中健365需要相机权限，以便您使用扫一扫功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA) + }.show() + } - DialogTip( - this, - "中健365需要相机权限，以便您使用扫一扫功能" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA) - }.show() } } diff --git a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt index de49d67..b53a82c 100644 --- a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt @@ -20,6 +20,7 @@ import com.mylhyl.acp.AcpOptions import com.tamsiree.rxkit.RxKeyboardTool import com.tamsiree.rxkit.RxRegTool import com.xty.base.act.BaseVmAct +import com.xty.base.weight.DeleteDialog import com.xty.base.weight.GpsToastDialog import com.xty.base.weight.TipDialog import com.xty.common.Const @@ -39,6 +40,7 @@ import com.xty.common.setImageUser import com.xty.common.util.CommonToastUtils import com.xty.common.util.GetJsonDataUtil import com.xty.common.util.JsonBean +import com.xty.common.util.JumpPermissionManagement import com.xty.common.weight.AreaSelectDialog import com.zj365.mime.R import com.zj365.mime.databinding.ActBaseInfoChangeBinding @@ -164,14 +166,25 @@ class BaseInfoChangeAct : BaseVmAct() , EasyPermissions.PermissionCa Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE)){ PictureUtils.openCamera(this@BaseInfoChangeAct) }else{ - FactorySettingDialog( - this, - "中健365需要相机存储权限，以便您完善用户的基本信息" - ) { - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE) - }.show() + if (EasyPermissions.somePermissionDenied(this, + Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE)){ + DeleteDialog( + this, + "中健365需要相机存储权限,需要打开设置页面么?" + ) { + JumpPermissionManagement.GoToSetting(this) + }.show() + }else{ + FactorySettingDialog( + this, + "中健365需要相机存储权限，以便您完善用户的基本信息" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.READ_EXTERNAL_STORAGE) + }.show() + } + }