CNLive Android Team / ModulePedometer · Commits

Commit 801f67e2436b50eb120a1a7c8875f9fbabdaa147

Authored by 杨帅
1 parent b7d1c017

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

Inline Side-by-side
Showing 3 changed files with 3 additions and 5 deletions
config.gradle
  View file @801f67e
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.7.7", 24 + version: "0.7.8",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @801f67e
@@ -641,8 +641,7 @@ public class RunMainFragmentView implements MvpView { @@ -641,8 +641,7 @@ public class RunMainFragmentView implements MvpView {
641 Log.e(TAG, "setSQLPauseTime: "); 641 Log.e(TAG, "setSQLPauseTime: ");
642 // if (needWriteDataFlag) { 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 if (userStepEntity != null) { 645 if (userStepEntity != null) {
647 userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase()); 646 userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase());
648 //设置当前暂停的时间戳 647 //设置当前暂停的时间戳
@@ -654,7 +653,6 @@ public class RunMainFragmentView implements MvpView { @@ -654,7 +653,6 @@ public class RunMainFragmentView implements MvpView {
654 //更新数据 653 //更新数据
655 StepUtil.updateStepData(fragment.getActivity(), userStepEntity); 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
  View file @801f67e
@@ -397,7 +397,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener { @@ -397,7 +397,7 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
397 MapStatus.Builder builder = new MapStatus.Builder(); 397 MapStatus.Builder builder = new MapStatus.Builder();
398 //不是第一次定位状态 398 //不是第一次定位状态
399 if (!isFirstLoc) { 399 if (!isFirstLoc) {
400 - if (currentPoints.size() > 0) { 400 + if (null != currentPoints && currentPoints.size() > 0) {
401 //进行判断 401 //进行判断
402 LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1); 402 LatLng lastLatLng = currentPoints.get(currentPoints.size() - 1);
403 LatLng curLatLng = new LatLng(location.getLatitude(), 403 LatLng curLatLng = new LatLng(location.getLatitude(),