CNLive Android Team / ModulePedometer · Commits

Commit 7ecde668782d0dc95b4bcabb7c2b90eb28f4caa6

Authored by 韩亚云
1 parent 78194573

我的记录接口更新修改对接

Inline Side-by-side
Showing 7 changed files with 79 additions and 44 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @7ecde66
... ... @@ -13,6 +13,7 @@ import com.cnlive.moudle.pedometer.net.bean.RaceRecordInfo;
13 13 import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
14 14 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
15 15 import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
  16 +import com.cnlive.moudle.pedometer.utils.TimeUtil;
16 17 import com.example.moudle_pedometer.R;
17 18 import com.hannesdorfmann.mosby3.mvp.MvpView;
18 19 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
... ... @@ -65,7 +66,7 @@ public class RaceRecorView implements MvpView {
65 66 RaceRecordInfo.BestResultBean bestResultBean = raceRecordInfoBaseInfo.getData().getBestResult();
66 67 fragment.binding.kilometerNum.setText(bestResultBean.getMileage());
67 68 fragment.binding.stepNum.setText(bestResultBean.getStep());
68   - fragment.binding.kilometerTime.setText(bestResultBean.getEmployTime());
  69 + fragment.binding.kilometerTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(bestResultBean.getEmployTime())));
69 70 fragment.binding.kilometerSpeed.setText(bestResultBean.getPace());
70 71 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
71 72 adapter = new RaceRecordAdapter(list,fragment.getActivity());
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @7ecde66
1 1 package com.cnlive.moudle.pedometer.frame.view;
2 2  
3 3  
4   -import android.content.Context;
5   -import android.content.Intent;
6 4 import android.support.v7.widget.LinearLayoutManager;
7 5 import android.view.View;
8 6  
... ... @@ -13,12 +11,11 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
13 11 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
14 12 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
15 13 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
16   -import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
17 14 import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
18 15 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
19 16 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
20 17 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
21   -import com.cnlive.moudle.pedometer.utils.StepUtil;
  18 +import com.cnlive.moudle.pedometer.utils.TimeUtil;
22 19 import com.example.moudle_pedometer.R;
23 20 import com.hannesdorfmann.mosby3.mvp.MvpView;
24 21 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
... ... @@ -62,15 +59,6 @@ public class SelfRecordView implements MvpView {
62 59 list.clear();
63 60 list.addAll(selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
64 61 if (adapter == null) {
65   - SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
66   - fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
67   - fragment.binding.stepNum.setText(recordSumBean.getYetStep());
68   - fragment.binding.allTime.setText(recordSumBean.getYetEmployTime());
69   - fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
70   -
71   - fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
72   - fragment.binding.allTimeNo.setText(recordSumBean.getNotEmployTime());
73   - fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
74 62  
75 63 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
76 64 adapter = new RaceRecordAdapter(list, fragment.getActivity());
... ... @@ -94,6 +82,16 @@ public class SelfRecordView implements MvpView {
94 82 showEmpty();
95 83 }
96 84  
  85 + SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
  86 + fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
  87 + if(recordSumBean.getYetStep() != null)fragment.binding.stepNum.setText(recordSumBean.getYetStep());
  88 + if(recordSumBean.getYetEmployTime() != null)fragment.binding.allTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getYetEmployTime())));
  89 + if(recordSumBean.getYetNumber() != null)fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
  90 +
  91 + if(recordSumBean.getNotStep() != null)fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
  92 + if(recordSumBean.getNotEmployTime() != null)fragment.binding.allTimeNo.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getNotEmployTime())));
  93 + if(recordSumBean.getNotNumber() != null)fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
  94 +
97 95 if (selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize) {
98 96 fragment.binding.refreshLayout.setEnableLoadMore(false);
99 97 } else {
... ... @@ -125,6 +123,9 @@ public class SelfRecordView implements MvpView {
125 123 fragment.binding.stepNum.setText("--");
126 124 fragment.binding.finishNum.setText("0");
127 125 fragment.binding.allTime.setText("00:00:00");
  126 + fragment.binding.stepNumNo.setText("--");
  127 + fragment.binding.allTimeNo.setText("00:00:00");
  128 + fragment.binding.finishNumNo.setText("0");
128 129 fragment.binding.checkAllLine.setOnClickListener(v -> {
129 130 RunLineActivity.newInstance(fragment.getActivity(), null, null, null, null);
130 131 });
... ... @@ -145,6 +146,7 @@ public class SelfRecordView implements MvpView {
145 146 @Override
146 147 public void onClick(View v) {
147 148 fragment.currentPage = 1;
  149 + fragment.completeStatus = 0;
148 150 fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize);
149 151 }
150 152 });
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/SelfRecordInfo.java
  View file @7ecde66
... ... @@ -8,19 +8,19 @@ import java.util.List;
8 8 public class SelfRecordInfo {
9 9  
10 10 /**
11   - * RecordSum : {"yetEmployTime":"30.0","yetNumber":"30.0","yetStep":"10000.0","yetMileage":"5.0","notNumber":"10000.0","notMileage":"5.0","notEmployTime":"30.0","notStep":"10000.0","countMileage":101.7}
  11 + * recordSum : {"yetEmployTime":"30.0","yetNumber":"30.0","yetStep":"10000.0","yetMileage":"5.0","notNumber":"10000.0","notMileage":"5.0","notEmployTime":"30.0","notStep":"10000.0","countMileage":101.7}
12 12 * eventRouteRecordBeanVoList : [{"createTime":1559722819000,"employTime":"30","eventTitle":"2018国际网络徒步大赛黄金海岸站","mileage":"5.5","pace":"22.33","recordId":2,"roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg","step":"10000"},{"createTime":1559722832000,"employTime":"00:0:55","eventTitle":"2018国际网络徒步大赛黄金海岸站","mileage":"5","pace":"22.33","recordId":3,"roadmap":"http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg","step":"10000"}]
13 13 */
14 14  
15   - private RecordSumBean RecordSum;
  15 + private RecordSumBean recordSum;
16 16 private List<EventRouteRecordBeanVoListBean> eventRouteRecordBeanVoList;
17 17  
18 18 public RecordSumBean getRecordSum() {
19   - return RecordSum;
  19 + return recordSum;
20 20 }
21 21  
22   - public void setRecordSum(RecordSumBean RecordSum) {
23   - this.RecordSum = RecordSum;
  22 + public void setRecordSum(RecordSumBean recordSum) {
  23 + this.recordSum = recordSum;
24 24 }
25 25  
26 26 public List<EventRouteRecordBeanVoListBean> getEventRouteRecordBeanVoList() {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
  View file @7ecde66
... ... @@ -43,45 +43,45 @@ public class SelfRecordFragment extends MvpBindingFragment&lt;SelfRecordView, SelfR
43 43 public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
44 44 super.onViewCreated(view, savedInstanceState);
45 45 if (getMvpView() != null) getMvpView().initView();
46   - getData(-1);
  46 + getData(completeStatus);
47 47  
48   - binding.hasFinish.setOnClickListener(v -> getData(0));
49   - binding.noFinish.setOnClickListener(v -> getData(1));
  48 + binding.hasFinish.setOnClickListener(v ->
  49 + getData(0));
  50 + binding.noFinish.setOnClickListener(v ->
  51 + getData(1));
50 52 binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
51 53 @Override
52 54 public void onRefresh(@NonNull RefreshLayout refreshLayout) {
53 55 currentPage = 1;
54   - getData(-1);
  56 + getData(completeStatus);
55 57 }
56 58 });
57 59 binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
58 60 @Override
59 61 public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
60 62 currentPage++;
61   - getData(-1);
  63 + getData(completeStatus);
62 64 }
63 65 });
64 66  
65 67 // getMvpView().onCheckFailDataCount(getActivity());
66 68 }
67 69  
68   - private void getData(int completeStatus) {
69   - if (completeStatus == -1) {
70   - getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
  70 +
  71 + private void getData(int completeStatu) {
  72 + if(completeStatu != completeStatus) currentPage = 1;
  73 + this.completeStatus = completeStatu;
  74 + getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
  75 + if (completeStatus == 0) {
  76 + binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
  77 + binding.hasFinish.setTextSize(18);
  78 + binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
  79 + binding.noFinish.setTextSize(15);
71 80 } else {
72   - this.completeStatus = currentPage;
73   - getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
74   - if (completeStatus == 0) {
75   - binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
76   - binding.hasFinish.setTextSize(18);
77   - binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
78   - binding.noFinish.setTextSize(15);
79   - } else {
80   - binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
81   - binding.hasFinish.setTextSize(15);
82   - binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
83   - binding.noFinish.setTextSize(18);
84   - }
  81 + binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
  82 + binding.hasFinish.setTextSize(15);
  83 + binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
  84 + binding.noFinish.setTextSize(18);
85 85 }
86 86 }
87 87  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
  View file @7ecde66
... ... @@ -42,6 +42,36 @@ public class TimeUtil {
42 42 return DateTimes;
43 43 }
44 44  
  45 +
  46 + public static String stampToChronometers(double mss) {
  47 + String DateTimes = "";
  48 + long msss = Math.round(mss);
  49 + long days = msss / (60 * 60 * 24);
  50 + long hours = (msss % (60 * 60 * 24)) / (60 * 60);
  51 + long minutes = (msss % (60 * 60)) / 60;
  52 + long seconds = msss % 60;
  53 +
  54 + if (hours < 10) {
  55 + DateTimes += "0" + hours + ":";
  56 + } else {
  57 + DateTimes += hours + ":";
  58 + }
  59 +
  60 + if (minutes < 10) {
  61 + DateTimes += "0" + minutes + ":";
  62 + } else {
  63 + DateTimes += minutes + ":";
  64 +
  65 + }
  66 + if (seconds < 10) {
  67 + DateTimes += "0" + seconds;
  68 + } else {
  69 + DateTimes += seconds;
  70 +
  71 + }
  72 + return DateTimes;
  73 + }
  74 +
45 75 /**
46 76 * 日期格式字符串转换成时间戳
47 77 *
... ...
moudle_pedometer/src/main/res/layout/fragment_race_recor.xml
  View file @7ecde66
... ... @@ -37,6 +37,7 @@
37 37 android:layout_width="wrap_content"
38 38 android:layout_height="wrap_content"
39 39 android:textColor="@color/white"
  40 + android:text="0"
40 41 android:textSize="30sp" />
41 42  
42 43 <TextView
... ... @@ -75,6 +76,7 @@
75 76 android:layout_height="wrap_content"
76 77 android:layout_marginTop="5dp"
77 78 android:textSize="23sp"
  79 + android:text="0"
78 80 android:textColor="@color/white" />
79 81 </LinearLayout>
80 82  
... ... @@ -100,6 +102,7 @@
100 102 android:layout_gravity="center"
101 103 android:layout_marginTop="5dp"
102 104 android:textSize="23sp"
  105 + android:text="00:00:00"
103 106 android:textColor="@color/white" />
104 107 </LinearLayout>
105 108  
... ... @@ -124,6 +127,7 @@
124 127 android:layout_gravity="center"
125 128 android:layout_marginTop="5dp"
126 129 android:textSize="23sp"
  130 + android:text="--"
127 131 android:textColor="@color/white" />
128 132 </LinearLayout>
129 133 </RelativeLayout>
... ...
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @7ecde66
... ... @@ -15,8 +15,7 @@
15 15 android:layout_width="wrap_content"
16 16 android:layout_height="wrap_content"
17 17 android:textColor="#333333"
18   - android:textSize="14sp"
19   - android:text="5月1日" />
  18 + android:textSize="14sp" />
20 19  
21 20 <TextView
22 21 android:id="@+id/record_time"
... ... @@ -25,8 +24,7 @@
25 24 android:layout_toRightOf="@id/record_time_day"
26 25 android:layout_marginLeft="15dp"
27 26 android:textColor="#999999"
28   - android:textSize="14sp"
29   - android:text="15:30" />
  27 + android:textSize="14sp"/>
30 28  
31 29 <LinearLayout
32 30 android:layout_width="match_parent"
... ...