1 修改用户使用时,地理围栏判断逻辑

杨帅
1 parent 21f98ef3
Showing 3 changed files with 27 additions and 6 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
@@ -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, ""));
@@ -533,6 +529,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);