CNLive Android Team / ModulePedometer · Commits

Commit 79e8a818dbc6fabdd03913c4c6d6008946f13927

Authored by 杨帅
1 parent c55c3ca9

1 修改暂停后,实时轨迹显示逻辑

Inline Side-by-side
Showing 4 changed files with 120 additions and 133 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
  View file @79e8a81
@@ -351,8 +351,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag @@ -351,8 +351,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag
351 if (!isPause) { 351 if (!isPause) {
352 endTime = TimeUtil.getNowTimeStamp(); 352 endTime = TimeUtil.getNowTimeStamp();
353 } else { 353 } else {
354 - endTime = userStepEntity.getPauseTimeStamp(); 354 + endTime = userStepEntity.getUserPauseTimeStamp();
355 } 355 }
  356 + Log.e(TAG, "startTime: "+startTime+",endTime:"+endTime );
356 //获取当前的实体名称 357 //获取当前的实体名称
357 String entityName = CommonInfo.getUserId(context); 358 String entityName = CommonInfo.getUserId(context);
358 //打的重要点 359 //打的重要点
@@ -388,8 +389,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag @@ -388,8 +389,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter<RunningMapFrag
388 //然后查询从暂停到现在的距离 389 //然后查询从暂停到现在的距离
389 if (isPause) { 390 if (isPause) {
390 long continueTime = userStepEntity.getContinueTime(); 391 long continueTime = userStepEntity.getContinueTime();
391 - long continueendTime = TimeUtil.getNowTimeStamp();  
392 - MyMapUtil.queryHistoryTrace(context, StepService.mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() { 392 + long continueEndTime = TimeUtil.getNowTimeStamp();
  393 + Log.e(TAG, "continueTime: "+continueTime+",continueEndTime:"+continueEndTime );
  394 + MyMapUtil.queryHistoryTrace(context, StepService.mClient, entityName, continueTime, continueEndTime, new MyMapUtil.CallBack() {
393 @Override 395 @Override
394 public void success(List<LatLng> resultPoints) { 396 public void success(List<LatLng> resultPoints) {
395 if (resultPoints != null && resultPoints.size() > 1) { 397 if (resultPoints != null && resultPoints.size() > 1) {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @79e8a81
@@ -231,8 +231,8 @@ public class RunMainFragmentView implements MvpView { @@ -231,8 +231,8 @@ public class RunMainFragmentView implements MvpView {
231 Log.e(TAG, "run: 是否暂停" + isPasue); 231 Log.e(TAG, "run: 是否暂停" + isPasue);
232 //如果暂停则从暂停那一刻开始 232 //如果暂停则从暂停那一刻开始
233 if (isPasue) { 233 if (isPasue) {
234 - if ((userStepEntity.getPauseTimeStamp() != 0) && (userStepEntity.getRecordTime() != 0)) {  
235 - fragment.binding.chronometer.setBase(userStepEntity.getPauseTimeStamp() + (SystemClock.elapsedRealtime() - userStepEntity.getRecordTime())); 234 + if ((userStepEntity.getChronometerBase() != 0) && (userStepEntity.getRecordTime() != 0)) {
  235 + fragment.binding.chronometer.setBase(userStepEntity.getChronometerBase() + (SystemClock.elapsedRealtime() - userStepEntity.getRecordTime()));
236 } else { 236 } else {
237 fragment.binding.chronometer.setFormat("00:00:01"); 237 fragment.binding.chronometer.setFormat("00:00:01");
238 fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime()); 238 fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
@@ -597,7 +597,7 @@ public class RunMainFragmentView implements MvpView { @@ -597,7 +597,7 @@ public class RunMainFragmentView implements MvpView {
597 if (!TextUtils.isEmpty(id)) { 597 if (!TextUtils.isEmpty(id)) {
598 UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid); 598 UserStepEntity userStepEntity = StepUtil.getUserStepData(fragment.getActivity(), uid);
599 if (userStepEntity != null) { 599 if (userStepEntity != null) {
600 - userStepEntity.setPauseTimeStamp(fragment.binding.chronometer.getBase()); 600 + userStepEntity.setChronometerBase(fragment.binding.chronometer.getBase());
601 //设置当前暂停的时间戳 601 //设置当前暂停的时间戳
602 userStepEntity.setRecordTime(SystemClock.elapsedRealtime()); 602 userStepEntity.setRecordTime(SystemClock.elapsedRealtime());
603 //设置当前用户暂停的时间戳 603 //设置当前用户暂停的时间戳
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/UserStepEntityDao.java
  View file @79e8a81
@@ -27,25 +27,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -27,25 +27,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
27 public final static Property UserId = new Property(0, String.class, "userId", true, "USER_ID"); 27 public final static Property UserId = new Property(0, String.class, "userId", true, "USER_ID");
28 public final static Property Date = new Property(1, String.class, "date", false, "DATE"); 28 public final static Property Date = new Property(1, String.class, "date", false, "DATE");
29 public final static Property StepCount = new Property(2, String.class, "stepCount", false, "STEP_COUNT"); 29 public final static Property StepCount = new Property(2, String.class, "stepCount", false, "STEP_COUNT");
30 - public final static Property PauseTimeStamp = new Property(3, long.class, "pauseTimeStamp", false, "PAUSE_TIME_STAMP");  
31 - public final static Property RecordTime = new Property(4, long.class, "recordTime", false, "RECORD_TIME");  
32 - public final static Property CaloriesCount = new Property(5, double.class, "caloriesCount", false, "CALORIES_COUNT");  
33 - public final static Property ServerTraceData = new Property(6, String.class, "serverTraceData", false, "SERVER_TRACE_DATA");  
34 - public final static Property StartPoint = new Property(7, String.class, "startPoint", false, "START_POINT");  
35 - public final static Property EndPoint = new Property(8, String.class, "endPoint", false, "END_POINT");  
36 - public final static Property StartTimeStamp = new Property(9, long.class, "startTimeStamp", false, "START_TIME_STAMP");  
37 - public final static Property FinishTimeStamp = new Property(10, long.class, "finishTimeStamp", false, "FINISH_TIME_STAMP");  
38 - public final static Property StreetId = new Property(11, String.class, "streetId", false, "STREET_ID");  
39 - public final static Property PauseCount = new Property(12, int.class, "pauseCount", false, "PAUSE_COUNT");  
40 - public final static Property UserPauseTimeStamp = new Property(13, long.class, "userPauseTimeStamp", false, "USER_PAUSE_TIME_STAMP");  
41 - public final static Property ChronometerBase = new Property(14, long.class, "chronometerBase", false, "CHRONOMETER_BASE");  
42 - public final static Property QueryTraceStartTime = new Property(15, long.class, "queryTraceStartTime", false, "QUERY_TRACE_START_TIME");  
43 - public final static Property QueryTraceEndTime = new Property(16, long.class, "queryTraceEndTime", false, "QUERY_TRACE_END_TIME");  
44 - public final static Property QueryEntityName = new Property(17, String.class, "queryEntityName", false, "QUERY_ENTITY_NAME");  
45 - public final static Property ContinueTime = new Property(18, long.class, "continueTime", false, "CONTINUE_TIME");  
46 - public final static Property FenceId = new Property(19, long.class, "fenceId", false, "FENCE_ID");  
47 - public final static Property ImportPoint = new Property(20, String.class, "importPoint", false, "IMPORT_POINT");  
48 - public final static Property StreetTitle = new Property(21, String.class, "streetTitle", false, "STREET_TITLE"); 30 + public final static Property RecordTime = new Property(3, long.class, "recordTime", false, "RECORD_TIME");
  31 + public final static Property CaloriesCount = new Property(4, double.class, "caloriesCount", false, "CALORIES_COUNT");
  32 + public final static Property ServerTraceData = new Property(5, String.class, "serverTraceData", false, "SERVER_TRACE_DATA");
  33 + public final static Property StartPoint = new Property(6, String.class, "startPoint", false, "START_POINT");
  34 + public final static Property EndPoint = new Property(7, String.class, "endPoint", false, "END_POINT");
  35 + public final static Property StartTimeStamp = new Property(8, long.class, "startTimeStamp", false, "START_TIME_STAMP");
  36 + public final static Property FinishTimeStamp = new Property(9, long.class, "finishTimeStamp", false, "FINISH_TIME_STAMP");
  37 + public final static Property StreetId = new Property(10, String.class, "streetId", false, "STREET_ID");
  38 + public final static Property PauseCount = new Property(11, int.class, "pauseCount", false, "PAUSE_COUNT");
  39 + public final static Property UserPauseTimeStamp = new Property(12, long.class, "userPauseTimeStamp", false, "USER_PAUSE_TIME_STAMP");
  40 + public final static Property ChronometerBase = new Property(13, long.class, "chronometerBase", false, "CHRONOMETER_BASE");
  41 + public final static Property QueryTraceStartTime = new Property(14, long.class, "queryTraceStartTime", false, "QUERY_TRACE_START_TIME");
  42 + public final static Property QueryTraceEndTime = new Property(15, long.class, "queryTraceEndTime", false, "QUERY_TRACE_END_TIME");
  43 + public final static Property QueryEntityName = new Property(16, String.class, "queryEntityName", false, "QUERY_ENTITY_NAME");
  44 + public final static Property ContinueTime = new Property(17, long.class, "continueTime", false, "CONTINUE_TIME");
  45 + public final static Property FenceId = new Property(18, long.class, "fenceId", false, "FENCE_ID");
  46 + public final static Property ImportPoint = new Property(19, String.class, "importPoint", false, "IMPORT_POINT");
  47 + public final static Property StreetTitle = new Property(20, String.class, "streetTitle", false, "STREET_TITLE");
49 } 48 }
50 49
51 50
@@ -64,25 +63,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -64,25 +63,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
64 "\"USER_ID\" TEXT PRIMARY KEY NOT NULL ," + // 0: userId 63 "\"USER_ID\" TEXT PRIMARY KEY NOT NULL ," + // 0: userId
65 "\"DATE\" TEXT," + // 1: date 64 "\"DATE\" TEXT," + // 1: date
66 "\"STEP_COUNT\" TEXT," + // 2: stepCount 65 "\"STEP_COUNT\" TEXT," + // 2: stepCount
67 - "\"PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 3: pauseTimeStamp  
68 - "\"RECORD_TIME\" INTEGER NOT NULL ," + // 4: recordTime  
69 - "\"CALORIES_COUNT\" REAL NOT NULL ," + // 5: caloriesCount  
70 - "\"SERVER_TRACE_DATA\" TEXT," + // 6: serverTraceData  
71 - "\"START_POINT\" TEXT," + // 7: startPoint  
72 - "\"END_POINT\" TEXT," + // 8: endPoint  
73 - "\"START_TIME_STAMP\" INTEGER NOT NULL ," + // 9: startTimeStamp  
74 - "\"FINISH_TIME_STAMP\" INTEGER NOT NULL ," + // 10: finishTimeStamp  
75 - "\"STREET_ID\" TEXT," + // 11: streetId  
76 - "\"PAUSE_COUNT\" INTEGER NOT NULL ," + // 12: pauseCount  
77 - "\"USER_PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 13: userPauseTimeStamp  
78 - "\"CHRONOMETER_BASE\" INTEGER NOT NULL ," + // 14: chronometerBase  
79 - "\"QUERY_TRACE_START_TIME\" INTEGER NOT NULL ," + // 15: queryTraceStartTime  
80 - "\"QUERY_TRACE_END_TIME\" INTEGER NOT NULL ," + // 16: queryTraceEndTime  
81 - "\"QUERY_ENTITY_NAME\" TEXT," + // 17: queryEntityName  
82 - "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 18: continueTime  
83 - "\"FENCE_ID\" INTEGER NOT NULL ," + // 19: fenceId  
84 - "\"IMPORT_POINT\" TEXT," + // 20: importPoint  
85 - "\"STREET_TITLE\" TEXT);"); // 21: streetTitle 66 + "\"RECORD_TIME\" INTEGER NOT NULL ," + // 3: recordTime
  67 + "\"CALORIES_COUNT\" REAL NOT NULL ," + // 4: caloriesCount
  68 + "\"SERVER_TRACE_DATA\" TEXT," + // 5: serverTraceData
  69 + "\"START_POINT\" TEXT," + // 6: startPoint
  70 + "\"END_POINT\" TEXT," + // 7: endPoint
  71 + "\"START_TIME_STAMP\" INTEGER NOT NULL ," + // 8: startTimeStamp
  72 + "\"FINISH_TIME_STAMP\" INTEGER NOT NULL ," + // 9: finishTimeStamp
  73 + "\"STREET_ID\" TEXT," + // 10: streetId
  74 + "\"PAUSE_COUNT\" INTEGER NOT NULL ," + // 11: pauseCount
  75 + "\"USER_PAUSE_TIME_STAMP\" INTEGER NOT NULL ," + // 12: userPauseTimeStamp
  76 + "\"CHRONOMETER_BASE\" INTEGER NOT NULL ," + // 13: chronometerBase
  77 + "\"QUERY_TRACE_START_TIME\" INTEGER NOT NULL ," + // 14: queryTraceStartTime
  78 + "\"QUERY_TRACE_END_TIME\" INTEGER NOT NULL ," + // 15: queryTraceEndTime
  79 + "\"QUERY_ENTITY_NAME\" TEXT," + // 16: queryEntityName
  80 + "\"CONTINUE_TIME\" INTEGER NOT NULL ," + // 17: continueTime
  81 + "\"FENCE_ID\" INTEGER NOT NULL ," + // 18: fenceId
  82 + "\"IMPORT_POINT\" TEXT," + // 19: importPoint
  83 + "\"STREET_TITLE\" TEXT);"); // 20: streetTitle
86 } 84 }
87 85
88 /** Drops the underlying database table. */ 86 /** Drops the underlying database table. */
@@ -109,52 +107,51 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -109,52 +107,51 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
109 if (stepCount != null) { 107 if (stepCount != null) {
110 stmt.bindString(3, stepCount); 108 stmt.bindString(3, stepCount);
111 } 109 }
112 - stmt.bindLong(4, entity.getPauseTimeStamp());  
113 - stmt.bindLong(5, entity.getRecordTime());  
114 - stmt.bindDouble(6, entity.getCaloriesCount()); 110 + stmt.bindLong(4, entity.getRecordTime());
  111 + stmt.bindDouble(5, entity.getCaloriesCount());
115 112
116 String serverTraceData = entity.getServerTraceData(); 113 String serverTraceData = entity.getServerTraceData();
117 if (serverTraceData != null) { 114 if (serverTraceData != null) {
118 - stmt.bindString(7, serverTraceData); 115 + stmt.bindString(6, serverTraceData);
119 } 116 }
120 117
121 String startPoint = entity.getStartPoint(); 118 String startPoint = entity.getStartPoint();
122 if (startPoint != null) { 119 if (startPoint != null) {
123 - stmt.bindString(8, startPoint); 120 + stmt.bindString(7, startPoint);
124 } 121 }
125 122
126 String endPoint = entity.getEndPoint(); 123 String endPoint = entity.getEndPoint();
127 if (endPoint != null) { 124 if (endPoint != null) {
128 - stmt.bindString(9, endPoint); 125 + stmt.bindString(8, endPoint);
129 } 126 }
130 - stmt.bindLong(10, entity.getStartTimeStamp());  
131 - stmt.bindLong(11, entity.getFinishTimeStamp()); 127 + stmt.bindLong(9, entity.getStartTimeStamp());
  128 + stmt.bindLong(10, entity.getFinishTimeStamp());
132 129
133 String streetId = entity.getStreetId(); 130 String streetId = entity.getStreetId();
134 if (streetId != null) { 131 if (streetId != null) {
135 - stmt.bindString(12, streetId); 132 + stmt.bindString(11, streetId);
136 } 133 }
137 - stmt.bindLong(13, entity.getPauseCount());  
138 - stmt.bindLong(14, entity.getUserPauseTimeStamp());  
139 - stmt.bindLong(15, entity.getChronometerBase());  
140 - stmt.bindLong(16, entity.getQueryTraceStartTime());  
141 - stmt.bindLong(17, entity.getQueryTraceEndTime()); 134 + stmt.bindLong(12, entity.getPauseCount());
  135 + stmt.bindLong(13, entity.getUserPauseTimeStamp());
  136 + stmt.bindLong(14, entity.getChronometerBase());
  137 + stmt.bindLong(15, entity.getQueryTraceStartTime());
  138 + stmt.bindLong(16, entity.getQueryTraceEndTime());
142 139
143 String queryEntityName = entity.getQueryEntityName(); 140 String queryEntityName = entity.getQueryEntityName();
144 if (queryEntityName != null) { 141 if (queryEntityName != null) {
145 - stmt.bindString(18, queryEntityName); 142 + stmt.bindString(17, queryEntityName);
146 } 143 }
147 - stmt.bindLong(19, entity.getContinueTime());  
148 - stmt.bindLong(20, entity.getFenceId()); 144 + stmt.bindLong(18, entity.getContinueTime());
  145 + stmt.bindLong(19, entity.getFenceId());
149 146
150 String importPoint = entity.getImportPoint(); 147 String importPoint = entity.getImportPoint();
151 if (importPoint != null) { 148 if (importPoint != null) {
152 - stmt.bindString(21, importPoint); 149 + stmt.bindString(20, importPoint);
153 } 150 }
154 151
155 String streetTitle = entity.getStreetTitle(); 152 String streetTitle = entity.getStreetTitle();
156 if (streetTitle != null) { 153 if (streetTitle != null) {
157 - stmt.bindString(22, streetTitle); 154 + stmt.bindString(21, streetTitle);
158 } 155 }
159 } 156 }
160 157
@@ -176,52 +173,51 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -176,52 +173,51 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
176 if (stepCount != null) { 173 if (stepCount != null) {
177 stmt.bindString(3, stepCount); 174 stmt.bindString(3, stepCount);
178 } 175 }
179 - stmt.bindLong(4, entity.getPauseTimeStamp());  
180 - stmt.bindLong(5, entity.getRecordTime());  
181 - stmt.bindDouble(6, entity.getCaloriesCount()); 176 + stmt.bindLong(4, entity.getRecordTime());
  177 + stmt.bindDouble(5, entity.getCaloriesCount());
182 178
183 String serverTraceData = entity.getServerTraceData(); 179 String serverTraceData = entity.getServerTraceData();
184 if (serverTraceData != null) { 180 if (serverTraceData != null) {
185 - stmt.bindString(7, serverTraceData); 181 + stmt.bindString(6, serverTraceData);
186 } 182 }
187 183
188 String startPoint = entity.getStartPoint(); 184 String startPoint = entity.getStartPoint();
189 if (startPoint != null) { 185 if (startPoint != null) {
190 - stmt.bindString(8, startPoint); 186 + stmt.bindString(7, startPoint);
191 } 187 }
192 188
193 String endPoint = entity.getEndPoint(); 189 String endPoint = entity.getEndPoint();
194 if (endPoint != null) { 190 if (endPoint != null) {
195 - stmt.bindString(9, endPoint); 191 + stmt.bindString(8, endPoint);
196 } 192 }
197 - stmt.bindLong(10, entity.getStartTimeStamp());  
198 - stmt.bindLong(11, entity.getFinishTimeStamp()); 193 + stmt.bindLong(9, entity.getStartTimeStamp());
  194 + stmt.bindLong(10, entity.getFinishTimeStamp());
199 195
200 String streetId = entity.getStreetId(); 196 String streetId = entity.getStreetId();
201 if (streetId != null) { 197 if (streetId != null) {
202 - stmt.bindString(12, streetId); 198 + stmt.bindString(11, streetId);
203 } 199 }
204 - stmt.bindLong(13, entity.getPauseCount());  
205 - stmt.bindLong(14, entity.getUserPauseTimeStamp());  
206 - stmt.bindLong(15, entity.getChronometerBase());  
207 - stmt.bindLong(16, entity.getQueryTraceStartTime());  
208 - stmt.bindLong(17, entity.getQueryTraceEndTime()); 200 + stmt.bindLong(12, entity.getPauseCount());
  201 + stmt.bindLong(13, entity.getUserPauseTimeStamp());
  202 + stmt.bindLong(14, entity.getChronometerBase());
  203 + stmt.bindLong(15, entity.getQueryTraceStartTime());
  204 + stmt.bindLong(16, entity.getQueryTraceEndTime());
209 205
210 String queryEntityName = entity.getQueryEntityName(); 206 String queryEntityName = entity.getQueryEntityName();
211 if (queryEntityName != null) { 207 if (queryEntityName != null) {
212 - stmt.bindString(18, queryEntityName); 208 + stmt.bindString(17, queryEntityName);
213 } 209 }
214 - stmt.bindLong(19, entity.getContinueTime());  
215 - stmt.bindLong(20, entity.getFenceId()); 210 + stmt.bindLong(18, entity.getContinueTime());
  211 + stmt.bindLong(19, entity.getFenceId());
216 212
217 String importPoint = entity.getImportPoint(); 213 String importPoint = entity.getImportPoint();
218 if (importPoint != null) { 214 if (importPoint != null) {
219 - stmt.bindString(21, importPoint); 215 + stmt.bindString(20, importPoint);
220 } 216 }
221 217
222 String streetTitle = entity.getStreetTitle(); 218 String streetTitle = entity.getStreetTitle();
223 if (streetTitle != null) { 219 if (streetTitle != null) {
224 - stmt.bindString(22, streetTitle); 220 + stmt.bindString(21, streetTitle);
225 } 221 }
226 } 222 }
227 223
@@ -236,25 +232,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -236,25 +232,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
236 cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0), // userId 232 cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0), // userId
237 cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // date 233 cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // date
238 cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // stepCount 234 cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // stepCount
239 - cursor.getLong(offset + 3), // pauseTimeStamp  
240 - cursor.getLong(offset + 4), // recordTime  
241 - cursor.getDouble(offset + 5), // caloriesCount  
242 - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // serverTraceData  
243 - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // startPoint  
244 - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // endPoint  
245 - cursor.getLong(offset + 9), // startTimeStamp  
246 - cursor.getLong(offset + 10), // finishTimeStamp  
247 - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11), // streetId  
248 - cursor.getInt(offset + 12), // pauseCount  
249 - cursor.getLong(offset + 13), // userPauseTimeStamp  
250 - cursor.getLong(offset + 14), // chronometerBase  
251 - cursor.getLong(offset + 15), // queryTraceStartTime  
252 - cursor.getLong(offset + 16), // queryTraceEndTime  
253 - cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17), // queryEntityName  
254 - cursor.getLong(offset + 18), // continueTime  
255 - cursor.getLong(offset + 19), // fenceId  
256 - cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // importPoint  
257 - cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21) // streetTitle 235 + cursor.getLong(offset + 3), // recordTime
  236 + cursor.getDouble(offset + 4), // caloriesCount
  237 + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // serverTraceData
  238 + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // startPoint
  239 + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // endPoint
  240 + cursor.getLong(offset + 8), // startTimeStamp
  241 + cursor.getLong(offset + 9), // finishTimeStamp
  242 + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // streetId
  243 + cursor.getInt(offset + 11), // pauseCount
  244 + cursor.getLong(offset + 12), // userPauseTimeStamp
  245 + cursor.getLong(offset + 13), // chronometerBase
  246 + cursor.getLong(offset + 14), // queryTraceStartTime
  247 + cursor.getLong(offset + 15), // queryTraceEndTime
  248 + cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16), // queryEntityName
  249 + cursor.getLong(offset + 17), // continueTime
  250 + cursor.getLong(offset + 18), // fenceId
  251 + cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // importPoint
  252 + cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20) // streetTitle
258 ); 253 );
259 return entity; 254 return entity;
260 } 255 }
@@ -264,25 +259,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; { @@ -264,25 +259,24 @@ public class UserStepEntityDao extends AbstractDao&lt;UserStepEntity, String&gt; {
264 entity.setUserId(cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0)); 259 entity.setUserId(cursor.isNull(offset + 0) ? null : cursor.getString(offset + 0));
265 entity.setDate(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1)); 260 entity.setDate(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
266 entity.setStepCount(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); 261 entity.setStepCount(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
267 - entity.setPauseTimeStamp(cursor.getLong(offset + 3));  
268 - entity.setRecordTime(cursor.getLong(offset + 4));  
269 - entity.setCaloriesCount(cursor.getDouble(offset + 5));  
270 - entity.setServerTraceData(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));  
271 - entity.setStartPoint(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));  
272 - entity.setEndPoint(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));  
273 - entity.setStartTimeStamp(cursor.getLong(offset + 9));  
274 - entity.setFinishTimeStamp(cursor.getLong(offset + 10));  
275 - entity.setStreetId(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11));  
276 - entity.setPauseCount(cursor.getInt(offset + 12));  
277 - entity.setUserPauseTimeStamp(cursor.getLong(offset + 13));  
278 - entity.setChronometerBase(cursor.getLong(offset + 14));  
279 - entity.setQueryTraceStartTime(cursor.getLong(offset + 15));  
280 - entity.setQueryTraceEndTime(cursor.getLong(offset + 16));  
281 - entity.setQueryEntityName(cursor.isNull(offset + 17) ? null : cursor.getString(offset + 17));  
282 - entity.setContinueTime(cursor.getLong(offset + 18));  
283 - entity.setFenceId(cursor.getLong(offset + 19));  
284 - entity.setImportPoint(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));  
285 - entity.setStreetTitle(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21)); 262 + entity.setRecordTime(cursor.getLong(offset + 3));
  263 + entity.setCaloriesCount(cursor.getDouble(offset + 4));
  264 + entity.setServerTraceData(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
  265 + entity.setStartPoint(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
  266 + entity.setEndPoint(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
  267 + entity.setStartTimeStamp(cursor.getLong(offset + 8));
  268 + entity.setFinishTimeStamp(cursor.getLong(offset + 9));
  269 + entity.setStreetId(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10));
  270 + entity.setPauseCount(cursor.getInt(offset + 11));
  271 + entity.setUserPauseTimeStamp(cursor.getLong(offset + 12));
  272 + entity.setChronometerBase(cursor.getLong(offset + 13));
  273 + entity.setQueryTraceStartTime(cursor.getLong(offset + 14));
  274 + entity.setQueryTraceEndTime(cursor.getLong(offset + 15));
  275 + entity.setQueryEntityName(cursor.isNull(offset + 16) ? null : cursor.getString(offset + 16));
  276 + entity.setContinueTime(cursor.getLong(offset + 17));
  277 + entity.setFenceId(cursor.getLong(offset + 18));
  278 + entity.setImportPoint(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
  279 + entity.setStreetTitle(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
286 } 280 }
287 281
288 @Override 282 @Override
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/entity/UserStepEntity.java
  View file @79e8a81
@@ -10,7 +10,6 @@ public class UserStepEntity { @@ -10,7 +10,6 @@ public class UserStepEntity {
10 private String userId; 10 private String userId;
11 private String date; 11 private String date;
12 private String stepCount; 12 private String stepCount;
13 - private long pauseTimeStamp;//暂停时间戳  
14 private long recordTime;//暂停时间 13 private long recordTime;//暂停时间
15 private double caloriesCount;//卡路里 14 private double caloriesCount;//卡路里
16 private String serverTraceData;//服务端赛道数据 15 private String serverTraceData;//服务端赛道数据
@@ -30,14 +29,13 @@ public class UserStepEntity { @@ -30,14 +29,13 @@ public class UserStepEntity {
30 private String importPoint;//关键点 29 private String importPoint;//关键点
31 private String streetTitle;//赛事标题 30 private String streetTitle;//赛事标题
32 31
33 - @Generated(hash = 1762072682)  
34 - public UserStepEntity(String userId, String date, String stepCount, long pauseTimeStamp, long recordTime, double caloriesCount, String serverTraceData, String startPoint,  
35 - String endPoint, long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp, long chronometerBase, long queryTraceStartTime,  
36 - long queryTraceEndTime, String queryEntityName, long continueTime, long fenceId, String importPoint, String streetTitle) { 32 + @Generated(hash = 281426159)
  33 + public UserStepEntity(String userId, String date, String stepCount, long recordTime, double caloriesCount, String serverTraceData, String startPoint, String endPoint,
  34 + long startTimeStamp, long finishTimeStamp, String streetId, int pauseCount, long userPauseTimeStamp, long chronometerBase, long queryTraceStartTime, long queryTraceEndTime,
  35 + String queryEntityName, long continueTime, long fenceId, String importPoint, String streetTitle) {
37 this.userId = userId; 36 this.userId = userId;
38 this.date = date; 37 this.date = date;
39 this.stepCount = stepCount; 38 this.stepCount = stepCount;
40 - this.pauseTimeStamp = pauseTimeStamp;  
41 this.recordTime = recordTime; 39 this.recordTime = recordTime;
42 this.caloriesCount = caloriesCount; 40 this.caloriesCount = caloriesCount;
43 this.serverTraceData = serverTraceData; 41 this.serverTraceData = serverTraceData;
@@ -86,13 +84,6 @@ public class UserStepEntity { @@ -86,13 +84,6 @@ public class UserStepEntity {
86 this.stepCount = stepCount; 84 this.stepCount = stepCount;
87 } 85 }
88 86
89 - public long getPauseTimeStamp() {  
90 - return this.pauseTimeStamp;  
91 - }  
92 -  
93 - public void setPauseTimeStamp(long pauseTimeStamp) {  
94 - this.pauseTimeStamp = pauseTimeStamp;  
95 - }  
96 87
97 public long getRecordTime() { 88 public long getRecordTime() {
98 return this.recordTime; 89 return this.recordTime;