1 修复用户开始运动后,点击返回按钮,再次点击继续运动按钮后,提示正在运行另一赛事的问题

杨帅
1 parent 8a2e7050
Showing 2 changed files with 27 additions and 13 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
@@ -77,6 +77,7 @@ public class RunMainFragmentView implements MvpView {
     private TipDialog tipDialog;
     //创建震动服务对象
     private Vibrator mVibrator;
+
     public RunMainFragmentView(RunMainFragment fragment) {
         this.fragment = fragment;
     }
@@ -136,26 +137,38 @@ public class RunMainFragmentView implements MvpView {
         //设置数据
         if (userStepEntity != null) {
             //设置赛事标题
-            if (TextUtils.isEmpty(userStepEntity.getStreetTitle())) {
-                StepUtil.setStreetTitle(getContext(), CommonInfo.getUserId(getContext()), runRaceDetailInfo.getTitle());
+            if (TextUtils.isEmpty(userStepEntity.getStreetTitle()) || null == userStepEntity.getStreetTitle()) {
+                userStepEntity = StepUtil.getUserStepData(getContext(), uid);
+                if (null != userStepEntity) {
+                    StepUtil.setStreetTitle(getContext(), CommonInfo.getUserId(getContext()), runRaceDetailInfo.getTitle());
+                }
             }
             //设置实体名字
-            if (TextUtils.isEmpty(userStepEntity.getQueryEntityName())) {
+            if (TextUtils.isEmpty(userStepEntity.getQueryEntityName()) || null == userStepEntity.getQueryEntityName()) {
                 long startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
                 long endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
-                StepUtil.setQueryTraceTime(getContext(), CommonInfo.getUserId(getContext()), startTime, endTime, runRaceDetailInfo.getEntityName());
+                userStepEntity = StepUtil.getUserStepData(getContext(), uid);
+                if (null != userStepEntity) {
+                    StepUtil.setQueryTraceTime(getContext(), CommonInfo.getUserId(getContext()), startTime, endTime, runRaceDetailInfo.getEntityName());
+                }
             }
             //设置开始时间和赛事id
-            if (TextUtils.isEmpty(userStepEntity.getStreetId())) {
-                StepUtil.setStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getContext()));
+            if (TextUtils.isEmpty(userStepEntity.getStreetId()) || null == userStepEntity.getStreetId()) {
+                userStepEntity = StepUtil.getUserStepData(getContext(), uid);
+                if (null != userStepEntity) {
+                    StepUtil.setStepStartData(getContext(), uid, TimeUtil.getNowTimeStamp(), CommonInfo.getStreetId(getContext()));
+                }
             }
             //设置终点经纬度
-            if (TextUtils.isEmpty(userStepEntity.getEndLatLng())) {
+            if (TextUtils.isEmpty(userStepEntity.getEndLatLng()) || null == userStepEntity.getEndLatLng()) {
                 if (null != runRaceDetailInfo.getEndLatLng()) {
-                    //设置终点坐标
-                    userStepEntity.setEndLatLng(runRaceDetailInfo.getEndLatLng());
-                    //更新数据
-                    StepUtil.updateStepData(getContext(), userStepEntity);
+                    userStepEntity = StepUtil.getUserStepData(getContext(), uid);
+                    if (null != userStepEntity) {
+                        //设置终点坐标
+                        userStepEntity.setEndLatLng(runRaceDetailInfo.getEndLatLng());
+                        //更新数据
+                        StepUtil.updateStepData(getContext(), userStepEntity);
+                    }
                 }
             }
             //设置终点经纬度
@@ -163,7 +176,7 @@ public class RunMainFragmentView implements MvpView {
                 endLatLng = GsonUtil.GsonToBean(userStepEntity.getEndLatLng(), LatLng.class);
             }
             //设置步数
-            if (!TextUtils.isEmpty(userStepEntity.getStepCount())){
+            if (!TextUtils.isEmpty(userStepEntity.getStepCount())) {
                 //设置行走步数
                 fragment.binding.tvStepCount.setText(userStepEntity.getStepCount());
                 //设置行走公里
@@ -898,6 +911,7 @@ public class RunMainFragmentView implements MvpView {
         StepUtil.setFailData(context, failedEntity);
     }
+
     public void onStop() {
         ChineseToSpeechUtil.destroy();
     }
@@ -258,8 +258,8 @@ public class StepUtil {
      */
     public static void updateStepData(Context context, UserStepEntity userStepEntity) {
         try {
+            DbCore.init(context, dbName);
             if (userStepEntity != null) {
-                DbCore.init(context, dbName);
                 DbCore.getDaoSession().getUserStepEntityDao().update(userStepEntity);
             }
         } catch (Exception e) {