CNLive Android Team / ModulePedometer · Commits

Commit f2384867974cea998d8f206239763e9909e9e355

Authored by 韩亚云
1 parent f1ddb047

轨迹绑定接口修改

Inline Side-by-side
Showing 6 changed files with 143 additions and 68 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
  View file @f238486
... ... @@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.callback.DataCallback;
7 7 import com.cnlive.libs.base.logic.callback.FailureCallback;
8 8 import com.cnlive.libs.base.logic.callback.SuccessCallback;
9 9 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
  10 +import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
10 11 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
11 12 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
12 13 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
... ... @@ -94,12 +95,12 @@ public class RaceNameListPresenter extends MvpBasePresenter<RaceNameListView> {
94 95 Map<String,String> map = new HashMap<>();
95 96 map.put("id",id+"");
96 97 map.put("eventId",eventId);
97   - Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo>() {
  98 + Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo<BindingShoeInfo>>() {
98 99 @Override
99   - public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
  100 + public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<BindingShoeInfo>> dataCallback) {
100 101 return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.bindingShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
101 102 }
102   - }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
  103 + }).<BaseInfo<BindingShoeInfo>>event().setFailureCallback(new FailureCallback() {
103 104 @Override
104 105 public void onFailure(int code, String message) {
105 106 if (getView() != null) {
... ... @@ -107,11 +108,11 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
107 108 getView().hideLoading();
108 109 }
109 110 }
110   - }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
  111 + }).setSuccessCallback(new SuccessCallback<BaseInfo<BindingShoeInfo>>() {
111 112 @Override
112   - public void onSuccess(BaseInfo baseInfo) {
  113 + public void onSuccess(BaseInfo<BindingShoeInfo> baseInfo) {
113 114 if (getView() != null){
114   - getView().bindingShoeLine(position);
  115 + getView().bindingShoeLine(position,baseInfo);
115 116 }
116 117 }
117 118 }).start();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
  View file @f238486
... ... @@ -20,6 +20,7 @@ import com.baidu.trace.api.fence.UpdateFenceResponse;
20 20 import com.baidu.trace.model.CoordType;
21 21 import com.cnlive.libs.base.util.AlertUtil;
22 22 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
  23 +import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
23 24 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
24 25 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
25 26 import com.cnlive.moudle.collectionTrace.ui.adapter.RaceNameListAdapter;
... ... @@ -80,7 +81,8 @@ public class RaceNameListView implements MvpView, OnFenceListener {
80 81 }
81 82  
82 83  
83   - public void bindingShoeLine(int position) {
  84 + public void bindingShoeLine(int position,BaseInfo<BindingShoeInfo> baseInfo) {
  85 + if(baseInfo.getData().getEntityName() != null) fragment.entityName = baseInfo.getData().getEntityName();
84 86 list.get(position).setIsEnable(0);
85 87 for (int i = 0; i < list.size(); i++) {
86 88 if (i != position && list.get(i).getIsEnable() == 0) {
... ... @@ -104,6 +106,7 @@ public class RaceNameListView implements MvpView, OnFenceListener {
104 106 if (adapter == null) {
105 107 adapter = new RaceNameListAdapter(list, fragment.getActivity());
106 108 fragment.binding.raceRecy.setAdapter(adapter);
  109 + if(raceNameListInfoBaseInfo.getData().getEntityName() != null) fragment.entityName = raceNameListInfoBaseInfo.getData().getEntityName();
107 110 adapter.setOnItemClick(new RaceNameListAdapter.OnItemClick() {
108 111 @Override
109 112 public void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/BindingShoeInfo.java 0 → 100644
  View file @f238486
  1 +package com.cnlive.moudle.collectionTrace.model;
  2 +
  3 +/**
  4 + * Created by hanyayun 019/07/8.
  5 + */
  6 +public class BindingShoeInfo {
  7 +
  8 + /**
  9 + * roadMap : http://wjjtest.ys2.cnliveimg.com/802/img/0/2019/07/05/156230801470911621062.png
  10 + * eventId : 170
  11 + * code : 1
  12 + * entityName : 10513196
  13 + */
  14 +
  15 + private String roadMap;
  16 + private String eventId;
  17 + private int code;
  18 + private String entityName;
  19 +
  20 + public String getRoadMap() {
  21 + return roadMap;
  22 + }
  23 +
  24 + public void setRoadMap(String roadMap) {
  25 + this.roadMap = roadMap;
  26 + }
  27 +
  28 + public String getEventId() {
  29 + return eventId;
  30 + }
  31 +
  32 + public void setEventId(String eventId) {
  33 + this.eventId = eventId;
  34 + }
  35 +
  36 + public int getCode() {
  37 + return code;
  38 + }
  39 +
  40 + public void setCode(int code) {
  41 + this.code = code;
  42 + }
  43 +
  44 + public String getEntityName() {
  45 + return entityName;
  46 + }
  47 +
  48 + public void setEntityName(String entityName) {
  49 + this.entityName = entityName;
  50 + }
  51 +}
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/RaceNameListInfo.java
  View file @f238486
... ... @@ -8,15 +8,24 @@ import java.util.List;
8 8 */
9 9 public class RaceNameListInfo implements Serializable {
10 10  
11   -
12 11 /**
13   - * eventShoeLines : [{"entityName":"yangshuai","startTime":"1560127625","endTime":"1560127625","createTime":1560498861000,"darenId":"daren_10513196","endLocation":"首都师范大学操场西门","eventId":"116","id":120,"isEnable":0,"latLongitude":"[{\"latitude\":39.933942415657,\"latitudeE6\":3.9933942415657E7,\"longitude\":116.30897883196,\"longitudeE6\":1.1630897883196001E8},{\"latitude\":39.933967093082,\"latitudeE6\":3.9933967093082E7,\"longitude\":116.30890884739,\"longitudeE6\":1.1630890884739E8},{\"latitude\":39.93396191311,\"latitudeE6\":3.9933961913109995E7,\"longitude\":116.30868153328,\"longitudeE6\":1.1630868153328E8},{\"latitude\":39.934018604395,\"latitudeE6\":3.9934018604395E7,\"longitude\":116.30864816843,\"longitudeE6\":1.1630864816843E8},{\"latitude\":39.934091845914,\"latitudeE6\":3.9934091845914E7,\"longitude\":116.30864003053,\"longitudeE6\":1.1630864003053E8},{\"latitude\":39.934360142831,\"latitudeE6\":3.9934360142831E7,\"longitude\":116.30875016067,\"longitudeE6\":1.1630875016067E8},{\"latitude\":39.934744000269,\"latitudeE6\":3.9934744000268996E7,\"longitude\":116.30886056182,\"longitudeE6\":1.1630886056182E8},{\"latitude\":39.934760553353,\"latitudeE6\":3.9934760553353004E7,\"longitude\":116.30891047327,\"longitudeE6\":1.1630891047327E8},{\"latitude\":39.934696015943,\"latitudeE6\":3.9934696015943E7,\"longitude\":116.30912422473,\"longitudeE6\":1.1630912422473E8},{\"latitude\":39.934698216461,\"latitudeE6\":3.9934698216461E7,\"longitude\":116.30938815875,\"longitudeE6\":1.1630938815875E8},{\"latitude\":39.934731879794,\"latitudeE6\":3.9934731879794E7,\"longitude\":116.30961357404,\"longitudeE6\":1.1630961357404E8},{\"latitude\":39.934696892741,\"latitudeE6\":3.9934696892741E7,\"longitude\":116.30967053826,\"longitudeE6\":1.1630967053826E8},{\"latitude\":39.934370279617,\"latitudeE6\":3.9934370279617E7,\"longitude\":116.30962008478,\"longitudeE6\":1.1630962008478E8},{\"latitude\":39.934132111504,\"latitudeE6\":3.9934132111503996E7,\"longitude\":116.309668369,\"longitudeE6\":1.1630966836899999E8},{\"latitude\":39.933978571682,\"latitudeE6\":3.9933978571682E7,\"longitude\":116.30965182248,\"longitudeE6\":1.1630965182248001E8},{\"latitude\":39.933964707162,\"latitudeE6\":3.9933964707162E7,\"longitude\":116.3093930426,\"longitudeE6\":1.1630939304259999E8},{\"latitude\":39.933996146467,\"latitudeE6\":3.9933996146467E7,\"longitude\":116.30915080933,\"longitudeE6\":1.1630915080933E8}]","mileage":"5","roadmap":"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1560748589378&di=bb8468bcde8fbebe49e62c49e1a4312c&imgtype=0&src=http%3A%2F%2F05imgmini.eastday.com%2Fmobile%2F20190309%2F20190309100119_57a582d9807694bc008c102f91d01d13_3.jpeg","startLocation":"首都师范大学操场东门","updateTime":1560498861000,"userMsg":{"image":"","nickName":""}}]
14   - * hasNext : false
  12 + * entityName : 10513196
  13 + * eventShoeLines : [{"createTime":1562308026000,"darenId":"10513196","endLocation":"在国图文化大厦附近","endTime":"1562305663","entityName":"10513196","eventId":"170","eventName":"23515","id":123,"isEnable":0,"mileage":"0.0","roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/0/2019/07/05/156230801470911621062.png","startLocation":"在国图文化大厦附近","startTime":"1562305531","userMsg":{"image":"http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg","nickName":"峨眉派掌门候选人","userId":"10513196"}},{"createTime":1562308213000,"darenId":"10513196","endLocation":"在国图文化大厦附近","endTime":"1562305663","entityName":"10513196","eventId":"170","eventName":"23515","id":124,"isEnable":1,"mileage":"0.0","roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/0/2019/07/05/156230820169082497735.png","startLocation":"在国图文化大厦附近","startTime":"1562305531","userMsg":{"image":"http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg","nickName":"峨眉派掌门候选人","userId":"10513196"}}]
  14 + * hasNext : true
15 15 */
16 16  
  17 + private String entityName;
17 18 private boolean hasNext;
18 19 private List<EventShoeLinesBean> eventShoeLines;
19 20  
  21 + public String getEntityName() {
  22 + return entityName;
  23 + }
  24 +
  25 + public void setEntityName(String entityName) {
  26 + this.entityName = entityName;
  27 + }
  28 +
20 29 public boolean isHasNext() {
21 30 return hasNext;
22 31 }
... ... @@ -35,62 +44,37 @@ public class RaceNameListInfo implements Serializable {
35 44  
36 45 public static class EventShoeLinesBean implements Serializable {
37 46 /**
38   - * entityName : yangshuai
39   - * startTime : 1560127625
40   - * endTime : 1560127625
41   - * createTime : 1560498861000
42   - * darenId : daren_10513196
43   - * endLocation : 首都师范大学操场西门
44   - * eventId : 116
45   - * id : 120
  47 + * createTime : 1562308026000
  48 + * darenId : 10513196
  49 + * endLocation : 在国图文化大厦附近
  50 + * endTime : 1562305663
  51 + * entityName : 10513196
  52 + * eventId : 170
  53 + * eventName : 23515
  54 + * id : 123
46 55 * isEnable : 0
47   - * latLongitude : [{"latitude":39.933942415657,"latitudeE6":3.9933942415657E7,"longitude":116.30897883196,"longitudeE6":1.1630897883196001E8},{"latitude":39.933967093082,"latitudeE6":3.9933967093082E7,"longitude":116.30890884739,"longitudeE6":1.1630890884739E8},{"latitude":39.93396191311,"latitudeE6":3.9933961913109995E7,"longitude":116.30868153328,"longitudeE6":1.1630868153328E8},{"latitude":39.934018604395,"latitudeE6":3.9934018604395E7,"longitude":116.30864816843,"longitudeE6":1.1630864816843E8},{"latitude":39.934091845914,"latitudeE6":3.9934091845914E7,"longitude":116.30864003053,"longitudeE6":1.1630864003053E8},{"latitude":39.934360142831,"latitudeE6":3.9934360142831E7,"longitude":116.30875016067,"longitudeE6":1.1630875016067E8},{"latitude":39.934744000269,"latitudeE6":3.9934744000268996E7,"longitude":116.30886056182,"longitudeE6":1.1630886056182E8},{"latitude":39.934760553353,"latitudeE6":3.9934760553353004E7,"longitude":116.30891047327,"longitudeE6":1.1630891047327E8},{"latitude":39.934696015943,"latitudeE6":3.9934696015943E7,"longitude":116.30912422473,"longitudeE6":1.1630912422473E8},{"latitude":39.934698216461,"latitudeE6":3.9934698216461E7,"longitude":116.30938815875,"longitudeE6":1.1630938815875E8},{"latitude":39.934731879794,"latitudeE6":3.9934731879794E7,"longitude":116.30961357404,"longitudeE6":1.1630961357404E8},{"latitude":39.934696892741,"latitudeE6":3.9934696892741E7,"longitude":116.30967053826,"longitudeE6":1.1630967053826E8},{"latitude":39.934370279617,"latitudeE6":3.9934370279617E7,"longitude":116.30962008478,"longitudeE6":1.1630962008478E8},{"latitude":39.934132111504,"latitudeE6":3.9934132111503996E7,"longitude":116.309668369,"longitudeE6":1.1630966836899999E8},{"latitude":39.933978571682,"latitudeE6":3.9933978571682E7,"longitude":116.30965182248,"longitudeE6":1.1630965182248001E8},{"latitude":39.933964707162,"latitudeE6":3.9933964707162E7,"longitude":116.3093930426,"longitudeE6":1.1630939304259999E8},{"latitude":39.933996146467,"latitudeE6":3.9933996146467E7,"longitude":116.30915080933,"longitudeE6":1.1630915080933E8}]
48   - * mileage : 5
49   - * roadmap : https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1560748589378&di=bb8468bcde8fbebe49e62c49e1a4312c&imgtype=0&src=http%3A%2F%2F05imgmini.eastday.com%2Fmobile%2F20190309%2F20190309100119_57a582d9807694bc008c102f91d01d13_3.jpeg
50   - * startLocation : 首都师范大学操场东门
51   - * updateTime : 1560498861000
52   - * userMsg : {"image":"","nickName":""}
  56 + * mileage : 0.0
  57 + * roadmap : http://wjjtest.ys2.cnliveimg.com/802/img/0/2019/07/05/156230801470911621062.png
  58 + * startLocation : 在国图文化大厦附近
  59 + * startTime : 1562305531
  60 + * userMsg : {"image":"http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg","nickName":"峨眉派掌门候选人","userId":"10513196"}
53 61 */
54 62  
55   - private String entityName;
56   - private String startTime;
57   - private String endTime;
58 63 private long createTime;
59 64 private String darenId;
60 65 private String endLocation;
  66 + private String endTime;
  67 + private String entityName;
61 68 private String eventId;
  69 + private String eventName;
62 70 private int id;
63 71 private int isEnable;
64   - private String latLongitude;
65 72 private String mileage;
66 73 private String roadmap;
67 74 private String startLocation;
68   - private long updateTime;
  75 + private String startTime;
69 76 private UserMsgBean userMsg;
70   -
71   - public String getEntityName() {
72   - return entityName;
73   - }
74   -
75   - public void setEntityName(String entityName) {
76   - this.entityName = entityName;
77   - }
78   -
79   - public String getStartTime() {
80   - return startTime;
81   - }
82   -
83   - public void setStartTime(String startTime) {
84   - this.startTime = startTime;
85   - }
86   -
87   - public String getEndTime() {
88   - return endTime;
89   - }
90   -
91   - public void setEndTime(String endTime) {
92   - this.endTime = endTime;
93   - }
  77 + private String latLongitude;
94 78  
95 79 public long getCreateTime() {
96 80 return createTime;
... ... @@ -116,6 +100,22 @@ public class RaceNameListInfo implements Serializable {
116 100 this.endLocation = endLocation;
117 101 }
118 102  
  103 + public String getEndTime() {
  104 + return endTime;
  105 + }
  106 +
  107 + public void setEndTime(String endTime) {
  108 + this.endTime = endTime;
  109 + }
  110 +
  111 + public String getEntityName() {
  112 + return entityName;
  113 + }
  114 +
  115 + public void setEntityName(String entityName) {
  116 + this.entityName = entityName;
  117 + }
  118 +
119 119 public String getEventId() {
120 120 return eventId;
121 121 }
... ... @@ -124,6 +124,14 @@ public class RaceNameListInfo implements Serializable {
124 124 this.eventId = eventId;
125 125 }
126 126  
  127 + public String getEventName() {
  128 + return eventName;
  129 + }
  130 +
  131 + public void setEventName(String eventName) {
  132 + this.eventName = eventName;
  133 + }
  134 +
127 135 public int getId() {
128 136 return id;
129 137 }
... ... @@ -140,14 +148,6 @@ public class RaceNameListInfo implements Serializable {
140 148 this.isEnable = isEnable;
141 149 }
142 150  
143   - public String getLatLongitude() {
144   - return latLongitude;
145   - }
146   -
147   - public void setLatLongitude(String latLongitude) {
148   - this.latLongitude = latLongitude;
149   - }
150   -
151 151 public String getMileage() {
152 152 return mileage;
153 153 }
... ... @@ -172,12 +172,12 @@ public class RaceNameListInfo implements Serializable {
172 172 this.startLocation = startLocation;
173 173 }
174 174  
175   - public long getUpdateTime() {
176   - return updateTime;
  175 + public String getStartTime() {
  176 + return startTime;
177 177 }
178 178  
179   - public void setUpdateTime(long updateTime) {
180   - this.updateTime = updateTime;
  179 + public void setStartTime(String startTime) {
  180 + this.startTime = startTime;
181 181 }
182 182  
183 183 public UserMsgBean getUserMsg() {
... ... @@ -188,14 +188,24 @@ public class RaceNameListInfo implements Serializable {
188 188 this.userMsg = userMsg;
189 189 }
190 190  
  191 + public String getLatLongitude() {
  192 + return latLongitude;
  193 + }
  194 +
  195 + public void setLatLongitude(String latLongitude) {
  196 + this.latLongitude = latLongitude;
  197 + }
  198 +
191 199 public static class UserMsgBean {
192 200 /**
193   - * image :
194   - * nickName :
  201 + * image : http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg
  202 + * nickName : 峨眉派掌门候选人
  203 + * userId : 10513196
195 204 */
196 205  
197 206 private String image;
198 207 private String nickName;
  208 + private String userId;
199 209  
200 210 public String getImage() {
201 211 return image;
... ... @@ -212,6 +222,14 @@ public class RaceNameListInfo implements Serializable {
212 222 public void setNickName(String nickName) {
213 223 this.nickName = nickName;
214 224 }
  225 +
  226 + public String getUserId() {
  227 + return userId;
  228 + }
  229 +
  230 + public void setUserId(String userId) {
  231 + this.userId = userId;
  232 + }
215 233 }
216 234 }
217 235 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
  View file @f238486
... ... @@ -22,6 +22,7 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
22 22 public int pageSize = 10;
23 23 public String eventId;
24 24 private RunRaceDetailInfo runRaceDetailInfo;
  25 + public String entityName = null;
25 26  
26 27 public static RaceNameListFragment newInstance(String eventId, RunRaceDetailInfo runRaceDetailInfo) {
27 28 RaceNameListFragment fragment = new RaceNameListFragment();
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
  View file @f238486
1 1 package com.cnlive.moudle.pedometer.net;
2 2  
3 3  
  4 +import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
4 5 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
5 6 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
6 7 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
... ... @@ -91,7 +92,7 @@ public interface ApiServiceRunLin {
91 92 * 踩点轨迹绑定
92 93 */
93 94 @POST("Daren/event/bindingShoeLine.action")
94   - Observable<Result<BaseInfo>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
  95 + Observable<Result<BaseInfo<BindingShoeInfo>>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
95 96  
96 97 /**
97 98 * http://apiwjjtest.cnlive.com/Daren/event/saveShoeLine.action
... ...