CNLive Android Team / ModulePedometer · Commits

Commit 1f6e43b37f1e94f594e8109b86bb23fb8eba3c20

Authored by 杨帅
2 parents aab700e4 78194573

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
Inline Side-by-side
Showing 6 changed files with 17 additions and 9 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
  View file @1f6e43b
... ... @@ -57,7 +57,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter<RaceNameListAdapte
57 57 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
58 58 myViewHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"yy/MM/dd"));
59 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 61 myViewHolder.kilometer_num.setText(list.get(i).getMileage());
62 62 myViewHolder.tv_start_addr.setText(list.get(i).getStartLocation());
63 63 myViewHolder.tv_end_addr.setText(list.get(i).getEndLocation());
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @1f6e43b
... ... @@ -73,6 +73,13 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
73 73 myViewHolder.day_num.setVisibility(View.VISIBLE);
74 74 myViewHolder.after_finish.setVisibility(View.GONE);
75 75 myViewHolder.day_num.setText(list.get(i).getDay());
  76 + if(list.get(i).getDay().contains("开始")){
  77 + myViewHolder.my_record.setVisibility(View.GONE);
  78 + myViewHolder.check_raking.setVisibility(View.GONE);
  79 + }else {
  80 + myViewHolder.my_record.setVisibility(View.VISIBLE);
  81 + myViewHolder.check_raking.setVisibility(View.VISIBLE);
  82 + }
76 83 }else {
77 84 myViewHolder.day_num.setVisibility(View.GONE);
78 85 myViewHolder.after_finish.setVisibility(View.VISIBLE);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
  View file @1f6e43b
... ... @@ -59,9 +59,10 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My
59 59 }
60 60 myHolder.record_speed.setText(list.get(i).getPace());
61 61 myHolder.record_step.setText(list.get(i).getStep());
62   - Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
63 62 if (onClickListener != null)
64 63 myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
  64 +// Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
  65 + if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
65 66 }
66 67  
67 68 @Override
... ... @@ -69,7 +70,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My
69 70 return list.size();
70 71 }
71 72  
72   - class MyHolder extends RecyclerView.ViewHolder {
  73 + class MyHolder extends RecyclerView.ViewHolder{
73 74  
74 75 TextView record_time_day;
75 76 TextView record_time;
... ... @@ -96,7 +97,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My
96 97 }
97 98  
98 99  
99   - public interface OnClickListener {
  100 + public interface OnClickListener{
100 101 void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
101 102 }
102 103 }
... ...
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
  View file @1f6e43b
... ... @@ -51,12 +51,12 @@
51 51 android:layout_width="80dp"
52 52 android:layout_height="80dp"
53 53 android:scaleType="fitXY"
  54 + android:visibility="gone"
54 55 android:src="@drawable/defaults" />
55 56  
56 57 <LinearLayout
57 58 android:layout_width="match_parent"
58 59 android:layout_height="wrap_content"
59   - android:layout_marginLeft="15dp"
60 60 android:orientation="vertical">
61 61  
62 62 <TextView
... ...
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @1f6e43b
... ... @@ -41,13 +41,13 @@
41 41 android:layout_height="80dp"
42 42 android:layout_gravity="center_vertical"
43 43 android:scaleType="fitXY"
  44 + android:visibility="gone"
44 45 android:src="@drawable/defaults" />
45 46  
46 47 <RelativeLayout
47 48 android:layout_width="match_parent"
48 49 android:layout_height="80dp"
49   - android:layout_gravity="center_vertical"
50   - android:layout_marginLeft="15dp">
  50 + android:layout_gravity="center_vertical">
51 51  
52 52 <TextView
53 53 android:id="@+id/item_title"
... ...
moudle_pedometer/src/main/res/layout/line_up__item_view.xml
  View file @1f6e43b
... ... @@ -53,14 +53,14 @@
53 53 android:layout_width="80dp"
54 54 android:layout_height="80dp"
55 55 android:scaleType="fitXY"
  56 + android:visibility="gone"
56 57 android:layout_gravity="center_vertical"
57 58 android:src="@drawable/defaults" />
58 59  
59 60 <RelativeLayout
60 61 android:layout_width="match_parent"
61 62 android:layout_height="80dp"
62   - android:layout_gravity="center_vertical"
63   - android:layout_marginLeft="15dp">
  63 + android:layout_gravity="center_vertical">
64 64  
65 65 <TextView
66 66 android:id="@+id/up_item_title"
... ...