CNLive Android Team / ModulePedometer · Commits

Commit ff6e793bca4f90eff986b6931d40447d8cce9f35

Authored by 韩亚云
1 parent eac345a5

Ui临时更新修改

Inline Side-by-side
Showing 6 changed files with 14 additions and 7 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
  View file @ff6e793
@@ -57,7 +57,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter<RaceNameListAdapte @@ -57,7 +57,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter<RaceNameListAdapte
57 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) { 57 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
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());
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @ff6e793
@@ -73,6 +73,13 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView @@ -73,6 +73,13 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
73 myViewHolder.day_num.setVisibility(View.VISIBLE); 73 myViewHolder.day_num.setVisibility(View.VISIBLE);
74 myViewHolder.after_finish.setVisibility(View.GONE); 74 myViewHolder.after_finish.setVisibility(View.GONE);
75 myViewHolder.day_num.setText(list.get(i).getDay()); 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 }else { 83 }else {
77 myViewHolder.day_num.setVisibility(View.GONE); 84 myViewHolder.day_num.setVisibility(View.GONE);
78 myViewHolder.after_finish.setVisibility(View.VISIBLE); 85 myViewHolder.after_finish.setVisibility(View.VISIBLE);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
  View file @ff6e793
@@ -55,7 +55,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My @@ -55,7 +55,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My
55 myHolder.record_minit.setText(list.get(i).getEmployTime()); 55 myHolder.record_minit.setText(list.get(i).getEmployTime());
56 myHolder.record_speed.setText(list.get(i).getPace()); 56 myHolder.record_speed.setText(list.get(i).getPace());
57 myHolder.record_step.setText(list.get(i).getStep()); 57 myHolder.record_step.setText(list.get(i).getStep());
58 - Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img); 58 +// Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
59 if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i)); 59 if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
60 } 60 }
61 61
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
  View file @ff6e793
@@ -51,12 +51,12 @@ @@ -51,12 +51,12 @@
51 android:layout_width="80dp" 51 android:layout_width="80dp"
52 android:layout_height="80dp" 52 android:layout_height="80dp"
53 android:scaleType="fitXY" 53 android:scaleType="fitXY"
  54 + android:visibility="gone"
54 android:src="@drawable/defaults" /> 55 android:src="@drawable/defaults" />
55 56
56 <LinearLayout 57 <LinearLayout
57 android:layout_width="match_parent" 58 android:layout_width="match_parent"
58 android:layout_height="wrap_content" 59 android:layout_height="wrap_content"
59 - android:layout_marginLeft="15dp"  
60 android:orientation="vertical"> 60 android:orientation="vertical">
61 61
62 <TextView 62 <TextView
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @ff6e793
@@ -40,13 +40,13 @@ @@ -40,13 +40,13 @@
40 android:layout_height="80dp" 40 android:layout_height="80dp"
41 android:layout_gravity="center_vertical" 41 android:layout_gravity="center_vertical"
42 android:scaleType="fitXY" 42 android:scaleType="fitXY"
  43 + android:visibility="gone"
43 android:src="@drawable/defaults" /> 44 android:src="@drawable/defaults" />
44 45
45 <RelativeLayout 46 <RelativeLayout
46 android:layout_width="match_parent" 47 android:layout_width="match_parent"
47 android:layout_height="80dp" 48 android:layout_height="80dp"
48 - android:layout_gravity="center_vertical"  
49 - android:layout_marginLeft="15dp"> 49 + android:layout_gravity="center_vertical">
50 50
51 <TextView 51 <TextView
52 android:id="@+id/item_title" 52 android:id="@+id/item_title"
moudle_pedometer/src/main/res/layout/line_up__item_view.xml
  View file @ff6e793
@@ -53,14 +53,14 @@ @@ -53,14 +53,14 @@
53 android:layout_width="80dp" 53 android:layout_width="80dp"
54 android:layout_height="80dp" 54 android:layout_height="80dp"
55 android:scaleType="fitXY" 55 android:scaleType="fitXY"
  56 + android:visibility="gone"
56 android:layout_gravity="center_vertical" 57 android:layout_gravity="center_vertical"
57 android:src="@drawable/defaults" /> 58 android:src="@drawable/defaults" />
58 59
59 <RelativeLayout 60 <RelativeLayout
60 android:layout_width="match_parent" 61 android:layout_width="match_parent"
61 android:layout_height="80dp" 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 <TextView 65 <TextView
66 android:id="@+id/up_item_title" 66 android:id="@+id/up_item_title"