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

杨帅
2 parents 46198c73 362595c5
Showing 7 changed files with 79 additions and 43 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/net/bean/SelfRecordInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/layout/fragment_race_recor.xml
moudle_pedometer/src/main/res/layout/item_race_record.xml
@@ -14,6 +14,7 @@ import com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity;
 import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
@@ -66,7 +67,7 @@ public class RaceRecorView implements MvpView {
                 RaceRecordInfo.BestResultBean bestResultBean = raceRecordInfoBaseInfo.getData().getBestResult();
                 fragment.binding.kilometerNum.setText(bestResultBean.getMileage());
                 fragment.binding.stepNum.setText(bestResultBean.getStep());
-                fragment.binding.kilometerTime.setText(bestResultBean.getEmployTime());
+                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());
 package com.cnlive.moudle.pedometer.frame.view;
-import android.content.Context;
-import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
@@ -13,12 +11,11 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.net.bean.SelfRecordInfo;
-import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
@@ -62,15 +59,6 @@ public class SelfRecordView implements MvpView {
             list.clear();
             list.addAll(selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList());
             if (adapter == null) {
-                SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
-                fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
-                fragment.binding.stepNum.setText(recordSumBean.getYetStep());
-                fragment.binding.allTime.setText(recordSumBean.getYetEmployTime());
-                fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
-
-                fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
-                fragment.binding.allTimeNo.setText(recordSumBean.getNotEmployTime());
-                fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
                 fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
                 adapter = new RaceRecordAdapter(list, fragment.getActivity());
@@ -94,6 +82,16 @@ public class SelfRecordView implements MvpView {
             showEmpty();
         }
+        SelfRecordInfo.RecordSumBean recordSumBean = selfRecordInfoBaseInfo.getData().getRecordSum();
+        fragment.binding.kilometerNum.setText(recordSumBean.getCountMileage() + "");
+        if(recordSumBean.getYetStep() != null)fragment.binding.stepNum.setText(recordSumBean.getYetStep());
+        if(recordSumBean.getYetEmployTime() != null)fragment.binding.allTime.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getYetEmployTime())));
+        if(recordSumBean.getYetNumber() != null)fragment.binding.finishNum.setText(recordSumBean.getYetNumber());
+
+        if(recordSumBean.getNotStep() != null)fragment.binding.stepNumNo.setText(recordSumBean.getNotStep());
+        if(recordSumBean.getNotEmployTime() != null)fragment.binding.allTimeNo.setText(TimeUtil.stampToChronometers(Double.parseDouble(recordSumBean.getNotEmployTime())));
+        if(recordSumBean.getNotNumber() != null)fragment.binding.finishNumNo.setText(recordSumBean.getNotNumber());
+
         if (selfRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
         } else {
@@ -125,6 +123,9 @@ public class SelfRecordView implements MvpView {
         fragment.binding.stepNum.setText("--");
         fragment.binding.finishNum.setText("0");
         fragment.binding.allTime.setText("00:00:00");
+        fragment.binding.stepNumNo.setText("--");
+        fragment.binding.allTimeNo.setText("00:00:00");
+        fragment.binding.finishNumNo.setText("0");
         fragment.binding.checkAllLine.setOnClickListener(v -> {
             RunLineActivity.newInstance(fragment.getActivity(), null, null, null, null);
         });
@@ -145,6 +146,7 @@ public class SelfRecordView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
+                    fragment.completeStatus = 0;
                     fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize);
                 }
             });
@@ -8,19 +8,19 @@ import java.util.List;
 public class SelfRecordInfo {
     /**
-     * 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}
+     * 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}
      * 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"}]
      */
-    private RecordSumBean RecordSum;
+    private RecordSumBean recordSum;
     private List<EventRouteRecordBeanVoListBean> eventRouteRecordBeanVoList;
     public RecordSumBean getRecordSum() {
-        return RecordSum;
+        return recordSum;
     }
-    public void setRecordSum(RecordSumBean RecordSum) {
-        this.RecordSum = RecordSum;
+    public void setRecordSum(RecordSumBean recordSum) {
+        this.recordSum = recordSum;
     }
     public List<EventRouteRecordBeanVoListBean> getEventRouteRecordBeanVoList() {
@@ -43,45 +43,45 @@ public class SelfRecordFragment extends MvpBindingFragment&lt;SelfRecordView, SelfR
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if (getMvpView() != null) getMvpView().initView();
-        getData(-1);
+        getData(completeStatus);
-        binding.hasFinish.setOnClickListener(v -> getData(0));
-        binding.noFinish.setOnClickListener(v -> getData(1));
+        binding.hasFinish.setOnClickListener(v ->
+                getData(0));
+        binding.noFinish.setOnClickListener(v ->
+                getData(1));
         binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                 currentPage = 1;
-                getData(-1);
+                getData(completeStatus);
             }
         });
         binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
                 currentPage++;
-                getData(-1);
+                getData(completeStatus);
             }
         });
 //        getMvpView().onCheckFailDataCount(getActivity());
     }
-    private void getData(int completeStatus) {
-        if (completeStatus == -1) {
-            getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
+
+    private void getData(int completeStatu) {
+        if(completeStatu != completeStatus) currentPage = 1;
+        this.completeStatus = completeStatu;
+        getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
+        if (completeStatus == 0) {
+            binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
+            binding.hasFinish.setTextSize(18);
+            binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
+            binding.noFinish.setTextSize(15);
         } else {
-            this.completeStatus = currentPage;
-            getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()), completeStatus, currentPage, pageSize);
-            if (completeStatus == 0) {
-                binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
-                binding.hasFinish.setTextSize(18);
-                binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
-                binding.noFinish.setTextSize(15);
-            } else {
-                binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
-                binding.hasFinish.setTextSize(15);
-                binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
-                binding.noFinish.setTextSize(18);
-            }
+            binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.text_black));
+            binding.hasFinish.setTextSize(15);
+            binding.noFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
+            binding.noFinish.setTextSize(18);
         }
     }
@@ -42,6 +42,36 @@ public class TimeUtil {
         return DateTimes;
     }
+
+    public static String stampToChronometers(double mss) {
+        String DateTimes = "";
+        long msss = Math.round(mss);
+        long days = msss / (60 * 60 * 24);
+        long hours = (msss % (60 * 60 * 24)) / (60 * 60);
+        long minutes = (msss % (60 * 60)) / 60;
+        long seconds = msss % 60;
+
+        if (hours < 10) {
+            DateTimes += "0" + hours + ":";
+        } else {
+            DateTimes += hours + ":";
+        }
+
+        if (minutes < 10) {
+            DateTimes += "0" + minutes + ":";
+        } else {
+            DateTimes += minutes + ":";
+
+        }
+        if (seconds < 10) {
+            DateTimes += "0" + seconds;
+        } else {
+            DateTimes += seconds;
+
+        }
+        return DateTimes;
+    }
+
     /**
      * 日期格式字符串转换成时间戳
      *
@@ -37,6 +37,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
+                    android:text="0"
                     android:textSize="30sp" />
                 <TextView
@@ -75,6 +76,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
+                        android:text="0"
                         android:textColor="@color/white" />
                 </LinearLayout>
@@ -100,6 +102,7 @@
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
+                        android:text="00:00:00"
                         android:textColor="@color/white" />
                 </LinearLayout>
@@ -124,6 +127,7 @@
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
+                        android:text="--"
                         android:textColor="@color/white" />
                 </LinearLayout>
             </RelativeLayout>
@@ -4,7 +4,6 @@
     <data>
     </data>
-
     <RelativeLayout
         android:id="@+id/ry_re"
         android:layout_width="match_parent"
@@ -120,7 +119,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:layout_alignParentBottom="true"
-            android:background="@color/line" />
+            android:background="@color/line"
+            android:layout_alignParentBottom="true"/>
     </RelativeLayout>
 </layout>