Commit a398df98dfce6170d06b6f46a99ac1151f234be8
Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer
Showing
2 changed files
with
9 additions
and
4 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
| @@ -58,7 +58,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter<RaceNameListAdapte | @@ -58,7 +58,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter<RaceNameListAdapte | ||
| 58 | myViewHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"yy/MM/dd")); | 58 | myViewHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"yy/MM/dd")); |
| 59 | myViewHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm")); | 59 | myViewHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm")); |
| 60 | // Glide.with(context).load(list.get(i).getRoadmap()).into(myViewHolder.item_img); | 60 | // Glide.with(context).load(list.get(i).getRoadmap()).into(myViewHolder.item_img); |
| 61 | - myViewHolder.kilometer_num.setText(list.get(i).getMileage()); | 61 | + myViewHolder.kilometer_num.setText(list.get(i).getMileage()+"公里"); |
| 62 | myViewHolder.tv_start_addr.setText(list.get(i).getStartLocation()); | 62 | myViewHolder.tv_start_addr.setText(list.get(i).getStartLocation()); |
| 63 | myViewHolder.tv_end_addr.setText(list.get(i).getEndLocation()); | 63 | myViewHolder.tv_end_addr.setText(list.get(i).getEndLocation()); |
| 64 | myViewHolder.shoe_ly.setOnClickListener(new View.OnClickListener() { | 64 | myViewHolder.shoe_ly.setOnClickListener(new View.OnClickListener() { |
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
| @@ -66,7 +66,7 @@ | @@ -66,7 +66,7 @@ | ||
| 66 | android:layout_height="wrap_content" | 66 | android:layout_height="wrap_content" |
| 67 | android:singleLine="true" | 67 | android:singleLine="true" |
| 68 | android:textColor="#333333" | 68 | android:textColor="#333333" |
| 69 | - android:textSize="16sp" /> | 69 | + android:textSize="17sp" /> |
| 70 | 70 | ||
| 71 | <LinearLayout | 71 | <LinearLayout |
| 72 | android:layout_width="match_parent" | 72 | android:layout_width="match_parent" |
| @@ -96,11 +96,16 @@ | @@ -96,11 +96,16 @@ | ||
| 96 | android:textColor="@color/text_black" | 96 | android:textColor="@color/text_black" |
| 97 | android:textSize="12sp" /> | 97 | android:textSize="12sp" /> |
| 98 | </LinearLayout> | 98 | </LinearLayout> |
| 99 | + | ||
| 100 | + <View | ||
| 101 | + android:layout_width="1dp" | ||
| 102 | + android:layout_height="10dp" | ||
| 103 | + android:layout_marginLeft="4dp" | ||
| 104 | + android:background="#C4C4C4"/> | ||
| 99 | 105 | ||
| 100 | <LinearLayout | 106 | <LinearLayout |
| 101 | android:layout_width="match_parent" | 107 | android:layout_width="match_parent" |
| 102 | - android:layout_height="wrap_content" | ||
| 103 | - android:layout_marginTop="10dp"> | 108 | + android:layout_height="wrap_content"> |
| 104 | 109 | ||
| 105 | <ImageView | 110 | <ImageView |
| 106 | android:layout_width="10dp" | 111 | android:layout_width="10dp" |