Merge remote-tracking branch 'origin/master'

杨帅
2 parents 64cb869e de53e4b9
Showing 12 changed files with 403 additions and 12 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/LineUpAgainPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/LineUpAgainView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/LineUpAgainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RegistrationInfoActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/LineUpAgainAdapter.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/LineUpAgainFragment.java
moudle_pedometer/src/main/res/layout/activity_line_up_again.xml
moudle_pedometer/src/main/res/layout/fragment_line_up_again.xml
moudle_pedometer/src/main/res/layout/line_up__item_view.xml
moudle_pedometer/src/main/res/values/strings.xml
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+/**
+ * Created by hanyayun 019/06/20.
+ */
+public class LineUpAgainPresenter extends MvpBasePresenter<LineUpAgainView> {
+    public void getData(){
+        getView().setData();
+    }
+}
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.support.v7.widget.LinearLayoutManager;
+
+import com.cnlive.moudle.pedometer.ui.adapter.LineUpAgainAdapter;
+import com.cnlive.moudle.pedometer.ui.fragment.LineUpAgainFragment;
+import com.example.moudle_pedometer.R;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
+import com.scwang.smartrefresh.layout.header.ClassicsHeader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by hanyayun 019/06/20.
+ */
+public class LineUpAgainView implements MvpView {
+
+    private LineUpAgainFragment fragment;
+
+    public LineUpAgainView(LineUpAgainFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public void initView(){
+        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+            fragment.getActivity().finish();
+        });
+        fragment.binding.topbar.setTitle("重新上传");
+
+//        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
+//        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
+        fragment.binding.recycler.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+    }
+
+    public void setData(){
+        List<String> list = new ArrayList<>();
+        list.add("fffff");
+        list.add("fffff");
+        list.add("fffff");
+        list.add("fffff");
+        list.add("fffff");
+        LineUpAgainAdapter againAdapter = new LineUpAgainAdapter(list,fragment.getActivity());
+        fragment.binding.recycler.setAdapter(againAdapter);
+    }
+}
@@ -40,6 +40,15 @@ public class RaceRecorView implements MvpView {
                 .create();
     }
+    public void initView(){
+        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
+            fragment.getActivity().finish();
+        });
+        fragment.binding.topbar.setTitle("全部成绩");
+        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
+        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
+    }
+
     public void setData(BaseInfo<RaceRecordInfo> raceRecordInfoBaseInfo){
         hideLoading();
         fragment.binding.ryRecord.setVisibility(View.VISIBLE);
@@ -99,15 +108,6 @@ public class RaceRecorView implements MvpView {
         fragment.binding.refreshLayout.finishLoadMore();
     }
-    public void initView(){
-        fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
-            fragment.getActivity().finish();
-        });
-        fragment.binding.topbar.setTitle("全部成绩");
-        fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
-        fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
-    }
-
     public void showEmpty(){
         fragment.binding.refreshLayout.setVisibility(View.GONE);
         fragment.binding.emptyNet.setVisibility(View.VISIBLE);
@@ -7,6 +7,8 @@ import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.ui.fragment.LineUpAgainFragment;
+import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
 import com.example.moudle_pedometer.R;
 /**
@@ -27,5 +29,7 @@ public class LineUpAgainActivity extends AppCompatActivity {
         StatusBarUtil.setStatusBarWrite(this);
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_line_up_again);
+
+        getSupportFragmentManager().beginTransaction().replace(R.id.line_up_container,new LineUpAgainFragment()).commit();
     }
 }
@@ -28,6 +28,5 @@ public class RegistrationInfoActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_registration_info);
         getSupportFragmentManager().beginTransaction().replace(R.id.container, RegistrationInfoFragment.newInstance()).commit();
-        setContentView(R.layout.activity_registration_info);
     }
 }
+package com.cnlive.moudle.pedometer.ui.adapter;
+
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.example.moudle_pedometer.R;
+
+import java.util.List;
+
+/**
+ * Created by hanyayun 019/06/20.
+ */
+public class LineUpAgainAdapter extends RecyclerView.Adapter<LineUpAgainAdapter.MyHolder> {
+
+    private List<String> list;
+    private Context context;
+    private OnClickListener onClickListener;
+
+    public void setOnClickListener(OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
+    public LineUpAgainAdapter(List<String> list, Context context) {
+        this.list = list;
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    public MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        View view = LayoutInflater.from(context).inflate(R.layout.line_up__item_view,viewGroup,false);
+        return new MyHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull MyHolder myHolder, int i) {
+
+//        myHolder.again_up.setOnClickListener(v -> );
+        if(onClickListener != null) myHolder.ry_re.setOnClickListener(v -> onClickListener.onClickListener(list.get(i),i));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    class MyHolder extends RecyclerView.ViewHolder{
+
+        TextView up_day;
+        TextView up_record_time;
+        ImageView up_item_img;
+        TextView up_item_title;
+        TextView up_kilometer_num;
+        TextView up_record_minit;
+        TextView up_record_speed;
+        TextView up_record_step;
+        TextView again_up;
+        RelativeLayout ry_re;
+
+        public MyHolder(@NonNull View itemView) {
+            super(itemView);
+            up_day = itemView.findViewById(R.id.up_day);
+            up_record_time = itemView.findViewById(R.id.up_record_time);
+            up_item_img = itemView.findViewById(R.id.up_item_img);
+            up_item_title = itemView.findViewById(R.id.up_item_title);
+            up_kilometer_num = itemView.findViewById(R.id.up_kilometer_num);
+            up_record_minit = itemView.findViewById(R.id.up_record_minit);
+            up_record_speed = itemView.findViewById(R.id.up_record_speed);
+            up_record_step = itemView.findViewById(R.id.up_record_step);
+            again_up = itemView.findViewById(R.id.again_up);
+            ry_re = itemView.findViewById(R.id.ry_re);
+        }
+    }
+
+
+    public interface OnClickListener{
+        void onClickListener(String bean, int position);
+    }
+}
@@ -18,6 +18,9 @@ import com.example.moudle_pedometer.R;
 import java.util.List;
+/**
+ * Created by hanyayun 019/05/31.
+ */
 public class RaceRecordAdapter extends RecyclerView.Adapter<RaceRecordAdapter.MyHolder> {
     private List<EventRouteRecordBeanVoListBean> list;
+package com.cnlive.moudle.pedometer.ui.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter;
+import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView;
+import com.example.moudle_pedometer.R;
+import com.example.moudle_pedometer.databinding.FragmentLineUpAgainBinding;
+
+/**
+ * Created by hanyayun 019/06/20.
+ */
+public class LineUpAgainFragment extends MvpBindingFragment<LineUpAgainView, LineUpAgainPresenter,Object,FragmentLineUpAgainBinding> {
+
+
+    public LineUpAgainFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_line_up_again;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if(getMvpView() != null) getMvpView().initView();
+        getPresenter().getData();
+        binding.refreshLayout.setEnableLoadMore(false);
+        binding.refreshLayout.setEnableRefresh(false);
+    }
+}
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity">
-</android.support.constraint.ConstraintLayout>
+    <RelativeLayout
+        android:id="@+id/line_up_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</RelativeLayout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.QMUITopBar
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/qmui_topbar_height" />
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/refreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#F8F8F8" >
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recycler"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+</layout>
+
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+    <RelativeLayout
+        android:id="@+id/ry_re"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:padding="10dp">
+
+        <TextView
+            android:id="@+id/up_day"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#333333"
+            android:textSize="14sp"
+            android:text="5月1日" />
+
+        <TextView
+            android:id="@+id/up_record_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/up_day"
+            android:layout_marginLeft="15dp"
+            android:textColor="#999999"
+            android:textSize="14sp"
+            android:text="15:30" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:textColor="#FE4E4E"
+            android:textSize="12sp"
+            android:text="@string/up_fail"
+            android:layout_alignParentRight="true"/>
+
+        <LinearLayout
+            android:id="@+id/ly"
+            android:layout_width="match_parent"
+            android:layout_height="100dp"
+            android:layout_below="@id/up_day"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/up_item_img"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/defaults" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="15dp">
+
+                <TextView
+                    android:id="@+id/up_item_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:textColor="#333333"
+                    android:text="奥森南园跑道" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/up_kilometer_num"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="1.23"
+                        android:textColor="#333333"
+                        android:textSize="30sp"
+                        android:layout_centerVertical="true"
+                        />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:text="@string/kilometer"
+                        android:textColor="#333333"
+                        android:textSize="12sp"
+                        android:layout_marginLeft="5dp"/>
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true">
+
+                    <TextView
+                        android:id="@+id/up_record_minit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawableRight="@drawable/time_cost"
+                        android:drawablePadding="5dp"
+                        android:textColor="#333333"
+                        android:textSize="13sp"
+                        android:text="00:27:23" />
+
+                    <TextView
+                        android:id="@+id/up_record_speed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:drawableRight="@drawable/speed"
+                        android:drawablePadding="5dp"
+                        android:textColor="#333333"
+                        android:textSize="13sp"
+                        android:text="22'22''" />
+
+                    <TextView
+                        android:id="@+id/up_record_step"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="20dp"
+                        android:drawableRight="@drawable/step"
+                        android:drawablePadding="5dp"
+                        android:text="1234" />
+                </LinearLayout>
+            </RelativeLayout>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/line"
+            android:layout_below="@id/ly"
+            />
+
+        <TextView
+            android:id="@+id/again_up"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/view"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/green_raduis_bg"
+            android:text="@string/again_up"
+            android:textColor="#36C28D"
+            android:textSize="12sp"
+            android:paddingTop="7dp"
+            android:paddingBottom="7dp"
+            android:paddingRight="10dp"
+            android:paddingLeft="10dp"
+            />
+    </RelativeLayout>
+</layout>
@@ -80,6 +80,7 @@
     <string name="no_finish">未完成</string>
     <string name="again_up">重新上传</string>
     <string name="myrecord">我的记录</string>
+    <string name="up_fail">上传失败</string>
 </resources>