关注，我的收藏，浏览历史初步实现

Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml

@@ -9,11 +9,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LeudaemiaLikeMe">
-        <activity android:name=".Activity.SafetyActivity"></activity>
+        <activity android:name=".Activity.AttentionActivity"></activity>
+        <activity android:name=".Activity.HistoryActivity" />
+        <activity android:name=".Activity.CollectActivity" />
+        <activity android:name=".Activity.SafetyActivity" />
         <activity android:name=".Activity.AboutActivity" />
         <activity android:name=".Activity.MyQuestionActivity" />
         <activity android:name=".Activity.ConcernedProblemActivity" />
-        <activity android:name=".Activity.CollectActivity" />
         <activity android:name=".Activity.DetailActivity" />
         <activity android:name=".Activity.MdctRmdActivity" />
         <activity android:name=".Activity.SearchActivity" />

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java

@@ -0,0 +1,40 @@
+package com.example.leudaemialikeme.Activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.os.Bundle;
+
+import com.example.leudaemialikeme.Adapter.AttentionAdapter;
+import com.example.leudaemialikeme.Attention;
+import com.example.leudaemialikeme.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AttentionActivity extends AppCompatActivity {
+
+    private List<Attention> attentionList = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_attention);
+        getData();//获得数据
+        RecyclerView recycleView = (RecyclerView) findViewById(R.id.attentionList);//获得视图
+        LinearLayoutManager layoutManager;
+        layoutManager = new LinearLayoutManager(this);
+        recycleView.setLayoutManager(layoutManager);//建立线性布局
+        AttentionAdapter adapter = new AttentionAdapter(attentionList);//创建适配器
+        recycleView.setAdapter(adapter);//将视图与适配器连接起来
+    }
+
+    private void getData() {
+        Attention attention1 = new Attention(R.mipmap.img_my_person,"小白帮","管住嘴，迈开腿，多喝水");
+        attentionList.add(attention1);
+        Attention attention2 = new Attention(R.mipmap.img_my_person,"小白帮","管住嘴，多饮水，常保暖");
+        attentionList.add(attention2);
+
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/CollectActivity.java

@@ -1,17 +1,24 @@
 package com.example.leudaemialikeme.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import android.os.Bundle;
 
+import com.example.leudaemialikeme.Fragment.CollectFragment;
 import com.example.leudaemialikeme.R;
 
-public class CollectActivity extends AppCompatActivity {
+public class CollectActivity extends AppCompatActivity  {
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_collect);
+        FragmentManager fm = getSupportFragmentManager();
+        FragmentTransaction trans = fm.beginTransaction();
+        String title = "我的收藏";
+        trans.replace(R.id.collect_frag_layout, new CollectFragment(title));
+        trans.commit();
     }
 }

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/HistoryActivity.java

@@ -0,0 +1,24 @@
+package com.example.leudaemialikeme.Activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import android.os.Bundle;
+
+import com.example.leudaemialikeme.Fragment.CollectFragment;
+import com.example.leudaemialikeme.R;
+
+public class HistoryActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_history);
+        FragmentManager fm = getSupportFragmentManager();
+        FragmentTransaction trans = fm.beginTransaction();
+        String title = "浏览历史";
+        trans.replace(R.id.collect_frag_layout, new CollectFragment(title));
+        trans.commit();
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/AttentionAdapter.java

@@ -0,0 +1,59 @@
+package com.example.leudaemialikeme.Adapter;
+
+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.example.leudaemialikeme.Attention;
+import com.example.leudaemialikeme.Collect;
+import com.example.leudaemialikeme.R;
+
+import java.util.List;
+
+public class AttentionAdapter extends RecyclerView.Adapter<AttentionAdapter.ViewHolder> {
+    private List<Attention> attentionList;
+
+    //重写构造方法
+    public AttentionAdapter(List<Attention> attentionList) {
+        this.attentionList = attentionList;
+    }
+
+    public int getItemCount() {
+        return attentionList.size();
+    }
+
+    //内部类
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView  attentionTitle,attentionInfo;
+        ImageView attentionIconId;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            this.attentionTitle = (TextView) itemView.findViewById(R.id.attentionTitle);
+            this.attentionIconId = (ImageView) itemView.findViewById(R.id.attentionIcon);
+            this.attentionInfo = (TextView) itemView.findViewById(R.id.attentionInfo);
+        }
+    }
+
+    //重写 onCreateViewHolder()方法
+    @Override
+    public AttentionAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.attention_item, parent, false);
+        AttentionAdapter.ViewHolder holder = new AttentionAdapter.ViewHolder(view);
+        return holder;
+    }
+
+    //重写onBindViewHolder()方法
+    @Override
+    public void onBindViewHolder(@NonNull AttentionAdapter.ViewHolder holder, int position) {
+        Attention attention = attentionList.get(position);
+        holder.attentionTitle.setText(attention.getAttentionTitle());
+        holder.attentionInfo.setText(attention.getAttentionInfo());
+        holder.attentionIconId.setImageResource(attention.getAttentionIconId());
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CollectAdapter.java

@@ -0,0 +1,60 @@
+package com.example.leudaemialikeme.Adapter;
+
+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.example.leudaemialikeme.Collect;
+import com.example.leudaemialikeme.R;
+
+import java.util.List;
+
+public class CollectAdapter extends RecyclerView.Adapter<CollectAdapter.ViewHolder>{
+    private List<Collect> collectList;
+
+    //重写构造方法
+    public CollectAdapter(List<Collect> collectList){
+        this.collectList = collectList;
+    }
+    public int getItemCount(){
+        return collectList.size();
+    }
+    //内部类
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView collectTitle,collectName,collectContent,collectRead;
+        ImageView collectIcon,collectImg;
+
+        public ViewHolder(@NonNull View itemView){
+            super(itemView);
+            this.collectTitle = (TextView)itemView.findViewById(R.id.collectTitle);
+            this.collectIcon = (ImageView)itemView.findViewById(R.id.collectIcon);
+            this.collectName = (TextView)itemView.findViewById(R.id.collectName);
+            this.collectContent = (TextView)itemView.findViewById(R.id.collectContent);
+            this.collectImg = (ImageView)itemView.findViewById(R.id.collectImg);
+            this.collectRead = (TextView)itemView.findViewById(R.id.collectRead);
+        }
+    }
+    //重写 onCreateViewHolder()方法
+    @Override
+    public CollectAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view= LayoutInflater.from(parent.getContext()).inflate(R.layout.collect_item,parent,false);
+        CollectAdapter.ViewHolder holder=new CollectAdapter.ViewHolder(view);
+        return holder;
+    }
+    //重写onBindViewHolder()方法
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder,int position){
+        Collect collect = collectList.get(position);
+        holder.collectTitle.setText(collect.getCollectTitle());
+        holder.collectName.setText(collect.getCollectName());
+        holder.collectContent.setText(collect.getCollectContent());
+        holder.collectRead.setText(collect.getCollectRead());
+        holder.collectIcon.setImageResource(collect.getCollectIconId());
+        holder.collectImg.setImageResource(collect.getCollectImgId());
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CollectPageFragmentAdapter.java

@@ -0,0 +1,33 @@
+package com.example.leudaemialikeme.Adapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
+import com.example.leudaemialikeme.Fragment.AnswerCollectFragment;
+import com.example.leudaemialikeme.Fragment.NewsCollectFragment;
+
+public class CollectPageFragmentAdapter extends FragmentPagerAdapter {
+    private String[] channelList;
+    private FragmentManager fm;
+
+    public CollectPageFragmentAdapter(FragmentManager fm, String[] channelList) {
+        super(fm);
+        this.channelList = channelList;
+        this.fm=fm;
+    }
+    @Override
+    public Fragment getItem(int idx) {
+        String collectCategoryTitle = channelList[idx];
+        if(collectCategoryTitle.equals("        资讯      "))
+        {
+            return NewsCollectFragment.newInstance(collectCategoryTitle);
+        }
+        else {
+            return AnswerCollectFragment.newInstance(collectCategoryTitle);
+        }
+    }
+    @Override
+    public int getCount() {
+        return channelList.length;
+    } }

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Attention.java

@@ -0,0 +1,40 @@
+package com.example.leudaemialikeme;
+
+import java.io.Serializable;
+
+public class Attention implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private int attentionIconId;
+    private String attentionTitle;
+    private String attentionInfo;
+
+    public Attention(int attentionIconId,String attentionTitle,String attentionInfo){
+        this.attentionIconId = attentionIconId;
+        this.attentionTitle = attentionTitle;
+        this.attentionInfo = attentionInfo;
+    }
+
+    public int getAttentionIconId() {
+        return attentionIconId;
+    }
+
+    public void setAttentionIconId(int attentionIconId) {
+        this.attentionIconId = attentionIconId;
+    }
+
+    public String getAttentionTitle() {
+        return attentionTitle;
+    }
+
+    public void setAttentionTitle(String attentionTitle) {
+        this.attentionTitle = attentionTitle;
+    }
+
+    public String getAttentionInfo() {
+        return attentionInfo;
+    }
+
+    public void setAttentionInfo(String attentionInfo) {
+        this.attentionInfo = attentionInfo;
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Collect.java

@@ -0,0 +1,72 @@
+package com.example.leudaemialikeme;
+
+import java.io.Serializable;
+
+public class Collect implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String collectTitle;
+    private int collectIconId;
+    private String collectName;
+    private String collectContent;
+    private int collectImgId;
+    private String collectRead;
+
+    public Collect(String collectTitle, int collectIconId, String collectName,
+                   String collectContent, int collectImgId, String collectRead){
+        this.collectTitle = collectTitle;
+        this.collectIconId = collectIconId;
+        this.collectName = collectName;
+        this.collectContent = collectContent;
+        this.collectRead = collectRead;
+        this.collectImgId = collectImgId;
+    }
+
+    public String getCollectTitle() {
+        return collectTitle;
+    }
+
+    public void setCollectTitle(String collectTitle) {
+        this.collectTitle = collectTitle;
+    }
+
+    public int getCollectIconId() {
+        return collectIconId;
+    }
+
+    public void setCollectIconId(int collectIconId) {
+        this.collectIconId = collectIconId;
+    }
+
+    public String getCollectName() {
+        return collectName;
+    }
+
+    public void setCollectName(String collectName) {
+        this.collectName = collectName;
+    }
+
+    public String getCollectContent() {
+        return collectContent;
+    }
+
+    public void setCollectContent(String collectContent) {
+        this.collectContent = collectContent;
+    }
+
+    public int getCollectImgId() {
+        return collectImgId;
+    }
+
+    public void setCollectImgId(int collectImgId) {
+        this.collectImgId = collectImgId;
+    }
+
+    public String getCollectRead() {
+        return collectRead;
+    }
+
+    public void setCollectRead(String collectRead) {
+        this.collectRead = collectRead;
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/AnswerCollectFragment.java

@@ -0,0 +1,109 @@
+package com.example.leudaemialikeme.Fragment;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.leudaemialikeme.Adapter.CollectAdapter;
+import com.example.leudaemialikeme.Collect;
+import com.example.leudaemialikeme.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * to handle interaction events.
+ * Use the {@link AnswerCollectFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class AnswerCollectFragment extends Fragment {
+    private static final String ARG_CATEGORY_TITLE = "category_title";
+    private String collectCategoryTitle = "Default";
+    private List<Collect> collectList = new ArrayList<>();
+    private SwipeRefreshLayout mSwipeRefreshLayout;
+
+    public AnswerCollectFragment() {
+        // Required empty public constructor
+    }
+
+    public static AnswerCollectFragment newInstance(String collectCategoryTitle) {
+        Bundle args = new Bundle();
+        args.putString(ARG_CATEGORY_TITLE, collectCategoryTitle);
+        AnswerCollectFragment fragment = new AnswerCollectFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        try {
+            collectCategoryTitle = (String) getArguments().getString(ARG_CATEGORY_TITLE);
+        }catch (java.lang.NullPointerException e)
+        {
+            System.out.println("TestFragment getArg error!");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_answer_collect, container, false);
+        getData();//获得数据
+        RecyclerView recycleView = (RecyclerView) view.findViewById(R.id.APNList);//获得视图
+        LinearLayoutManager layoutManager;
+        layoutManager = new LinearLayoutManager(getActivity());
+        recycleView.setLayoutManager(layoutManager);//建立线性布局
+        final CollectAdapter adapter = new CollectAdapter(collectList);//创建适配器
+        recycleView.setItemAnimator(new DefaultItemAnimator());//设置动画效果
+        recycleView.setAdapter(adapter);
+        mSwipeRefreshLayout = view.findViewById(R.id.refresh_layout);
+//        mTextView = view.findViewById(R.id.tv_pull_down_refresh);
+        handleDownPullUpdate();
+
+        return view;
+    }
+
+    private void handleDownPullUpdate() {
+        mSwipeRefreshLayout.setEnabled(true);
+        mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent,R.color.colorPrimary,R.color.light_grey);
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                //不再显示提示正在刷新和刷新成功
+//                mTextView.setText("正在刷新...");
+                //被刷新时的操作
+                //更新UI
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        //更新成功后设置UI，停止更新
+//                        mTextView.setText("刷新成功！！！");
+                        mSwipeRefreshLayout.setRefreshing(false);
+                    }
+                },3000);
+            }
+        });
+    }
+
+    private void getData() {
+        Collect collect1 = new Collect("临时的测算", R.mipmap.img_my_person, "病因很重要", "加油加油"
+                , R.mipmap.img_search, "12浏览");
+        collectList.add(collect1);
+        Collect collect2 = new Collect("临时的测算", R.mipmap.img_my_person, "病因很重要", "加油加油"
+                , R.mipmap.img_search, "12浏览");
+        collectList.add(collect2);
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java

@@ -0,0 +1,128 @@
+package com.example.leudaemialikeme.Fragment;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import com.example.leudaemialikeme.Adapter.CollectPageFragmentAdapter;
+import com.example.leudaemialikeme.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * to handle interaction events.
+ * create an instance of this fragment.
+ */
+public class CollectFragment extends Fragment implements ViewPager.OnPageChangeListener{
+    private static final String ARG_CHANNEL_LIST = "channel_list";
+    private View view=null; // 碎片的布局实例
+    private ViewPager viewPager; //内导航的碎片的容器
+    private RadioGroup rgChannelCollect=null; // 内导航由单选按钮组构成
+    private HorizontalScrollView hvChannelCollect=null; //单选按钮组可滚动动
+    private String[] channelList = {"        资讯      ","      回答与文章       ",
+           }; //默认的内导航栏目
+    private CollectPageFragmentAdapter adapter; //viewPager 的适配器
+    private TextView Name;
+    private String title;
+
+    public CollectFragment() {
+        // Required empty public constructor
+    }
+
+    public CollectFragment(String title){
+        this.title = title;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        if(view==null){
+            view=inflater.inflate(R.layout.fragment_collect, container, false);
+            viewPager=(ViewPager)view.findViewById(R.id.vpNewsListCollect);
+            initViewPager(); //设置 ViewPager
+
+            rgChannelCollect=(RadioGroup)view.findViewById(R.id.rgChannelCollect);
+            hvChannelCollect=(HorizontalScrollView)view.findViewById(R.id.hvChannelCollect);
+            initTab(inflater);
+
+            Name = (TextView)view.findViewById(R.id.Name);
+            Name.setText(title);
+            rgChannelCollect.setOnCheckedChangeListener(
+                    new RadioGroup.OnCheckedChangeListener() {
+                        @Override
+                        public void onCheckedChanged(RadioGroup group, int checkedId) {
+                            viewPager.setCurrentItem(checkedId);
+                        }
+                    }
+            );
+        }
+        return view;
+    }
+
+    private void initTab(LayoutInflater inflater) {//初始化上面的
+        for(int i=0;i<channelList.length;i++){
+            RadioButton rb=(RadioButton)inflater.inflate(R.layout.invitation_tab_rb,null);
+            rb.setId(i);
+            rb.setText(channelList[i]);
+            RadioGroup.LayoutParams params = new
+                    RadioGroup.LayoutParams(RadioGroup.LayoutParams.WRAP_CONTENT,
+                    RadioGroup.LayoutParams.WRAP_CONTENT);
+
+            rgChannelCollect.addView(rb,params);
+        }
+        rgChannelCollect.check(0);
+    }
+
+    private void initViewPager() { //初始化ViewPager
+        FragmentManager fragmentManager = super.getActivity().getSupportFragmentManager();
+        // adapter=new MessagePageFragmentAdapter(fragmentManager, channelList);
+        adapter=new CollectPageFragmentAdapter(fragmentManager, channelList);
+//参数 channelList 将被适配器用来在动态切换碎片的时候实时创建碎片 //设置 ViewPager 的适配器
+        viewPager.setAdapter(adapter);
+        viewPager.setOffscreenPageLimit(2);
+        //设置显示第 1 个碎片
+        viewPager.setCurrentItem(0);//这里设置显示第一个碎片
+        //设置 ViewPager 的切换监听
+        viewPager.addOnPageChangeListener(this);
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        setTab(position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+    private void setTab(int idx){
+        RadioButton rb=(RadioButton)rgChannelCollect.getChildAt(idx);
+        rb.setChecked(true);
+        int left=rb.getLeft();
+        int width=rb.getMeasuredWidth();
+        DisplayMetrics metrics=new DisplayMetrics();
+        super.getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        int screenWidth=metrics.widthPixels;
+        // int len=left+width/2-screenWidth/2;
+        int len=left+width/2-screenWidth/2;
+        hvChannelCollect.smoothScrollTo(len,0);
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java

@@ -9,11 +9,15 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.example.leudaemialikeme.Activity.APNActivity;
 import com.example.leudaemialikeme.Activity.AboutActivity;
+import com.example.leudaemialikeme.Activity.AttentionActivity;
+import com.example.leudaemialikeme.Activity.CollectActivity;
 import com.example.leudaemialikeme.Activity.ConcernedProblemActivity;
 import com.example.leudaemialikeme.Activity.EventActivity;
+import com.example.leudaemialikeme.Activity.HistoryActivity;
 import com.example.leudaemialikeme.Activity.MdctRmdActivity;
 import com.example.leudaemialikeme.Activity.MyQuestionActivity;
 import com.example.leudaemialikeme.Activity.SafetyActivity;
@@ -85,11 +89,13 @@ public class MyFragment extends Fragment {
         LinearLayout myQuestionLinear = view.findViewById(R.id.myQuestion);
         LinearLayout aboutUS = view.findViewById(R.id.aboutUS);
         LinearLayout safety = view.findViewById(R.id.safety);
+        LinearLayout collect = view.findViewById(R.id.collect);
+        LinearLayout history = view.findViewById(R.id.history);
         //三个TextView 回答，帖子，赞同
         TextView answer = view.findViewById(R.id.my_answer);
         TextView invitation = view.findViewById(R.id.my_invitation);
         TextView consent = view.findViewById(R.id.my_consent);
-
+        TextView attention = view.findViewById(R.id.attention);
         //设置文本点击之后的跳转
         answer.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -112,7 +118,13 @@ public class MyFragment extends Fragment {
                 startActivity(intent);
             }
         });
-
+        attention.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getContext(), AttentionActivity.class);
+                startActivity(intent);
+            }
+        });
        //服药提醒的跳转
        remindLinear.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -158,5 +170,20 @@ public class MyFragment extends Fragment {
                 startActivity(intent);
             }
         });
+        collect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getContext(), CollectActivity.class);
+                startActivity(intent);
+            }
+        });
+        history.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getContext(), HistoryActivity.class);
+                startActivity(intent);
+            }
+        });
+
     }
 }

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/NewsCollectFragment.java

@@ -0,0 +1,111 @@
+package com.example.leudaemialikeme.Fragment;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.leudaemialikeme.Adapter.CollectAdapter;
+import com.example.leudaemialikeme.Collect;
+import com.example.leudaemialikeme.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * to handle interaction events.
+ * Use the {@link NewsCollectFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class NewsCollectFragment extends Fragment {
+    private static final String ARG_CATEGORY_TITLE = "category_title";
+    private String collectCategoryTitle = "Default";
+    private List<Collect> collectList = new ArrayList<>();
+    private SwipeRefreshLayout mSwipeRefreshLayout;
+
+    public NewsCollectFragment() {
+        // Required empty public constructor
+    }
+
+    public static NewsCollectFragment newInstance(String collectCategoryTitle) {
+        Bundle args = new Bundle();
+        args.putString(ARG_CATEGORY_TITLE, collectCategoryTitle);
+        NewsCollectFragment fragment = new NewsCollectFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        try {
+            collectCategoryTitle = (String) getArguments().getString(ARG_CATEGORY_TITLE);
+        }catch (java.lang.NullPointerException e)
+        {
+            System.out.println("TestFragment getArg error!");
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.fragment_news_collect, container, false);
+        getData();//获得数据
+        RecyclerView recycleView = (RecyclerView) view.findViewById(R.id.APNList);//获得视图
+        LinearLayoutManager layoutManager;
+        layoutManager = new LinearLayoutManager(getActivity());
+        recycleView.setLayoutManager(layoutManager);//建立线性布局
+        final CollectAdapter adapter = new CollectAdapter(collectList);//创建适配器
+        recycleView.setItemAnimator(new DefaultItemAnimator());//设置动画效果
+        recycleView.setAdapter(adapter);
+        mSwipeRefreshLayout = view.findViewById(R.id.refresh_layout);
+//        mTextView = view.findViewById(R.id.tv_pull_down_refresh);
+        handleDownPullUpdate();
+
+        return view;
+    }
+
+    private void handleDownPullUpdate() {
+        mSwipeRefreshLayout.setEnabled(true);
+        mSwipeRefreshLayout.setColorSchemeResources(R.color.colorAccent,R.color.colorPrimary,R.color.light_grey);
+        mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                //不再显示提示正在刷新和刷新成功
+//                mTextView.setText("正在刷新...");
+                //被刷新时的操作
+                //更新UI
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        //更新成功后设置UI，停止更新
+//                        mTextView.setText("刷新成功！！！");
+                        mSwipeRefreshLayout.setRefreshing(false);
+                    }
+                },3000);
+            }
+        });
+    }
+
+    private void getData(){
+        Collect collect1 = new Collect("临时测算",R.mipmap.img_my_person,"病因很重要","加油加油"
+        ,R.mipmap.img_search,"12浏览");
+        collectList.add(collect1);
+        Collect collect2 = new Collect("临时测算",R.mipmap.img_my_person,"病因很重要","加油加油"
+                ,R.mipmap.img_search,"12浏览");
+        collectList.add(collect2);
+    }
+}

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_attention.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    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"
+    android:orientation="vertical"
+    tools:context="com.example.leudaemialikeme.Activity.AttentionActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_margin="15dp"
+            android:src="@mipmap/img_go_answer_return"
+            />
+
+        <TextView
+            android:id="@+id/text_attention"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="3"
+            android:textSize="18dp"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:text="关注" />
+
+        <TextView
+            android:id="@+id/find"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textSize="18dp"
+            android:gravity="center"
+            android:layout_gravity="center"
+            android:text="发现用户" />
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@color/light_grey"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/attentionList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_collect.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
+    android:orientation="vertical"
     tools:context="com.example.leudaemialikeme.Activity.CollectActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/collect_frag_layout">
+    </FrameLayout>
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_history.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical"
+    tools:context="com.example.leudaemialikeme.Activity.HistoryActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/collect_frag_layout">
+    </FrameLayout>
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/attention_item.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="10dp"
+        android:layout_weight="1"
+        android:id="@+id/attentionIcon"
+        />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:layout_margin="10dp"
+        android:layout_weight="4"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/attentionTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:textSize="16dp" />
+
+        <TextView
+            android:id="@+id/attentionInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+             />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_weight="1"
+        android:layout_margin="20dp"
+        android:background="@drawable/shape_round_corner"
+        android:text="已关注" />
+
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/collect_item.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@drawable/shape_round_corner"
+    android:layout_width="match_parent"
+    android:layout_margin="10dp"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/collectTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="60dp"
+            android:layout_weight="3"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="10dp"
+                    android:id="@+id/collectIcon"
+                    />
+
+                <TextView
+                    android:id="@+id/collectName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textSize="14dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_gravity="center"
+                    />
+            </LinearLayout>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="16dp"
+                android:id="@+id/collectContent"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+
+                />
+        </LinearLayout>
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_weight="1"
+            android:id="@+id/collectImg"
+            />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/collectRead"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginBottom="10dp"
+        />
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_answer_collect.xml

@@ -0,0 +1,23 @@
+<FrameLayout 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"
+    tools:context="com.example.leudaemialikeme.Fragment.AnswerCollectFragment">
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/APNList"
+            android:background="@color/light_grey"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</FrameLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_collect.xml

@@ -0,0 +1,72 @@
+<LinearLayout 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"
+    android:orientation="vertical"
+    tools:context="com.example.leudaemialikeme.Fragment.CollectFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="265dp"
+            android:layout_height="match_parent"
+            android:layout_weight="20">
+            <ImageView
+                android:id="@+id/imageButton2"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_margin="10dp"
+                android:src="@mipmap/img_go_answer_return" />
+
+            <TextView
+                android:id="@+id/Name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:layout_weight="20"
+                android:gravity="center"
+                android:textSize="20dp" />
+
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp">
+            <!-- 导航标签，包含一个单选按钮组-->
+            <!-- 任意数量不能显示时的缩略符号 -->
+            <HorizontalScrollView
+                android:id="@+id/hvChannelCollect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/ivShowChannel"
+                android:scrollbars="none">
+
+                <RadioGroup
+                    android:id="@+id/rgChannelCollect"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal" />
+            </HorizontalScrollView>
+        </RelativeLayout>
+    </LinearLayout>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/vpNewsListCollect"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        />
+
+</LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_my.xml

@@ -95,7 +95,7 @@
                     android:textSize="20dp" />
 
                 <TextView
-                    android:id="@+id/textView16"
+                    android:id="@+id/attention"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
@@ -115,6 +115,7 @@
                     android:layout_height="60dp"
                     android:layout_marginTop="5dp"
                     android:layout_weight="1"
+                    android:id="@+id/collect"
                     android:orientation="vertical">
 
                     <ImageView
@@ -141,6 +142,7 @@
                     android:layout_height="60dp"
                     android:layout_marginTop="5dp"
                     android:layout_weight="1"
+                    android:id="@+id/history"
                     android:orientation="vertical">
 
                     <ImageView

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_news_collect.xml

@@ -0,0 +1,24 @@
+<FrameLayout
+    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"
+    tools:context="com.example.leudaemialikeme.Fragment.NewsCollectFragment">
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/APNList"
+            android:background="@color/light_grey"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</FrameLayout>