CNLive Android Team / ModulePedometer · Commits

Commit 8a242ada83cb035647f3c8156a080e32ec50879e

Authored by 杨帅
1 parent 10faab3d

1 修改保活服务判断逻辑

Inline Side-by-side
Showing 5 changed files with 16 additions and 7 deletions
config.gradle
  View file @8a242ad
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.5.9",
  24 + version: "0.6.0",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/receivers/ServiceReceiver.java
  View file @8a242ad
... ... @@ -21,7 +21,7 @@ import com.cnlive.moudle.pedometer.utils.ServiceUtils;
21 21 public class ServiceReceiver extends BroadcastReceiver {
22 22 //唤醒锁
23 23 private PowerManager.WakeLock wakeLock = null;
24   - private final String TAG = "CollServiceReceiver";
  24 + private final String TAG = "ServiceReceiver";
25 25  
26 26 public ServiceReceiver() {
27 27  
... ... @@ -39,7 +39,7 @@ public class ServiceReceiver extends BroadcastReceiver {
39 39 //todo 这里判断要保活的服务
40 40 boolean isRunStepService = CommonInfo.getIsRunStepService(context);
41 41 if (isRunStepService) {
42   - if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.CollStepService")) {
  42 + if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.StepService")) {
43 43 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
44 44 context.startForegroundService(new Intent(context, StepService.class));
45 45 } else {
... ... @@ -65,7 +65,7 @@ public class ServiceReceiver extends BroadcastReceiver {
65 65 //todo 保活
66 66 boolean isRunKeepAliveService = CommonInfo.getIsRunKeepAliveService(context);
67 67 if (isRunKeepAliveService) {
68   - if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.CollKeepLiveService")) {
  68 + if (!ServiceUtils.isServiceRunning(context, "com.cnlive.moudle.pedometer.service.KeepLiveService")) {
69 69 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
70 70 context.startForegroundService(new Intent(context, KeepLiveService.class));
71 71 } else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
  View file @8a242ad
... ... @@ -159,7 +159,7 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
159 159 }
160 160 showHideForegroundNotification();
161 161 // startService(new Intent(getApplicationContext(), HideKeepTipService.class));
162   - Log.e(TAG, "启动HideKeepTipService");
  162 +// Log.e(TAG, "启动HideKeepTipService");
163 163 startPlaySong();
164 164 }
165 165 return START_STICKY;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @8a242ad
... ... @@ -29,6 +29,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
29 29 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
30 30 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
31 31 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
  32 +import com.cnlive.moudle.pedometer.utils.CheckUtil;
32 33 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
33 34 import com.cnlive.moudle.pedometer.utils.NotificationUtil;
34 35 import com.cnlive.moudle.pedometer.utils.StepUtil;
... ... @@ -94,7 +95,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
94 95 @Override
95 96 protected void onResume() {
96 97 super.onResume();
97   - if ( !TextUtils.isEmpty(eventId)) {
  98 + if (!TextUtils.isEmpty(eventId)) {
98 99 CommonInfo.setStreetId(this, eventId);
99 100 Log.e("设置全局eventId", "onResume: " + eventId);
100 101 }
... ... @@ -107,7 +108,12 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
107 108 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
108 109 startActivityForResult(intent, 10);
109 110 } else {
110   - getPermissionsWithTip();
  111 + boolean isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
  112 + if (!isSetBattery) {
  113 + isSetBattery = CheckUtil.isIgnoringBatteryOptimizationss(RunRaceDetailActivity.this);
  114 + } else {
  115 + getPermissionsWithTip();
  116 + }
111 117 }
112 118 }
113 119  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/CheckUtil.java
  View file @8a242ad
... ... @@ -8,6 +8,8 @@ import android.net.Uri;
8 8 import android.os.PowerManager;
9 9 import android.provider.Settings;
10 10  
  11 +import com.cnlive.libs.base.util.AlertUtil;
  12 +
11 13 import static android.content.Context.POWER_SERVICE;
12 14  
13 15 public class CheckUtil {
... ... @@ -23,6 +25,7 @@ public class CheckUtil {
23 25 if (intent.resolveActivity(pm) != null) {
24 26 context.startActivity(intent);
25 27 }
  28 + AlertUtil.showDeftToast(context, "请选择允许加入电池优化白名单,否则将会影响您的正常使用!");
26 29 return false;
27 30 } else {
28 31 return true;
... ...