From 446aed157481c8ff46adc59f521c8043ca9dadb6 Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 28 Oct 2024 15:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../ui/home/HomeFragment.java | 55 ++++++++++++------- .../util/OneDayShowUtils.java | 23 ++++++++ 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bbad36f..44ff043 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 24 targetSdkVersion 30 - versionCode 71 - versionName "3.4.1" + versionCode 72 + versionName "3.4.2" flavorDimensions "CHANNEL_VALUE" flavorDimensions "app_icon" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 0dbded9..44cd218 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -112,6 +112,8 @@ import org.greenrobot.eventbus.Subscribe; import java.util.ArrayList; import java.util.List; +import pub.devrel.easypermissions.EasyPermissions; + /** * @author hlh * @version 1.0.0 @@ -736,6 +738,7 @@ public class HomeFragment extends BaseFragment { ur.getDriverExpire(); hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId); // hyr.startOrder(0); + //获取权限 应用市场审核不通过 ur.driverAuthData(); } // oldTime= Calendar.getInstance().getTimeInMillis(); @@ -1091,28 +1094,38 @@ public class HomeFragment extends BaseFragment { public void initAlct() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - PermissionX.init(getActivity()) - .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.ACCESS_FINE_LOCATION, - Manifest.permission.ACCESS_COARSE_LOCATION) - .request((allGranted, grantedList, deniedList) -> { - if (allGranted) { - ALProcess.verification(con); - } else { - boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION"); - boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE"); - if (accessCoarseLocation | contains) { - new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> { - Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); - Uri uri = Uri.fromParts("package", getPackageName(), null); - intent.setData(uri); - startActivity(intent); - }); - } +// if (!OneDayShowUtils.getInstance().todayIsShowQx(con)){ + boolean b = EasyPermissions.hasPermissions(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION); + if (b) { + ALProcess.verification(con); + } +// PermissionX.init(getActivity()) +// .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, +// Manifest.permission.READ_EXTERNAL_STORAGE, +// Manifest.permission.ACCESS_FINE_LOCATION, +// Manifest.permission.ACCESS_COARSE_LOCATION) +// .request((allGranted, grantedList, deniedList) -> { +// if (allGranted) { +// ALProcess.verification(con); +// } else { +// boolean accessCoarseLocation = deniedList.contains("android.permission.ACCESS_FINE_LOCATION"); +// boolean contains = deniedList.contains("android.permission.WRITE_EXTERNAL_STORAGE"); +// if (accessCoarseLocation | contains) { +// new MessageUtils().showSimCenPop(con, "缺少定位权限或媒体和文件权限,会导致无法结算运费,去开启！", "取消", "确认", () -> { +// Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); +// Uri uri = Uri.fromParts("package", getPackageName(), null); +// intent.setData(uri); +// startActivity(intent); +// }); +// } +// +// } +// }); +// } - } - }); } else { ALProcess.verification(con); } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/OneDayShowUtils.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/OneDayShowUtils.java index c43d5b9..55b5480 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/OneDayShowUtils.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/OneDayShowUtils.java @@ -50,4 +50,27 @@ public class OneDayShowUtils { } } + + + /** + * + * @param ctx + * @return true:当天已弹出 false:当天未弹出 + */ + public boolean todayIsShowQx(Context ctx) { + String preday = (String) SPUtils.get(ctx, "permission", ""); + if (TextUtils.isEmpty(preday)) { + String nowString = TimeUtil.getNowString("yyyy-MM-dd"); + SPUtils.put(ctx, "permission", nowString); + return false; + } else { + boolean today = TimeUtil.isToday(preday, new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())); + if (!today) { + String nowString = TimeUtil.getNowString("yyyy-MM-dd"); + SPUtils.put(ctx, "permission", nowString); + } + return today; + } + + } }