Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer

杨帅
2 parents 61a896b2 4fe6c6e0
Showing 5 changed files with 45 additions and 13 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
moudle_pedometer/src/main/res/layout/item_race_record.xml
moudle_pedometer/src/main/res/values/colors.xml
@@ -65,7 +65,7 @@ public class RaceRecorView implements MvpView {
                 fragment.binding.kilometerTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(bestResultBean.getEmployTime())));
                 fragment.binding.kilometerSpeed.setText(bestResultBean.getPace());
                 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-                adapter = new RaceRecordAdapter(list, fragment.getActivity());
+                adapter = new RaceRecordAdapter(list, fragment.getActivity(),true);
                 fragment.binding.recordRecy.setAdapter(adapter);
                 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
                     @Override
@@ -57,7 +57,7 @@ public class SelfRecordView implements MvpView {
             if (adapter == null) {
                 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-                adapter = new RaceRecordAdapter(list, fragment.getActivity());
+                adapter = new RaceRecordAdapter(list, fragment.getActivity(),false);
                 fragment.binding.recordRecy.setAdapter(adapter);
                 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
                     @Override
@@ -30,14 +30,16 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     private List<EventRouteRecordBeanVoListBean> list;
     private Context context;
     private OnClickListener onClickListener;
+    private boolean isShowStatus;
     public void setOnClickListener(OnClickListener onClickListener) {
         this.onClickListener = onClickListener;
     }
-    public RaceRecordAdapter(List<EventRouteRecordBeanVoListBean> list, Context context) {
+    public RaceRecordAdapter(List<EventRouteRecordBeanVoListBean> list, Context context,boolean isShowStatus) {
         this.list = list;
         this.context = context;
+        this.isShowStatus = isShowStatus;
     }
     @NonNull
@@ -49,20 +51,36 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @Override
     public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
-        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
-            myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "MM月dd日"));
+        EventRouteRecordBeanVoListBean bean = list.get(i);
+        if (!TextUtils.isEmpty(bean.getStartTime())) {
+            myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(bean.getStartTime()) * 1000, "MM月dd日"));
         }
-        if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
-            myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "HH:mm"));
+        if (!TextUtils.isEmpty(bean.getStartTime())) {
+            myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(bean.getStartTime()) * 1000, "HH:mm"));
         }
-        myHolder.item_title.setText(list.get(i).getEventTitle());
-        myHolder.record_kli.setText(list.get(i).getMileage());
+        myHolder.item_title.setText(bean.getEventTitle());
+        myHolder.record_kli.setText(bean.getMileage());
         //设置时间
-        if (!TextUtils.isEmpty(list.get(i).getEmployTime())) {
-            myHolder.record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(list.get(i).getEmployTime())));
+        if (!TextUtils.isEmpty(bean.getEmployTime())) {
+            myHolder.record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(bean.getEmployTime())));
         }
-        myHolder.record_speed.setText(list.get(i).getPace());
-        myHolder.record_step.setText(list.get(i).getStep());
+        myHolder.record_speed.setText(bean.getPace());
+        myHolder.record_step.setText(bean.getStep());
+
+        if(isShowStatus){
+            myHolder.record_status.setVisibility(View.VISIBLE);
+            if(bean.getCompleteStatus() == 0){
+                myHolder.record_status.setText("未完成");
+                myHolder.record_status.setTextColor(context.getResources().getColor(R.color.all_record_statud_red));
+            }else {
+                myHolder.record_status.setText("完成");
+                myHolder.record_status.setTextColor(context.getResources().getColor(R.color.all_record_statud_green));
+            }
+        }else {
+            myHolder.record_status.setVisibility(View.GONE);
+        }
+
+
         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);
@@ -86,6 +104,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         TextView record_speed;
         TextView record_step;
         RelativeLayout ry_re;
+        TextView record_status;
         public MyHolder(@NonNull View itemView) {
             super(itemView);
@@ -98,6 +117,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
             record_speed = itemView.findViewById(R.id.record_speed);
             record_step = itemView.findViewById(R.id.record_step);
             ry_re = itemView.findViewById(R.id.ry_re);
+            record_status = itemView.findViewById(R.id.record_status);
         }
     }
@@ -28,6 +28,16 @@
             android:textColor="#999999"
             android:textSize="14sp" />
+        <TextView
+            android:id="@+id/record_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="15dp"
+            android:textSize="14sp"
+            android:visibility="gone"
+            />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="100dp"
@@ -38,6 +38,8 @@
     <color name="color_7cbd83">#7cbd83</color>
     <color name="green_tx">#36C28D</color>
     <color name="s_topbar_btn_color">#333333</color>
+    <color name="all_record_statud_green">#39CB93</color>
+    <color name="all_record_statud_red">#FA5234</color>
 </resources>