1 线上赛事列表增加赛事结束图标显示

YangShuai
1 parent 498d6e65
Showing 8 changed files with 28 additions and 5 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunLineInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RunLineAdapter.java
moudle_pedometer/src/main/res/drawable-hdpi/icon_pedometer_end.png
moudle_pedometer/src/main/res/drawable-xhdpi/icon_pedometer_end.png
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_pedometer_end.png
moudle_pedometer/src/main/res/layout/item_my_record.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.19",
+            version: "1.1.0",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -178,6 +178,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
         fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+
     }
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
@@ -16,7 +16,7 @@ public class RunLineInfo {
      * totalPage : 1
      * totalRecord : 8
      */
-
+    public static final String TYPE_END = "1";//赛事结束
     private boolean hasNext;
     private int pageNumber;
     private int pageSize;
@@ -25,6 +25,7 @@ public class RunLineInfo {
     private int totalRecord;
     private List<ListBean> list;
+
     public boolean isHasNext() {
         return hasNext;
     }
@@ -104,6 +105,15 @@ public class RunLineInfo {
         private String mileage;
         private List<String> faceUrl;
         private String e_subtitle;
+        private String activityState;//1-已结束 0-默认
+
+        public String getActivityState() {
+            return activityState;
+        }
+
+        public void setActivityState(String activityState) {
+            this.activityState = activityState;
+        }
         public String getE_subtitle() {
             return e_subtitle;
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.ui.adapter;
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -50,11 +51,22 @@ public class RunLineAdapter extends RecyclerView.Adapter&lt;RunLineAdapter.MyViewHo
     public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
         myViewHolder.my_record_ry.setVisibility(View.GONE);
-        if (list.get(i).isSignResult()) {
+        //先判断赛事是否结束
+        if (RunLineInfo.TYPE_END.equals(list.get(i).getActivityState())) {
             myViewHolder.has_report.setVisibility(View.VISIBLE);
+            myViewHolder.has_report.setBackground(ContextCompat.getDrawable(context, R.drawable.icon_pedometer_end));
         } else {
+            //赛事没有结束
             myViewHolder.has_report.setVisibility(View.GONE);
+            //判断是否显示报名
+            if (list.get(i).isSignResult()) {
+                myViewHolder.has_report.setVisibility(View.VISIBLE);
+                myViewHolder.has_report.setBackground(ContextCompat.getDrawable(context, R.drawable.pedometer_yplx_registered));
+            } else {
+                myViewHolder.has_report.setVisibility(View.GONE);
+            }
         }
+
         if (clickListener != null) {
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
         }
@@ -178,6 +178,5 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_marginTop="7dp"
-        android:layout_marginRight="5dp"
-        android:src="@drawable/pedometer_yplx_registered" />
+        android:layout_marginRight="5dp" />
 </RelativeLayout>
 \ No newline at end of file