Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/res/layout/line_up__item_view.xml

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/res/layout/line_up__item_view.xml
杨帅
2 parents 48fec4a7 ec0a0460
Showing 18 changed files with 123 additions and 99 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
app/src/main/res/layout/activity_main.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RaceRecorPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/res/layout/fragment_collect_running_map.xml
moudle_pedometer/src/main/res/layout/fragment_race_name_list.xml
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
moudle_pedometer/src/main/res/layout/item_my_record.xml
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
moudle_pedometer/src/main/res/layout/item_race_record.xml
moudle_pedometer/src/main/res/layout/item_record.xml
moudle_pedometer/src/main/res/layout/line_up__item_view.xml
@@ -3,10 +3,12 @@ package com.example.modulepedometer;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
+import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
@@ -16,14 +18,30 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, RunLineActivity.class);
+                startActivity(intent);
+            }
+        });
+        findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(MainActivity.this, RaceListActivity.class);
+                startActivity(intent);
+            }
+        });
+
 //        RunLineActivity.newInstance(this,null,null,null);
-        Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
-        startActivity(intent);
+//        Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
+//        startActivity(intent);
 //        ARouter.getInstance()
 ////                .build("/moudle_pedometer/InterestActivity")
 //                .build("/moudle_pedometer/CollRunRaceDetailActivity")
 //                .navigation(this);
-        finish();
+//        finish();
 //        BottomSheetDialog bottomSheetDialog=new BottomSheetDialog(this);
 //        View view=getLayoutInflater().inflate(R.layout.dialog_start_tip_bottomsheet,null);
 //        bottomSheetDialog.setContentView(view);
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
+    android:orientation="vertical"
     tools:context=".MainActivity">
-    <TextView
-        android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/recordd"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_margin="10dp"
+        android:text="体育活动"
+        />
-</android.support.constraint.ConstraintLayout>
 \ No newline at end of file
+    <Button
+        android:id="@+id/tooll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="路径工具"
+        />
+
+</LinearLayout>
 \ No newline at end of file
@@ -5,6 +5,7 @@ import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
+import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.collectionTrace.ui.adapter.RaceNameListAdapter;
 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceNameListFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -38,7 +39,7 @@ public class RaceNameListView implements MvpView {
     public void initView(){
         fragment.binding.raceBack.setOnClickListener(v -> fragment.getActivity().finish());
-//        fragment.binding.intoPath.setOnClickListener(v -> );
+        fragment.binding.intoPath.setOnClickListener(v -> StartCollectTraceActivity.newInstance(fragment.getActivity(),fragment.eventId));
         fragment.binding.raceTittle.setText("赛事轨迹列表");
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
 package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -13,7 +13,6 @@ import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
-import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.example.moudle_pedometer.R;
@@ -27,6 +26,12 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
     private final String TAG = "CollRunRaceDetail";
     private QMUIFragment fragment;
+    public static void newInstance(Context context,String eventId){
+        Intent intent = new Intent(context,CollRunRaceDetailActivity.class);
+        intent.putExtra("eventId",eventId);
+        context.startActivity(intent);
+    }
+
     @Override
     protected int getContextViewId() {
         return R.id.fragment_finish_run_map;
 package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -12,6 +13,14 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.example.moudle_pedometer.R;
 public class StartCollectTraceActivity extends QMUIFragmentActivity {
+
+
+    public static void newInstance(Context context,String eventId){
+        Intent intent = new Intent(context,StartCollectTraceActivity.class);
+        intent.putExtra("eventId",eventId);
+        context.startActivity(intent);
+    }
+
     @Override
     protected int getContextViewId() {
         return R.id.fragment_start_collect_trace;
@@ -6,9 +6,12 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
+import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -42,8 +45,9 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
         myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
         myViewHolder.line_address.setText(list.get(i).getAddress() + "  " + list.get(i).getMileage());
         //添加轨迹
-//        myViewHolder.add_path.setOnClickListener(v -> );
+        myViewHolder.add_path.setOnClickListener(v -> StartCollectTraceActivity.newInstance(context,list.get(i).getId()+""));
         myViewHolder.path_list.setOnClickListener(v -> RaceNameListActivity.newInstance(context,list.get(i).getId()+""));
+        myViewHolder.item_ly.setOnClickListener(v -> CollRunRaceDetailActivity.newInstance(context,list.get(i).getId()+""));
     }
     @Override
@@ -58,6 +62,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
         TextView line_address;
         TextView add_path;
         TextView path_list;
+        RelativeLayout item_ly;
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -66,6 +71,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
             line_address = itemView.findViewById(R.id.line_address);
             add_path = itemView.findViewById(R.id.add_path);
             path_list = itemView.findViewById(R.id.path_list);
+            item_ly = itemView.findViewById(R.id.item_ly);
         }
     }
 }
@@ -19,7 +19,7 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
     public int currentPage = 1;
     public int pageSize = 10;
-    private String eventId;
+    public String eventId;
     public static RaceNameListFragment newInstance(String eventId){
         RaceNameListFragment fragment = new RaceNameListFragment();
@@ -38,14 +38,14 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
         super.onViewCreated(view, savedInstanceState);
         if(getMvpView() != null) getMvpView().initView();
         eventId = getArguments().getString("eventId");
-        getPresenter().setData(getActivity(),"117",currentPage,pageSize);
+        getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(v ->{
             currentPage = 1;
-            getPresenter().setData(getActivity(),"117",currentPage,pageSize);
+            getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
         });
         binding.refreshLayout.setOnLoadMoreListener(v ->{
             currentPage++;
-            getPresenter().setData(getActivity(),"117",currentPage,pageSize);
+            getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
         });
     }
@@ -50,32 +50,6 @@ public class RaceRecorPresenter extends MvpBasePresenter&lt;RaceRecorView&gt; {
             @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<EventRouteRecordBeanVoListBean> listBeans = new ArrayList<>();
-                    EventRouteRecordBeanVoListBean eventRouteRecordBeanVoListBean = new 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);
                 }
             }
@@ -560,7 +560,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             public void onClick(View view) {
                 ARouter.getInstance().build("/web/WebViewColorActivity")
                         .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html")
-                        .withString("title", runRaceDetailInfo.getTitle() + "排行榜")
+                        .withString("title", "排行榜")
                         .navigation(fragment.getActivity());
             }
         });
@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
+import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
@@ -57,7 +58,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.check_raking.setOnClickListener(v ->
                 ARouter.getInstance().build("/web/WebViewColorActivity")
                         .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html")
-                        .withString("title",list.get(i).getTitle()+"总排行榜")
+                        .withString("title","总排行榜")
                         .navigation(context));
         if (clickListener != null) {
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
@@ -81,8 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
     private void startAc(MyRecordInfo.ListBean listBean){
         CommonInfo.setStreetId(context,listBean.getId()+"");
-//        RaceRecordActivity.newInstance(context,listBean.getTitle());
-        SelfRecordActivity.newInstance(context,null,null,null,null);
+        RaceRecordActivity.newInstance(context,listBean.getTitle());
     }
@@ -50,6 +50,7 @@
                 android:layout_width="80dp"
                 android:layout_height="35dp"
                 android:layout_gravity="right"
+                android:scaleType="fitXY"
                 android:background="@drawable/gps_white_shadow"
                 android:gravity="center">
@@ -19,6 +19,7 @@
                 android:src="@drawable/top_back_black"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
+                android:layout_marginLeft="10dp"
                 />
             <TextView
@@ -26,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:textSize="16sp"
+                android:textSize="18sp"
                 android:textColor="#333333"
                 />
@@ -34,7 +35,7 @@
                 android:id="@+id/into_path"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="13sp"
+                android:textSize="15sp"
                 android:textColor="#333333"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
@@ -16,6 +16,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:padding="10dp"
+                android:layout_marginLeft="10dp"
                 android:src="@drawable/top_back_black" />
             <TextView
@@ -20,6 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="#333333"
+            android:singleLine="true"
             android:layout_marginRight="30dp"
             android:textSize="18sp" />
@@ -42,6 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
+                android:singleLine="true"
                 android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -65,6 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
+                android:singleLine="true"
                 android:textColor="#999999"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -43,13 +43,14 @@
         android:id="@+id/ry_re"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="10dp"
         android:orientation="horizontal">
         <ImageView
             android:id="@+id/item_img"
             android:layout_width="80dp"
             android:layout_height="80dp"
+            android:scaleType="fitXY"
             android:src="@drawable/defaults" />
         <LinearLayout
@@ -62,7 +63,7 @@
                 android:id="@+id/kilometer_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="4.42 公里"
+                android:singleLine="true"
                 android:textColor="#333333"
                 android:textSize="16sp" />
@@ -90,7 +91,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="首都师范大学操场东门"
+                    android:singleLine="true"
                     android:textColor="@color/text_black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -119,7 +120,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="首都师范大学操场西门"
+                    android:singleLine="true"
                     android:textColor="@color/text_black"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -39,6 +39,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:layout_gravity="center_vertical"
+                android:scaleType="fitXY"
                 android:src="@drawable/defaults" />
             <RelativeLayout
@@ -51,9 +52,9 @@
                     android:id="@+id/item_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:singleLine="true"
                     android:textSize="12sp"
-                    android:textColor="#333333"
-                    android:text="奥森南园跑道" />
+                    android:textColor="#333333"/>
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -64,7 +65,6 @@
                         android:id="@+id/kilometer_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="1.23"
                         android:textColor="#333333"
                         android:textSize="30sp"
                         android:layout_centerVertical="true"
@@ -93,8 +93,7 @@
                         android:drawableRight="@drawable/time_cost"
                         android:drawablePadding="5dp"
                         android:textColor="#333333"
-                        android:textSize="13sp"
-                        android:text="00:27:23" />
+                        android:textSize="13sp" />
                     <TextView
                         android:id="@+id/record_speed"
@@ -104,8 +103,7 @@
                         android:drawableRight="@drawable/speed"
                         android:drawablePadding="5dp"
                         android:textColor="#333333"
-                        android:textSize="13sp"
-                        android:text="22'22''" />
+                        android:textSize="13sp" />
                     <TextView
                         android:id="@+id/record_step"
@@ -113,8 +111,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="20dp"
                         android:drawableRight="@drawable/step"
-                        android:drawablePadding="5dp"
-                        android:text="1234" />
+                        android:drawablePadding="5dp" />
                 </LinearLayout>
             </RelativeLayout>
         </LinearLayout>
@@ -17,6 +17,7 @@
             android:id="@+id/line_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:singleLine="true"
             android:textColor="#333333"
             android:textSize="18sp" />
@@ -38,6 +39,7 @@
                 android:id="@+id/activity_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:singleLine="true"
                 android:layout_marginLeft="10dp"
                 android:textColor="#999999"
                 android:textSize="12sp" />
@@ -4,43 +4,42 @@
     <data>
     </data>
-
     <RelativeLayout
         android:id="@+id/ry_re"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:background="@color/white"
         android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:background="@color/white"
         android:padding="10dp">
         <TextView
             android:id="@+id/up_day"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="5月1日"
             android:textColor="#333333"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:text="5月1日" />
         <TextView
             android:id="@+id/up_record_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
             android:layout_toRightOf="@id/up_day"
-            android:text="15:30"
+            android:layout_marginLeft="15dp"
             android:textColor="#999999"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            android:text="15:30" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
-            android:text="@string/up_fail"
             android:textColor="#FE4E4E"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            android:text="@string/up_fail"
+            android:layout_alignParentRight="true"/>
         <LinearLayout
             android:id="@+id/ly"
@@ -53,6 +52,7 @@
                 android:id="@+id/up_item_img"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
+                android:scaleType="fitXY"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/defaults" />
@@ -66,34 +66,32 @@
                     android:id="@+id/up_item_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="奥森南园跑道"
-                    android:textColor="#333333"
-                    android:textSize="12sp" />
+                    android:singleLine="true"
+                    android:textSize="12sp"
+                    android:textColor="#333333"/>
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:orientation="horizontal">
-
                     <TextView
                         android:id="@+id/up_kilometer_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_marginTop="5dp"
-                        android:text="1.23"
                         android:textColor="#333333"
-                        android:textSize="30sp" />
+                        android:textSize="30sp"
+                        android:layout_centerVertical="true"
+                        />
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="5dp"
                         android:text="@string/kilometer"
                         android:textColor="#333333"
-                        android:textSize="12sp" />
+                        android:textSize="12sp"
+                        android:layout_marginLeft="5dp"/>
                 </LinearLayout>
@@ -108,9 +106,8 @@
                         android:layout_height="wrap_content"
                         android:drawableRight="@drawable/time_cost"
                         android:drawablePadding="5dp"
-                        android:text="00:27:23"
                         android:textColor="#333333"
-                        android:textSize="13sp" />
+                        android:textSize="13sp"/>
                     <TextView
                         android:id="@+id/up_record_speed"
@@ -119,9 +116,8 @@
                         android:layout_marginLeft="20dp"
                         android:drawableRight="@drawable/speed"
                         android:drawablePadding="5dp"
-                        android:text="22'22''"
                         android:textColor="#333333"
-                        android:textSize="13sp" />
+                        android:textSize="13sp"/>
                     <TextView
                         android:id="@+id/up_record_step"
@@ -129,8 +125,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="20dp"
                         android:drawableRight="@drawable/step"
-                        android:drawablePadding="5dp"
-                        android:text="1234" />
+                        android:drawablePadding="5dp"/>
                 </LinearLayout>
             </RelativeLayout>
         </LinearLayout>
@@ -139,24 +134,26 @@
             android:id="@+id/view"
             android:layout_width="match_parent"
             android:layout_height="1dp"
+            android:background="@color/line"
             android:layout_below="@id/ly"
-            android:background="@color/line" />
+            />
         <TextView
             android:id="@+id/again_up"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/view"
             android:layout_alignParentRight="true"
+            android:layout_below="@id/view"
             android:layout_marginTop="10dp"
             android:layout_marginRight="10dp"
             android:background="@drawable/green_raduis_bg"
-            android:paddingLeft="10dp"
-            android:paddingTop="7dp"
-            android:paddingRight="10dp"
-            android:paddingBottom="7dp"
             android:text="@string/again_up"
             android:textColor="#36C28D"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            android:paddingTop="7dp"
+            android:paddingBottom="7dp"
+            android:paddingRight="10dp"
+            android:paddingLeft="10dp"
+            />
     </RelativeLayout>
 </layout>