轨迹绑定接口修改

韩亚云
1 parent f1ddb047
Showing 6 changed files with 143 additions and 68 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/RaceNameListPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/BindingShoeInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/model/RaceNameListInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceRunLin.java
@@ -7,6 +7,7 @@ import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.moudle.collectionTrace.frame.view.RaceNameListView;
+import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
@@ -94,12 +95,12 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
         Map<String,String> map = new HashMap<>();
         map.put("id",id+"");
         map.put("eventId",eventId);
-        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo>() {
+        Logic.create(map).action(new Logic.Action<Map<String,String>, BaseInfo<BindingShoeInfo>>() {
             @Override
-            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<BindingShoeInfo>> dataCallback) {
                 return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.bindingShoeLineInfo(stringStringMap)).subscribe(context, dataCallback);
             }
-        }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
+        }).<BaseInfo<BindingShoeInfo>>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
                 if (getView() != null) {
@@ -107,11 +108,11 @@ public class RaceNameListPresenter extends MvpBasePresenter&lt;RaceNameListView&gt; {
                     getView().hideLoading();
                 }
             }
-        }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
+        }).setSuccessCallback(new SuccessCallback<BaseInfo<BindingShoeInfo>>() {
             @Override
-            public void onSuccess(BaseInfo baseInfo) {
+            public void onSuccess(BaseInfo<BindingShoeInfo> baseInfo) {
                 if (getView() != null){
-                    getView().bindingShoeLine(position);
+                    getView().bindingShoeLine(position,baseInfo);
                 }
             }
         }).start();
@@ -20,6 +20,7 @@ import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.CoordType;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
+import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.adapter.RaceNameListAdapter;
@@ -80,7 +81,8 @@ public class RaceNameListView implements MvpView, OnFenceListener {
     }
-    public void bindingShoeLine(int position) {
+    public void bindingShoeLine(int position,BaseInfo<BindingShoeInfo> baseInfo) {
+        if(baseInfo.getData().getEntityName() != null) fragment.entityName = baseInfo.getData().getEntityName();
         list.get(position).setIsEnable(0);
         for (int i = 0; i < list.size(); i++) {
             if (i != position && list.get(i).getIsEnable() == 0) {
@@ -104,6 +106,7 @@ public class RaceNameListView implements MvpView, OnFenceListener {
             if (adapter == null) {
                 adapter = new RaceNameListAdapter(list, fragment.getActivity());
                 fragment.binding.raceRecy.setAdapter(adapter);
+                if(raceNameListInfoBaseInfo.getData().getEntityName() != null) fragment.entityName = raceNameListInfoBaseInfo.getData().getEntityName();
                 adapter.setOnItemClick(new RaceNameListAdapter.OnItemClick() {
                     @Override
                     public void onItemClickListener(RaceNameListInfo.EventShoeLinesBean eventShoeLinesBean, int position) {
+package com.cnlive.moudle.collectionTrace.model;
+
+/**
+ * Created by hanyayun 019/07/8.
+ */
+public class BindingShoeInfo {
+
+    /**
+     * roadMap : http://wjjtest.ys2.cnliveimg.com/802/img/0/2019/07/05/156230801470911621062.png
+     * eventId : 170
+     * code : 1
+     * entityName : 10513196
+     */
+
+    private String roadMap;
+    private String eventId;
+    private int code;
+    private String entityName;
+
+    public String getRoadMap() {
+        return roadMap;
+    }
+
+    public void setRoadMap(String roadMap) {
+        this.roadMap = roadMap;
+    }
+
+    public String getEventId() {
+        return eventId;
+    }
+
+    public void setEventId(String eventId) {
+        this.eventId = eventId;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getEntityName() {
+        return entityName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+}
@@ -8,15 +8,24 @@ import java.util.List;
  */
 public class RaceNameListInfo implements Serializable {
-
     /**
-     * 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":""}}]
-     * hasNext : false
+     * entityName : 10513196
+     * 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"}}]
+     * hasNext : true
      */
+    private String entityName;
     private boolean hasNext;
     private List<EventShoeLinesBean> eventShoeLines;
+    public String getEntityName() {
+        return entityName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
     public boolean isHasNext() {
         return hasNext;
     }
@@ -35,62 +44,37 @@ public class RaceNameListInfo implements Serializable {
     public static class EventShoeLinesBean implements Serializable {
         /**
-         * entityName : yangshuai
-         * startTime : 1560127625
-         * endTime : 1560127625
-         * createTime : 1560498861000
-         * darenId : daren_10513196
-         * endLocation : 首都师范大学操场西门
-         * eventId : 116
-         * id : 120
+         * createTime : 1562308026000
+         * darenId : 10513196
+         * endLocation : 在国图文化大厦附近
+         * endTime : 1562305663
+         * entityName : 10513196
+         * eventId : 170
+         * eventName : 23515
+         * id : 123
          * 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":""}
+         * 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"}
          */
-        private String entityName;
-        private String startTime;
-        private String endTime;
         private long createTime;
         private String darenId;
         private String endLocation;
+        private String endTime;
+        private String entityName;
         private String eventId;
+        private String eventName;
         private int id;
         private int isEnable;
-        private String latLongitude;
         private String mileage;
         private String roadmap;
         private String startLocation;
-        private long updateTime;
+        private String startTime;
         private UserMsgBean userMsg;
-
-        public String getEntityName() {
-            return entityName;
-        }
-
-        public void setEntityName(String entityName) {
-            this.entityName = entityName;
-        }
-
-        public String getStartTime() {
-            return startTime;
-        }
-
-        public void setStartTime(String startTime) {
-            this.startTime = startTime;
-        }
-
-        public String getEndTime() {
-            return endTime;
-        }
-
-        public void setEndTime(String endTime) {
-            this.endTime = endTime;
-        }
+        private String latLongitude;
         public long getCreateTime() {
             return createTime;
@@ -116,6 +100,22 @@ public class RaceNameListInfo implements Serializable {
             this.endLocation = endLocation;
         }
+        public String getEndTime() {
+            return endTime;
+        }
+
+        public void setEndTime(String endTime) {
+            this.endTime = endTime;
+        }
+
+        public String getEntityName() {
+            return entityName;
+        }
+
+        public void setEntityName(String entityName) {
+            this.entityName = entityName;
+        }
+
         public String getEventId() {
             return eventId;
         }
@@ -124,6 +124,14 @@ public class RaceNameListInfo implements Serializable {
             this.eventId = eventId;
         }
+        public String getEventName() {
+            return eventName;
+        }
+
+        public void setEventName(String eventName) {
+            this.eventName = eventName;
+        }
+
         public int getId() {
             return id;
         }
@@ -140,14 +148,6 @@ public class RaceNameListInfo implements Serializable {
             this.isEnable = isEnable;
         }
-        public String getLatLongitude() {
-            return latLongitude;
-        }
-
-        public void setLatLongitude(String latLongitude) {
-            this.latLongitude = latLongitude;
-        }
-
         public String getMileage() {
             return mileage;
         }
@@ -172,12 +172,12 @@ public class RaceNameListInfo implements Serializable {
             this.startLocation = startLocation;
         }
-        public long getUpdateTime() {
-            return updateTime;
+        public String getStartTime() {
+            return startTime;
         }
-        public void setUpdateTime(long updateTime) {
-            this.updateTime = updateTime;
+        public void setStartTime(String startTime) {
+            this.startTime = startTime;
         }
         public UserMsgBean getUserMsg() {
@@ -188,14 +188,24 @@ public class RaceNameListInfo implements Serializable {
             this.userMsg = userMsg;
         }
+        public String getLatLongitude() {
+            return latLongitude;
+        }
+
+        public void setLatLongitude(String latLongitude) {
+            this.latLongitude = latLongitude;
+        }
+
         public static class UserMsgBean {
             /**
-             * image :
-             * nickName :
+             * image : http://yweb0.cnliveimg.com/images/headImg/2019/0521/1558424757652_small.jpg
+             * nickName : 峨眉派掌门候选人
+             * userId : 10513196
              */
             private String image;
             private String nickName;
+            private String userId;
             public String getImage() {
                 return image;
@@ -212,6 +222,14 @@ public class RaceNameListInfo implements Serializable {
             public void setNickName(String nickName) {
                 this.nickName = nickName;
             }
+
+            public String getUserId() {
+                return userId;
+            }
+
+            public void setUserId(String userId) {
+                this.userId = userId;
+            }
         }
     }
 }
@@ -22,6 +22,7 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     public int pageSize = 10;
     public String eventId;
     private RunRaceDetailInfo runRaceDetailInfo;
+    public String entityName = null;
     public static RaceNameListFragment newInstance(String eventId, RunRaceDetailInfo runRaceDetailInfo) {
         RaceNameListFragment fragment = new RaceNameListFragment();
 package com.cnlive.moudle.pedometer.net;
+import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
@@ -91,7 +92,7 @@ public interface ApiServiceRunLin {
      * 踩点轨迹绑定
      */
     @POST("Daren/event/bindingShoeLine.action")
-    Observable<Result<BaseInfo>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
+    Observable<Result<BaseInfo<BindingShoeInfo>>> bindingShoeLineInfo(@QueryMap() Map<String, String> maps);
     /**
      * http://apiwjjtest.cnlive.com/Daren/event/saveShoeLine.action