1 完成全部成绩详情页

杨帅
1 parent 8c453f94
Showing 7 changed files with 103 additions and 21 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.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/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/EventRouteRecordBeanVoListBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
@@ -81,7 +81,9 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         //配速
         String pace = "";
         if ("--".equals(runningFinishBean.getSpeed())) {
-            pace = "0";
+//            pace = "0";
+            //开始计算配速
+            pace = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(mileage));
         } else {
             pace = runningFinishBean.getSpeed();
         }
@@ -125,7 +127,6 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         paramsMap.put("step", step);
-
         Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo>() {
             @Override
             public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo> dataCallback) {
@@ -85,8 +85,19 @@ public class RaceRecorView implements MvpView {
                             runningFinishBean.setRunDistance(bean.getMileage());
                             //设置配速
                             runningFinishBean.setSpeed(bean.getPace());
-                            //设置用书
+                            //设置用时
                             runningFinishBean.setEmployTime(bean.getEmployTime());
+                            //设置开始位置
+                            runningFinishBean.setStartPoint(bean.getStartLocation());
+                            //设置结束位置
+                            runningFinishBean.setEndPoint(bean.getEndLocation());
+                            //设置用户轨迹开始时间
+                            runningFinishBean.setUserStartTime(bean.getStartTime());
+                            //设置用户轨迹结束时间
+                            runningFinishBean.setUserFinishTime(bean.getEndTime());
+                            //设置用户是否完成
+                            runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
+
                             //设置起点
                             ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
@@ -371,8 +371,17 @@ public class RunMainFragmentView implements MvpView {
                                                     runningFinishBean.setStartPoint(userStepEntity.getStartPoint());
                                                     runningFinishBean.setEndPoint(userStepEntity.getEndPoint());
                                                     runningFinishBean.setRunDistance(fragment.binding.tvRunDistance.getText().toString());
-                                                    runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
-                                                    runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    if ("--".equals(fragment.binding.tvSpeed.getText().toString())) {
+                                                        String speed = StepUtil.getPaceSpeed(Double.parseDouble(employTime), Double.parseDouble(fragment.binding.tvRunDistance.getText().toString()));
+                                                        runningFinishBean.setSpeed(speed);
+                                                    } else {
+                                                        runningFinishBean.setSpeed(fragment.binding.tvSpeed.getText().toString());
+                                                    }
+                                                    if ("--".equals(fragment.binding.tvStepCount.getText().toString())) {
+                                                        runningFinishBean.setStep("0");
+                                                    } else {
+                                                        runningFinishBean.setStep(fragment.binding.tvStepCount.getText().toString());
+                                                    }
                                                     runningFinishBean.setTime(fragment.binding.chronometer.getText().toString());
                                                     runningFinishBean.setDate(TimeUtil.getStampToTime(userStepEntity.getFinishTimeStamp() * 1000, "yyyy/MM/dd HH:mm"));
                                                     runningFinishBean.setStreetTitle(userStepEntity.getStreetTitle());
@@ -17,6 +17,7 @@ import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@@ -59,21 +60,13 @@ public class RunningFinishFragmentView implements MvpView {
         //设置距离
         fragment.binding.includeFinishUserInfo.tvDistance.setText(runningFinishBean.getRunDistance());
         //设置配速
-        if ("--".equals(runningFinishBean.getSpeed())) {
-            fragment.binding.includeFinishUserInfo.tvSpeed.setText("0");
-        } else {
-            fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
-        }
+        fragment.binding.includeFinishUserInfo.tvSpeed.setText(runningFinishBean.getSpeed());
         //设置用时
         fragment.binding.includeFinishUserInfo.tvTimer.setText(runningFinishBean.getTime());
         //设置日期
         fragment.binding.includeFinishUserInfo.tvDate.setText(runningFinishBean.getDate());
         //设置步数
-        if ("--".equals(runningFinishBean.getStep())) {
-            fragment.binding.includeFinishStep.tvStep.setText("0");
-        } else {
-            fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
-        }
+        fragment.binding.includeFinishStep.tvStep.setText(runningFinishBean.getStep());
         //设置起点位置
         fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
         //设置终点位置
@@ -21,6 +21,24 @@ public class RunningFinishBean implements Serializable {
     private String isFinish;
     private String roadmap;
     private String streetTitle;
+    private String userStartTime;
+    private String userFinishTime;
+
+    public String getUserStartTime() {
+        return userStartTime;
+    }
+
+    public void setUserStartTime(String userStartTime) {
+        this.userStartTime = userStartTime;
+    }
+
+    public String getUserFinishTime() {
+        return userFinishTime;
+    }
+
+    public void setUserFinishTime(String userFinishTime) {
+        this.userFinishTime = userFinishTime;
+    }
     public String getStreetTitle() {
         return streetTitle;
@@ -25,6 +25,51 @@ public class EventRouteRecordBeanVoListBean {
     private int recordId;
     private String roadmap;
     private String step;
+    private String startTime;
+    private String endTime;
+    private String startLocation;
+    private String endLocation;
+    private int completeStatus;
+
+    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;
+    }
+
+    public String getStartLocation() {
+        return startLocation;
+    }
+
+    public void setStartLocation(String startLocation) {
+        this.startLocation = startLocation;
+    }
+
+    public String getEndLocation() {
+        return endLocation;
+    }
+
+    public void setEndLocation(String endLocation) {
+        this.endLocation = endLocation;
+    }
+
+    public int getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(int completeStatus) {
+        this.completeStatus = completeStatus;
+    }
     public long getCreateTime() {
         return createTime;
@@ -43,14 +43,18 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @NonNull
     @Override
     public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record,viewGroup,false);
+        View view = LayoutInflater.from(context).inflate(R.layout.item_race_record, viewGroup, false);
         return new MyHolder(view);
     }
     @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.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(), "HH:mm"));
+        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
+            myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "MM月dd日"));
+        }
+        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
+            myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "HH:mm"));
+        }
         myHolder.item_title.setText(list.get(i).getEventTitle());
         myHolder.record_kli.setText(list.get(i).getMileage());
         //设置时间
@@ -62,7 +66,8 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         if (onClickListener != null)
             myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
 //        Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
-        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
+        if (onClickListener != null)
+            myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
     }
     @Override
@@ -70,7 +75,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         return list.size();
     }
-    class MyHolder extends RecyclerView.ViewHolder{
+    class MyHolder extends RecyclerView.ViewHolder {
         TextView record_time_day;
         TextView record_time;
@@ -97,7 +102,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     }
-    public interface OnClickListener{
+    public interface OnClickListener {
         void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
     }
 }