CNLive Android Team / ModulePedometer · Commits

Commit 312fcc08ac0dcd3ea7ba1827c03a1c042336a0f2

Authored by 杨帅
2 parents 61a896b2 4fe6c6e0

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

Inline Side-by-side
Showing 5 changed files with 45 additions and 13 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @312fcc0
... ... @@ -65,7 +65,7 @@ public class RaceRecorView implements MvpView {
65 65 fragment.binding.kilometerTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(bestResultBean.getEmployTime())));
66 66 fragment.binding.kilometerSpeed.setText(bestResultBean.getPace());
67 67 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
68   - adapter = new RaceRecordAdapter(list, fragment.getActivity());
  68 + adapter = new RaceRecordAdapter(list, fragment.getActivity(),true);
69 69 fragment.binding.recordRecy.setAdapter(adapter);
70 70 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
71 71 @Override
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @312fcc0
... ... @@ -57,7 +57,7 @@ public class SelfRecordView implements MvpView {
57 57 if (adapter == null) {
58 58  
59 59 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
60   - adapter = new RaceRecordAdapter(list, fragment.getActivity());
  60 + adapter = new RaceRecordAdapter(list, fragment.getActivity(),false);
61 61 fragment.binding.recordRecy.setAdapter(adapter);
62 62 adapter.setOnClickListener(new RaceRecordAdapter.OnClickListener() {
63 63 @Override
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
  View file @312fcc0
... ... @@ -30,14 +30,16 @@ public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.My
30 30 private List<EventRouteRecordBeanVoListBean> list;
31 31 private Context context;
32 32 private OnClickListener onClickListener;
  33 + private boolean isShowStatus;
33 34  
34 35 public void setOnClickListener(OnClickListener onClickListener) {
35 36 this.onClickListener = onClickListener;
36 37 }
37 38  
38   - public RaceRecordAdapter(List<EventRouteRecordBeanVoListBean> list, Context context) {
  39 + public RaceRecordAdapter(List<EventRouteRecordBeanVoListBean> list, Context context,boolean isShowStatus) {
39 40 this.list = list;
40 41 this.context = context;
  42 + this.isShowStatus = isShowStatus;
41 43 }
42 44  
43 45 @NonNull
... ... @@ -49,20 +51,36 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
49 51  
50 52 @Override
51 53 public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
52   - if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
53   - myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "MM月dd日"));
  54 + EventRouteRecordBeanVoListBean bean = list.get(i);
  55 + if (!TextUtils.isEmpty(bean.getStartTime())) {
  56 + myHolder.record_time_day.setText(TimeUtil.getStampToTime(Long.parseLong(bean.getStartTime()) * 1000, "MM月dd日"));
54 57 }
55   - if (!TextUtils.isEmpty(list.get(i).getStartTime())) {
56   - myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(list.get(i).getStartTime()) * 1000, "HH:mm"));
  58 + if (!TextUtils.isEmpty(bean.getStartTime())) {
  59 + myHolder.record_time.setText(TimeUtil.getStampToTime(Long.parseLong(bean.getStartTime()) * 1000, "HH:mm"));
57 60 }
58   - myHolder.item_title.setText(list.get(i).getEventTitle());
59   - myHolder.record_kli.setText(list.get(i).getMileage());
  61 + myHolder.item_title.setText(bean.getEventTitle());
  62 + myHolder.record_kli.setText(bean.getMileage());
60 63 //设置时间
61   - if (!TextUtils.isEmpty(list.get(i).getEmployTime())) {
62   - myHolder.record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(list.get(i).getEmployTime())));
  64 + if (!TextUtils.isEmpty(bean.getEmployTime())) {
  65 + myHolder.record_minit.setText(TimeUtil.stampToChronometer(Long.parseLong(bean.getEmployTime())));
63 66 }
64   - myHolder.record_speed.setText(list.get(i).getPace());
65   - myHolder.record_step.setText(list.get(i).getStep());
  67 + myHolder.record_speed.setText(bean.getPace());
  68 + myHolder.record_step.setText(bean.getStep());
  69 +
  70 + if(isShowStatus){
  71 + myHolder.record_status.setVisibility(View.VISIBLE);
  72 + if(bean.getCompleteStatus() == 0){
  73 + myHolder.record_status.setText("未完成");
  74 + myHolder.record_status.setTextColor(context.getResources().getColor(R.color.all_record_statud_red));
  75 + }else {
  76 + myHolder.record_status.setText("完成");
  77 + myHolder.record_status.setTextColor(context.getResources().getColor(R.color.all_record_statud_green));
  78 + }
  79 + }else {
  80 + myHolder.record_status.setVisibility(View.GONE);
  81 + }
  82 +
  83 +
66 84 if (onClickListener != null)
67 85 myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i), i));
68 86 // 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
86 104 TextView record_speed;
87 105 TextView record_step;
88 106 RelativeLayout ry_re;
  107 + TextView record_status;
89 108  
90 109 public MyHolder(@NonNull View itemView) {
91 110 super(itemView);
... ... @@ -98,6 +117,7 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
98 117 record_speed = itemView.findViewById(R.id.record_speed);
99 118 record_step = itemView.findViewById(R.id.record_step);
100 119 ry_re = itemView.findViewById(R.id.ry_re);
  120 + record_status = itemView.findViewById(R.id.record_status);
101 121 }
102 122 }
103 123  
... ...
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @312fcc0
... ... @@ -28,6 +28,16 @@
28 28 android:textColor="#999999"
29 29 android:textSize="14sp" />
30 30  
  31 + <TextView
  32 + android:id="@+id/record_status"
  33 + android:layout_width="wrap_content"
  34 + android:layout_height="wrap_content"
  35 + android:layout_alignParentRight="true"
  36 + android:layout_marginRight="15dp"
  37 + android:textSize="14sp"
  38 + android:visibility="gone"
  39 + />
  40 +
31 41 <LinearLayout
32 42 android:layout_width="match_parent"
33 43 android:layout_height="100dp"
... ...
moudle_pedometer/src/main/res/values/colors.xml
  View file @312fcc0
... ... @@ -38,6 +38,8 @@
38 38 <color name="color_7cbd83">#7cbd83</color>
39 39 <color name="green_tx">#36C28D</color>
40 40 <color name="s_topbar_btn_color">#333333</color>
  41 + <color name="all_record_statud_green">#39CB93</color>
  42 + <color name="all_record_statud_red">#FA5234</color>
41 43  
42 44  
43 45 </resources>
... ...