Commit 801f67e2436b50eb120a1a7c8875f9fbabdaa147
1 parent
b7d1c017
1 修改白名单及通知权限检查逻辑
Showing
3 changed files
with
3 additions
and
5 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
| ... | ... | @@ -641,8 +641,7 @@ public class RunMainFragmentView implements MvpView { |
| 641 | 641 | Log.e(TAG, "setSQLPauseTime: "); |
| 642 | 642 | // if (needWriteDataFlag) { |
| 643 | 643 | //将当前计时器时间戳写入数据库 |
| 644 | - if (!TextUtils.isEmpty(id)) { | |
| 645 | - UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid); | |
| 644 | + UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), id); | |
| 646 | 645 | if (userStepEntity != null) { |
| 647 | 646 | userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase()); |
| 648 | 647 | //设置当前暂停的时间戳 |
| ... | ... | @@ -654,7 +653,6 @@ public class RunMainFragmentView implements MvpView { |
| 654 | 653 | //更新数据 |
| 655 | 654 | StepUtil.updateStepData(fragment.getActivity(), userStepEntity); |
| 656 | 655 | } |
| 657 | - } | |
| 658 | 656 | // } |
| 659 | 657 | } |
| 660 | 658 | ... | ... |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningMapFragmentView.java
| ... | ... | @@ -397,7 +397,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener { |
| 397 | 397 | MapStatus.Builder builder = new MapStatus.Builder(); |
| 398 | 398 | //不是第一次定位状态 |
| 399 | 399 | if (!isFirstLoc) { |
| 400 | - if (currentPoints.size() > 0) { | |
| 400 | + if (null != currentPoints && currentPoints.size() > 0) { | |
| 401 | 401 | //进行判断 |
| 402 | 402 | LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1); |
| 403 | 403 | LatLng curLatLng = new LatLng(location.getLatitude(), | ... | ... |