Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
杨帅
2 parents 447fd430 54e1430c
Showing 10 changed files with 62 additions and 32 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RaceRecorPresenter.java
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/frame/view/TakePartView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.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/fragment_take_part.xml
moudle_pedometer/src/main/res/layout/item_race_record.xml
@@ -38,7 +38,7 @@ public class RaceRecorPresenter extends MvpBasePresenter&lt;RaceRecorView&gt; {
         }).<BaseInfo<RaceRecordInfo>>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
-                getView().showEmpty();
+                getView().showError();
             }
         }).setSuccessCallback(new SuccessCallback<BaseInfo<RaceRecordInfo>>() {
             @Override
@@ -26,14 +26,17 @@ public class RaceRecorView implements MvpView {
         this.fragment = fragment;
     }
-    public void setData(BaseInfo<RaceRecordInfo> registerInfo){
-        List<String> raceRecordModels = new ArrayList<>();
-        raceRecordModels.add("0");
-        raceRecordModels.add("0");
-        raceRecordModels.add("0");
-        raceRecordModels.add("0");
+    public void setData(BaseInfo<RaceRecordInfo> raceRecordInfoBaseInfo){
+        if(raceRecordInfoBaseInfo.getData().getBestResult() == null){
+            showEmpty();
+            return;
+        }
+        fragment.binding.kilometerNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getMileage());
+        fragment.binding.stepNum.setText(raceRecordInfoBaseInfo.getData().getBestResult().getStep());
+        fragment.binding.kilometerTime.setText(raceRecordInfoBaseInfo.getData().getBestResult().getEmployTime());
+        fragment.binding.kilometerSpeed.setText(raceRecordInfoBaseInfo.getData().getBestResult().getPace());
         fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-        fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordModels,fragment.getActivity()));
+        fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordInfoBaseInfo.getData().getEventRouteRecordBeanVoList(),fragment.getActivity()));
     }
     public void initView(){
@@ -51,5 +54,13 @@ public class RaceRecorView implements MvpView {
     public void showEmpty(){
         fragment.binding.recordRecy.setVisibility(View.GONE);
         fragment.binding.empty.setVisibility(View.VISIBLE);
+        fragment.binding.kilometerNum.setText("0.00");
+        fragment.binding.stepNum.setText("--");
+        fragment.binding.kilometerTime.setText("00:00:00");
+        fragment.binding.kilometerSpeed.setText("--");
+    }
+
+    public void showError(){
+
     }
 }
@@ -32,7 +32,7 @@ public class SelfRecordView implements MvpView{
         raceRecordModels.add("0");
         raceRecordModels.add("0");
         fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
-        fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordModels,fragment.getActivity()));
+//        fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordModels,fragment.getActivity()));
     }
     public void initView(){
@@ -30,6 +30,10 @@ public class TakePartView implements MvpView {
         fragment.binding.topbar.setTitle("已参与");
         fragment.binding.takePartRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+        fragment.binding.refreshLayout.setOnRefreshListener(v ->{
+
+        });
+//        fragment.binding.refreshLayout.setOn
     }
     public void onSuccess(BaseInfo<TakePartPeopleInfo> partPeopleInfoBaseInfo){
@@ -11,16 +11,18 @@ import android.widget.ImageView;
 import android.widget.TextView;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.strike.data.network.model.RaceRecordInfo;
 import com.example.moudle_pedometer.R;
 import java.util.List;
 public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.MyHolder> {
-    private List<String> list;
+    private List<RaceRecordInfo.EventRouteRecordBeanVoListBean> list;
     private Context context;
-    public RaceRecordAdapter(List<String> list, Context context) {
+    public RaceRecordAdapter(List<RaceRecordInfo.EventRouteRecordBeanVoListBean> list, Context context) {
         this.list = list;
         this.context = context;
     }
@@ -34,6 +36,13 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     @Override
     public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
+        myHolder.record_time_day.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"MM-dd"));
+        myHolder.record_time.setText(TimeUtil.getStampToTime(list.get(i).getCreateTime(),"HH:mm"));
+        myHolder.item_title.setText(list.get(i).getEventTitle());
+        myHolder.record_kli.setText(list.get(i).getMileage());
+        myHolder.record_minit.setText(list.get(i).getEmployTime());
+        myHolder.record_speed.setText(list.get(i).getPace());
+        myHolder.record_step.setText(list.get(i).getStep());
     }
@@ -44,9 +53,10 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
     class MyHolder extends RecyclerView.ViewHolder{
+        TextView record_time_day;
         TextView record_time;
         ImageView item_img;
-        TextView item_time;
+        TextView item_title;
         TextView record_kli;
         TextView record_minit;
         TextView record_speed;
@@ -54,9 +64,10 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
         public MyHolder(@NonNull View itemView) {
             super(itemView);
+            record_time_day = itemView.findViewById(R.id.record_time_day);
             record_time = itemView.findViewById(R.id.record_time);
             item_img = itemView.findViewById(R.id.item_img);
-            item_time = itemView.findViewById(R.id.item_time);
+            item_title = itemView.findViewById(R.id.item_title);
             record_kli = itemView.findViewById(R.id.kilometer_num);
             record_minit = itemView.findViewById(R.id.record_minit);
             record_speed = itemView.findViewById(R.id.record_speed);
@@ -14,7 +14,7 @@ import com.example.moudle_pedometer.databinding.FragmentRaceRecorBinding;
 /**
  * Created by hanyayun 019/05/30.
  */
-public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRecorPresenter, Object, FragmentRaceRecorBinding> {
+public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRecorPresenter,Object, FragmentRaceRecorBinding> {
     public RaceRecorFragment() {
@@ -25,7 +25,8 @@ public class RaceRecorFragment extends MvpBindingFragment&lt;RaceRecorView, RaceRec
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (getMvpView() != null) getMvpView().initView();
+        if(getMvpView() != null) getMvpView().initView();
+        getPresenter().getData(getActivity(),"116","10514343","1","10");
     }
     @Override
@@ -73,9 +73,9 @@ public class TimeUtil {
      *
      * @return 格式化后的日期
      */
-    public static String getStampToTime(long time) {
+    public static String getStampToTime(long time,String pattern) {
         String res;
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);//"yyyy-MM-dd HH:mm:ss"
         long lt = new Long(time * 1000);
         Date date = new Date(lt);
         res = simpleDateFormat.format(date);
@@ -32,9 +32,9 @@
                 android:layout_alignParentRight="true">
                 <TextView
+                    android:id="@+id/kilometer_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="1.53"
                     android:textColor="@color/white"
                     android:textSize="30sp" />
@@ -56,13 +56,11 @@
                 android:layout_marginRight="20dp">
                 <LinearLayout
-                    android:id="@+id/kilometer_ly"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
                     <TextView
-                        android:id="@+id/kilometer"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/stepnum"
@@ -71,25 +69,22 @@
                         android:textColor="@color/white" />
                     <TextView
+                        android:id="@+id/step_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/kilometer"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
-                        android:text="1234"
                         android:textColor="@color/white" />
                 </LinearLayout>
                 <LinearLayout
-                    android:id="@+id/foot_ly"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:orientation="vertical">
                     <TextView
-                        android:id="@+id/foot"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textSize="12sp"
@@ -98,12 +93,12 @@
                         android:textColor="@color/white" />
                     <TextView
+                        android:id="@+id/kilometer_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
-                        android:text="00:27:23"
                         android:textColor="@color/white" />
                 </LinearLayout>
@@ -114,7 +109,6 @@
                     android:orientation="vertical">
                     <TextView
-                        android:id="@+id/kilometer_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textSize="12sp"
@@ -123,12 +117,12 @@
                         android:textColor="@color/white" />
                     <TextView
+                        android:id="@+id/kilometer_speed"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:layout_marginTop="5dp"
                         android:textSize="23sp"
-                        android:text="22'22''"
                         android:textColor="@color/white" />
                 </LinearLayout>
             </RelativeLayout>
@@ -156,7 +150,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone"
-            android:background="#F8F8F8">
+            android:background="@color/white">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -181,6 +175,7 @@
             </LinearLayout>
         </RelativeLayout>
+
     </LinearLayout>
 </layout>
@@ -11,10 +11,18 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"/>
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/take_part_recy"
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/take_part_recy"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
         <com.cnlive.strike.ui.widget.UIEmptyView
             android:id="@+id/empty"
@@ -47,7 +47,7 @@
                 android:layout_marginLeft="15dp">
                 <TextView
-                    android:id="@+id/item_time"
+                    android:id="@+id/item_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="12sp"