CNLive Android Team / ModulePedometer · Commits

Commit 46198c7316f698b326c3b70ff11d6cc8840c1db2

Authored by 杨帅
1 parent 8c453f94

1 完成全部成绩详情页

Inline Side-by-side
Showing 7 changed files with 103 additions and 21 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
  View file @46198c7
... ... @@ -81,7 +81,9 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinis
81 81 //配速
82 82 String pace = "";
83 83 if ("--".equals(runningFinishBean.getSpeed())) {
84   - pace = "0";
  84 +// pace = "0";
  85 + //开始计算配速
  86 + pace = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(mileage));
85 87 } else {
86 88 pace = runningFinishBean.getSpeed();
87 89 }
... ... @@ -125,7 +127,6 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinis
125 127 paramsMap.put("step", step);
126 128  
127 129  
128   -
129 130 Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
130 131 @Override
131 132 public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @46198c7
... ... @@ -85,8 +85,19 @@ public class RaceRecorView implements MvpView {
85 85 runningFinishBean.setRunDistance(bean.getMileage());
86 86 //设置配速
87 87 runningFinishBean.setSpeed(bean.getPace());
88   - //设置用书
  88 + //设置用时
89 89 runningFinishBean.setEmployTime(bean.getEmployTime());
  90 + //设置开始位置
  91 + runningFinishBean.setStartPoint(bean.getStartLocation());
  92 + //设置结束位置
  93 + runningFinishBean.setEndPoint(bean.getEndLocation());
  94 + //设置用户轨迹开始时间
  95 + runningFinishBean.setUserStartTime(bean.getStartTime());
  96 + //设置用户轨迹结束时间
  97 + runningFinishBean.setUserFinishTime(bean.getEndTime());
  98 + //设置用户是否完成
  99 + runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
  100 +
90 101 //设置起点
91 102 ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
92 103  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @46198c7
... ... @@ -371,8 +371,17 @@ public class RunMainFragmentView implements MvpView {
371 371 runningFinishBean.setStartPoint(userStepEntity.getStartPoint());
372 372 runningFinishBean.setEndPoint(userStepEntity.getEndPoint());
373 373 runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
374   - runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
375   - runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
  374 + if ("--".equals(fragment.binding.tvSpeed.getText().toString())) {
  375 + String speed = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(fragment.binding.tvRunDistance.getText().toString()));
  376 + runningFinishBean.setSpeed(speed);
  377 + } else {
  378 + runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
  379 + }
  380 + if ("--".equals(fragment.binding.tvStepCount.getText().toString())) {
  381 + runningFinishBean.setStep("0");
  382 + } else {
  383 + runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
  384 + }
376 385 runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
377 386 runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp() * 1000, "yyyy/MM/dd HH:mm"));
378 387 runningFinishBean.setStreetTitle(userStepEntity.getStreetTitle());
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
  View file @46198c7
... ... @@ -17,6 +17,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
17 17 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
18 18 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
19 19 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
  20 +import com.cnlive.moudle.pedometer.utils.StepUtil;
20 21 import com.example.moudle_pedometer.R;
21 22 import com.hannesdorfmann.mosby3.mvp.MvpView;
22 23 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
... ... @@ -59,21 +60,13 @@ public class RunningFinishFragmentView implements MvpView {
59 60 //设置距离
60 61 fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
61 62 //设置配速
62   - if ("--".equals(runningFinishBean.getSpeed())) {
63   - fragment.binding.includeFinishUserInfo.tvSpeed.setText("0");
64   - } else {
65   - fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
66   - }
  63 + fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
67 64 //设置用时
68 65 fragment.binding.includeFinishUserInfo.tvTimer.setText(runningFinishBean.getTime());
69 66 //设置日期
70 67 fragment.binding.includeFinishUserInfo.tvDate.setText(runningFinishBean.getDate());
71 68 //设置步数
72   - if ("--".equals(runningFinishBean.getStep())) {
73   - fragment.binding.includeFinishStep.tvStep.setText("0");
74   - } else {
75   - fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
76   - }
  69 + fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
77 70 //设置起点位置
78 71 fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
79 72 //设置终点位置
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
  View file @46198c7
... ... @@ -21,6 +21,24 @@ public class RunningFinishBean implements Serializable {
21 21 private String isFinish;
22 22 private String roadmap;
23 23 private String streetTitle;
  24 + private String userStartTime;
  25 + private String userFinishTime;
  26 +
  27 + public String getUserStartTime() {
  28 + return userStartTime;
  29 + }
  30 +
  31 + public void setUserStartTime(String userStartTime) {
  32 + this.userStartTime = userStartTime;
  33 + }
  34 +
  35 + public String getUserFinishTime() {
  36 + return userFinishTime;
  37 + }
  38 +
  39 + public void setUserFinishTime(String userFinishTime) {
  40 + this.userFinishTime = userFinishTime;
  41 + }
24 42  
25 43 public String getStreetTitle() {
26 44 return streetTitle;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/EventRouteRecordBeanVoListBean.java
  View file @46198c7
... ... @@ -25,6 +25,51 @@ public class EventRouteRecordBeanVoListBean {
25 25 private int recordId;
26 26 private String roadmap;
27 27 private String step;
  28 + private String startTime;
  29 + private String endTime;
  30 + private String startLocation;
  31 + private String endLocation;
  32 + private int completeStatus;
  33 +
  34 + public String getStartTime() {
  35 + return startTime;
  36 + }
  37 +
  38 + public void setStartTime(String startTime) {
  39 + this.startTime = startTime;
  40 + }
  41 +
  42 + public String getEndTime() {
  43 + return endTime;
  44 + }
  45 +
  46 + public void setEndTime(String endTime) {
  47 + this.endTime = endTime;
  48 + }
  49 +
  50 + public String getStartLocation() {
  51 + return startLocation;
  52 + }
  53 +
  54 + public void setStartLocation(String startLocation) {
  55 + this.startLocation = startLocation;
  56 + }
  57 +
  58 + public String getEndLocation() {
  59 + return endLocation;
  60 + }
  61 +
  62 + public void setEndLocation(String endLocation) {
  63 + this.endLocation = endLocation;
  64 + }
  65 +
  66 + public int getCompleteStatus() {
  67 + return completeStatus;
  68 + }
  69 +
  70 + public void setCompleteStatus(int completeStatus) {
  71 + this.completeStatus = completeStatus;
  72 + }
28 73  
29 74 public long getCreateTime() {
30 75 return createTime;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
  View file @46198c7
... ... @@ -43,14 +43,18 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
43 43 @NonNull
44 44 @Override
45 45 public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
46   - View view = LayoutInflater.from(context).inflate(R.layout.item_race_record,viewGroup,false);
  46 + View view = LayoutInflater.from(context).inflate(R.layout.item_race_record, viewGroup, false);
47 47 return new MyHolder(view);
48 48 }
49 49  
50 50 @Override
51 51 public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
52   - myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "MM月dd日"));
53   - myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "HH:mm"));
  52 + if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
  53 + myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "MM月dd日"));
  54 + }
  55 + if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
  56 + myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "HH:mm"));
  57 + }
54 58 myHolder.item_title.setText(list.get(i).getEventTitle());
55 59 myHolder.record_kli.setText(list.get(i).getMileage());
56 60 //设置时间
... ... @@ -62,7 +66,8 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
62 66 if (onClickListener != null)
63 67 myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
64 68 // Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
65   - if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
  69 + if (onClickListener != null)
  70 + myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
66 71 }
67 72  
68 73 @Override
... ... @@ -70,7 +75,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
70 75 return list.size();
71 76 }
72 77  
73   - class MyHolder extends RecyclerView.ViewHolder{
  78 + class MyHolder extends RecyclerView.ViewHolder {
74 79  
75 80 TextView record_time_day;
76 81 TextView record_time;
... ... @@ -97,7 +102,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
97 102 }
98 103  
99 104  
100   - public interface OnClickListener{
  105 + public interface OnClickListener {
101 106 void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
102 107 }
103 108 }
... ...