Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer

杨帅
2 parents de1136ae 70d69cfc
Showing 12 changed files with 376 additions and 107 deletions
.idea/gradle.xml
moudle_pedometer/build.gradle
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/SelfRecordPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/SelfRecordInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/LineUpAgainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
moudle_pedometer/src/main/res/layout/activity_line_up_again.xml
moudle_pedometer/src/main/res/layout/fragment_self_record.xml
moudle_pedometer/src/main/res/values/colors.xml
moudle_pedometer/src/main/res/values/strings.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -74,6 +74,7 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$rootProject.glide"
     implementation "jp.wasabeef:glide-transformations:$rootProject.glideTransformations"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:support-v4:28.0.0'
     annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.compiler"
     //--------------------------------------------------------
@@ -52,7 +52,8 @@
         android:required="true" />
     <application android:persistent="true">
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity"></activity>
+        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity"></activity>
+        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity" />
@@ -24,9 +24,10 @@ import io.reactivex.disposables.Disposable;
 public class SelfRecordPresenter extends MvpBasePresenter<SelfRecordView> {
-    public void getData(Context context,String sid, int pageNo, int pageSize){
+    public void getData(Context context,String sid,int completeStatus, int pageNo, int pageSize){
         HashMap<String, String> map = new HashMap<>();
         map.put("sid", sid);
+        map.put("completeStatus",completeStatus+"");
         map.put("pageNo", pageNo+"");
         map.put("pageSize",pageSize+"");
         getView().showLoading();
@@ -11,6 +11,7 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
+import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
@@ -26,13 +27,14 @@ import java.util.List;
 /**
  * Created by hanyayun 019/06/12.
  */
-public class SelfRecordView implements MvpView{
+public class SelfRecordView implements MvpView {
     private SelfRecordFragment fragment;
     public QMUITipDialog loadingDiaog;
     private List<EventRouteRecordBeanVoListBean> list = new ArrayList<>();
     private RaceRecordAdapter adapter;
+
     public SelfRecordView(SelfRecordFragment fragment) {
         this.fragment = fragment;
         loadingDiaog = new QMUITipDialog.Builder(fragment.getActivity())
@@ -41,59 +43,57 @@ public class SelfRecordView implements MvpView{
                 .create();
     }
-    public void setData(BaseInfo<SelfRecordInfo> selfRecordInfoBaseInfo){
+    public void setData(BaseInfo<SelfRecordInfo> selfRecordInfoBaseInfo) {
         hideLoading();
         fragment.binding.ryRecord.setVisibility(View.VISIBLE);
         fragment.binding.txAll.setVisibility(View.VISIBLE);
-        if(selfRecordInfoBaseInfo.getData().getRecordSum() == null){
+        if (selfRecordInfoBaseInfo.getData().getRecordSum() == null) {
             showEmpty();
             return;
         }
-        if(fragment.currentPage == 1){
+        if (fragment.currentPage == 1) {
             list.clear();
             list.addAll(selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
-            if(adapter == null){
-                SelfRecordInfo.RecordSumBean recordSumBean =  selfRecordInfoBaseInfo.getData().getRecordSum();
-                fragment.binding.kilometerNum.setText(recordSumBean.getMileage()+"");
-                fragment.binding.stepNum.setText(recordSumBean.getStep());
-                fragment.binding.allTime.setText(recordSumBean.getEmployTime());
-                fragment.binding.finishNum.setText(recordSumBean.getNumber());
+            if (adapter == null) {
+                SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
+                fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
+                fragment.binding.stepNum.setText(recordSumBean.getYetStep());
+                fragment.binding.allTime.setText(recordSumBean.getYetEmployTime());
+                fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
+
+                fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
+                fragment.binding.allTimeNo.setText(recordSumBean.getNotEmployTime());
+                fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
+
                 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-                adapter = new RaceRecordAdapter(list,fragment.getActivity());
+                adapter = new RaceRecordAdapter(list, fragment.getActivity());
                 fragment.binding.recordRecy.setAdapter(adapter);
                 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(EventRouteRecordBeanVoListBean bean, int position) {
-                        CollRunningFinishActivity.startActivity(fragment.getActivity(),new RunningFinishBean());
+                        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,bestResultBean.getMileage(),bestResultBean.getStep(),
-////                                    bestResultBean.getEmployTime(),bestResultBean.getPace());
-//                        });
-
-            }else {
+            } else {
                 adapter.notifyDataSetChanged();
             }
         }
-        if(list.size() != 0){
+        if (list.size() != 0) {
             fragment.binding.emptyNet.setVisibility(View.GONE);
             fragment.binding.empty.setVisibility(View.GONE);
             fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             showEmpty();
         }
-        if(selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize){
+        if (selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
-        }else {
+        } else {
             fragment.binding.refreshLayout.setEnableLoadMore(true);
         }
-        if(fragment.currentPage > 1){
+        if (fragment.currentPage > 1) {
             list.addAll(selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
             adapter.notifyDataSetChanged();
         }
@@ -101,18 +101,16 @@ public class SelfRecordView implements MvpView{
         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("我的记录");
+    public void initView() {
+        fragment.binding.back.setOnClickListener(v -> fragment.getActivity().finish());
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+        fragment.binding.againUp.setOnClickListener(v -> LineUpAgainActivity.newInstance(fragment.getActivity()));
     }
-    public void showEmpty(){
+    public void showEmpty() {
         fragment.binding.refreshLayout.setVisibility(View.GONE);
         fragment.binding.empty.setVisibility(View.VISIBLE);
         fragment.binding.emptyNet.setVisibility(View.GONE);
@@ -126,7 +124,7 @@ public class SelfRecordView implements MvpView{
         });
     }
-    public void showError(String msg){
+    public void showError(String msg) {
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
         if (list.size() == 0) {
@@ -141,7 +139,7 @@ public class SelfRecordView implements MvpView{
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().getData(fragment.getActivity(),"10514343",fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().getData(fragment.getActivity(), "10514343", fragment.completeStatus, fragment.currentPage, fragment.pageSize);
                 }
             });
             fragment.binding.emptyNet.setLoadingShowing(false);
@@ -8,19 +8,19 @@ import java.util.List;
 public class SelfRecordInfo {
     /**
-     * recordSum : {"number":5,"employTime":0,"step":50000,"mileage":25.5}
+     * RecordSum : {"yetEmployTime":"30.0","yetNumber":"30.0","yetStep":"10000.0","yetMileage":"5.0","notNumber":"10000.0","notMileage":"5.0","notEmployTime":"30.0","notStep":"10000.0","countMileage":101.7}
      * eventRouteRecordBeanVoList : [{"createTime":1559722819000,"employTime":"30","eventTitle":"2018国际网络徒步大赛黄金海岸站","mileage":"5.5","pace":"22.33","recordId":2,"roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg","step":"10000"},{"createTime":1559722832000,"employTime":"00:0:55","eventTitle":"2018国际网络徒步大赛黄金海岸站","mileage":"5","pace":"22.33","recordId":3,"roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg","step":"10000"}]
      */
-    private RecordSumBean recordSum;
+    private RecordSumBean RecordSum;
     private List<EventRouteRecordBeanVoListBean> eventRouteRecordBeanVoList;
     public RecordSumBean getRecordSum() {
-        return recordSum;
+        return RecordSum;
     }
-    public void setRecordSum(RecordSumBean recordSum) {
-        this.recordSum = recordSum;
+    public void setRecordSum(RecordSumBean RecordSum) {
+        this.RecordSum = RecordSum;
     }
     public List<EventRouteRecordBeanVoListBean> getEventRouteRecordBeanVoList() {
@@ -33,47 +33,97 @@ public class SelfRecordInfo {
     public static class RecordSumBean {
         /**
-         * number : 5
-         * employTime : 0
-         * step : 50000
-         * mileage : 25.5
+         * yetEmployTime : 30.0
+         * yetNumber : 30.0
+         * yetStep : 10000.0
+         * yetMileage : 5.0
+         * notNumber : 10000.0
+         * notMileage : 5.0
+         * notEmployTime : 30.0
+         * notStep : 10000.0
+         * countMileage : 101.7
          */
-        private int number;
-        private int employTime;
-        private int step;
-        private double mileage;
+        private String yetEmployTime;
+        private String yetNumber;
+        private String yetStep;
+        private String yetMileage;
+        private String notNumber;
+        private String notMileage;
+        private String notEmployTime;
+        private String notStep;
+        private double countMileage;
+
+        public String getYetEmployTime() {
+            return yetEmployTime;
+        }
+
+        public void setYetEmployTime(String yetEmployTime) {
+            this.yetEmployTime = yetEmployTime;
+        }
+
+        public String getYetNumber() {
+            return yetNumber;
+        }
+
+        public void setYetNumber(String yetNumber) {
+            this.yetNumber = yetNumber;
+        }
+
+        public String getYetStep() {
+            return yetStep;
+        }
+
+        public void setYetStep(String yetStep) {
+            this.yetStep = yetStep;
+        }
+
+        public String getYetMileage() {
+            return yetMileage;
+        }
+
+        public void setYetMileage(String yetMileage) {
+            this.yetMileage = yetMileage;
+        }
+
+        public String getNotNumber() {
+            return notNumber;
+        }
+
+        public void setNotNumber(String notNumber) {
+            this.notNumber = notNumber;
+        }
-        public int getNumber() {
-            return number;
+        public String getNotMileage() {
+            return notMileage;
         }
-        public void setNumber(int number) {
-            this.number = number;
+        public void setNotMileage(String notMileage) {
+            this.notMileage = notMileage;
         }
-        public int getEmployTime() {
-            return employTime;
+        public String getNotEmployTime() {
+            return notEmployTime;
         }
-        public void setEmployTime(int employTime) {
-            this.employTime = employTime;
+        public void setNotEmployTime(String notEmployTime) {
+            this.notEmployTime = notEmployTime;
         }
-        public int getStep() {
-            return step;
+        public String getNotStep() {
+            return notStep;
         }
-        public void setStep(int step) {
-            this.step = step;
+        public void setNotStep(String notStep) {
+            this.notStep = notStep;
         }
-        public double getMileage() {
-            return mileage;
+        public double getCountMileage() {
+            return countMileage;
         }
-        public void setMileage(double mileage) {
-            this.mileage = mileage;
+        public void setCountMileage(double countMileage) {
+            this.countMileage = countMileage;
         }
     }
 }
+package com.cnlive.moudle.pedometer.ui.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.cnlive.libs.base.util.StatusBarUtil;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.example.moudle_pedometer.R;
+
+/**
+ * 重新上传
+ * Created by hanyayun 019/06/20.
+ */
+public class LineUpAgainActivity extends AppCompatActivity {
+
+    public static void newInstance(Context context){
+        Intent intent = new Intent();
+        intent.setClass(context,LineUpAgainActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        StatusBarUtil.setStatusBarWrite(this);
+        StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
+        setContentView(R.layout.activity_line_up_again);
+    }
+}
@@ -23,6 +23,7 @@ public class SelfRecordFragment extends MvpBindingFragment&lt;SelfRecordView, SelfR
     public int currentPage = 1;
     public int pageSize = 10;
+    public int completeStatus = 0;
     public SelfRecordFragment() {
         // Required empty public constructor
     }
@@ -32,23 +33,47 @@ public class SelfRecordFragment extends MvpBindingFragment&lt;SelfRecordView, SelfR
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if(getMvpView() != null) getMvpView().initView();
-        getPresenter().getData(getActivity(),"10514343",currentPage,pageSize);
+        getData(-1);
+
+        binding.hasFinish.setOnClickListener(v -> getData(0));
+        binding.noFinish.setOnClickListener(v -> getData(1));
         binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                 currentPage = 1;
-                getPresenter().getData(getActivity(),"10514343",currentPage,pageSize);
+                getData(-1);
             }
         });
         binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
                 currentPage++;
-                getPresenter().getData(getActivity(),"10514343",currentPage,pageSize);
+                getData(-1);
             }
         });
     }
+    private void getData(int completeStatus){
+        if(completeStatus == -1){
+            getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
+        }else {
+            this.completeStatus = currentPage;
+            getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
+            if(completeStatus == 0){
+                binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
+                binding.hasFinish.setTextSize(18);
+                binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
+                binding.noFinish.setTextSize(15);
+            }else {
+                binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
+                binding.hasFinish.setTextSize(15);
+                binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
+                binding.noFinish.setTextSize(18);
+            }
+        }
+    }
+
+
     @Override
     protected int getLayoutId() {
         return R.layout.fragment_self_record;
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity">
+
+</android.support.constraint.ConstraintLayout>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout
         android:layout_width="match_parent"
@@ -6,10 +7,40 @@
         android:background="@color/white"
         android:orientation="vertical">
-        <com.qmuiteam.qmui.widget.QMUITopBar
-            android:id="@+id/topbar"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="?attr/qmui_topbar_height" />
+            android:layout_height="?attr/qmui_topbar_height">
+
+            <ImageView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:padding="10dp"
+                android:src="@drawable/top_back_black"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:textColor="#333333"
+                android:textSize="18sp"
+                android:layout_centerInParent="true"
+                android:text="@string/myrecord"
+                />
+
+            <TextView
+                android:id="@+id/again_up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:padding="10dp"
+                android:textColor="#333333"
+                android:textSize="15sp"
+                android:layout_alignParentRight="true"
+                android:text="@string/again_up"
+                />
+        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/ry_record"
@@ -38,19 +69,19 @@
                 android:id="@+id/kilometer_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:layout_centerHorizontal="true"
+                android:layout_marginTop="20dp"
                 android:text="0.0"
                 android:textColor="@color/white"
-                android:textSize="50sp"
-                />
+                android:textSize="50sp" />
             <RelativeLayout
+                android:id="@+id/ry_finish"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/kilometer_num"
-                android:layout_marginTop="10dp"
                 android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginRight="20dp">
                 <LinearLayout
@@ -61,10 +92,10 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/finish_num"
-                        android:textSize="12sp"
                         android:layout_gravity="center"
-                        android:textColor="@color/white" />
+                        android:text="@string/finish_num"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
                     <TextView
                         android:id="@+id/finish_num"
@@ -72,9 +103,9 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
-                        android:textSize="20sp"
                         android:text="0"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
                 </LinearLayout>
@@ -87,10 +118,10 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="12sp"
                         android:layout_gravity="center"
                         android:text="@string/all_time"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
                     <TextView
                         android:id="@+id/all_time"
@@ -98,9 +129,9 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
-                        android:textSize="20sp"
                         android:text="00:00:00"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
                 </LinearLayout>
                 <LinearLayout
@@ -112,10 +143,10 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="12sp"
                         android:layout_gravity="center"
                         android:text="@string/stepnum"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
                     <TextView
                         android:id="@+id/step_num"
@@ -123,23 +154,138 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
-                        android:textSize="20sp"
                         android:text="--"
-                        android:textColor="@color/white" />
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/ry_finish"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="20dp">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/finish_num_no"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/finish_num_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="5dp"
+                        android:text="0"
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/all_time"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/all_time_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="5dp"
+                        android:text="00:00:00"
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/stepnum"
+                        android:textColor="@color/white"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/step_num_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="5dp"
+                        android:text="--"
+                        android:textColor="@color/white"
+                        android:textSize="20sp" />
                 </LinearLayout>
             </RelativeLayout>
         </RelativeLayout>
-        <TextView
+        <RelativeLayout
             android:id="@+id/tx_all"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
-            android:textSize="18sp"
-            android:textColor="#333333"
-            android:text="@string/has_take_part_line" />
+            android:layout_marginRight="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/has_take_part_line"
+                android:textColor="#333333"
+                android:textSize="18sp" />
+            
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/has_finish"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="18sp"
+                    android:textColor="#36C28D"
+                    android:text="@string/finish" />
+
+                <TextView
+                    android:id="@+id/no_finish"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/no_finish"
+                    android:layout_marginLeft="20dp"
+                    android:textColor="#333333"
+                    android:textSize="15sp"
+                    />
+            </LinearLayout>
+        </RelativeLayout>
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/refreshLayout"
@@ -150,16 +296,16 @@
                 android:id="@+id/record_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="10dp"
-                android:background="@color/white" />
+                android:background="@color/white"
+                android:padding="10dp" />
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
         <RelativeLayout
             android:id="@+id/empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:visibility="gone"
-            android:background="@color/white">
+            android:background="@color/white"
+            android:visibility="gone">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -175,28 +321,26 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="15dp"
                     android:text="还没有跑过的线路"
                     android:textColor="#333333"
-                    android:textSize="15sp"
-                    android:layout_marginTop="15dp"
-                    android:layout_gravity="center"
-                    />
+                    android:textSize="15sp" />
                 <TextView
                     android:id="@+id/check_all_line"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/chek_all_line"
                     android:layout_marginTop="10dp"
-                    android:textSize="12sp"
-                    android:textColor="#36C28D"
                     android:background="@drawable/green_raduis_bg"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
                     android:paddingLeft="8dp"
+                    android:paddingTop="5dp"
                     android:paddingRight="8dp"
-                    />
+                    android:paddingBottom="5dp"
+                    android:text="@string/chek_all_line"
+                    android:textColor="#36C28D"
+                    android:textSize="12sp" />
             </LinearLayout>
         </RelativeLayout>
@@ -34,6 +34,7 @@
     <color name="bottom_sheet_dialog_race_location_text">#999999</color>
     <color name="color_7cbd83">#7cbd83</color>
+    <color name="green_tx">#36C28D</color>
     <color name="s_topbar_btn_color">#333333</color>
@@ -60,6 +60,7 @@
     <string name="has_balence">累计步行距离</string>
     <string name="Kilimanjaro">（公里）</string>
     <string name="finish_num">完成（次）</string>
+    <string name="finish_num_no">未完成（次）</string>
     <string name="all_time">累计用时</string>
     <string name="has_take_part_line">我跑过的线路</string>
     <string name="chek_all_line">查看全部路线</string>
@@ -75,6 +76,10 @@
     <string name="later_finish">天后结束</string>
     <string name="layout_collect_bind_trace">绑定轨迹</string>
     <string name="identify_the_start_point">确认开始地点</string>
+    <string name="finish">完成</string>
+    <string name="no_finish">未完成</string>
+    <string name="again_up">重新上传</string>
+    <string name="myrecord">我的记录</string>
 </resources>