约跑线路接口对接，增加下拉刷新，下拉加载更多，增加错误页面

韩亚云
1 parent 54e1430c
Showing 20 changed files with 573 additions and 93 deletions
lib_network/src/main/java/com/cnlive/strike/data/network/api/ApiServiceDaren.java
lib_network/src/main/java/com/cnlive/strike/data/network/model/RaceRecordInfo.java → lib_network/src/main/java/com/cnlive/strike/data/network/model/runAbout/RaceRecordInfo.java
lib_network/src/main/java/com/cnlive/strike/data/network/model/runAbout/RunLineInfo.java
lib_network/src/main/java/com/cnlive/strike/data/network/model/TakePartPeopleInfo.java → lib_network/src/main/java/com/cnlive/strike/data/network/model/runAbout/TakePartPeopleInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RaceRecorPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunLinePresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/TakePartPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/TakePartAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/TakePartFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
moudle_pedometer/src/main/res/layout/item_my_record.xml
@@ -7,9 +7,10 @@ import com.cnlive.strike.data.network.model.CheckTransferInfo;
 import com.cnlive.strike.data.network.model.DarenApplyModel;
 import com.cnlive.strike.data.network.model.GifEmojiItemData;
 import com.cnlive.strike.data.network.model.GifListData;
-import com.cnlive.strike.data.network.model.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
 import com.cnlive.strike.data.network.model.ShortLinkInfo;
-import com.cnlive.strike.data.network.model.TakePartPeopleInfo;
+import com.cnlive.strike.data.network.model.runAbout.RunLineInfo;
+import com.cnlive.strike.data.network.model.runAbout.TakePartPeopleInfo;
 import com.cnlive.strike.data.network.model.runAbout.RunRaceDetailInfo;
 import java.util.List;
@@ -118,5 +119,12 @@ public interface ApiServiceDaren {
      */
     @GET("Daren/event/getEventDetails.action")
     Observable<Result<BaseInfo<RunRaceDetailInfo>>> getRunRaceDetail(@QueryMap Map<String, String> map);
+
+
+    /**
+     * 约跑线路列表
+     */
+    @POST("Daren/event/getEventList.action")
+    Observable<Result<BaseInfo<RunLineInfo>>> getRunLineListInfo(@QueryMap() Map<String, String> maps);
 }
-package com.cnlive.strike.data.network.model;
+package com.cnlive.strike.data.network.model.runAbout;
 import java.util.List;
+package com.cnlive.strike.data.network.model.runAbout;
+
+import java.util.List;
+
+/**
+ * Created by hanyayun 019/06/14.
+ */
+public class RunLineInfo {
+
+    /**
+     * hasNext : false
+     * list : [{"address":"巴彦浩特体育场","end_time":1536894000000,"faceUrl":[],"id":134,"signResult":false,"signupNum":0,"start_time":1536966000000,"title":"2018阿拉善旅游文化节·户外徒步大会 \u201c助力冬奥·阿拉善在行动\u201d"},{"address":"内蒙古阿拉善左旗巴彦浩特体育场","end_time":1536980400000,"faceUrl":[],"id":133,"signResult":false,"signupNum":0,"start_time":1536966000000,"title":"2018阿拉善旅游文化节·阿拉善半程马拉松\u201c助力冬奥·阿拉善在行动\u201d"},{"address":"东莞市同沙生态公园","end_time":1524366000000,"faceUrl":[],"id":132,"signResult":false,"signupNum":0,"start_time":1524355200000,"title":"2018东莞市东城旅游节暨世界大众体育杯·粤港澳大湾区（东莞）户外徒步大会"},{"address":"青海湖","end_time":1472632140000,"faceUrl":[],"id":119,"signResult":false,"signupNum":0,"start_time":1472455620000,"title":"2016第三届环青海湖国际电动汽车拉力赛"},{"address":"北京长阳","end_time":1498719300000,"faceUrl":[],"id":118,"signResult":false,"signupNum":0,"start_time":1498546380000,"title":"2017北京长阳全城热跑赛火力全开"},{"address":"内蒙古鄂尔多斯市准格尔旗","end_time":1565697600000,"faceUrl":[],"id":117,"mileage":"全长4.43公里","signResult":false,"signupNum":0,"start_time":1502409600000,"title":"世界大众体育杯 · 2017准格尔国际徒步大会"},{"address":"澳大利亚黄金海岸","end_time":1571140800000,"faceUrl":["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg"],"id":116,"mileage":"全长4.42公里","signResult":true,"signupNum":3,"start_time":1522454400000,"title":"2018国际网络徒步大赛黄金海岸站"},{"address":"内蒙古阿拉善左旗巴彦浩特体育场","end_time":1536894000000,"faceUrl":[],"id":135,"signResult":false,"signupNum":0,"start_time":1536966000000,"title":"2018阿拉善旅游文化节·户外徒步大会 \u201c助力冬奥·阿拉善在行动\u201d"}]
+     * pageNumber : 1
+     * pageSize : 10
+     * startIndex : 0
+     * totalPage : 1
+     * totalRecord : 8
+     */
+
+    private boolean hasNext;
+    private int pageNumber;
+    private int pageSize;
+    private int startIndex;
+    private int totalPage;
+    private int totalRecord;
+    private List<ListBean> list;
+
+    public boolean isHasNext() {
+        return hasNext;
+    }
+
+    public void setHasNext(boolean hasNext) {
+        this.hasNext = hasNext;
+    }
+
+    public int getPageNumber() {
+        return pageNumber;
+    }
+
+    public void setPageNumber(int pageNumber) {
+        this.pageNumber = pageNumber;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getStartIndex() {
+        return startIndex;
+    }
+
+    public void setStartIndex(int startIndex) {
+        this.startIndex = startIndex;
+    }
+
+    public int getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public int getTotalRecord() {
+        return totalRecord;
+    }
+
+    public void setTotalRecord(int totalRecord) {
+        this.totalRecord = totalRecord;
+    }
+
+    public List<ListBean> getList() {
+        return list;
+    }
+
+    public void setList(List<ListBean> list) {
+        this.list = list;
+    }
+
+    public static class ListBean {
+        /**
+         * address : 巴彦浩特体育场
+         * end_time : 1536894000000
+         * faceUrl : []
+         * id : 134
+         * signResult : false
+         * signupNum : 0
+         * start_time : 1536966000000
+         * title : 2018阿拉善旅游文化节·户外徒步大会 “助力冬奥·阿拉善在行动”
+         * mileage : 全长4.43公里
+         */
+
+        private String address;
+        private long end_time;
+        private int id;
+        private boolean signResult;
+        private int signupNum;
+        private long start_time;
+        private String title;
+        private String mileage;
+        private List<String> faceUrl;
+
+        public String getAddress() {
+            return address;
+        }
+
+        public void setAddress(String address) {
+            this.address = address;
+        }
+
+        public long getEnd_time() {
+            return end_time;
+        }
+
+        public void setEnd_time(long end_time) {
+            this.end_time = end_time;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public boolean isSignResult() {
+            return signResult;
+        }
+
+        public void setSignResult(boolean signResult) {
+            this.signResult = signResult;
+        }
+
+        public int getSignupNum() {
+            return signupNum;
+        }
+
+        public void setSignupNum(int signupNum) {
+            this.signupNum = signupNum;
+        }
+
+        public long getStart_time() {
+            return start_time;
+        }
+
+        public void setStart_time(long start_time) {
+            this.start_time = start_time;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getMileage() {
+            return mileage;
+        }
+
+        public void setMileage(String mileage) {
+            this.mileage = mileage;
+        }
+
+        public List<String> getFaceUrl() {
+            return faceUrl;
+        }
+
+        public void setFaceUrl(List<String> faceUrl) {
+            this.faceUrl = faceUrl;
+        }
+    }
+}
-package com.cnlive.strike.data.network.model;
+package com.cnlive.strike.data.network.model.runAbout;
 import java.util.List;
 package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
-import android.widget.Toast;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
@@ -11,7 +10,7 @@ import com.cnlive.moudle.pedometer.frame.view.RaceRecorView;
 import com.cnlive.strike.data.network.api.ApiRequest;
 import com.cnlive.strike.data.network.api.ApiServiceDaren;
 import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.util.HashMap;
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import android.content.Context;
+
+import com.cnlive.libs.base.logic.Logic;
+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.pedometer.frame.view.RunLineView;
+import com.cnlive.strike.data.network.api.ApiRequest;
+import com.cnlive.strike.data.network.api.ApiServiceDaren;
+import com.cnlive.strike.data.network.model.BaseInfo;
+import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RunLineInfo;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
+/**
+ * Created by hanyayun 019/06/14.
+ */
+public class RunLinePresenter extends MvpBasePresenter<RunLineView> {
+
+    public void setData(Context context,String sid, int pageNo, int pageSize){
+        HashMap<String, String> map = new HashMap<>();
+        map.put("sid", sid);
+        map.put("pageNo", pageNo+"");
+        map.put("pageSize", pageSize+"");
+        getView().showLoading();
+        Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<RunLineInfo>>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<RunLineInfo>> dataCallback) {
+                return ApiRequest.observable(ApiServiceDaren.class, api -> api.getRunLineListInfo(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo<RunLineInfo>>event().setFailureCallback(new FailureCallback() {
+            @Override
+            public void onFailure(int code, String message) {
+                if (getView() != null) {
+                    getView().showErr(message);
+                    getView().hideLoading();
+                }
+            }
+        }).setSuccessCallback(new SuccessCallback<BaseInfo<RunLineInfo>>() {
+            @Override
+            public void onSuccess(BaseInfo<RunLineInfo> registerInfo) {
+                if (getView() != null){
+                    getView().onSuccess(registerInfo);
+                }
+            }
+        }).start();
+    }
+}
@@ -8,11 +8,9 @@ import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.moudle.pedometer.frame.view.TakePartView;
 import com.cnlive.strike.data.network.api.ApiRequest;
-import com.cnlive.strike.data.network.api.ApiServiceCms;
 import com.cnlive.strike.data.network.api.ApiServiceDaren;
-import com.cnlive.strike.data.network.model.AudioAlbumDetailsInfo;
 import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.TakePartPeopleInfo;
+import com.cnlive.strike.data.network.model.runAbout.TakePartPeopleInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.util.HashMap;
@@ -25,11 +23,12 @@ import io.reactivex.disposables.Disposable;
  */
 public class TakePartPresenter extends MvpBasePresenter<TakePartView> {
-    public void setData(Context context,String eventId, long pageNo, long pageSize){
+    public void setData(Context context,String eventId, long pageNo,long pageSize){
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
         map.put("pageNo", pageNo+"");
         map.put("pageSize", pageSize+"");
+        if (getView() != null && pageNo ==1) getView().showLoading();
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<TakePartPeopleInfo>>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<TakePartPeopleInfo>> dataCallback) {
@@ -38,7 +37,10 @@ public class TakePartPresenter extends MvpBasePresenter&lt;TakePartView&gt; {
         }).<BaseInfo<TakePartPeopleInfo>>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
-                if (getView() != null) getView().showErr(message);
+                if (getView() != null) {
+                    getView().showErr(message);
+                    getView().hideLoading();
+                }
             }
         }).setSuccessCallback(new SuccessCallback<BaseInfo<TakePartPeopleInfo>>() {
             @Override
@@ -31,15 +31,15 @@ public class MyRecordView implements MvpView {
         list.add("fff");
         list.add("fff");
         list.add("fff");
-        MyRecordAdapter myRecordAdapter = new MyRecordAdapter(list,fragment.getActivity(),true);
-        fragment.binding.myRecordRecy.setAdapter(myRecordAdapter);
-        myRecordAdapter.setClickListener(new MyRecordAdapter.OnClickListener() {
-            @Override
-            public void onClickListener(String msg, int position) {
-                Intent intent = new Intent(fragment.getActivity(), RunRaceDetailActivity.class);
-                fragment.getActivity().startActivity(intent);
-            }
-        });
+//        MyRecordAdapter myRecordAdapter = new MyRecordAdapter(list,fragment.getActivity(),true);
+//        fragment.binding.myRecordRecy.setAdapter(myRecordAdapter);
+//        myRecordAdapter.setClickListener(new MyRecordAdapter.OnClickListener() {
+//            @Override
+//            public void onClickListener(String msg, int position) {
+//                Intent intent = new Intent(fragment.getActivity(), RunRaceDetailActivity.class);
+//                fragment.getActivity().startActivity(intent);
+//            }
+//        });
     }
     public void initView(){
@@ -3,18 +3,14 @@ package com.cnlive.moudle.pedometer.frame.view;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
-import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
 import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by hanyayun 019/05/30.
  */
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.content.Intent;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
+import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
+import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
+import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment;
+import com.cnlive.strike.data.network.model.BaseInfo;
+import com.cnlive.strike.data.network.model.runAbout.RunLineInfo;
+import com.example.moudle_pedometer.R;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
+import com.scwang.smartrefresh.layout.header.ClassicsHeader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by hanyayun 019/06/14.
+ */
+public class RunLineView implements MvpView {
+
+    private RunLineFragment fragment;
+    public QMUITipDialog loadingDiaog;
+    private MyRecordAdapter adapter;
+    private List<RunLineInfo.ListBean> list = new ArrayList<>();
+
+    public RunLineView(RunLineFragment fragment) {
+        this.fragment = fragment;
+        loadingDiaog = new QMUITipDialog.Builder(fragment.getActivity())
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord("请稍后")
+                .create();
+    }
+
+    public void initView(){
+        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
+        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
+        fragment.binding.backBtn.setOnClickListener(v -> fragment.getActivity().finish());
+        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity()));
+
+        fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+    }
+
+    public void onSuccess(BaseInfo<RunLineInfo> runLineInfoBaseInfo){
+        hideLoading();
+        if(fragment.currentPage == 1){
+            list.clear();
+            list.addAll(runLineInfoBaseInfo.getData().getList());
+            if(adapter == null){
+                adapter = new MyRecordAdapter(list,fragment.getActivity(),false);
+                fragment.binding.runLineRecy.setAdapter(adapter);
+                adapter.setClickListener(new MyRecordAdapter.OnClickListener() {
+                    @Override
+                    public void onClickListener(RunLineInfo.ListBean bean, int position) {
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"");
+                    }
+                });
+            }else {
+                adapter.notifyDataSetChanged();
+            }
+        }
+
+        if(list.size() != 0){
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+        }else {
+            showEmpty();
+        }
+
+        if(runLineInfoBaseInfo.getData().getList().size() < fragment.pageSize){
+            fragment.binding.refreshLayout.setEnableLoadMore(false);
+        }else {
+            fragment.binding.refreshLayout.setEnableLoadMore(true);
+        }
+        if(fragment.currentPage > 1){
+            list.addAll(runLineInfoBaseInfo.getData().getList());
+            adapter.notifyDataSetChanged();
+        }
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
+    }
+
+    public void showErr(String msg){
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
+        if (list.size() == 0) {
+            fragment.binding.empty.setVisibility(View.VISIBLE);
+            fragment.binding.refreshLayout.setVisibility(View.GONE);
+            fragment.binding.empty.setDetailText(fragment.getResources().getString(R.string.msg_failed_network_detail));
+            fragment.binding.empty.setTitleText(msg);
+            fragment.binding.empty.setButton("重试", new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fragment.currentPage = 1;
+                    fragment.getPresenter().setData(fragment.getActivity(),"10514343",fragment.currentPage,fragment.pageSize);
+                }
+            });
+            fragment.binding.empty.setLoadingShowing(false);
+            fragment.binding.empty.setImage(R.drawable.wufalianjie);
+        } else {
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+            showToast(msg);
+        }
+    }
+
+
+    public void showToast(String message) {
+        AlertUtil.showDeftToast(fragment.getActivity(), message);
+    }
+
+    public void showEmpty(){
+        fragment.binding.empty.setVisibility(View.VISIBLE);
+        fragment.binding.refreshLayout.setVisibility(View.GONE);
+        fragment.binding.empty.show("没有相关数据", "", R.drawable.zhuangtai_kong);
+    }
+
+
+    public void showLoading() {
+        if (loadingDiaog != null) loadingDiaog.show();
+    }
+
+    public void hideLoading() {
+        if (loadingDiaog != null) loadingDiaog.dismiss();
+    }
+}
 package com.cnlive.moudle.pedometer.frame.view;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
 import com.cnlive.strike.data.network.model.BaseInfo;
-import com.cnlive.strike.data.network.model.TakePartPeopleInfo;
+import com.cnlive.strike.data.network.model.runAbout.TakePartPeopleInfo;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
+import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +23,16 @@ import java.util.List;
 public class TakePartView implements MvpView {
     private TakePartFragment fragment;
+    public QMUITipDialog loadingDiaog;
+    private TakePartAdapter adapter;
+    private List<TakePartPeopleInfo.UserMsgsBean> list = new ArrayList<>();
     public TakePartView(TakePartFragment fragment) {
         this.fragment = fragment;
+        loadingDiaog = new QMUITipDialog.Builder(fragment.getActivity())
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord("请稍后")
+                .create();
     }
     public void initView(){
@@ -29,18 +41,85 @@ public class TakePartView implements MvpView {
         });
         fragment.binding.topbar.setTitle("已参与");
         fragment.binding.takePartRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-
-        fragment.binding.refreshLayout.setOnRefreshListener(v ->{
-
-        });
-//        fragment.binding.refreshLayout.setOn
+        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
+        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
     }
     public void onSuccess(BaseInfo<TakePartPeopleInfo> partPeopleInfoBaseInfo){
-        fragment.binding.takePartRecy.setAdapter(new TakePartAdapter(partPeopleInfoBaseInfo.getData().getUserMsgs(),fragment.getActivity()));
+        hideLoading();
+        if(fragment.currentPage == 1){
+            list.clear();
+            list.addAll(partPeopleInfoBaseInfo.getData().getUserMsgs());
+            if(adapter == null){
+                adapter = new TakePartAdapter(list,fragment.getActivity());
+                fragment.binding.takePartRecy.setAdapter(adapter);
+            }else {
+                adapter.notifyDataSetChanged();
+            }
+        }
+
+        if(list.size() != 0){
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+        }else {
+            showEmpty();
+        }
+
+        if(partPeopleInfoBaseInfo.getData().getUserMsgs().size() < fragment.itemNum){
+            fragment.binding.refreshLayout.setEnableLoadMore(false);
+        }else {
+            fragment.binding.refreshLayout.setEnableLoadMore(true);
+        }
+        if(fragment.currentPage > 1){
+            list.addAll(partPeopleInfoBaseInfo.getData().getUserMsgs());
+            adapter.notifyDataSetChanged();
+        }
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
     }
     public void showErr(String msg){
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
+        if (list.size() == 0) {
+            fragment.binding.empty.setVisibility(View.VISIBLE);
+            fragment.binding.refreshLayout.setVisibility(View.GONE);
+            fragment.binding.empty.setDetailText(fragment.getResources().getString(R.string.msg_failed_network_detail));
+            fragment.binding.empty.setTitleText(msg);
+            fragment.binding.empty.setButton("重试", new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fragment.currentPage = 1;
+                    fragment.getPresenter().setData(fragment.getActivity(),"116",fragment.currentPage,fragment.itemNum);
+                }
+            });
+            fragment.binding.empty.setLoadingShowing(false);
+            fragment.binding.empty.setImage(R.drawable.wufalianjie);
+        } else {
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+            showToast(msg);
+        }
+    }
+
+    public void showToast(String message) {
+        AlertUtil.showDeftToast(fragment.getActivity(), message);
     }
+
+    public void showEmpty(){
+        fragment.binding.empty.setVisibility(View.VISIBLE);
+        fragment.binding.refreshLayout.setVisibility(View.GONE);
+        fragment.binding.empty.show("还没有人参加哦", "", R.drawable.zhuangtai_kong);
+    }
+
+
+    public void showLoading() {
+        if (loadingDiaog != null) loadingDiaog.show();
+    }
+
+    public void hideLoading() {
+        if (loadingDiaog != null) loadingDiaog.dismiss();
+    }
+
 }
@@ -37,6 +37,12 @@ import java.util.List;
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
+    public static void startActivity(Activity activity, String eventId) {
+        Intent intent = new Intent(activity, RunRaceDetailActivity.class);
+        intent.putExtra("eventId", eventId);
+        activity.startActivity(intent);
+    }
+
     @Override
     protected int getContextViewId() {
         return R.id.fragment_finish_run_map;
@@ -17,6 +17,8 @@ import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.strike.data.network.model.runAbout.RunLineInfo;
 import com.example.moudle_pedometer.R;
 import java.util.ArrayList;
@@ -26,7 +28,7 @@ import java.util.List;
  */
 public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyViewHolder> {
-    private List<String> list = new ArrayList<>();
+    private List<RunLineInfo.ListBean> list = new ArrayList<>();
     private Activity context;
     private boolean isShow;
     private OnClickListener clickListener;
@@ -35,7 +37,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         this.clickListener = clickListener;
     }
-    public MyRecordAdapter(List<String> list, Activity context,boolean isShow) {
+    public MyRecordAdapter(List<RunLineInfo.ListBean> list, Activity context, boolean isShow) {
         this.list = list;
         this.context = context;
         this.isShow = isShow;
@@ -55,13 +57,23 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
             myViewHolder.has_report.setVisibility(View.GONE);
         }else {
             myViewHolder.my_record_ry.setVisibility(View.GONE);
-            myViewHolder.has_report.setVisibility(View.VISIBLE);
+            if(list.get(i).isSignResult()){
+                myViewHolder.has_report.setVisibility(View.VISIBLE);
+            }else {
+                myViewHolder.has_report.setVisibility(View.GONE);
+            }
         }
         myViewHolder.my_record.setOnClickListener(v -> SelfRecordActivity.newInstance(context));
 //        myViewHolder.check_raking.setOnClickListener(v -> );
         if(clickListener != null){
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i),i));
         }
+
+        myViewHolder.line_name.setText(list.get(i).getTitle());
+        myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(),"yyyy.MM.dd")+"——"+TimeUtil.getStampToTime(list.get(i).getEnd_time(),"yyyy.MM.dd"));
+        myViewHolder.line_address.setText(list.get(i).getAddress()+"  "+list.get(i).getMileage());
+        myViewHolder.people_part.setText(list.get(i).getSignupNum()+"");
+        myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
     }
@@ -78,6 +90,10 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         RelativeLayout item_ly;
         RelativeLayout my_record_ry;
         ImageView has_report;
+        TextView line_name;
+        TextView activity_time;
+        TextView line_address;
+        TextView people_part;
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -87,10 +103,14 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
             item_ly = itemView.findViewById(R.id.item_ly);
             my_record_ry = itemView.findViewById(R.id.my_record_ry);
             has_report = itemView.findViewById(R.id.has_report);
+            line_name = itemView.findViewById(R.id.line_name);
+            activity_time = itemView.findViewById(R.id.activity_time);
+            line_address = itemView.findViewById(R.id.line_address);
+            people_part = itemView.findViewById(R.id.people_part);
         }
     }
     public interface OnClickListener{
-        void onClickListener(String msg,int position);
+        void onClickListener(RunLineInfo.ListBean msg,int position);
     }
 }
@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
-import com.cnlive.strike.data.network.model.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
 import com.example.moudle_pedometer.R;
 import java.util.List;
@@ -9,11 +9,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.cnlive.strike.application.GlideApp;
-import com.cnlive.strike.data.network.model.TakePartPeopleInfo;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
+import com.cnlive.strike.data.network.model.runAbout.TakePartPeopleInfo;
 import com.example.moudle_pedometer.R;
-import java.time.temporal.Temporal;
 import java.util.List;
 /**
@@ -38,7 +39,8 @@ public class TakePartAdapter extends RecyclerView.Adapter&lt;TakePartAdapter.MyHold
     @Override
     public void onBindViewHolder(@NonNull TakePartAdapter.MyHolder myViewHolder, int i) {
-        GlideApp.with(context).load(list.get(i).getImage()).into(myViewHolder.icon_img);
+        Glide.with(context).load(list.get(i).getImage())
+                .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(myViewHolder.icon_img);
         myViewHolder.nickname.setText(list.get(i).getNickName());
     }
@@ -12,11 +12,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter;
+import com.cnlive.moudle.pedometer.frame.view.RunLineView;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunLineBinding;
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
+import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,43 +29,33 @@ import java.util.List;
 /**
  * Created by hanyayun 019/06/03.
  */
-public class RunLineFragment extends Fragment {
+public class RunLineFragment extends MvpBindingFragment<RunLineView, RunLinePresenter,Object,FragmentRunLineBinding> {
-    private FragmentRunLineBinding binding;
+    public int currentPage = 1;
+    public int pageSize = 10;
     public RunLineFragment() {
         // Required empty public constructor
     }
-
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        binding = DataBindingUtil.inflate(inflater,R.layout.fragment_run_line, container, false);
-        return binding.getRoot();
+    protected int getLayoutId() {
+        return R.layout.fragment_run_line;
     }
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        if(getMvpView() != null)getMvpView().initView();
+        getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
-        binding.backBtn.setOnClickListener(v -> getActivity().finish());
-        binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(getActivity()));
-        List<String> list = new ArrayList<>();
-        list.add("fff");
-        list.add("fff");
-        list.add("fff");
-        list.add("fff");
-        binding.runLineRecy.setLayoutManager(new LinearLayoutManager(getActivity()));
-        MyRecordAdapter myRecordAdapter = new MyRecordAdapter(list,getActivity(),false);
-        binding.runLineRecy.setAdapter(myRecordAdapter);
-        myRecordAdapter.setClickListener(new MyRecordAdapter.OnClickListener() {
-            @Override
-            public void onClickListener(String msg, int position) {
-                Intent intent = new Intent(getActivity(), RunRaceDetailActivity.class);
-                getActivity().startActivity(intent);
-            }
+        binding.refreshLayout.setOnRefreshListener(v ->{
+            currentPage = 1;
+            getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
+        });
+        binding.refreshLayout.setOnLoadMoreListener(v ->{
+            currentPage++;
+            getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
         });
     }
 }
@@ -3,10 +3,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.pedometer.frame.presenter.TakePartPresenter;
@@ -19,6 +16,8 @@ import com.example.moudle_pedometer.databinding.FragmentTakePartBinding;
  */
 public class TakePartFragment extends MvpBindingFragment<TakePartView, TakePartPresenter,Object, FragmentTakePartBinding> {
+    public int currentPage = 1;
+    public int itemNum = 10;
     public TakePartFragment() {
         // Required empty public constructor
@@ -32,7 +31,15 @@ public class TakePartFragment extends MvpBindingFragment&lt;TakePartView, TakePartP
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        getPresenter().setData(getActivity(),"116",0,10);
+        getPresenter().setData(getActivity(),"116",currentPage,itemNum);
         if(getMvpView() != null)getMvpView().initView();
+        binding.refreshLayout.setOnRefreshListener(v ->{
+            currentPage = 1;
+            getPresenter().setData(getActivity(),"116",currentPage,itemNum);
+        });
+        binding.refreshLayout.setOnLoadMoreListener(v ->{
+            currentPage++;
+            getPresenter().setData(getActivity(),"116",currentPage,itemNum);
+        });
     }
 }
@@ -73,12 +73,9 @@ public class TimeUtil {
      * @return 格式化后的日期
      */
     public static String getStampToTime(long time,String pattern) {
-        String res;
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);//"yyyy-MM-dd HH:mm:ss"
-        long lt = new Long(time * 1000);
-        Date date = new Date(lt);
-        res = simpleDateFormat.format(date);
-        return res;
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        Date date = new Date(time);
+        return sdf.format(date);
     }
     /**
@@ -14,51 +14,54 @@
                 android:id="@+id/back_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/top_back_black"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
-                />
+                android:src="@drawable/top_back_black" />
             <TextView
                 android:id="@+id/beijing"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/back_btn"
-                android:text="@string/beijing"
-                android:layout_marginLeft="10dp"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:layout_toRightOf="@id/back_btn"
                 android:drawableRight="@drawable/sport_dropdown"
                 android:drawablePadding="7dp"
-                android:textSize="15sp"
+                android:text="@string/beijing"
                 android:textColor="#333333"
-                />
+                android:textSize="15sp" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
                 android:text="@string/goline"
-                android:textSize="18sp"
                 android:textColor="#333333"
-                android:layout_centerInParent="true"
-                />
+                android:textSize="18sp" />
             <TextView
                 android:id="@+id/my_activity"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:padding="10dp"
                 android:text="@string/myactivity"
-                android:textSize="15sp"
                 android:textColor="#333333"
-                />
+                android:textSize="15sp" />
         </RelativeLayout>
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/run_line_recy"
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/run_line_recy"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
         <com.cnlive.strike.ui.widget.UIEmptyView
             android:id="@+id/empty"
@@ -19,7 +19,6 @@
             android:id="@+id/line_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="首都师范大学田径场"
             android:textColor="#333333"
             android:textSize="18sp" />
@@ -38,6 +37,7 @@
                 android:textSize="12sp" />
             <TextView
+                android:id="@+id/activity_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
@@ -61,6 +61,7 @@
                 android:textSize="12sp" />
             <TextView
+                android:id="@+id/line_address"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
@@ -88,7 +89,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
-                android:text="@string/_123"
                 android:textColor="#333333"
                 android:textSize="15sp" />