1 修改相关UI

杨帅
1 parent 5470b0f1
Showing 14 changed files with 140 additions and 33 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.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/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/RunningFinishBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/ALLScoreDetailFragment.java
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/fragment_running_map.xml
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
moudle_pedometer/src/main/res/layout/layout_finish_step.xml
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_person_score.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street_introduce.xml
@@ -38,8 +38,18 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
         }
         //获取当前的时间戳(秒)
         long endTime = 0;
-        if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())){
-            endTime = Long.parseLong(runningFinishBean.getUserFinishTime());
+        //判断当期那用户是否暂停
+        if (runningFinishBean.isPause()) {
+            //用户暂停了
+            if (!TextUtils.isEmpty(runningFinishBean.getUserPauseTime())) {
+                endTime = Long.parseLong(runningFinishBean.getUserPauseTime());
+            }
+        }
+        //没有暂停
+        else {
+            if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())) {
+                endTime = Long.parseLong(runningFinishBean.getUserFinishTime());
+            }
         }
         //获取当前的实体名称
         String entityName = CommonInfo.getUserId(context);
@@ -53,9 +63,16 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
                     if (getView() != null) {
                         QMUITipDialogUtil.dismessDialog();
                         if (resultPoints.size() > 1) {
-                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
-                            //设置地图自动缩放
-                            MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -2f);
+                            //用户暂停了
+                            if (runningFinishBean.isPause()) {
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                            }
+                            //用户没有暂停
+                            else {
+                                MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                                //设置地图自动缩放
+                                MyMapUtil.setMapAutoZoom(getView().baiduMap, resultPoints, -2f);
+                            }
                         }
                     }
 package com.cnlive.moudle.pedometer.frame.view;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -98,7 +99,14 @@ public class RaceRecorView implements MvpView {
                             runningFinishBean.setUserFinishTime(bean.getEndTime());
                             //设置用户是否完成
                             runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
-
+                            //设置是否暂停
+                            if (!TextUtils.isEmpty(bean.getPauseTime())) {
+                                runningFinishBean.setPause(true);
+                                //设置暂停时间
+                                runningFinishBean.setUserPauseTime(bean.getPauseTime());
+                                //设置用户继续时间
+                                runningFinishBean.setUserContinueTime(bean.getContinueTime());
+                            }
                             //设置起点
                             ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.frame.view;
 import android.support.v7.widget.LinearLayoutManager;
+import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -90,11 +91,19 @@ public class SelfRecordView implements MvpView {
                             runningFinishBean.setUserFinishTime(bean.getEndTime());
                             //设置用户是否完成
                             runningFinishBean.setIsFinish(bean.getCompleteStatus() + "");
-
+                            //设置是否暂停
+                            if (!TextUtils.isEmpty(bean.getPauseTime())) {
+                                runningFinishBean.setPause(true);
+                                //设置暂停时间
+                                runningFinishBean.setUserPauseTime(bean.getPauseTime());
+                                //设置用户继续时间
+                                runningFinishBean.setUserContinueTime(bean.getContinueTime());
+                            }
                             //设置起点
                             ALLScoreDetailActivity.startActivity(fragment.getActivity(), runningFinishBean);
-                        }                    }
+                        }
+                    }
                 });
             } else {
                 adapter.notifyDataSetChanged();
@@ -111,13 +120,19 @@ public class SelfRecordView implements MvpView {
         SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
         fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
-        if(recordSumBean.getYetStep() != null)fragment.binding.stepNum.setText(recordSumBean.getYetStep());
-        if(recordSumBean.getYetEmployTime() != null)fragment.binding.allTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getYetEmployTime())));
-        if(recordSumBean.getYetNumber() != null)fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
-
-        if(recordSumBean.getNotStep() != null)fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
-        if(recordSumBean.getNotEmployTime() != null)fragment.binding.allTimeNo.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getNotEmployTime())));
-        if(recordSumBean.getNotNumber() != null)fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
+        if (recordSumBean.getYetStep() != null)
+            fragment.binding.stepNum.setText(recordSumBean.getYetStep());
+        if (recordSumBean.getYetEmployTime() != null)
+            fragment.binding.allTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getYetEmployTime())));
+        if (recordSumBean.getYetNumber() != null)
+            fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
+
+        if (recordSumBean.getNotStep() != null)
+            fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
+        if (recordSumBean.getNotEmployTime() != null)
+            fragment.binding.allTimeNo.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getNotEmployTime())));
+        if (recordSumBean.getNotNumber() != null)
+            fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
         if (selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
@@ -21,9 +21,36 @@ public class RunningFinishBean implements Serializable {
     private String isFinish;
     private String roadmap;
     private String streetTitle;
-    //后续添加的,用于我的记录详情页跳转
+    //****************************后续添加的,用于我的记录详情页跳转
     private String userStartTime;
     private String userFinishTime;
+    private boolean isPause;
+    private String userPauseTime;
+    private String userContinueTime;
+
+    public boolean isPause() {
+        return isPause;
+    }
+
+    public void setPause(boolean pause) {
+        isPause = pause;
+    }
+
+    public String getUserPauseTime() {
+        return userPauseTime;
+    }
+
+    public void setUserPauseTime(String userPauseTime) {
+        this.userPauseTime = userPauseTime;
+    }
+
+    public String getUserContinueTime() {
+        return userContinueTime;
+    }
+
+    public void setUserContinueTime(String userContinueTime) {
+        this.userContinueTime = userContinueTime;
+    }
     public String getUserStartTime() {
         return userStartTime;
@@ -12,6 +12,11 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
+/**
+ * 我的活动-全部成绩
+ *
+ * @author ShinnyYang
+ */
 public class ALLScoreDetailFragment extends QMUIFragment<ALLScoreDetailFragmentView, ALLScoreDetailFragmentPresenter, FragmentFinishRunMapBinding> {
     private RunningFinishBean runningFinishBean;
@@ -96,7 +96,7 @@
                         <!---->
                         <View
                             android:layout_width="match_parent"
-                            android:layout_height="20dp"
+                            android:layout_height="10dp"
                             android:background="#F4F4F4" />
                         <!--路线介绍-->
                         <include
@@ -175,7 +175,6 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingLeft="5dp"
                     android:paddingRight="5dp">
                     <TextView
@@ -183,6 +182,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="--"
+                        android:layout_marginRight="5dp"
                         android:textColor="@color/black"
                         android:textSize="20sp"
                         android:textStyle="bold" />
@@ -192,6 +192,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
                         android:text="距离(km)"
+                        android:layout_marginRight="5dp"
                         android:textColor="@color/black"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -4,7 +4,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/shape_10dp_white_raduis_bg"
         android:orientation="vertical">
         <!--跑步路线-->
@@ -63,7 +66,7 @@
         <!--竖线-->
         <View
             android:layout_width="1dp"
-            android:layout_height="18dp"
+            android:layout_height="25dp"
             android:layout_marginLeft="17dp"
             android:layout_marginTop="-3dp"
             android:background="@color/vertical_line" />
@@ -4,7 +4,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:layout_margin="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
         android:background="@drawable/shape_10dp_white_raduis_bg"
         android:orientation="vertical">
@@ -8,7 +8,7 @@
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="190dp"
+            android:layout_height="200dp"
             android:layout_marginTop="30dp"
             android:background="@drawable/shape_10dp_white_raduis_bg"
             android:orientation="vertical">
@@ -113,6 +113,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
+                        android:layout_marginBottom="10dp"
                         android:text="配速"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
@@ -138,6 +139,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
+                        android:layout_marginBottom="10dp"
                         android:text="用时"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
@@ -9,7 +9,7 @@
         <!--个人最佳成绩-->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="180dp"
+            android:layout_height="200dp"
             android:background="@drawable/white_shadow_bg"
             android:orientation="vertical"
             android:paddingLeft="15dp"
@@ -11,6 +11,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="150dp"
+            android:layout_marginBottom="20dp"
             android:background="@drawable/white_shadow_bg"
             android:orientation="vertical"
             android:paddingLeft="15dp"
@@ -3,7 +3,8 @@
     <LinearLayout xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@color/white">
         <LinearLayout
             android:id="@+id/ll_run_detail_street_root"
@@ -78,6 +79,14 @@
                     </LinearLayout>
                 </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginRight="35dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/line" />
                 <!--按钮-->
                 <RelativeLayout
                     android:id="@+id/rl_start_btn"
@@ -128,8 +137,8 @@
                     android:gravity="center_vertical">
                     <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
                         android:layout_marginLeft="25dp"
                         android:background="@drawable/shape_circle_green" />
@@ -150,6 +159,14 @@
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
                 </LinearLayout>
+                <!--竖线-->
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="20dp"
+                    android:layout_marginLeft="37dp"
+                    android:layout_marginTop="-3dp"
+                    android:layout_marginBottom="-13dp"
+                    android:background="@color/vertical_line" />
                 <!--终点-->
                 <LinearLayout
                     android:id="@+id/ll_end_point"
@@ -160,8 +177,8 @@
                     android:gravity="center_vertical">
                     <View
-                        android:layout_width="10dp"
-                        android:layout_height="10dp"
+                        android:layout_width="6dp"
+                        android:layout_height="6dp"
                         android:layout_marginLeft="25dp"
                         android:background="@drawable/shape_circle_red" />
@@ -242,9 +259,9 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="5dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="35dp"
                     android:background="@color/line" />
                 <!--活动时间-->
                 <LinearLayout
@@ -304,9 +321,9 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="5dp"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="35dp"
                     android:background="@color/line" />
                 <!--活动类型-->
                 <LinearLayout
@@ -347,6 +364,14 @@
                         android:textStyle="bold" />
                 </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginRight="35dp"
+                    android:background="@color/line" />
                 <!--参与人数-->
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:id="@+id/tv_race_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="18dp"
             android:text="@string/layout_run_detail_street_introduce_title"
             android:textSize="18sp"
             android:textStyle="bold" />