1 修改白名单及通知权限检查逻辑

杨帅
1 parent 99f1762f
Showing 6 changed files with 35 additions and 26 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/CheckUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/NotificationUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.7.6",
+            version: "0.7.7",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -71,7 +71,7 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
         super.onResume();
         boolean isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
         if (!isSet) {
-            isSet = CheckUtil.isIgnoringBatteryOptimizationss(this);
+            CheckUtil.toSetIgnore(this);
         }
     }
@@ -75,11 +75,13 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
             } else {
                 boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(StartCollectTraceActivity.this);
                 if (!isSetBattery) {
-                    isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(StartCollectTraceActivity.this);
+                    CheckUtil.toSetIgnore(this);
                 } else {
                     getPermissionsWithTip();
                 }
             }
+        } else {
+            NotificationUtil.goToSettingNo(this);
         }
     }
@@ -142,11 +142,13 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
             } else {
                 boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
                 if (!isSetBattery) {
-                    isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
+                    CheckUtil.toSetIgnore(this);
                 } else {
                     getPermissionsWithTip();
                 }
             }
+        }else {
+            NotificationUtil.goToSettingNo(this);
         }
     }
@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.PowerManager;
 import android.provider.Settings;
+import android.widget.Toast;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -21,27 +22,34 @@ public class CheckUtil {
      * @return
      */
     public static boolean isIgnoringBatteryOptimizationss(Activity context) {
-        String carrier = android.os.Build.MANUFACTURER;
-        if (!"smartisan".equals(carrier)) {
-            PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
-                if (!hasIgnored) {
-                    Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                    intent.setData(Uri.parse("package:" + context.getPackageName()));
-                    PackageManager pm = context.getPackageManager();
-                    if (intent.resolveActivity(pm) != null) {
-                        context.startActivity(intent);
-                    }
-                    AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
-                    return false;
-                } else {
-                    return true;
+        try {
+            String carrier = android.os.Build.MANUFACTURER;
+            if (!"smartisan".equals(carrier)) {
+                PowerManager powerManager = (PowerManager) context.getSystemService(POWER_SERVICE);
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    boolean hasIgnored = powerManager.isIgnoringBatteryOptimizations(context.getPackageName());
+                    return hasIgnored;
                 }
+            } else {
+                return true;
             }
-        } else {
+            return false;
+        } catch (Exception e) {
             return true;
         }
-        return false;
+    }
+
+    public static void toSetIgnore(Activity context) {
+        try {
+            Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+            intent.setData(Uri.parse("package:" + context.getPackageName()));
+            PackageManager pm = context.getPackageManager();
+            if (intent.resolveActivity(pm) != null) {
+                context.startActivity(intent);
+                AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
+
+            }
+        } catch (Exception e) {
+        }
     }
 }
@@ -20,13 +20,10 @@ public class NotificationUtil {
         //监测通知权限是否打开
         notificationManagerCompat = NotificationManagerCompat.from(activity);
         isOpen = notificationManagerCompat.areNotificationsEnabled();
-        if (!isOpen) {
-            goToSettingNo(activity);
-        }
         return isOpen;
     }
-    private static void goToSettingNo(Activity activity) {
+    public static void goToSettingNo(Activity activity) {
         Toast.makeText(activity, "您尚未开启通知权限,无法进行计步", Toast.LENGTH_LONG).show();
         Intent intent1 = new Intent();
         try {