CNLive Android Team / ModulePedometer · Commits

Commit ae64a207c802e66a79107868ab762ef6ba7b5830

Authored by 杨帅
1 parent 1cdfcd27

1 去除用户是否完成的吐司

Inline Side-by-side
Showing 5 changed files with 19 additions and 40 deletions
config.gradle
  View file @ae64a20
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.7.13", 24 + version: "0.7.14",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
  View file @ae64a20
@@ -140,7 +140,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin @@ -140,7 +140,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin
140 //自动判断交通方式 140 //自动判断交通方式
141 processOption.setTransportMode(TransportMode.walking); 141 processOption.setTransportMode(TransportMode.walking);
142 // 设置精度过滤值(定位精度大于100米的过滤掉) 142 // 设置精度过滤值(定位精度大于100米的过滤掉)
143 - processOption.setRadiusThreshold(9); 143 + processOption.setRadiusThreshold(20);
144 // 设置纠偏选项 144 // 设置纠偏选项
145 historyTrackRequest.setProcessOption(processOption); 145 historyTrackRequest.setProcessOption(processOption);
146 // 设置里程填充方式为驾车 146 // 设置里程填充方式为驾车
@@ -208,7 +208,6 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin @@ -208,7 +208,6 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter<CollRunnin
208 queryHistoryTrace(context, entityName, startTime, endTime); 208 queryHistoryTrace(context, entityName, startTime, endTime);
209 } else { 209 } else {
210 if (getView() != null) { 210 if (getView() != null) {
211 -  
212 //开始比较(杨帅的思路) 211 //开始比较(杨帅的思路)
213 // for (int i = 0; i < trackPoints.size(); i++) { 212 // for (int i = 0; i < trackPoints.size(); i++) {
214 // if (matchIndex < importPoints.size() - 1) { 213 // if (matchIndex < importPoints.size() - 1) {
@@ -236,34 +235,14 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin @@ -236,34 +235,14 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
236 // } else { 235 // } else {
237 // Toast.makeText(context, "已完成", Toast.LENGTH_LONG).show(); 236 // Toast.makeText(context, "已完成", Toast.LENGTH_LONG).show();
238 // } 237 // }
239 - //郭瑞鹏的思路  
240 - int index = 0;  
241 - for (int i = 0; i < importPoints.size(); i++) {  
242 - LatLng importLatLng = importPoints.get(i);  
243 - for (int j = index; j < trackPoints.size(); j++) {  
244 - double distance = DistanceUtil.getDistance(importLatLng, trackPoints.get(j));  
245 - if (distance<100){  
246 - importHash.put(i,true);  
247 - index=j;  
248 - }  
249 - }  
250 - }  
251 - //输出  
252 - int result = 0;  
253 - for (int i = 0; i < importHash.size(); i++) {  
254 - if (!importHash.get(i)) {  
255 - result++;  
256 - Log.e(TAG, "onHistoryTrackCallback: 没过:" + i + importHash.get(i));  
257 - }  
258 - }  
259 - if (result > importPoints.size() * 0.4) {  
260 - Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();  
261 -  
262 - } else {  
263 - Toast.makeText(context, "已完成", Toast.LENGTH_LONG).show();  
264 - }  
265 - Log.e(TAG, "结果: " + result);  
266 - Log.e(TAG, "onHistoryTrackCallback: 轨迹点:" + trackPoints.size() + ",详情" + GsonUtil.GsonString(trackPoints)); 238 +// if (result > importPoints.size() * 0.4) {
  239 +// Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
  240 +//
  241 +// } else {
  242 +// Toast.makeText(context, "已完成", Toast.LENGTH_LONG).show();
  243 +// }
  244 +// Log.e(TAG, "结果: " + result);
  245 +// Log.e(TAG, "onHistoryTrackCallback: 轨迹点:" + trackPoints.size() + ",详情" + GsonUtil.GsonString(trackPoints));
267 MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end); 246 MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
268 // MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red); 247 // MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red);
269 } 248 }
@@ -274,7 +253,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin @@ -274,7 +253,7 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
274 public void onDistanceCallback(DistanceResponse distanceResponse) { 253 public void onDistanceCallback(DistanceResponse distanceResponse) {
275 super.onDistanceCallback(distanceResponse); 254 super.onDistanceCallback(distanceResponse);
276 // Toast.makeText(context, "查询的里程数:" + (int) distanceResponse.getDistance() + "米", Toast.LENGTH_SHORT).show(); 255 // Toast.makeText(context, "查询的里程数:" + (int) distanceResponse.getDistance() + "米", Toast.LENGTH_SHORT).show();
277 - Log.e(TAG, "onDistanceCallback: " + distanceResponse.getDistance()); 256 +// Log.e(TAG, "onDistanceCallback: " + distanceResponse.getDistance());
278 } 257 }
279 }; 258 };
280 //开始查询历史轨迹 259 //开始查询历史轨迹
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/LineUpAgainPresenter.java
  View file @ae64a20
@@ -82,10 +82,10 @@ public class LineUpAgainPresenter extends MvpBasePresenter&lt;LineUpAgainView&gt; { @@ -82,10 +82,10 @@ public class LineUpAgainPresenter extends MvpBasePresenter&lt;LineUpAgainView&gt; {
82 //判断是否完成 82 //判断是否完成
83 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE); 83 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
84 if (isFinish) { 84 if (isFinish) {
85 - Toast.makeText(context, "完成", Toast.LENGTH_LONG).show(); 85 +// Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
86 failedEntity.setIsFinish("1"); 86 failedEntity.setIsFinish("1");
87 } else { 87 } else {
88 - Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show(); 88 +// Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
89 failedEntity.setIsFinish("0"); 89 failedEntity.setIsFinish("0");
90 } 90 }
91 saveRouteData(context, failedEntity, onResultListener); 91 saveRouteData(context, failedEntity, onResultListener);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
  View file @ae64a20
@@ -334,10 +334,10 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis @@ -334,10 +334,10 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
334 //判断是否完成 334 //判断是否完成
335 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE); 335 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
336 if (isFinish) { 336 if (isFinish) {
337 - Toast.makeText(context, "完成", Toast.LENGTH_LONG).show(); 337 +// Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
338 runningFinishBean.setIsFinish("1"); 338 runningFinishBean.setIsFinish("1");
339 } else { 339 } else {
340 - Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show(); 340 +// Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
341 runningFinishBean.setIsFinish("0"); 341 runningFinishBean.setIsFinish("0");
342 } 342 }
343 } 343 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/UploadFailDetailFragmentPresenter.java
  View file @ae64a20
@@ -115,13 +115,13 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa @@ -115,13 +115,13 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
115 //判断是否完成 115 //判断是否完成
116 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE); 116 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
117 if (isFinish) { 117 if (isFinish) {
118 - Toast.makeText(context, "完成", Toast.LENGTH_LONG).show(); 118 +// Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
119 failedEntity.setIsFinish("1"); 119 failedEntity.setIsFinish("1");
120 if (getView() != null) { 120 if (getView() != null) {
121 getView().updateIsFinish("1"); 121 getView().updateIsFinish("1");
122 } 122 }
123 } else { 123 } else {
124 - Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show(); 124 +// Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
125 failedEntity.setIsFinish("0"); 125 failedEntity.setIsFinish("0");
126 if (getView() != null) { 126 if (getView() != null) {
127 getView().updateIsFinish("0"); 127 getView().updateIsFinish("0");
@@ -158,13 +158,13 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa @@ -158,13 +158,13 @@ public class UploadFailDetailFragmentPresenter extends MvpBasePresenter&lt;UploadFa
158 //判断是否完成 158 //判断是否完成
159 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, allResultPoints, Constant.PASS_RATE); 159 boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, allResultPoints, Constant.PASS_RATE);
160 if (isFinish) { 160 if (isFinish) {
161 - Toast.makeText(context, "完成", Toast.LENGTH_LONG).show(); 161 +// Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
162 failedEntity.setIsFinish("1"); 162 failedEntity.setIsFinish("1");
163 if (getView() != null) { 163 if (getView() != null) {
164 getView().updateIsFinish("1"); 164 getView().updateIsFinish("1");
165 } 165 }
166 } else { 166 } else {
167 - Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show(); 167 +// Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
168 failedEntity.setIsFinish("0"); 168 failedEntity.setIsFinish("0");
169 if (getView() != null) { 169 if (getView() != null) {
170 getView().updateIsFinish("0"); 170 getView().updateIsFinish("0");