Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
杨帅
2 parents 761995aa b97b19f4
Showing 11 changed files with 248 additions and 2 deletions
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/TakePartPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/TakePartView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/TakePartActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/TakePartAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/TakePartFragment.java
moudle_pedometer/src/main/res/layout/activity_take_part.xml
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
moudle_pedometer/src/main/res/layout/fragment_take_part.xml
moudle_pedometer/src/main/res/layout/item_tabke_part.xml
@@ -52,7 +52,8 @@
         android:required="true" />
     <application android:persistent="true">
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity"></activity>
+        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity"></activity>
+        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity" />
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import com.cnlive.moudle.pedometer.frame.view.TakePartView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+/**
+ * Created by hanyayun 019/06/03.
+ */
+public class TakePartPresenter extends MvpBasePresenter<TakePartView> {
+
+}
@@ -44,6 +44,8 @@ import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
+import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
+import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
@@ -51,8 +53,8 @@ import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import java.io.LineNumberReader;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.support.v7.widget.LinearLayoutManager;
+
+import com.cnlive.moudle.pedometer.ui.adapter.TakePartAdapter;
+import com.cnlive.moudle.pedometer.ui.fragment.TakePartFragment;
+import com.example.moudle_pedometer.R;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by hanyayun 019/06/03.
+ */
+public class TakePartView implements MvpView {
+
+    private TakePartFragment fragment;
+
+    public TakePartView(TakePartFragment 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.takePartRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
+        List<String> list = new ArrayList<>();
+        for(int i = 0;i < 6;i++){
+            list.add("ss");
+        }
+        fragment.binding.takePartRecy.setAdapter(new TakePartAdapter(list,fragment.getActivity()));
+    }
+}
+package com.cnlive.moudle.pedometer.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+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.TakePartFragment;
+import com.example.moudle_pedometer.R;
+
+/**
+ * 已参与
+ * Created by hanyayun 019/06/03.
+ */
+public class TakePartActivity extends AppCompatActivity {
+
+
+    public static void newInstance(Activity context){
+        Intent intent = new Intent(context,TakePartActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        StatusBarUtil.setStatusBarWrite(this);
+        StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
+        setContentView(R.layout.activity_take_part);
+        getSupportFragmentManager().beginTransaction().replace(R.id.take_park_container, new TakePartFragment()).commit();
+    }
+}
+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 com.example.moudle_pedometer.R;
+
+import java.util.List;
+
+/**
+ * Created by hanyayun 019/06/04.
+ */
+public class TakePartAdapter extends RecyclerView.Adapter<TakePartAdapter.MyHolder> {
+
+    private List<String> list;
+    private Context context;
+
+    public TakePartAdapter(List<String> list, Context context) {
+        this.list = list;
+        this.context = context;
+    }
+
+    @NonNull
+    @Override
+    public TakePartAdapter.MyHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        View view = LayoutInflater.from(context).inflate(R.layout.item_tabke_part,viewGroup,false);
+        return new MyHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull TakePartAdapter.MyHolder myViewHolder, int i) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    class MyHolder extends RecyclerView.ViewHolder{
+
+        public MyHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+}
+package com.cnlive.moudle.pedometer.ui.fragment;
+
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.frame.presenter.TakePartPresenter;
+import com.cnlive.moudle.pedometer.frame.view.TakePartView;
+import com.example.moudle_pedometer.R;
+import com.example.moudle_pedometer.databinding.FragmentTakePartBinding;
+
+/**
+ * Created by hanyayun 019/06/03.
+ */
+public class TakePartFragment extends MvpBindingFragment<TakePartView, TakePartPresenter,Object, FragmentTakePartBinding> {
+
+
+    public TakePartFragment() {
+        // Required empty public constructor
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_take_part;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if(getMvpView() != null)getMvpView().initView();
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<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.TakePartActivity">
+
+    <RelativeLayout
+        android:id="@+id/take_park_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</RelativeLayout>
@@ -14,6 +14,12 @@
             android:id="@+id/run_line_recy"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+
+        <com.cnlive.strike.ui.widget.UIEmptyView
+            android:id="@+id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
     </LinearLayout>
 </layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:orientation="vertical">
+
+        <com.qmuiteam.qmui.widget.QMUITopBar
+            android:id="@+id/topbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/take_part_recy"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <com.cnlive.strike.ui.widget.UIEmptyView
+            android:id="@+id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone" />
+    </LinearLayout>
+
+</layout>
+
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white">
+
+    <ImageView
+        android:id="@+id/icon_img"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_margin="15dp"
+        android:src="@drawable/ic_icon"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="用户"
+        android:layout_toRightOf="@id/icon_img"
+        android:layout_centerVertical="true"
+        />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/line"
+        />
+</RelativeLayout>
 \ No newline at end of file