CNLive Android Team / ModulePedometer · Commits

Commit e64e679486929a29dbd267e002b66e054c1eb480

Authored by 杨帅
2 parents 627219f8 f1a3fdb3

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

Inline Side-by-side
Showing 2 changed files with 12 additions and 2 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @e64e679
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.adapter; @@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.adapter;
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.support.annotation.NonNull; 4 import android.support.annotation.NonNull;
5 import android.support.v7.widget.RecyclerView; 5 import android.support.v7.widget.RecyclerView;
  6 +import android.text.TextUtils;
6 import android.view.LayoutInflater; 7 import android.view.LayoutInflater;
7 import android.view.View; 8 import android.view.View;
8 import android.view.ViewGroup; 9 import android.view.ViewGroup;
@@ -63,7 +64,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView @@ -63,7 +64,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
63 64
64 myViewHolder.line_name.setText(list.get(i).getTitle()); 65 myViewHolder.line_name.setText(list.get(i).getTitle());
65 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd")); 66 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
66 - myViewHolder.line_address.setText(list.get(i).getAddress() + " " + list.get(i).getMileage()); 67 + if (!TextUtils.isEmpty(list.get(i).getMileage())) {
  68 + myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
  69 + } else {
  70 + myViewHolder.line_address.setText(list.get(i).getAddress());
  71 + }
67 myViewHolder.people_part.setText(list.get(i).getSignupNum() + ""); 72 myViewHolder.people_part.setText(list.get(i).getSignupNum() + "");
68 myViewHolder.join_person.initIconData(list.get(i).getFaceUrl()); 73 myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
69 if(state.equals("0")){ 74 if(state.equals("0")){
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RunLineAdapter.java
  View file @e64e679
@@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.adapter; @@ -3,6 +3,7 @@ package com.cnlive.moudle.pedometer.ui.adapter;
3 import android.app.Activity; 3 import android.app.Activity;
4 import android.support.annotation.NonNull; 4 import android.support.annotation.NonNull;
5 import android.support.v7.widget.RecyclerView; 5 import android.support.v7.widget.RecyclerView;
  6 +import android.text.TextUtils;
6 import android.view.LayoutInflater; 7 import android.view.LayoutInflater;
7 import android.view.View; 8 import android.view.View;
8 import android.view.ViewGroup; 9 import android.view.ViewGroup;
@@ -58,7 +59,11 @@ public class RunLineAdapter extends RecyclerView.Adapter<RunLineAdapter.MyViewHo @@ -58,7 +59,11 @@ public class RunLineAdapter extends RecyclerView.Adapter<RunLineAdapter.MyViewHo
58 59
59 myViewHolder.line_name.setText(list.get(i).getTitle()); 60 myViewHolder.line_name.setText(list.get(i).getTitle());
60 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd")); 61 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
61 - myViewHolder.line_address.setText(list.get(i).getAddress() + " " + list.get(i).getMileage()); 62 + if (!TextUtils.isEmpty(list.get(i).getMileage())) {
  63 + myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
  64 + } else {
  65 + myViewHolder.line_address.setText(list.get(i).getAddress());
  66 + }
62 myViewHolder.people_part.setText(list.get(i).getSignupNum() + ""); 67 myViewHolder.people_part.setText(list.get(i).getSignupNum() + "");
63 myViewHolder.join_person.initIconData(list.get(i).getFaceUrl()); 68 myViewHolder.join_person.initIconData(list.get(i).getFaceUrl());
64 } 69 }