Commit 1cdfcd27b51682531e189ab6ed3bc44be8f8f9a5
1 parent
3ee7a10b
1 修复用户运动超过9小时后,返回赛事详情页,服务未停止的问题
Showing
6 changed files
with
11 additions
and
9 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
| @@ -219,9 +219,9 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple | @@ -219,9 +219,9 @@ public class CollKeepLiveService extends Service implements MediaPlayer.OnComple | ||
| 219 | channel.setLockscreenVisibility(NotificationCompat.VISIBILITY_PRIVATE); | 219 | channel.setLockscreenVisibility(NotificationCompat.VISIBILITY_PRIVATE); |
| 220 | mNM.createNotificationChannel(channel); | 220 | mNM.createNotificationChannel(channel); |
| 221 | } | 221 | } |
| 222 | - Intent notificationIntent = new Intent(this, CollRunningMapActivity.class); | 222 | +// Intent notificationIntent = new Intent(this, CollRunningMapActivity.class); |
| 223 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) | 223 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) |
| 224 | - .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) | 224 | +// .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) |
| 225 | .setSmallIcon(R.mipmap.ic_launcher) | 225 | .setSmallIcon(R.mipmap.ic_launcher) |
| 226 | // .setCustomContentView(remoteViews) | 226 | // .setCustomContentView(remoteViews) |
| 227 | .setContentTitle(getResources().getString(R.string.app_name)) | 227 | .setContentTitle(getResources().getString(R.string.app_name)) |
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
| @@ -439,9 +439,9 @@ public class CollStepService extends Service implements SensorEventListener { | @@ -439,9 +439,9 @@ public class CollStepService extends Service implements SensorEventListener { | ||
| 439 | } | 439 | } |
| 440 | 440 | ||
| 441 | 441 | ||
| 442 | - Intent notificationIntent = new Intent(this, CollRunningMapActivity.class); | 442 | +// Intent notificationIntent = new Intent(this, CollRunningMapActivity.class); |
| 443 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) | 443 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) |
| 444 | - .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) | 444 | +// .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) |
| 445 | .setSmallIcon(R.mipmap.ic_launcher) | 445 | .setSmallIcon(R.mipmap.ic_launcher) |
| 446 | // .setCustomContentView(remoteViews) | 446 | // .setCustomContentView(remoteViews) |
| 447 | .setContentTitle(getResources().getString(R.string.app_name)) | 447 | .setContentTitle(getResources().getString(R.string.app_name)) |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
| @@ -1108,6 +1108,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { | @@ -1108,6 +1108,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener { | ||
| 1108 | fragment.binding.rlScrollViewStartBtn.setTag(BTN_CONTINUE_RACE); | 1108 | fragment.binding.rlScrollViewStartBtn.setTag(BTN_CONTINUE_RACE); |
| 1109 | } else { | 1109 | } else { |
| 1110 | Log.e(TAG, "大于9小时"); | 1110 | Log.e(TAG, "大于9小时"); |
| 1111 | + //停止服务 | ||
| 1112 | + stopStepService(); | ||
| 1111 | //重置数据 | 1113 | //重置数据 |
| 1112 | CommonInfo.resetRace(getContext()); | 1114 | CommonInfo.resetRace(getContext()); |
| 1113 | //清空数据库 | 1115 | //清空数据库 |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
| @@ -237,9 +237,9 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion | @@ -237,9 +237,9 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion | ||
| 237 | // .setContentText("正在计步,请勿关闭") | 237 | // .setContentText("正在计步,请勿关闭") |
| 238 | // .setSound(null) | 238 | // .setSound(null) |
| 239 | // .build(); | 239 | // .build(); |
| 240 | - Intent notificationIntent = new Intent(this, PedometerMainActivity.class); | 240 | +// Intent notificationIntent = new Intent(this, PedometerMainActivity.class); |
| 241 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) | 241 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) |
| 242 | - .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) | 242 | +// .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) |
| 243 | .setSmallIcon(R.mipmap.ic_launcher) | 243 | .setSmallIcon(R.mipmap.ic_launcher) |
| 244 | // .setCustomContentView(remoteViews) | 244 | // .setCustomContentView(remoteViews) |
| 245 | .setContentTitle(getResources().getString(R.string.app_name)) | 245 | .setContentTitle(getResources().getString(R.string.app_name)) |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
| @@ -630,9 +630,9 @@ public class StepService extends Service implements SensorEventListener { | @@ -630,9 +630,9 @@ public class StepService extends Service implements SensorEventListener { | ||
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | 632 | ||
| 633 | - Intent notificationIntent = new Intent(this, PedometerMainActivity.class); | 633 | +// Intent notificationIntent = new Intent(this, PedometerMainActivity.class); |
| 634 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) | 634 | notification = new NotificationCompat.Builder(this, CHANNEL_ONE_ID) |
| 635 | - .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) | 635 | +// .setContentIntent(PendingIntent.getActivity(this, 0, notificationIntent, 0)) |
| 636 | .setSmallIcon(R.mipmap.ic_launcher) | 636 | .setSmallIcon(R.mipmap.ic_launcher) |
| 637 | // .setCustomContentView(remoteViews) | 637 | // .setCustomContentView(remoteViews) |
| 638 | .setContentTitle(getResources().getString(R.string.app_name)) | 638 | .setContentTitle(getResources().getString(R.string.app_name)) |