Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
杨帅
2 parents c7aa6d82 27981300
Showing 19 changed files with 283 additions and 80 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.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/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RaceRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/TakePartFragment.java
moudle_pedometer/src/main/res/layout/activity_share_record.xml
moudle_pedometer/src/main/res/layout/fragment_race_recor.xml
moudle_pedometer/src/main/res/layout/item_my_record.xml
moudle_pedometer/src/main/res/layout/item_race_record.xml
@@ -365,7 +365,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         });
         //查看全部成绩点击事件
         fragment.binding.includePersonScore.checkAllCord.setOnClickListener(v -> {
-            RaceRecordActivity.newInstance(fragment.getActivity());
+            RaceRecordActivity.newInstance(fragment.getActivity(),runRaceDetailInfo.getTitle());
         });
         fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
 import com.example.moudle_pedometer.R;
@@ -47,7 +48,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmen
             getMvpView().initMap();;
         }
         if (getPresenter()!=null){
-            getPresenter().getRunRaceDetailInfo(getActivity(),"116","10513196");
+            getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()),"10513196");
         }
     }
@@ -13,7 +13,9 @@ import com.cnlive.strike.data.network.model.BaseInfo;
 import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import io.reactivex.disposables.Disposable;
@@ -23,12 +25,13 @@ import io.reactivex.disposables.Disposable;
  */
 public class RaceRecorPresenter extends MvpBasePresenter<RaceRecorView> {
-    public void getData(Context context,String eventId,String sid,String pageNo,String pageSize){
+    public void getData(Context context,String eventId,String sid,int pageNo,int pageSize){
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
         map.put("sid", sid);
-        map.put("pageNo", pageNo);
-        map.put("pageSize", pageSize);
+        map.put("pageNo", pageNo+"");
+        map.put("pageSize", pageSize+"");
+        getView().showLoading();
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<RaceRecordInfo>>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<RaceRecordInfo>> dataCallback) {
@@ -37,12 +40,41 @@ public class RaceRecorPresenter extends MvpBasePresenter&lt;RaceRecorView&gt; {
         }).<BaseInfo<RaceRecordInfo>>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
-                getView().showError();
+                if (getView() != null) {
+                    getView().showError(message);
+                    getView().hideLoading();
+                }
             }
         }).setSuccessCallback(new SuccessCallback<BaseInfo<RaceRecordInfo>>() {
             @Override
             public void onSuccess(BaseInfo<RaceRecordInfo> registerInfo) {
                 if (getView() != null){
+                    RaceRecordInfo raceRecordInfo = new RaceRecordInfo();
+                    RaceRecordInfo.BestResultBean resultBean = new RaceRecordInfo.BestResultBean();
+                    resultBean.setEmployTime("88");
+                    resultBean.setEventTitle("2018国际网络徒步大赛黄金海岸站");
+                    resultBean.setPace("22.33");
+                    resultBean.setRecordId(32);
+                    resultBean.setRoadmap("http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg");
+                    resultBean.setStep(10000+"");
+                    resultBean.setMileage(5+"");
+                    resultBean.setLatLongitude("[{\"latitude\":88.88,\"longitude\":88.88}]");
+                    raceRecordInfo.setBestResult(resultBean);
+
+                    List< RaceRecordInfo.EventRouteRecordBeanVoListBean > listBeans = new ArrayList<>();
+                    RaceRecordInfo.EventRouteRecordBeanVoListBean eventRouteRecordBeanVoListBean = new RaceRecordInfo.EventRouteRecordBeanVoListBean();
+                    eventRouteRecordBeanVoListBean.setCreateTime(1559722832);
+                    eventRouteRecordBeanVoListBean.setEmployTime("00:88");
+                    eventRouteRecordBeanVoListBean.setLatLongitude("[\"39.74788,116.14294\",\"39.74888,116.14394\"]");
+                    eventRouteRecordBeanVoListBean.setMileage(5.4+"");
+                    eventRouteRecordBeanVoListBean.setPace("22.33");
+                    eventRouteRecordBeanVoListBean.setRecordId(4);
+                    eventRouteRecordBeanVoListBean.setRoadmap("http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg");
+                    eventRouteRecordBeanVoListBean.setStep(10000+"");
+                    eventRouteRecordBeanVoListBean.setEventTitle("2018国际网络徒步大赛黄金海岸站");
+                    listBeans.add(eventRouteRecordBeanVoListBean);
+                    raceRecordInfo.setEventRouteRecordBeanVoList(listBeans);
+                    registerInfo.setData(raceRecordInfo);
                     getView().setData(registerInfo);
                 }
             }
@@ -28,6 +28,7 @@ public class RunLinePresenter extends MvpBasePresenter&lt;RunLineView&gt; {
         HashMap<String, String> map = new HashMap<>();
         map.put("sid", sid);
         map.put("pageNo", pageNo+"");
+        map.put("state","0");
         map.put("pageSize", pageSize+"");
         getView().showLoading();
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo<RunLineInfo>>() {
@@ -3,52 +3,115 @@ 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.collectionTrace.ui.activity.CollRunningFinishActivity;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.RunningFinishBean;
+import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
+import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
 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.runAbout.RaceRecordInfo;
+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/05/30.
  */
 public class RaceRecorView implements MvpView {
     private RaceRecorFragment fragment;
+    public QMUITipDialog loadingDiaog;
+    private List<RaceRecordInfo.EventRouteRecordBeanVoListBean> list = new ArrayList<>();
+    private RaceRecordAdapter adapter;
     public RaceRecorView(RaceRecorFragment fragment) {
         this.fragment = fragment;
+        loadingDiaog = new QMUITipDialog.Builder(fragment.getActivity())
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord("请稍后")
+                .create();
     }
     public void setData(BaseInfo<RaceRecordInfo> raceRecordInfoBaseInfo){
+        hideLoading();
+        fragment.binding.ryRecord.setVisibility(View.VISIBLE);
+        fragment.binding.txAll.setVisibility(View.VISIBLE);
         if(raceRecordInfoBaseInfo.getData().getBestResult() == null){
             showEmpty();
             return;
         }
-        fragment.binding.kilometerNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getMileage());
-        fragment.binding.stepNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getStep());
-        fragment.binding.kilometerTime.setText(raceRecordInfoBaseInfo.getData().getBestResult().getEmployTime());
-        fragment.binding.kilometerSpeed.setText(raceRecordInfoBaseInfo.getData().getBestResult().getPace());
-        fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-        fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList(),fragment.getActivity()));
+
+        if(fragment.currentPage == 1){
+            list.clear();
+            list.addAll(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
+            if(adapter == null){
+                fragment.binding.kilometerNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getMileage());
+                fragment.binding.stepNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getStep());
+                fragment.binding.kilometerTime.setText(raceRecordInfoBaseInfo.getData().getBestResult().getEmployTime());
+                fragment.binding.kilometerSpeed.setText(raceRecordInfoBaseInfo.getData().getBestResult().getPace());
+                fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+                adapter = new RaceRecordAdapter(list,fragment.getActivity());
+                fragment.binding.recordRecy.setAdapter(adapter);
+                adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
+                    @Override
+                    public void onClickListener(RaceRecordInfo.EventRouteRecordBeanVoListBean bean, int position) {
+                        CollRunningFinishActivity.startActivity(fragment.getActivity(),new RunningFinishBean());
+                    }
+                });
+                fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
+                        .setOnClickListener(v -> {
+                            //分享
+                            ShareRecordActivity.newInstance(fragment.getActivity(),fragment.raceTitle);
+                        });
+
+            }else {
+                adapter.notifyDataSetChanged();
+            }
+        }
+
+        if(list.size() != 0){
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.emptyNet.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+        }else {
+            showEmpty();
+        }
+
+        if(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize){
+            fragment.binding.refreshLayout.setEnableLoadMore(false);
+        }else {
+            fragment.binding.refreshLayout.setEnableLoadMore(true);
+        }
+        if(fragment.currentPage > 1){
+            list.addAll(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
+            adapter.notifyDataSetChanged();
+        }
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
     }
     public void initView(){
         fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             fragment.getActivity().finish();
         });
-        fragment.binding.topbar.setTitle("奥森跑道全部成绩");
-        fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
-                .setOnClickListener(v -> {
-                    //分享
-                    ShareRecordActivity.newInstance(fragment.getActivity());
-                });
+        fragment.binding.topbar.setTitle("全部成绩");
+        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
+        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
     }
     public void showEmpty(){
-        fragment.binding.recordRecy.setVisibility(View.GONE);
+        fragment.binding.refreshLayout.setVisibility(View.GONE);
+        fragment.binding.emptyNet.setVisibility(View.GONE);
         fragment.binding.empty.setVisibility(View.VISIBLE);
         fragment.binding.kilometerNum.setText("0.00");
         fragment.binding.stepNum.setText("--");
@@ -56,7 +119,41 @@ public class RaceRecorView implements MvpView {
         fragment.binding.kilometerSpeed.setText("--");
     }
-    public void showError(){
+    public void showError(String msg){
+        fragment.binding.refreshLayout.finishRefresh();
+        fragment.binding.refreshLayout.finishLoadMore();
+        if (list.size() == 0) {
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.GONE);
+            fragment.binding.ryRecord.setVisibility(View.GONE);
+            fragment.binding.txAll.setVisibility(View.GONE);
+            fragment.binding.emptyNet.setVisibility(View.VISIBLE);
+            fragment.binding.emptyNet.setDetailText(fragment.getResources().getString(R.string.msg_failed_network_detail));
+            fragment.binding.emptyNet.setTitleText(msg);
+            fragment.binding.emptyNet.setButton("重试", new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    fragment.currentPage = 1;
+                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),"10514343",fragment.currentPage,fragment.pageSize);
+                }
+            });
+            fragment.binding.emptyNet.setLoadingShowing(false);
+            fragment.binding.emptyNet.setImage(R.drawable.wufalianjie);
+        } else {
+            fragment.binding.empty.setVisibility(View.GONE);
+            fragment.binding.emptyNet.setVisibility(View.GONE);
+            fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
+            fragment.binding.ryRecord.setVisibility(View.VISIBLE);
+            fragment.binding.txAll.setVisibility(View.VISIBLE);
+            AlertUtil.showDeftToast(fragment.getActivity(), msg);
+        }
+    }
+
+    public void showLoading() {
+        if (loadingDiaog != null) loadingDiaog.show();
+    }
+    public void hideLoading() {
+        if (loadingDiaog != null) loadingDiaog.dismiss();
     }
 }
@@ -386,7 +386,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         });
         //查看全部成绩点击事件
         fragment.binding.includePersonScore.checkAllCord.setOnClickListener(v -> {
-            RaceRecordActivity.newInstance(fragment.getActivity());
+            RaceRecordActivity.newInstance(fragment.getActivity(),runRaceDetailInfo.getTitle());
         });
         fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
@@ -43,7 +43,7 @@ public class SelfRecordView implements MvpView{
         fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
                 .setOnClickListener(v -> {
                     //分享
-                    ShareRecordActivity.newInstance(fragment.getActivity());
+                    ShareRecordActivity.newInstance(fragment.getActivity(),"");
                 });
     }
@@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
 import com.cnlive.strike.data.network.model.BaseInfo;
@@ -90,7 +91,7 @@ public class TakePartView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().setData(fragment.getActivity(),"116",fragment.currentPage,fragment.itemNum);
+                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),fragment.currentPage,fragment.itemNum);
                 }
             });
             fragment.binding.empty.setLoadingShowing(false);
 package com.cnlive.moudle.pedometer.model;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 跑步结束相关数据
@@ -15,6 +16,9 @@ public class RunningFinishBean implements Serializable {
     private String startPoint;
     private String endPoint;
     private String date;
+    private List<String> latList;
+
+
     public String getRunDistance() {
         return runDistance;
@@ -15,8 +15,10 @@ import com.example.moudle_pedometer.R;
  * Created by hanyayun 019/05/30.
  */
 public class RaceRecordActivity extends AppCompatActivity {
-    public static void newInstance(Activity context){
+
+    public static void newInstance(Activity context,String raceTitle){
         Intent intent = new Intent(context,RaceRecordActivity.class);
+        intent.putExtra("raceTitle",raceTitle);
         context.startActivity(intent);
     }
@@ -27,6 +29,6 @@ public class RaceRecordActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_race_record);
-        getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new RaceRecorFragment()).commit();
+        getSupportFragmentManager().beginTransaction().replace(R.id.record_container, RaceRecorFragment.newInstance(getIntent().getStringExtra("raceTitle"))).commit();
     }
 }
@@ -22,10 +22,11 @@ import com.qmuiteam.qmui.util.QMUIDrawableHelper;
 public class ShareRecordActivity extends AppCompatActivity {
     private ImageView share_back;
-    private TextView share;
+    private TextView share,cord_name;
     private RelativeLayout ry_cen;
-    public static void newInstance(Activity context){
+    public static void newInstance(Activity context,String title){
         Intent intent = new Intent(context,ShareRecordActivity.class);
+        intent.putExtra("raceTitle",title);
         context.startActivity(intent);
     }
@@ -36,6 +37,8 @@ public class ShareRecordActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.bg), 0);
         setContentView(R.layout.activity_share_record);
+        cord_name = findViewById(R.id.cord_name);
+        cord_name.setText("用户在"+getIntent().getStringExtra("raceTitle")+"中的最佳成绩");
         share_back = findViewById(R.id.share_back);
         share = findViewById(R.id.share);
         ry_cen = findViewById(R.id.ry_cen);
@@ -8,11 +8,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.data.network.model.runAbout.RaceRecordInfo;
+import com.cnlive.strike.data.network.model.runAbout.RunLineInfo;
 import com.example.moudle_pedometer.R;
 import java.util.List;
@@ -21,6 +23,11 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     private List<RaceRecordInfo.EventRouteRecordBeanVoListBean> list;
     private Context context;
+    private OnClickListener onClickListener;
+
+    public void setOnClickListener(OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
     public RaceRecordAdapter(List<RaceRecordInfo.EventRouteRecordBeanVoListBean> list, Context context) {
         this.list = list;
@@ -36,14 +43,14 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @Override
     public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
-        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"MM-dd"));
+        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"MM月dd日"));
         myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm"));
         myHolder.item_title.setText(list.get(i).getEventTitle());
         myHolder.record_kli.setText(list.get(i).getMileage());
         myHolder.record_minit.setText(list.get(i).getEmployTime());
         myHolder.record_speed.setText(list.get(i).getPace());
         myHolder.record_step.setText(list.get(i).getStep());
-
+        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
     }
     @Override
@@ -61,6 +68,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         TextView record_minit;
         TextView record_speed;
         TextView record_step;
+        RelativeLayout ry_re;
         public MyHolder(@NonNull View itemView) {
             super(itemView);
@@ -72,6 +80,12 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
             record_minit = itemView.findViewById(R.id.record_minit);
             record_speed = itemView.findViewById(R.id.record_speed);
             record_step = itemView.findViewById(R.id.record_step);
+            ry_re = itemView.findViewById(R.id.ry_re);
         }
     }
+
+
+    public interface OnClickListener{
+        void onClickListener(RaceRecordInfo.EventRouteRecordBeanVoListBean bean, int position);
+    }
 }
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RaceRecorPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RaceRecorView;
 import com.example.moudle_pedometer.R;
@@ -16,17 +17,35 @@ import com.example.moudle_pedometer.databinding.FragmentRaceRecorBinding;
  */
 public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRecorPresenter,Object, FragmentRaceRecorBinding> {
-
-    public RaceRecorFragment() {
+    public String raceTitle;
+    public int currentPage = 1;
+    public int pageSize = 10;
+    public static RaceRecorFragment newInstance(String raceTitle) {
         // Required empty public constructor
+        RaceRecorFragment fragment = new RaceRecorFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("raceTitle",raceTitle);
+        fragment.setArguments(bundle);
+        return fragment;
     }
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        raceTitle = getArguments().getString("raceTitle");
         if(getMvpView() != null) getMvpView().initView();
-        getPresenter().getData(getActivity(),"116","10514343","1","10");
+
+        getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+
+        binding.refreshLayout.setOnRefreshListener(v ->{
+            currentPage = 1;
+            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+        });
+        binding.refreshLayout.setOnLoadMoreListener(v ->{
+            currentPage++;
+            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+        });
     }
     @Override
@@ -41,6 +41,6 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
     }
     public void commitInfo(){
-        getPresenter().commitInfo(getActivity(),"116", "10514343","15210479774","","");
+        getPresenter().commitInfo(getActivity(),CommonInfo.getStreetId(getActivity()), "10514343","15210479774","","");
     }
 }
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.TakePartPresenter;
 import com.cnlive.moudle.pedometer.frame.view.TakePartView;
 import com.example.moudle_pedometer.R;
@@ -18,6 +19,7 @@ public class TakePartFragment extends MvpBindingFragment&lt;TakePartView, TakePartP
     public int currentPage = 1;
     public int itemNum = 10;
+    private String eventID = "";
     public TakePartFragment() {
         // Required empty public constructor
@@ -31,15 +33,16 @@ 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",currentPage,itemNum);
+        eventID =  CommonInfo.getStreetId(getActivity());
+        getPresenter().setData(getActivity(),eventID,currentPage,itemNum);
         if(getMvpView() != null)getMvpView().initView();
         binding.refreshLayout.setOnRefreshListener(v ->{
             currentPage = 1;
-            getPresenter().setData(getActivity(),"116",currentPage,itemNum);
+            getPresenter().setData(getActivity(),eventID,currentPage,itemNum);
         });
         binding.refreshLayout.setOnLoadMoreListener(v ->{
             currentPage++;
-            getPresenter().setData(getActivity(),"116",currentPage,itemNum);
+            getPresenter().setData(getActivity(),eventID,currentPage,itemNum);
         });
     }
 }
@@ -9,8 +9,8 @@
     <RelativeLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:background="@color/bg"
-        android:layout_height="48dp">
+        android:layout_height="48dp"
+        android:background="@color/bg">
         <ImageView
             android:id="@+id/share_back"
@@ -40,12 +40,14 @@
             android:text="@string/containuue"
             android:textColor="@color/white" />
     </RelativeLayout>
+
     <RelativeLayout
         android:id="@+id/ry_cen"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/share_background"
-        android:layout_below="@id/topbar">
+        android:layout_below="@id/topbar"
+        android:background="@drawable/share_background">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -197,58 +199,67 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="10dp"
-                android:background="#CCCCCC"/>
+                android:background="#CCCCCC" />
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/kilometer_ry"
                 android:layout_marginTop="30dp"
+                android:orientation="horizontal"
+                android:weightSum="3"
                 android:padding="10dp">
-                <TextView
-                    android:id="@+id/cord_name"
+                <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:gravity="left"
-                    android:text="用户在奥森南苑路线中的最佳成绩"
-                    android:textColor="#333333"
-                    android:textSize="12sp" />
+                    android:layout_weight="3">
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/cord_name"
-                    android:layout_marginTop="30dp"
-                    android:background="@drawable/cc_bg_circle"
-                    android:orientation="vertical"
-                    android:padding="10dp"
-                    >
                     <TextView
-                        android:id="@+id/tv_tv"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/cord_name"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="#心情标签#"
+                        android:gravity="left"
+                        android:text="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         android:textColor="#333333"
-                        android:textSize="10sp" />
+                        android:textSize="12sp" />
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/tv_tv"
-                        android:layout_marginTop="7dp"
-                        android:text="点击这里写下你的心情标签"
-                        android:textColor="#999999"
-                        android:textSize="10sp"/>
-                </LinearLayout>
+                        android:layout_below="@id/cord_name"
+                        android:layout_marginTop="20dp"
+                        android:background="@drawable/cc_bg_circle"
+                        android:orientation="vertical"
+                        android:padding="10dp">
+
+                        <TextView
+                            android:id="@+id/tv_tv"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="#心情标签#"
+                            android:textColor="#333333"
+                            android:textSize="10sp" />
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_tv"
+                            android:layout_marginTop="7dp"
+                            android:text="点击这里写下你的心情标签"
+                            android:textColor="#999999"
+                            android:textSize="10sp" />
+                    </LinearLayout>
+                </RelativeLayout>
                 <ImageView
-                    android:layout_width="95dp"
-                    android:layout_height="95dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:layout_alignParentRight="true"
                     android:src="@drawable/erwe" />
-            </RelativeLayout>
+            </LinearLayout>
         </RelativeLayout>
     </RelativeLayout>
@@ -12,6 +12,7 @@
             android:layout_height="?attr/qmui_topbar_height" />
         <RelativeLayout
+            android:id="@+id/ry_record"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
@@ -129,7 +130,9 @@
         </RelativeLayout>
+
         <TextView
+            android:id="@+id/tx_all"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
@@ -138,12 +141,19 @@
             android:textColor="#333333"
             android:text="@string/all_line_record" />
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/record_recy"
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp"
-            android:background="@color/white" />
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/record_recy"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="10dp"
+                android:background="@color/white" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
         <RelativeLayout
             android:id="@+id/empty"
@@ -176,6 +186,12 @@
         </RelativeLayout>
+        <com.cnlive.strike.ui.widget.UIEmptyView
+            android:id="@+id/empty_net"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+
     </LinearLayout>
 </layout>
@@ -41,7 +41,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="2019.05.01--2019.09.01"
                 android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -65,7 +64,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="北京  首都师范大学  全长4.42公里"
                 android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -78,7 +76,7 @@
             <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
                 android:id="@+id/join_person"
-                android:layout_width="150dp"
+                android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_marginRight="10dp"
                 FivePersonIconView:showRightFlag="false" />
@@ -5,6 +5,7 @@
     </data>
     <RelativeLayout
+        android:id="@+id/ry_re"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="5dp">