From d0a81d9ab446e7922c14829dd4eb88ff07a9f8b9 Mon Sep 17 00:00:00 2001
From: Toyga <330282372@qq.com>
Date: Sun, 9 Jan 2022 23:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=89=88=E5=9D=97=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8A=A8=E4=BD=9C=E6=B7=BB=E5=8A=A0=EF=BC=8C=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86UI=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Activity/BaseActivity.java                |  2 +-
 .../Activity/ConcernedProblemActivity.java    | 18 +++++++++------
 .../Adapter/QuestionAdapter.java              | 23 ++++++++++++++-----
 .../Fragment/CollectFragment.java             |  9 ++++++++
 .../Fragment/HistoryFragment.java             | 20 ++++++++++------
 .../res/layout/activity_concerned_problem.xml | 11 ++++-----
 .../main/res/layout/activity_my_question.xml  |  6 ++---
 .../src/main/res/layout/fragment_collect.xml  | 10 ++++----
 .../src/main/res/layout/fragment_history.xml  | 10 ++++----
 .../app/src/main/res/layout/question_item.xml | 13 ++++++++++-
 10 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
index dbf0c50..a224ed2 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java
@@ -31,7 +31,7 @@ public class BaseActivity extends AppCompatActivity {
     public static Owner owner;
 
     //服务器链接
-    public static String SERVER_IP = "192.168.186.23";
+    public static String SERVER_IP = "192.168.43.206";
 
 //    static {
 //        try {
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ConcernedProblemActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ConcernedProblemActivity.java
index 1dc2245..5539837 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ConcernedProblemActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ConcernedProblemActivity.java
@@ -1,6 +1,8 @@
 package com.example.leudaemialikeme.Activity;
 
 import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -9,7 +11,6 @@ import com.example.leudaemialikeme.Adapter.QuestionAdapter;
 import com.example.leudaemialikeme.Model.Question;
 import com.example.leudaemialikeme.R;
 import com.example.leudaemialikeme.Utils.OkHttpUtil;
-import com.example.leudaemialikeme.Utils.TimeUtil;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
@@ -33,19 +34,22 @@ public class ConcernedProblemActivity extends BaseActivity {
         setContentView(R.layout.activity_concerned_problem);
         getData();//获得数据
         RecyclerView recycleView = (RecyclerView) findViewById(R.id.questionList);//获得视图
+        ImageView back_concerned = findViewById(R.id.back_concerned);
         LinearLayoutManager layoutManager;
         layoutManager = new LinearLayoutManager(this);
         recycleView.setLayoutManager(layoutManager);//建立线性布局
-        QuestionAdapter adapter = new QuestionAdapter(mData);//创建适配器
+        QuestionAdapter adapter = new QuestionAdapter(mData, ConcernedProblemActivity.this);//创建适配器
         recycleView.setAdapter(adapter);//将视图与适配器连接起来
+
+        back_concerned.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     private void getData() {
-//        Question q1 = new Question("问题标题","白血病的早期症状和前兆有什么",24,TimeUtil.stringToTime("2022-01-07 12:12:12"));
-//        mData.add(q1);
-//        Question q2 = new Question("问题标题","白血病是什么原因引起的",112, TimeUtil.stringToTime("2022-01-07 12:12:12"));
-//        mData.add(q2);
-
         new Thread(new Runnable() {
             @Override
             public void run() {
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/QuestionAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/QuestionAdapter.java
index 2128369..d4646a1 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/QuestionAdapter.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/QuestionAdapter.java
@@ -1,14 +1,16 @@
 package com.example.leudaemialikeme.Adapter;
 
+import android.content.Context;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.example.leudaemialikeme.Activity.QuestionDetailActivity;
 import com.example.leudaemialikeme.Model.Question;
 import com.example.leudaemialikeme.R;
 import com.example.leudaemialikeme.Utils.TimeUtil;
@@ -17,26 +19,26 @@ import java.util.List;
 
 public class QuestionAdapter extends RecyclerView.Adapter<QuestionAdapter.ViewHolder>{
     private List<Question> questionList;
-
+    private Context context;
     //重写构造方法
-    public QuestionAdapter(List<Question> questionList){
+    public QuestionAdapter(List<Question> questionList, Context context){
         this.questionList = questionList;
+        this.context = context;
     }
     public int getItemCount(){
         return questionList.size();
     }
     //内部类
     static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView questiontitle,questionInfo,questionRead,questionTime;
-        LinearLayout questionMore;
+        private TextView questionId, questiontitle,questionInfo,questionRead,questionTime;
 
         public ViewHolder(@NonNull View itemView){
             super(itemView);
+            this.questionId = itemView.findViewById(R.id.question_id);
             this.questiontitle = itemView.findViewById(R.id.questionTitle);
             this.questionInfo = (TextView)itemView.findViewById(R.id.questionInfo);
             this.questionRead = (TextView)itemView.findViewById(R.id.questionRead);
             this.questionTime = (TextView)itemView.findViewById(R.id.questionTime);
-            this.questionMore = (LinearLayout) itemView.findViewById(R.id.questionMore);
         }
     }
     //重写 onCreateViewHolder()方法
@@ -44,12 +46,21 @@ public class QuestionAdapter extends RecyclerView.Adapter<QuestionAdapter.ViewHo
     public QuestionAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view= LayoutInflater.from(parent.getContext()).inflate(R.layout.question_item,parent,false);
         QuestionAdapter.ViewHolder holder=new QuestionAdapter.ViewHolder(view);
+        holder.itemView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(context, QuestionDetailActivity.class);
+                intent.putExtra("qid", Integer.parseInt(holder.questionId.getText().toString()));
+                context.startActivity(intent);
+            }
+        });
         return holder;
     }
     //重写onBindViewHolder()方法
     @Override
     public void onBindViewHolder(@NonNull QuestionAdapter.ViewHolder holder, int position){
         Question question = questionList.get(position);
+        holder.questionId.setText(String.valueOf(question.getQid()));
         holder.questiontitle.setText(question.getQtittle());
         holder.questionInfo.setText(question.getQcontent());
         holder.questionRead.setText(String.valueOf(question.getQbrowseNum()));
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java
index 2639c0b..9e5d35c 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
@@ -34,6 +35,7 @@ public class CollectFragment extends Fragment implements ViewPager.OnPageChangeL
     private CollectPageFragmentAdapter adapter; //viewPager 的适配器
     private TextView Name;
     private String title;
+    private ImageView back_collect;
 
     public CollectFragment() {
         // Required empty public constructor
@@ -48,6 +50,7 @@ public class CollectFragment extends Fragment implements ViewPager.OnPageChangeL
                              Bundle savedInstanceState) {
         if(view==null){
             view=inflater.inflate(R.layout.fragment_collect, container, false);
+            back_collect = view.findViewById(R.id.back_collect);
             viewPager=(ViewPager)view.findViewById(R.id.vpNewsListCollect);
             initViewPager(); //设置 ViewPager
 
@@ -65,6 +68,12 @@ public class CollectFragment extends Fragment implements ViewPager.OnPageChangeL
                         }
                     }
             );
+            back_collect.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    getActivity().finish();
+                }
+            });
         }
         return view;
     }
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java
index 7ae5b82..28ae30a 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java
@@ -1,22 +1,20 @@
 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.ImageView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
 import com.example.leudaemialikeme.Adapter.HistoryPageFragmentAdapter;
 import com.example.leudaemialikeme.R;
 
@@ -33,6 +31,7 @@ public class HistoryFragment extends Fragment implements ViewPager.OnPageChangeL
     private HistoryPageFragmentAdapter adapter; //viewPager 的适配器
     private TextView Name;
     private String title;
+    private ImageView back_history;
 
     public HistoryFragment() {
         // Required empty public constructor
@@ -47,6 +46,7 @@ public class HistoryFragment extends Fragment implements ViewPager.OnPageChangeL
                              Bundle savedInstanceState) {
         if(view==null){
             view=inflater.inflate(R.layout.fragment_history, container, false);
+            back_history = view.findViewById(R.id.back_history);
             viewPager=(ViewPager)view.findViewById(R.id.vpNewsListHistory);
             initViewPager(); //设置 ViewPager
 
@@ -64,6 +64,12 @@ public class HistoryFragment extends Fragment implements ViewPager.OnPageChangeL
                         }
                     }
             );
+            back_history.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    getActivity().finish();
+                }
+            });
         }
         return view;
     }
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_concerned_problem.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_concerned_problem.xml
index d5c8528..37111ed 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_concerned_problem.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_concerned_problem.xml
@@ -9,24 +9,23 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_height="50dp"
         android:orientation="horizontal">
 
         <ImageView
+            android:id="@+id/back_concerned"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_margin="15dp"
-            android:src="@mipmap/img_go_answer_return"
+            android:src="@mipmap/left_back"
             />
 
         <TextView
             android:id="@+id/text_concern_question"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="4"
-            android:textSize="18dp"
-            android:gravity="center"
+            android:layout_marginLeft="100dp"
+            android:textSize="20dp"
             android:layout_gravity="center"
             android:text="关注的问题" />
     </LinearLayout>
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_question.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_question.xml
index 49d0626..626d49d 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_question.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_my_question.xml
@@ -9,7 +9,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -24,8 +24,8 @@
             android:id="@+id/text_concern_question"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="100dp"
-            android:textSize="18dp"
+            android:layout_marginLeft="110dp"
+            android:textSize="20dp"
             android:layout_gravity="center"
             android:text="我的提问" />
     </LinearLayout>
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_collect.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_collect.xml
index 3ff0f7a..4c42782 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_collect.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_collect.xml
@@ -19,16 +19,16 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_margin="10dp"
-                android:src="@mipmap/img_go_answer_return" />
+                android:src="@mipmap/left_back" />
 
             <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" />
+                android:layout_marginLeft="110dp"
+                android:layout_gravity="center"
+                android:textSize="20dp"
+                android:text="我的收藏"/>
 
 
         </LinearLayout>
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_history.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_history.xml
index 596a71a..cc3791b 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_history.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_history.xml
@@ -20,16 +20,16 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_margin="10dp"
-                android:src="@mipmap/img_go_answer_return" />
+                android:src="@mipmap/left_back" />
 
             <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" />
+                android:layout_marginLeft="110dp"
+                android:layout_gravity="center"
+                android:textSize="20dp"
+                android:text="浏览历史"/>
 
 
         </LinearLayout>
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/question_item.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/question_item.xml
index 630dc78..45614bc 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/question_item.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/question_item.xml
@@ -12,6 +12,12 @@
     android:orientation="vertical"
     android:padding="11dp">
 
+    <TextView
+        android:id="@+id/question_id"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:text="" />
+
     <TextView
         android:id="@+id/questionTitle"
         android:layout_width="match_parent"
@@ -38,11 +44,16 @@
             android:id="@+id/questionRead"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:textSize="11dp"
             android:layout_marginLeft="5dp"
              />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="浏览" />
+
         <TextView
             android:id="@+id/questionTime"
             android:layout_width="wrap_content"