1 修复用户在运动开始后,地理围栏不生效的问题

杨帅
1 parent f20d81f6
Showing 7 changed files with 43 additions and 32 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/UserStepEntityDao.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/UserStepEntity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.5.6",
+            version: "0.5.7",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -1014,7 +1014,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             //获取用户暂停的时间戳
             long userPauseTime = userStepEntity.getChronometerBase();
             //判断时间是否小于9小时
-            Log.e(TAG, "checkStartBtnState: " + currnetTime + ",userPauseTime:" + userPauseTime);
+//            Log.e(TAG, "checkStartBtnState: " + currnetTime + ",userPauseTime:" + userPauseTime);
             if ((currnetTime - userPauseTime) <= (9 * 60 * 60 * 1000)) {
                 Log.e(TAG, "小于9小时");
                 fragment.binding.tvRunNow.setText("继续运动");
@@ -38,7 +38,7 @@ public class Constant {
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
     public static final int LOCA_ACCURACY = 20;//定位过滤精度
     public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
-    public static final int LOCA_START_POINT_ACCURACY = 20;//起点位置比较精度
+    public static final int LOCA_START_POINT_ACCURACY = 200;//起点位置比较精度
     public static final int FENCE_OFFSET = 70;//围栏偏离距离
     public static final int FENCE_DENOISE = 70;//围栏去噪精度
     public static final int TAKE_POINT_MAX_SIZE = 100;//最大打点数量
@@ -369,10 +369,10 @@ public class StepService extends Service implements SensorEventListener {
                     return;
                 }
                 UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
-                if (null == userStepEntity) {
+                if (null == userStepEntity || TextUtils.isEmpty(userStepEntity.getFenceId())) {
                     return;
                 }
-                if (alarmPushInfo.getFenceId() == userStepEntity.getFenceId()) {
+                if (alarmPushInfo.getFenceId() == Long.parseLong(userStepEntity.getFenceId())) {
                     //超出范围
                     if (alarmPushInfo.getMonitoredAction() == MonitoredAction.exit) {
                         EventBus.getDefault().post(new MessageEvent(Constant.EXIT_RANGE, ""));
@@ -398,7 +398,7 @@ public class StepService extends Service implements SensorEventListener {
     }
     public void startQueryFence() {
-        UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
+        final UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
         // 初始化围栏监听器
         OnFenceListener onFenceListener = new OnFenceListener() {
             // 创建围栏回调
@@ -442,11 +442,11 @@ public class StepService extends Service implements SensorEventListener {
                     Toast.makeText(getApplicationContext(), "围栏列表回调成功:个数:" + monitoredStatusResponse.getMonitoredStatusInfos().size(), Toast.LENGTH_SHORT).show();
                 } //查询监控对象状态响应结果
                 List<MonitoredStatusInfo> monitoredStatusInfos = monitoredStatusResponse.getMonitoredStatusInfos();
-                if (monitoredStatusInfos == null) {
+                if (monitoredStatusInfos == null||TextUtils.isEmpty(userStepEntity.getFenceId())) {
                     return;
                 }
                 for (MonitoredStatusInfo monitoredStatusInfo : monitoredStatusInfos) {
-                    if (monitoredStatusInfo.getFenceId() == userStepEntity.getFenceId()) {
+                    if (monitoredStatusInfo.getFenceId() == Long.parseLong(userStepEntity.getFenceId())) {
                         MonitoredStatus status = monitoredStatusInfo.getMonitoredStatus();//获取状态
                         switch (status) {
                             case in:
@@ -498,9 +498,9 @@ public class StepService extends Service implements SensorEventListener {
                 Log.e(TAG, "onListMonitoredPersonCallback: ");
             }
         };
-        if (userStepEntity != null) {
+        if (userStepEntity != null||TextUtils.isEmpty(userStepEntity.getFenceId())) {
             List<Long> fenids = new ArrayList<>();
-            fenids.add(userStepEntity.getFenceId());
+            fenids.add(Long.parseLong(userStepEntity.getFenceId()));
             MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
                     Constant.SERVICE_ID, userId, fenids);
             if (mClient != null) {
@@ -525,11 +525,13 @@ public class StepService extends Service implements SensorEventListener {
             }
             //设置围栏ID
             UserStepEntity userStepEntity = StepUtil.getUserStepData(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()));
-            if (userStepEntity == null) {
-                int fenceId = CommonInfo.getFenceId(getApplicationContext());
-                Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
-                //设置围栏id
-                StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId);
+            if (userStepEntity != null) {
+                if (TextUtils.isEmpty(userStepEntity.getFenceId())) {
+                    int fenceId = CommonInfo.getFenceId(getApplicationContext());
+                    Log.e(TAG, "onStartTraceCallback: 保存的围栏id" + fenceId);
+                    //设置围栏id
+                    StepUtil.setFenceId(getApplicationContext(), CommonInfo.getUserId(getApplicationContext()), fenceId + "");
+                }
             }
             entityName = userId;
             initTodayData(userId);
@@ -42,7 +42,7 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         public final static Property QueryTraceEndTime = new Property(15, long.class, "queryTraceEndTime", false, "QUERY_TRACE_END_TIME");
         public final static Property QueryEntityName = new Property(16, String.class, "queryEntityName", false, "QUERY_ENTITY_NAME");
         public final static Property ContinueTime = new Property(17, long.class, "continueTime", false, "CONTINUE_TIME");
-        public final static Property FenceId = new Property(18, long.class, "fenceId", false, "FENCE_ID");
+        public final static Property FenceId = new Property(18, String.class, "fenceId", false, "FENCE_ID");
         public final static Property ImportPoint = new Property(19, String.class, "importPoint", false, "IMPORT_POINT");
         public final static Property StreetTitle = new Property(20, String.class, "streetTitle", false, "STREET_TITLE");
         public final static Property EndLatLng = new Property(21, String.class, "endLatLng", false, "END_LAT_LNG");
@@ -80,7 +80,7 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
                 "\"QUERY_TRACE_END_TIME\" INTEGER NOT NULL ," + // 15: queryTraceEndTime
                 "\"QUERY_ENTITY_NAME\" TEXT," + // 16: queryEntityName
                 "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 17: continueTime
-                "\"FENCE_ID\" INTEGER NOT NULL ," + // 18: fenceId
+                "\"FENCE_ID\" TEXT," + // 18: fenceId
                 "\"IMPORT_POINT\" TEXT," + // 19: importPoint
                 "\"STREET_TITLE\" TEXT," + // 20: streetTitle
                 "\"END_LAT_LNG\" TEXT," + // 21: endLatLng
@@ -146,7 +146,11 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
             stmt.bindString(17, queryEntityName);
         }
         stmt.bindLong(18, entity.getContinueTime());
-        stmt.bindLong(19, entity.getFenceId());
+ 
+        String fenceId = entity.getFenceId();
+        if (fenceId != null) {
+            stmt.bindString(19, fenceId);
+        }
         String importPoint = entity.getImportPoint();
         if (importPoint != null) {
@@ -218,7 +222,11 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
             stmt.bindString(17, queryEntityName);
         }
         stmt.bindLong(18, entity.getContinueTime());
-        stmt.bindLong(19, entity.getFenceId());
+ 
+        String fenceId = entity.getFenceId();
+        if (fenceId != null) {
+            stmt.bindString(19, fenceId);
+        }
         String importPoint = entity.getImportPoint();
         if (importPoint != null) {
@@ -263,7 +271,7 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
             cursor.getLong(offset + 15), // queryTraceEndTime
             cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // queryEntityName
             cursor.getLong(offset + 17), // continueTime
-            cursor.getLong(offset + 18), // fenceId
+            cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // fenceId
             cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // importPoint
             cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // streetTitle
             cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // endLatLng
@@ -292,7 +300,7 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
         entity.setQueryTraceEndTime(cursor.getLong(offset + 15));
         entity.setQueryEntityName(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
         entity.setContinueTime(cursor.getLong(offset + 17));
-        entity.setFenceId(cursor.getLong(offset + 18));
+        entity.setFenceId(cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18));
         entity.setImportPoint(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
         entity.setStreetTitle(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
         entity.setEndLatLng(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
@@ -27,15 +27,15 @@ public class UserStepEntity {
     private long queryTraceEndTime;//从服务器获取的结束时间呢
     private String queryEntityName;//从服务器获取的运营人员的实体名称
     private long continueTime;//继续运动时间
-    private long fenceId;//围栏id
+    private String fenceId;//围栏id
     private String importPoint;//关键点
     private String streetTitle;//赛事标题
     private String endLatLng;//终点坐标
     private boolean isArriveEndPoint;//是否到达终点
-    @Generated(hash = 434792384)
+    @Generated(hash = 640124145)
     public UserStepEntity(String userId, String date, String stepCount, long recordTime, double caloriesCount, String serverTraceData, String startPoint, String endPoint,
             long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp, long chronometerBase, long queryTraceStartTime, long queryTraceEndTime,
-            String queryEntityName, long continueTime, long fenceId, String importPoint, String streetTitle, String endLatLng, boolean isArriveEndPoint) {
+            String queryEntityName, long continueTime, String fenceId, String importPoint, String streetTitle, String endLatLng, boolean isArriveEndPoint) {
         this.userId = userId;
         this.date = date;
         this.stepCount = stepCount;
@@ -210,13 +210,6 @@ public class UserStepEntity {
         this.continueTime = continueTime;
     }
-    public long getFenceId() {
-        return this.fenceId;
-    }
-
-    public void setFenceId(long fenceId) {
-        this.fenceId = fenceId;
-    }
     public String getImportPoint() {
         return this.importPoint;
@@ -250,6 +243,14 @@ public class UserStepEntity {
         this.endLatLng = endLatLng;
     }
+    public String getFenceId() {
+        return this.fenceId;
+    }
+
+    public void setFenceId(String fenceId) {
+        this.fenceId = fenceId;
+    }
+
 }
@@ -215,7 +215,7 @@ public class StepUtil {
      * @param uid
      * @param fenceId
      */
-    public static void setFenceId(Context context, String uid, long fenceId) {
+    public static void setFenceId(Context context, String uid, String fenceId) {
         try {
             if (getUserStepData(context, uid) != null) {
                 UserStepEntity entity = getUserStepData(context, uid);