Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
杨帅
2 parents aab700e4 78194573
Showing 6 changed files with 17 additions and 9 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RaceNameListAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
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/line_up__item_view.xml
@@ -57,7 +57,7 @@ public class RaceNameListAdapter extends RecyclerView.Adapter&lt;RaceNameListAdapte
     public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
         myViewHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"yy/MM/dd"));
         myViewHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm"));
-        Glide.with(context).load(list.get(i).getRoadmap()).into(myViewHolder.item_img);
+//        Glide.with(context).load(list.get(i).getRoadmap()).into(myViewHolder.item_img);
         myViewHolder.kilometer_num.setText(list.get(i).getMileage());
         myViewHolder.tv_start_addr.setText(list.get(i).getStartLocation());
         myViewHolder.tv_end_addr.setText(list.get(i).getEndLocation());
@@ -73,6 +73,13 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
             myViewHolder.day_num.setVisibility(View.VISIBLE);
             myViewHolder.after_finish.setVisibility(View.GONE);
             myViewHolder.day_num.setText(list.get(i).getDay());
+            if(list.get(i).getDay().contains("开始")){
+                myViewHolder.my_record.setVisibility(View.GONE);
+                myViewHolder.check_raking.setVisibility(View.GONE);
+            }else {
+                myViewHolder.my_record.setVisibility(View.VISIBLE);
+                myViewHolder.check_raking.setVisibility(View.VISIBLE);
+            }
         }else {
             myViewHolder.day_num.setVisibility(View.GONE);
             myViewHolder.after_finish.setVisibility(View.VISIBLE);
@@ -59,9 +59,10 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         }
         myHolder.record_speed.setText(list.get(i).getPace());
         myHolder.record_step.setText(list.get(i).getStep());
-        Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
         if (onClickListener != null)
             myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
+//        Glide.with(context).load(list.get(i).getRoadmap()).into(myHolder.item_img);
+        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
     }
     @Override
@@ -69,7 +70,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         return list.size();
     }
-    class MyHolder extends RecyclerView.ViewHolder {
+    class MyHolder extends RecyclerView.ViewHolder{
         TextView record_time_day;
         TextView record_time;
@@ -96,7 +97,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     }
-    public interface OnClickListener {
+    public interface OnClickListener{
         void onClickListener(EventRouteRecordBeanVoListBean bean, int position);
     }
 }
@@ -51,12 +51,12 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:scaleType="fitXY"
+            android:visibility="gone"
             android:src="@drawable/defaults" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
             android:orientation="vertical">
             <TextView
@@ -41,13 +41,13 @@
                 android:layout_height="80dp"
                 android:layout_gravity="center_vertical"
                 android:scaleType="fitXY"
+                android:visibility="gone"
                 android:src="@drawable/defaults" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="15dp">
+                android:layout_gravity="center_vertical">
                 <TextView
                     android:id="@+id/item_title"
@@ -53,14 +53,14 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:scaleType="fitXY"
+                android:visibility="gone"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/defaults" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="15dp">
+                android:layout_gravity="center_vertical">
                 <TextView
                     android:id="@+id/up_item_title"