1 修改保活服务判断逻辑

杨帅
1 parent 10faab3d
Showing 5 changed files with 16 additions and 7 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/receivers/ServiceReceiver.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.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
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.5.9",
+            version: "0.6.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -21,7 +21,7 @@ import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 public class ServiceReceiver extends BroadcastReceiver {
     //唤醒锁
     private PowerManager.WakeLock wakeLock = null;
-    private final String TAG = "CollServiceReceiver";
+    private final String TAG = "ServiceReceiver";
     public ServiceReceiver() {
@@ -39,7 +39,7 @@ public class ServiceReceiver extends BroadcastReceiver {
         //todo 这里判断要保活的服务
         boolean isRunStepService = CommonInfo.getIsRunStepService(context);
         if (isRunStepService) {
-            if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.CollStepService")) {
+            if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.StepService")) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     context.startForegroundService(new Intent(context, StepService.class));
                 } else {
@@ -65,7 +65,7 @@ public class ServiceReceiver extends BroadcastReceiver {
         //todo 保活
         boolean isRunKeepAliveService = CommonInfo.getIsRunKeepAliveService(context);
         if (isRunKeepAliveService) {
-            if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.CollKeepLiveService")) {
+            if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.KeepLiveService")) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     context.startForegroundService(new Intent(context, KeepLiveService.class));
                 } else {
@@ -159,7 +159,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
             }
             showHideForegroundNotification();
 //            startService(new Intent(getApplicationContext(), HideKeepTipService.class));
-            Log.e(TAG, "启动HideKeepTipService");
+//            Log.e(TAG, "启动HideKeepTipService");
             startPlaySong();
         }
         return START_STICKY;
@@ -29,6 +29,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
+import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.NotificationUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
@@ -94,7 +95,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if ( !TextUtils.isEmpty(eventId)) {
+        if (!TextUtils.isEmpty(eventId)) {
             CommonInfo.setStreetId(this, eventId);
             Log.e("设置全局eventId", "onResume: " + eventId);
         }
@@ -107,7 +108,12 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
                 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
                 startActivityForResult(intent, 10);
             } else {
-                getPermissionsWithTip();
+                boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
+                if (!isSetBattery) {
+                    isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
+                } else {
+                    getPermissionsWithTip();
+                }
             }
         }
@@ -8,6 +8,8 @@ import android.net.Uri;
 import android.os.PowerManager;
 import android.provider.Settings;
+import com.cnlive.libs.base.util.AlertUtil;
+
 import static android.content.Context.POWER_SERVICE;
 public class CheckUtil {
@@ -23,6 +25,7 @@ public class CheckUtil {
                 if (intent.resolveActivity(pm) != null) {
                     context.startActivity(intent);
                 }
+                AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
                 return false;
             } else {
                 return true;