!3 完成了任务说明

Merge pull request !3 from Amdi/master

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/example/myapplication/activity/CapacityEvaluationAdapter.java

@@ -0,0 +1,83 @@
+package com.example.myapplication.activity;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
+import com.example.myapplication.R;
+import com.example.myapplication.bean.TaskExplainInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CapacityEvaluationAdapter extends RecyclerView.Adapter<CapacityEvaluationAdapter.ViewHolder> {
+    private List<TaskExplainInfo.BodyBean.DataBean> capacityList = new ArrayList<>();
+    private Context context;
+
+    public CapacityEvaluationAdapter(Context context) {
+        this.context = context;
+    }
+
+    public void setCapacityList(List<TaskExplainInfo.BodyBean.DataBean> capacityList) {
+        this.capacityList.addAll(capacityList);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View capacity = LayoutInflater.from(context).inflate(R.layout.capacity_item, parent, false);
+        return new ViewHolder(capacity);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        holder.tvCapacity.setText(capacityList.get(position).getTitle());
+        Glide.with(context).load(capacityList.get(position).getSrc()).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(holder.ivCapacity);
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onCapacityClick != null) {
+                    onCapacityClick.onClick(position);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return capacityList.size();
+    }
+
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView ivCapacity;
+        TextView tvCapacity;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            ivCapacity = itemView.findViewById(R.id.iv_tas_capacity);
+            tvCapacity = itemView.findViewById(R.id.tas_capacity_title);
+        }
+
+    }
+
+    public interface OnCapacityClick {
+        void onClick(int pos);
+    }
+
+    private OnCapacityClick onCapacityClick;
+
+    public void setOnCapacityClick(OnCapacityClick onCapacityClick) {
+        this.onCapacityClick = onCapacityClick;
+    }
+}

app/src/main/java/com/example/myapplication/activity/HomeActivity.java

@@ -1,7 +1,6 @@
 package com.example.myapplication.activity;
 
 import android.os.Bundle;
-
 import com.example.myapplication.base.BaseActivity;
 import com.example.myapplication.fragment.FindFragment;
 import com.example.myapplication.fragment.MineFragment;
@@ -10,21 +9,17 @@ import com.example.myapplication.fragment.TreasureFragment;
 import com.example.myapplication.util.NoSlideViewPager;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentPagerAdapter;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.example.myapplication.R;
 import com.google.android.material.tabs.TabLayout;
 import com.gyf.immersionbar.ImmersionBar;
-
 import java.util.ArrayList;
 
 public class HomeActivity extends BaseActivity{

app/src/main/java/com/example/myapplication/activity/ManagementFragment.java

@@ -1,16 +1,17 @@
 package com.example.myapplication.activity;
 
 import android.content.Intent;
-import android.os.Bundle;
-import android.view.KeyEvent;
 
 import com.example.myapplication.R;
 import com.example.myapplication.base.BaseActivity;
+import com.example.myapplication.fragment.CapacityEvaluationFragment;
+import com.example.myapplication.fragment.CapacityEvaluationFragment2;
 import com.example.myapplication.fragment.FindFragment;
 import com.example.myapplication.fragment.ForgetPawFragment;
 import com.example.myapplication.fragment.MineFragment;
 import com.example.myapplication.fragment.RecordFragment;
 import com.example.myapplication.fragment.TaskExplainFragment;
+import com.example.myapplication.fragment.TaskExplainFragment2;
 import com.example.myapplication.fragment.TaskPrefectureFragment;
 
 import com.example.myapplication.fragment.RegisterFragment;
@@ -34,13 +35,17 @@ public class ManagementFragment extends BaseActivity {
     private RecordFragment recordFragment;//纪录的fragment
     private TreasureFragment treasureFragment;//寻宝的fragment
     private TaskPrefectureFragment taskPrefectureFragment;//发现-任务专区的fragment
+    private CapacityEvaluationFragment capacityEvaluationFragment;//发现-能力测评fragment
+
     private TaskExplainFragment taskExplainFragment;//发现-任务说明的fragment
+    private TaskExplainFragment2 taskExplainFragment2;//发现-任务说明2的fragment
+
+    private CapacityEvaluationFragment2 capacityEvaluationFragment2;//发现-能力测评2的fragment
 
     private RegisterFragment registerFragment;//注册的fragment
     private ForgetPawFragment forgetPawFragment;//忘记密码fragment
 
 
-
     @Override
     protected int getLayout() {
         return R.layout.management_fragment;
@@ -68,10 +73,17 @@ public class ManagementFragment extends BaseActivity {
         if (treasureFragment != null)
             fragmentTransaction.hide(treasureFragment);
 
-        if (taskPrefectureFragment!=null)
+        if (taskPrefectureFragment != null)
             fragmentTransaction.hide(taskPrefectureFragment);
-        if (taskExplainFragment!=null)
+        if (taskExplainFragment != null)
             fragmentTransaction.hide(taskExplainFragment);
+        if (taskExplainFragment2 != null)
+            fragmentTransaction.hide(taskExplainFragment2);
+
+        if (capacityEvaluationFragment != null)
+            fragmentTransaction.hide(capacityEvaluationFragment);
+        if (capacityEvaluationFragment2 != null)
+            fragmentTransaction.hide(capacityEvaluationFragment2);
 
         if (registerFragment != null)
             fragmentTransaction.hide(registerFragment);
@@ -151,8 +163,34 @@ public class ManagementFragment extends BaseActivity {
                     fragmentTransaction.show(taskExplainFragment);
                 }
                 break;
+            case 10:
+                if (taskExplainFragment2 == null) {
+                    taskExplainFragment2 = new TaskExplainFragment2();
+                    fragmentTransaction.add(R.id.frame_layout, taskExplainFragment2);
+                } else {
+                    fragmentTransaction.show(taskExplainFragment2);
+                }
+                break;
+            case 11:
+                if (capacityEvaluationFragment == null) {
+                    capacityEvaluationFragment = new CapacityEvaluationFragment();
+                    fragmentTransaction.add(R.id.frame_layout, capacityEvaluationFragment);
+                } else {
+                    fragmentTransaction.show(capacityEvaluationFragment);
+                }
+                break;
+                case 12:
+                if (capacityEvaluationFragment2 == null) {
+                    capacityEvaluationFragment2 = new CapacityEvaluationFragment2();
+                    fragmentTransaction.add(R.id.frame_layout, capacityEvaluationFragment2);
+                } else {
+                    fragmentTransaction.show(capacityEvaluationFragment2);
+                }
+                break;
+
+
         }
-                fragmentTransaction.commit();
+        fragmentTransaction.commit();
     }
 
     @Override
@@ -180,9 +218,19 @@ public class ManagementFragment extends BaseActivity {
             case 7:
                 taskPrefectureFragment.onActivityResult(requestCode, resultCode, data);
                 break;
-                case 8:
+            case 8:
                 taskExplainFragment.onActivityResult(requestCode, resultCode, data);
                 break;
+            case 10:
+                taskExplainFragment2.onActivityResult(requestCode, resultCode, data);
+                break;
+            case 11:
+                capacityEvaluationFragment.onActivityResult(requestCode, resultCode, data);
+                break;
+                case 12:
+                capacityEvaluationFragment2.onActivityResult(requestCode, resultCode, data);
+                break;
+
         }
     }
 

app/src/main/java/com/example/myapplication/activity/TaskExplainAdapter.java

@@ -0,0 +1,84 @@
+package com.example.myapplication.activity;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
+import com.example.myapplication.R;
+import com.example.myapplication.bean.TaskExplainInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TaskExplainAdapter extends RecyclerView.Adapter<TaskExplainAdapter.ViewHolder> {
+    private List<TaskExplainInfo.BodyBean.DataBean> explainList = new ArrayList<>();
+    private Context context;
+
+    public TaskExplainAdapter(Context context) {
+        this.context = context;
+    }
+
+    public void setExplainList(List<TaskExplainInfo.BodyBean.DataBean> explainList) {
+        this.explainList.addAll(explainList);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View inflate = LayoutInflater.from(context).inflate(R.layout.tas_explain_item, parent, false);
+
+        return new ViewHolder(inflate);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        Glide.with(context).load(explainList.get(position).getSrc()).apply(RequestOptions.bitmapTransform(new CircleCrop())).into(holder.ivExplain);
+        holder.tvExplain.setText(explainList.get(position).getTitle());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnItemClick != null) {
+                    mOnItemClick.onClick(position);
+                }
+            }
+        });
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return explainList.size();
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        ImageView ivExplain;
+        TextView tvExplain;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            ivExplain = itemView.findViewById(R.id.iv_tas_explain);
+            tvExplain = itemView.findViewById(R.id.tas_explain_title);
+        }
+    }
+
+    public interface OnItemClick {
+        void onClick(int pos);
+    }
+
+    private OnItemClick mOnItemClick;
+
+    public void setOnItemClick(OnItemClick pOnItemClick) {
+        mOnItemClick = pOnItemClick;
+    }
+
+}

app/src/main/java/com/example/myapplication/activity/TaskExplainAdapter2.java

@@ -0,0 +1,74 @@
+package com.example.myapplication.activity;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.myapplication.R;
+import com.example.myapplication.bean.TaskExplainInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TaskExplainAdapter2 extends RecyclerView.Adapter<TaskExplainAdapter2.ViewHolder2> {
+    private List<TaskExplainInfo.BodyBean.DataBean> explainList2 = new ArrayList<>();
+    private Context context;
+
+    public TaskExplainAdapter2(Context context) {
+        this.context = context;
+    }
+
+    public void setExplainList2(List<TaskExplainInfo.BodyBean.DataBean> explainList2) {
+        this.explainList2.addAll(explainList2);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder2 onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(context).inflate(R.layout.task_explain2, parent, false);
+        return new ViewHolder2(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder2 holder, int position) {
+        holder.tvText.setText(explainList2.get(position).getTitle());
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnItemClick2!=null){
+                    mOnItemClick2.onClick2(position);
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return explainList2.size();
+    }
+
+    class ViewHolder2 extends RecyclerView.ViewHolder {
+        TextView tvText;
+
+        public ViewHolder2(@NonNull View itemView) {
+            super(itemView);
+            tvText = itemView.findViewById(R.id.tv_task_explain2);
+        }
+    }
+
+    public interface OnItemClick2 {
+        void onClick2(int pos);
+    }
+
+    private TaskExplainAdapter2.OnItemClick2 mOnItemClick2;
+
+    public void setOnItemClick(TaskExplainAdapter2.OnItemClick2 pOnItemClick2) {
+        mOnItemClick2 = pOnItemClick2;
+    }
+}

app/src/main/java/com/example/myapplication/base/BaseFragment.java

@@ -29,6 +29,7 @@ public abstract class BaseFragment extends Fragment {
         initMvp();
         initView();
         initData();
+
         return mView;
 
     }

app/src/main/java/com/example/myapplication/bean/TaskExplainInfo.java

@@ -0,0 +1,143 @@
+package com.example.myapplication.bean;
+
+import java.util.List;
+
+public class    TaskExplainInfo {
+
+
+    /**
+     * msg : 成功
+     * body : {"rownum":0,"data":[{"Subtitle":"副标题","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":11,"title":"标题11"},{"Subtitle":"","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":12,"title":"标题12"},{"Subtitle":"","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":13,"title":"标题13"}],"numFound":100,"rows":10}
+     * status : 0
+     */
+
+    private String msg;
+    private BodyBean body;
+    private int status;
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public BodyBean getBody() {
+        return body;
+    }
+
+    public void setBody(BodyBean body) {
+        this.body = body;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public static class BodyBean {
+        /**
+         * rownum : 0
+         * data : [{"Subtitle":"副标题","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":11,"title":"标题11"},{"Subtitle":"","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":12,"title":"标题12"},{"Subtitle":"","createtime":"2021-5-11","src":"http://10.130.23.166:8080/cbt/img/blue.png","id":13,"title":"标题13"}]
+         * numFound : 100
+         * rows : 10
+         */
+
+        private int rownum;
+        private int numFound;
+        private int rows;
+        private List<DataBean> data;
+
+        public int getRownum() {
+            return rownum;
+        }
+
+        public void setRownum(int rownum) {
+            this.rownum = rownum;
+        }
+
+        public int getNumFound() {
+            return numFound;
+        }
+
+        public void setNumFound(int numFound) {
+            this.numFound = numFound;
+        }
+
+        public int getRows() {
+            return rows;
+        }
+
+        public void setRows(int rows) {
+            this.rows = rows;
+        }
+
+        public List<DataBean> getData() {
+            return data;
+        }
+
+        public void setData(List<DataBean> data) {
+            this.data = data;
+        }
+
+        public static class DataBean {
+            /**
+             * Subtitle : 副标题
+             * createtime : 2021-5-11
+             * src : http://10.130.23.166:8080/cbt/img/blue.png
+             * id : 11
+             * title : 标题11
+             */
+
+            private String Subtitle;
+            private String createtime;
+            private String src;
+            private int id;
+            private String title;
+
+            public String getSubtitle() {
+                return Subtitle;
+            }
+
+            public void setSubtitle(String Subtitle) {
+                this.Subtitle = Subtitle;
+            }
+
+            public String getCreatetime() {
+                return createtime;
+            }
+
+            public void setCreatetime(String createtime) {
+                this.createtime = createtime;
+            }
+
+            public String getSrc() {
+                return src;
+            }
+
+            public void setSrc(String src) {
+                this.src = src;
+            }
+
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+        }
+    }
+}

app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment.java

@@ -0,0 +1,124 @@
+package com.example.myapplication.fragment;
+
+import android.content.Intent;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.example.myapplication.R;
+import com.example.myapplication.activity.CapacityEvaluationAdapter;
+import com.example.myapplication.activity.ManagementFragment;
+import com.example.myapplication.base.BaseFragment;
+import com.example.myapplication.bean.TaskExplainInfo;
+import com.example.myapplication.http.Callback;
+import com.example.myapplication.http.HttpInterface;
+import com.example.myapplication.http.OkGoBuilder;
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+/**
+ * 发现页面的活动专区
+ */
+public class CapacityEvaluationFragment extends BaseFragment implements View.OnClickListener {
+
+
+
+    private ImageView ivEvaluationTaskFinish;
+    private XRecyclerView capacityEvaluationRecycler;
+    private CapacityEvaluationAdapter capacityEvaluationAdapter;
+    private ArrayList<TaskExplainInfo.BodyBean.DataBean> capacityList;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_capacity_evaluation;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        ivEvaluationTaskFinish = mView.findViewById(R.id.iv_evaluation_task_finish);
+        capacityEvaluationRecycler = mView.findViewById(R.id.capacity_evaluation_recycler);
+        ivEvaluationTaskFinish.setOnClickListener(this::onClick);
+        capacityEvaluationRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        capacityEvaluationRecycler.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+        capacityEvaluationRecycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+        capacityEvaluationRecycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        //取消上拉加载，刷新功能
+        capacityEvaluationRecycler.setPullRefreshEnabled(false);
+        capacityEvaluationRecycler.setLoadingMoreEnabled(false);
+        capacityEvaluationAdapter = new CapacityEvaluationAdapter(getActivity());
+        capacityEvaluationRecycler.setAdapter(capacityEvaluationAdapter);
+        capacityEvaluationRecycler.getDefaultFootView().setNoMoreHint("加载成功");
+        capacityEvaluationRecycler.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+
+            }
+
+            @Override
+            public void onLoadMore() {
+
+            }
+        });
+        capacityEvaluationAdapter.setOnCapacityClick(new CapacityEvaluationAdapter.OnCapacityClick() {
+            @Override
+            public void onClick(int id) {
+                Intent itemIntent = new Intent(getActivity(), ManagementFragment.class);
+                itemIntent.putExtra("tag", 12);
+                startActivity(itemIntent);
+                //Toast.makeText(getContext(), "哈哈，成功了"+id, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void initData() {
+        super.initData();
+        capacityList = new ArrayList<>();
+        initNewWork(true);
+    }
+
+    private void initNewWork(boolean b) {
+        OkGoBuilder.getInstance()
+                .Builder(getActivity())
+                .url(HttpInterface.listTaskExplain)
+                .method(OkGoBuilder.GET)
+                .cls(TaskExplainInfo.class)
+                .json(new JSONObject())
+                .callback(new Callback<TaskExplainInfo>() {
+                    @Override
+                    public void onSuccess(TaskExplainInfo response, int id) {
+                        dismissLoadingDialog();
+                        capacityEvaluationAdapter.setCapacityList(response.getBody().getData());
+                        Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss");
+                        Toast.makeText(getActivity(), response.getMsg() + "", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(Throwable e, int id) {
+                        dismissLoadingDialog();
+                        Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
+                        Log.d("TAG", "onError: " + e.getMessage());
+                    }
+                }).build();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_evaluation_task_finish:
+                getActivity().finish();
+                break;
+        }
+    }
+}

app/src/main/java/com/example/myapplication/fragment/CapacityEvaluationFragment2.java

@@ -0,0 +1,36 @@
+package com.example.myapplication.fragment;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.myapplication.R;
+import com.example.myapplication.base.BaseFragment;
+
+/**
+ * 能力测评的第二个页面
+ */
+public class CapacityEvaluationFragment2 extends BaseFragment implements View.OnClickListener {
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_capacity_evaluation2;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+    }
+    @Override
+    protected void initData() {
+        super.initData();
+    }
+    @Override
+    public void onClick(View v) {
+
+    }
+}

app/src/main/java/com/example/myapplication/fragment/FindFragment.java

@@ -4,24 +4,22 @@ import android.content.Intent;
 import android.view.View;
 import android.widget.LinearLayout;
 
-
 import com.example.myapplication.R;
 import com.example.myapplication.activity.ManagementFragment;
 import com.example.myapplication.base.BaseFragment;
-import com.gyf.immersionbar.ImmersionBar;
-
-
-import presenter.CapacityEvaluationPresenter;
 
 
 /**
  * 发现的Fragment
  * 2021-5-25
  */
-public class FindFragment extends BaseFragment implements View.OnClickListener{
+public class FindFragment extends BaseFragment implements View.OnClickListener {
 
     private LinearLayout linear_task_prefecture;//任务专区
     private LinearLayout linear_task_explain;//任务说明
+    private LinearLayout linearRight;
+    private LinearLayout linearEnd;
+    private LinearLayout linearTaskExplain;
 
     @Override
     protected int getLayout() {
@@ -35,6 +33,11 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{
         linear_task_prefecture.setOnClickListener(this::onClick);
         linear_task_explain = mView.findViewById(R.id.linear_task_explain);
         linear_task_explain.setOnClickListener(this::onClick);
+        linearRight = mView.findViewById(R.id.linear_right);
+        linearRight.setOnClickListener(this::onClick);
+        linearEnd = mView.findViewById(R.id.linear_end);
+        linearEnd.setOnClickListener(this::onClick);
+
     }
 
     @Override
@@ -44,17 +47,23 @@ public class FindFragment extends BaseFragment implements View.OnClickListener{
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.linear_task_prefecture:
                 Intent prefectureIntent = new Intent(getActivity(), ManagementFragment.class);
-                prefectureIntent.putExtra("tag",7);
+                prefectureIntent.putExtra("tag", 7);
                 startActivity(prefectureIntent);
                 break;
             case R.id.linear_task_explain:
                 Intent explainIntent = new Intent(getActivity(), ManagementFragment.class);
-                explainIntent.putExtra("tag",8);
+                explainIntent.putExtra("tag", 8);
                 startActivity(explainIntent);
                 break;
+            case R.id.linear_end:
+                Intent endIntent = new Intent(getActivity(), ManagementFragment.class);
+                endIntent.putExtra("tag", 11);
+                startActivity(endIntent);
+                break;
+
         }
     }
 }

app/src/main/java/com/example/myapplication/fragment/ForgetPawFragment.java

@@ -1,20 +1,27 @@
 package com.example.myapplication.fragment;
 
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.example.myapplication.R;
 import com.example.myapplication.base.BaseFragment;
 
 /**
- *忘记密码页面
+ * 忘记密码页面
  */
-public class ForgetPawFragment extends BaseFragment {
+public class ForgetPawFragment extends BaseFragment implements View.OnClickListener{
+    private ImageView ivFinish;
+    private TextView title;
+    private EditText etForgetPawPhone;
+    private EditText etForgetPawNote;
+    private EditText etForgetPawPaw;
+    private EditText etForgetPawConfirmPaw;
+    private TextView tvForgetPaw;
+    private TextView forgetPawGetNote;
+
     @Override
     protected int getLayout() {
         return R.layout.fragment_forget_paw;
@@ -23,10 +30,35 @@ public class ForgetPawFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivFinish = mView.findViewById(R.id.iv_finish);
+        title = mView.findViewById(R.id.title);
+        etForgetPawPhone = mView.findViewById(R.id.et_forgetPaw_phone);
+        etForgetPawNote = mView.findViewById(R.id.et_forgetPaw_note);
+        etForgetPawPaw = mView.findViewById(R.id.et_forgetPaw_paw);
+        etForgetPawConfirmPaw = mView.findViewById(R.id.et_forgetPaw_confirm_paw);
+        forgetPawGetNote = mView.findViewById(R.id.forgetPaw_get_note);
+        tvForgetPaw = mView.findViewById(R.id.tv_forgetPaw);
+
+        ivFinish.setOnClickListener(this::onClick);
+        forgetPawGetNote.setOnClickListener(this::onClick);
+        title.setText("忘记密码");
+
     }
 
     @Override
     protected void initData() {
         super.initData();
     }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_finish:
+                getActivity().finish();
+                break;
+            case R.id.forgetPaw_get_note:
+                Toast.makeText(getActivity(), "忘记密码获取验证码", Toast.LENGTH_SHORT).show();
+                break;
+        }
+    }
 }

app/src/main/java/com/example/myapplication/fragment/RegisterFragment.java

@@ -4,6 +4,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.example.myapplication.R;
 import com.example.myapplication.base.BaseFragment;
@@ -11,7 +12,7 @@ import com.example.myapplication.base.BaseFragment;
 /**
  * 注册页面
  */
-public class RegisterFragment extends BaseFragment {
+public class RegisterFragment extends BaseFragment implements View.OnClickListener{
 
 
     private EditText etRegisterPhone;
@@ -44,12 +45,9 @@ public class RegisterFragment extends BaseFragment {
         ivRegisterCheck = mView.findViewById(R.id.iv_register_check);
         haveGoLogin = mView.findViewById(R.id.have_go_login);
         tvRegister = mView.findViewById(R.id.tv_register);
-        ivFinish.setOnClickListener(new View.OnClickListener() {
+
-            @Override
+        ivFinish.setOnClickListener(this::onClick);
-            public void onClick(View v) {
+        registerGetNote.setOnClickListener(this::onClick);
-                getActivity().finish();
-            }
-        });
 
     }
 
@@ -59,4 +57,17 @@ public class RegisterFragment extends BaseFragment {
         super.initData();
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.iv_finish:
+                getActivity().finish();
+                break;
+            case R.id.register_get_note:
+                Toast.makeText(getActivity(), "获取验证码", Toast.LENGTH_SHORT).show();
+                break;
+
+
+        }
+    }
 }

app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment.java

@@ -1,12 +1,39 @@
 package com.example.myapplication.fragment;
 
+import android.content.Intent;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.example.myapplication.R;
+import com.example.myapplication.activity.ManagementFragment;
+import com.example.myapplication.activity.TaskExplainAdapter;
 import com.example.myapplication.base.BaseFragment;
+import com.example.myapplication.bean.TaskExplainInfo;
+import com.example.myapplication.http.Callback;
+import com.example.myapplication.http.HttpInterface;
+import com.example.myapplication.http.OkGoBuilder;
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
 
 /**
  * 发现-任务说明
  */
-public class TaskExplainFragment extends BaseFragment {
+public class TaskExplainFragment extends BaseFragment implements View.OnClickListener {
+    private ImageView ivFindTaskExplain;
+    private XRecyclerView taskExplainRecycle;
+    private ArrayList<TaskExplainInfo.BodyBean.DataBean> dataBeans;
+    private TaskExplainAdapter taskExplainAdapter;
+    private int page1 = 1;
+
     @Override
     protected int getLayout() {
         return R.layout.task_explain_fragment;
@@ -15,10 +42,83 @@ public class TaskExplainFragment extends BaseFragment {
     @Override
     protected void initView() {
         super.initView();
+        ivFindTaskExplain = mView.findViewById(R.id.iv_find_task_explain);
+        taskExplainRecycle = mView.findViewById(R.id.task_explain_recycler);
+        ivFindTaskExplain.setOnClickListener(this::onClick);
+
+        taskExplainRecycle.setLayoutManager(new LinearLayoutManager(getActivity()));
+        //下划线
+        taskExplainRecycle.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
+        taskExplainRecycle.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+        taskExplainRecycle.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        //取消上啦加载下拉刷新
+        taskExplainRecycle.setPullRefreshEnabled(false);
+        taskExplainRecycle.setLoadingMoreEnabled(false);
+        taskExplainAdapter = new TaskExplainAdapter(getActivity());
+        taskExplainRecycle.setAdapter(taskExplainAdapter);
+        taskExplainRecycle.getDefaultFootView().setNoMoreHint("加载完毕");
+        taskExplainRecycle.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+
+            }
+
+            @Override
+            public void onLoadMore() {
+
+            }
+        });
+        taskExplainAdapter.setOnItemClick(new TaskExplainAdapter.OnItemClick() {
+            @Override
+            public void onClick(int pos) {
+                Intent itemIntent = new Intent(getActivity(), ManagementFragment.class);
+                itemIntent.putExtra("tag", 10);
+                startActivity(itemIntent);
+                //Toast.makeText(getContext(), "你猜"+pos, Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 
     @Override
     protected void initData() {
         super.initData();
+        dataBeans = new ArrayList<>();
+        initNetWork(true);
+    }
+
+    private void initNetWork(boolean b) {
+        OkGoBuilder.getInstance()
+                .Builder(getActivity())
+                .url(HttpInterface.listTaskExplain)
+                .method(OkGoBuilder.GET)
+                .cls(TaskExplainInfo.class)
+                .json(new JSONObject())
+                .callback(new Callback<TaskExplainInfo>() {
+                    @Override
+                    public void onSuccess(TaskExplainInfo response, int id) {
+                        dismissLoadingDialog();
+                        taskExplainAdapter.setExplainList(response.getBody().getData());
+                        Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss");
+                        Toast.makeText(getActivity(), response.getMsg() + "", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(Throwable e, int id) {
+                        dismissLoadingDialog();
+                        Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
+                        Log.d("TAG", "onError: " + e.getMessage());
+                    }
+                }).build();
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_find_task_explain:
+                getActivity().finish();
+                break;
+
+        }
     }
 }

app/src/main/java/com/example/myapplication/fragment/TaskExplainFragment2.java

@@ -0,0 +1,119 @@
+package com.example.myapplication.fragment;
+
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.example.myapplication.R;
+import com.example.myapplication.activity.TaskExplainAdapter;
+import com.example.myapplication.activity.TaskExplainAdapter2;
+import com.example.myapplication.base.BaseFragment;
+import com.example.myapplication.bean.TaskExplainInfo;
+import com.example.myapplication.http.Callback;
+import com.example.myapplication.http.HttpInterface;
+import com.example.myapplication.http.OkGoBuilder;
+import com.jcodecraeer.xrecyclerview.ProgressStyle;
+import com.jcodecraeer.xrecyclerview.XRecyclerView;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+/**
+ * 发现页面的任务说明的点击条目跳转第二个页面
+ */
+public class TaskExplainFragment2 extends BaseFragment implements View.OnClickListener {
+
+    private ImageView ivTaskExplain2;
+    private XRecyclerView taskExplain2Recycler;
+    private ArrayList<TaskExplainInfo.BodyBean.DataBean> dataBeans2;
+    private TaskExplainAdapter2 taskExplainAdapter2;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_task_explain2;
+    }
+
+
+
+    @Override
+    protected void initView() {
+        super.initView();
+        ivTaskExplain2 = mView.findViewById(R.id.iv_task_explain2_finish);
+        taskExplain2Recycler = mView.findViewById(R.id.task_explain2_recycler);
+        ivTaskExplain2.setOnClickListener(this::onClick);
+        taskExplain2Recycler.setLayoutManager(new LinearLayoutManager(getActivity()));
+        taskExplain2Recycler.addItemDecoration(new DividerItemDecoration(getActivity(),DividerItemDecoration.VERTICAL));
+        taskExplain2Recycler.setRefreshProgressStyle(ProgressStyle.BallSpinFadeLoader);
+        taskExplain2Recycler.setLoadingMoreProgressStyle(ProgressStyle.BallRotate);
+        //取消上拉加载，刷新功能。
+        taskExplain2Recycler.setPullRefreshEnabled(false);
+        taskExplain2Recycler.setLoadingMoreEnabled(false);
+
+        taskExplainAdapter2 = new TaskExplainAdapter2(getActivity());
+        taskExplain2Recycler.setAdapter(taskExplainAdapter2);
+        taskExplain2Recycler.getDefaultFootView().setNoMoreHint("加载完毕");
+        taskExplain2Recycler.setLoadingListener(new XRecyclerView.LoadingListener() {
+            @Override
+            public void onRefresh() {
+
+            }
+
+            @Override
+            public void onLoadMore() {
+
+            }
+        });
+        taskExplainAdapter2.setOnItemClick(new TaskExplainAdapter2.OnItemClick2() {
+            @Override
+            public void onClick2(int pos) {
+
+                Toast.makeText(getContext(), "你猜"+pos, Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+    @Override
+    protected void initData() {
+        super.initData();
+        dataBeans2 = new ArrayList<>();
+        initNetWork2(true);
+    }
+
+    private void initNetWork2(boolean b) {
+        OkGoBuilder.getInstance()
+                .Builder(getActivity())
+                .url(HttpInterface.listTaskExplain)
+                .method(OkGoBuilder.GET)
+                .cls(TaskExplainInfo.class)
+                .json(new JSONObject())
+                .callback(new Callback<TaskExplainInfo>() {
+                    @Override
+                    public void onSuccess(TaskExplainInfo response, int id) {
+                        dismissLoadingDialog();
+                        taskExplainAdapter2.setExplainList2(response.getBody().getData());
+                        Log.d("TAG", "onSuccess: " + response.getMsg() + "sssssssssssss");
+                        Toast.makeText(getActivity(), response.getMsg() + "", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(Throwable e, int id) {
+                        dismissLoadingDialog();
+                        Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
+                        Log.d("TAG", "onError: " + e.getMessage());
+                    }
+                }).build();
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.iv_task_explain2_finish:
+                getActivity().finish();
+                break;
+        }
+    }
+}

app/src/main/java/com/example/myapplication/http/HttpInterface.java

@@ -4,4 +4,5 @@ public class HttpInterface {
     //http://172.21.91.160:8000/api/user/list
     public static final String IP = "http://172.21.91.160:8000/api/1/";
     public static final String listTask = IP + "task/list";//任务专区，活动专区
+    public static final String listTaskExplain = IP + "task/info";//任务说明
 }

app/src/main/res/layout/activity_area_title.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:paddingTop="20dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+<ImageView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    android:src="@drawable/ic_baseline_arrow"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
+    android:layout_marginLeft="15dp"
+    android:id="@+id/activity_area_finish"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="任务说明"
+        android:textSize="16sp"
+        android:textColor="@color/colorBack"
+        app:layout_constraintTop_toTopOf="@id/activity_area_finish"
+        app:layout_constraintBottom_toBottomOf="@id/activity_area_finish"
+        app:layout_constraintLeft_toRightOf="@id/activity_area_finish"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/capacity_item.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="100dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:id="@+id/iv_tas_capacity"
+        android:layout_marginLeft="10dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        />
+    <TextView
+        android:id="@+id/tas_capacity_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="111111111"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@id/iv_tas_capacity"
+        app:layout_constraintBottom_toBottomOf="@id/iv_tas_capacity"
+        app:layout_constraintLeft_toRightOf="@id/iv_tas_capacity"
+        android:layout_marginLeft="10dp"/>
+    <TextView
+        android:id="@+id/tv_through"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="成绩：通过"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginRight="8dp"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="去测评>"
+        app:layout_constraintTop_toBottomOf="@id/tv_through"
+        app:layout_constraintRight_toRightOf="@id/tv_through"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_capacity_evaluation.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".fragment.CapacityEvaluationFragment">
+
+    <LinearLayout
+        android:id="@+id/rl_capacity_evaluation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#fff"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_evaluation_task_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow"
+            />
+
+        <TextView
+            android:id="@+id/tv_find"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/iv_find_task"
+            android:gravity="center"
+            android:text="能力测评"
+            android:textColor="#000"
+            android:textSize="17sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/capacity_evaluation_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_capacity_evaluation" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_capacity_evaluation2.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".fragment.CapacityEvaluationFragment2">
+
+    <LinearLayout
+        android:id="@+id/rl_capacity2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryBlue"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_task_capacity2_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow"
+            />
+    </LinearLayout>
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/task_capacity2_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/rl_capacity2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_forget_paw.xml

@@ -36,13 +36,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="11为手机号码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/forgetPaw_phone"
         app:layout_constraintTop_toBottomOf="@id/forgetPaw_phone" />
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_phone"
+        app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_phone"/>
     <TextView
         android:id="@+id/forgetPaw_note"
         android:layout_width="wrap_content"
@@ -57,16 +65,25 @@
 
     <EditText
         android:id="@+id/et_forgetPaw_note"
-        android:layout_width="300dp"
+        android:layout_width="200dp"
         android:layout_height="wrap_content"
         android:hint="6为短信验证"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/forgetPaw_note"
         app:layout_constraintTop_toBottomOf="@id/forgetPaw_note" />
+
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note"
+        app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"/>
     <TextView
         android:id="@+id/forgetPaw_get_note"
         android:layout_width="wrap_content"
@@ -77,8 +94,13 @@
         app:layout_constraintTop_toTopOf="@id/et_forgetPaw_note"
         app:layout_constraintBottom_toBottomOf="@id/et_forgetPaw_note"
         app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginRight="30dp"/>
+        android:layout_marginRight="40dp"/>
-
+<TextView
+    android:layout_width="300dp"
+    android:layout_height="1dp"
+    android:textColor="@color/colorWhite"
+    app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_note"
+    app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_note"/>
 
 
     <TextView
@@ -98,13 +120,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="6-20位密码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/forgetPaw_paw"
         app:layout_constraintTop_toBottomOf="@id/forgetPaw_paw"/>
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_paw"
+        app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_paw"/>
     <TextView
         android:id="@+id/forgetPaw_confirm_paw"
         android:layout_width="wrap_content"
@@ -122,13 +152,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="请再次输入一遍密码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/forgetPaw_confirm_paw"
         app:layout_constraintTop_toBottomOf="@id/forgetPaw_confirm_paw"/>
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw"
+        app:layout_constraintLeft_toLeftOf="@id/et_forgetPaw_confirm_paw"/>
     <TextView
         android:id="@+id/tv_forgetPaw"
         android:layout_width="300dp"
@@ -143,4 +181,5 @@
         app:layout_constraintTop_toBottomOf="@id/et_forgetPaw_confirm_paw"
         app:layout_constraintRight_toRightOf="parent"
         />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_register.xml

@@ -49,13 +49,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="11为手机号码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/register_phone"
         app:layout_constraintTop_toBottomOf="@id/register_phone" />
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_register_phone"
+        app:layout_constraintLeft_toLeftOf="@id/et_register_phone"/>
     <TextView
         android:id="@+id/register_note"
         android:layout_width="wrap_content"
@@ -70,16 +78,24 @@
 
     <EditText
         android:id="@+id/et_register_note"
-        android:layout_width="300dp"
+        android:layout_width="200dp"
         android:layout_height="wrap_content"
         android:hint="6为短信验证"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
         android:textSize="15sp"
+        android:background="@null"
+        android:layout_marginTop="10dp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/register_note"
         app:layout_constraintTop_toBottomOf="@id/register_note" />
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_register_note"
+        app:layout_constraintLeft_toLeftOf="@id/et_register_note"/>
     <TextView
         android:id="@+id/register_get_note"
         android:layout_width="wrap_content"
@@ -110,12 +126,20 @@
         android:layout_height="wrap_content"
         android:hint="推荐人(编码/邮箱/手机号)"
         android:textSize="15sp"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/register_referrer"
         app:layout_constraintTop_toBottomOf="@id/register_referrer"/>
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_register_referrer"
+        app:layout_constraintLeft_toLeftOf="@id/et_register_referrer"/>
     <TextView
         android:id="@+id/register_paw"
         android:layout_width="wrap_content"
@@ -133,13 +157,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="6-20位密码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/register_paw"
         app:layout_constraintTop_toBottomOf="@id/register_paw"/>
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_register_paw"
+        app:layout_constraintLeft_toLeftOf="@id/et_register_paw"/>
     <TextView
         android:id="@+id/register_confirm_paw"
         android:layout_width="wrap_content"
@@ -157,13 +189,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:hint="请再次输入一遍密码"
-        android:paddingBottom="20dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:background="@null"
         android:textSize="15sp"
         android:textColorHint="@color/colorTransparent"
         android:textCursorDrawable="@drawable/text_color"
         android:theme="@style/MyEditText"
         app:layout_constraintLeft_toLeftOf="@id/register_confirm_paw"
         app:layout_constraintTop_toBottomOf="@id/register_confirm_paw"/>
+    <View
+        android:layout_width="300dp"
+        android:layout_height="1dp"
+        android:background="@color/colorHui"
+        app:layout_constraintTop_toBottomOf="@id/et_register_confirm_paw"
+        app:layout_constraintLeft_toLeftOf="@id/et_register_confirm_paw"/>
     <ImageView
         android:id="@+id/iv_register_check"
         android:layout_width="20dp"

app/src/main/res/layout/fragment_task_explain2.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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=".fragment.TaskExplainFragment2">
+    <LinearLayout
+        android:id="@+id/rl_task2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryBlue"
+        android:paddingTop="@dimen/top_pind_sp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_task_explain2_finish"
+            android:layout_width="wrap_content"
+            android:layout_height="45dp"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="15dp"
+            android:src="@drawable/ic_baseline_arrow"
+            />
+    </LinearLayout>
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/task_explain2_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/rl_task2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+       />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/register_title.xml

@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
     android:background="@color/colorPrimaryBlue"
-    android:paddingTop="20dp"
+    android:paddingTop="@dimen/top_pind_sp">
-    android:layout_height="wrap_content">
+
     <ImageView
         android:id="@+id/iv_finish"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:layout_marginLeft="10dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:background="@mipmap/icon_goback"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"/>
-    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:src="@drawable/ic_baseline_arrow"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
         android:text="注册"
         android:textColor="@color/colorWhite"
         android:textSize="18sp"
-        android:id="@+id/title_register"
-        app:layout_constraintLeft_toRightOf="@id/iv_finish"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginLeft="20dp"/>
+        app:layout_constraintLeft_toRightOf="@id/iv_finish"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/tas_explain_item.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_height="60dp">
+<ImageView
+    android:layout_width="40dp"
+    android:layout_height="40dp"
+    android:id="@+id/iv_tas_explain"
+    android:layout_marginLeft="10dp"
+    android:scaleType="fitCenter"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    />
+    <TextView
+        android:id="@+id/tas_explain_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="111111111"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="@id/iv_tas_explain"
+        app:layout_constraintBottom_toBottomOf="@id/iv_tas_explain"
+        app:layout_constraintLeft_toRightOf="@id/iv_tas_explain"
+        android:layout_marginLeft="10dp"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/task_explain2.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+<TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:id="@+id/tv_task_explain2"
+    android:text="11111111"
+    android:textSize="16sp"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintLeft_toLeftOf="parent"
+    android:layout_marginLeft="10dp"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/task_explain_fragment.xml

@@ -3,12 +3,44 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView
+    <LinearLayout
-        android:layout_width="wrap_content"
+            android:id="@+id/rl_find"
-        android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#fff"
+            android:paddingTop="@dimen/top_pind_sp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <ImageView
+                android:id="@+id/iv_find_task_explain"
+                android:layout_width="wrap_content"
+                android:layout_height="45dp"
+                android:layout_alignParentLeft="true"
+                android:layout_marginLeft="15dp"
+                android:src="@drawable/ic_baseline_arrow"
+                />
+
+            <TextView
+                android:id="@+id/tv_find"
+                android:layout_width="wrap_content"
+                android:layout_height="45dp"
+                android:layout_marginLeft="15dp"
+                android:layout_toRightOf="@id/iv_find_task"
+                android:gravity="center"
+                android:text="任务说明"
+                android:textColor="#000"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+    <com.jcodecraeer.xrecyclerview.XRecyclerView
+        android:id="@+id/task_explain_recycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:background="@mipmap/ic_launcher_round"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/rl_find" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -8,4 +8,5 @@
     <color name="colorGrey">#FAFAFA</color>
     <color name="colorWhite">#ffffff</color>
     <color name="colorTransparent">#7fffffff</color>
+    <color name="colorHui">#95CAF6</color>
 </resources>