Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents 93f5e6b2 55a3d330
Showing 4 changed files with 36 additions and 11 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
@@ -279,7 +279,28 @@ public class CommonInfo {
     }
-//    /**
+    /**
+     * 设置赛事标题
+     *
+     * @param context
+     * @param streetTitle
+     */
+    public static void setStreetTitle(Context context, String streetTitle) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStreetTitle", streetTitle);
+
+    }
+
+    /**
+     * 获取赛事标题
+     *
+     * @param context
+     */
+    public static String getStreetTitle(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runStreetTitle", "");
+
+    }
+
+    //    /**
 //     * 设置起点经纬度
 //     *
 //     * @param context
@@ -323,6 +323,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
+            CommonInfo.setStreetTitle(getContext(),runRaceDetailInfo.getTitle());
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
             fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
                 @Override
@@ -372,11 +372,7 @@ public class StepService extends Service implements SensorEventListener {
                 if (null == userStepEntity) {
                     return;
                 }
-                if (userStepEntity.getFenceId() == 0) {
-                    return;
-                }
-                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId()) {
-
+                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId() && alarmPushInfo.getFenceName().equals(userStepEntity.getStreetTitle())) {
                     //超出范围
                     if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
                         EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
@@ -523,6 +519,7 @@ public class StepService extends Service implements SensorEventListener {
     public int onStartCommand(Intent intent, int flags, int startId) {
         userId = CommonInfo.getUserId(getApplicationContext());
         if (userId != null && !TextUtils.isEmpty(userId)) {
+            StepUtil.initDataBase(getApplicationContext(), userId);
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
@@ -533,6 +530,9 @@ public class StepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
                 //设置围栏id
                 StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
+                //设置赛事标题
+                String streetTitle = CommonInfo.getStreetTitle(getApplicationContext());
+                StepUtil.setStreetTitle(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), streetTitle);
             }
             entityName = userId;
             initTodayData(userId);
@@ -35,6 +35,14 @@ public class StepUtil {
         return UUID.randomUUID().toString().replace("-", "");
     }
+    public static void initDataBase(Context context, String uid) {
+        if (null == getUserStepData(context, uid)) {
+            DbCore.init(context, dbName);
+            UserStepEntity userStepEntity = new UserStepEntity();
+            userStepEntity.setUserId(uid);
+            DbCore.getDaoSession().getUserStepEntityDao().insert(userStepEntity);
+        }
+    }
     /**
      * 删除临时保存数据
@@ -107,7 +115,6 @@ public class StepUtil {
     }
-
     /**
      * 设置重要点
      *
@@ -211,7 +218,6 @@ public class StepUtil {
     }
-
     /**
      * 得到当前速度
      *
@@ -338,7 +344,6 @@ public class StepUtil {
     }
-
     /**
      * 设置计步开始时间
      *
@@ -373,8 +378,6 @@ public class StepUtil {
     }
-
-
     /**
      * 获取用户暂停次数
      *