Commit 028b7baef7b903eec1a86a57700b01d9a0aeae5a
1 parent
f76bbdf5
1 修改偏离轨迹弹框提示语
2 修复计步服务中,开启围栏逻辑
Showing
3 changed files
with
3 additions
and
3 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
| @@ -506,7 +506,7 @@ public class StepService extends Service implements SensorEventListener { | @@ -506,7 +506,7 @@ public class StepService extends Service implements SensorEventListener { | ||
| 506 | Log.e(TAG, "onListMonitoredPersonCallback: "); | 506 | Log.e(TAG, "onListMonitoredPersonCallback: "); |
| 507 | } | 507 | } |
| 508 | }; | 508 | }; |
| 509 | - if (userStepEntity != null || TextUtils.isEmpty(userStepEntity.getFenceId())) { | 509 | + if (userStepEntity != null &&!TextUtils.isEmpty(userStepEntity.getFenceId())) { |
| 510 | List<Long> fenids = new ArrayList<>(); | 510 | List<Long> fenids = new ArrayList<>(); |
| 511 | fenids.add(Long.parseLong(userStepEntity.getFenceId())); | 511 | fenids.add(Long.parseLong(userStepEntity.getFenceId())); |
| 512 | MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG, | 512 | MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG, |
moudle_pedometer/src/main/res/values/strings.xml
| @@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
| 82 | <string name="myrecord">我的记录</string> | 82 | <string name="myrecord">我的记录</string> |
| 83 | <string name="up_fail">上传失败</string> | 83 | <string name="up_fail">上传失败</string> |
| 84 | <string name="enter_range_tip">您已回归轨迹继续参与运动吧</string> | 84 | <string name="enter_range_tip">您已回归轨迹继续参与运动吧</string> |
| 85 | - <string name="exit_range_tip">您已偏离路径轨迹请您计时回归路径</string> | 85 | + <string name="exit_range_tip">您已偏离路径轨迹请您及时回归路径</string> |
| 86 | <string name="more_than_pause_count_tip">您已超过最大暂停次数,无法继续比赛</string> | 86 | <string name="more_than_pause_count_tip">您已超过最大暂停次数,无法继续比赛</string> |
| 87 | <string name="run_pause_tip">固定赛事只可暂停一次\n是否确定使用?</string> | 87 | <string name="run_pause_tip">固定赛事只可暂停一次\n是否确定使用?</string> |
| 88 | <string name="add_path">添加轨迹</string> | 88 | <string name="add_path">添加轨迹</string> |