diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml index 521df5c..cba3f38 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml @@ -107,9 +107,6 @@ - diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BlogDetailActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BlogDetailActivity.java index 1190a8c..570dc1d 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BlogDetailActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BlogDetailActivity.java @@ -48,8 +48,9 @@ public class BlogDetailActivity extends BaseActivity { TextView comComView; ImageView detail_to; ImageView search; + ImageView img_person; ImageView bColImage; - Blog blog=new Blog(); + Blog blog = new Blog(); User author; List commentList=new ArrayList<>(); CommentAdapter commentAdapter=new CommentAdapter(); @@ -131,7 +132,6 @@ public class BlogDetailActivity extends BaseActivity { String url = BaseActivity.SERVER_URL + "/main-servlet?action=getUserById"; Map paramMap = new HashMap(); paramMap.put("uid", String.valueOf(blog.getUid())); - Log.e("设置帖子的作者uid",uid); OkHttpUtil.asyPost(url, paramMap, new Callback() { @Override public void onFailure(Call call, IOException e) { @@ -145,11 +145,8 @@ public class BlogDetailActivity extends BaseActivity { @Override public void run() { Gson gson = new Gson(); // 使用 gson 库解析 JSON 数据 -// 创建一个 TypeToken 的匿名子类对象，并调用对象的 getType()方法 -// Log.e("Blog's Str",jsonStr); Type listType = new TypeToken() {}.getType(); author = gson.fromJson(jsonStr, listType); -// bAuthorNameView=findViewById(R.id.author); bAuthorNameView.setText(author.getUsername()); } }); @@ -163,6 +160,7 @@ public class BlogDetailActivity extends BaseActivity { } private void initView(){ + img_person = findViewById(R.id.img_person); bTitleView=findViewById(R.id.detail_theme); bAuthorNameView=findViewById(R.id.author); bContentView=findViewById(R.id.bContent); @@ -180,7 +178,6 @@ public class BlogDetailActivity extends BaseActivity { private void setData(){ setBlogAuthorName(String.valueOf(blog.getUid())); -// setBColNumViewImage(blog.getBid(),BaseActivity.owner.getNetId()); 需要传入登录用户的id setBColNumViewImage(blog.getBid(),BaseActivity.owner.getNetId(),2); bViewNumView.setText(String.valueOf(blog.getBbrowse())); bTitleView.setText(blog.getBtittle()); @@ -211,12 +208,21 @@ public class BlogDetailActivity extends BaseActivity { } } }); - System.out.println("更新collect表成功"); } }).start(); } private void initClick(){ + img_person.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(BlogDetailActivity.this, ChatActivity.class); + intent.putExtra("friendNetId", blog.getUid()); + intent.putExtra("friendName", bAuthorNameView.getText().toString()); + startActivity(intent); + } + }); + detail_to.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View v) { diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ChatActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ChatActivity.java index 1057a32..99ab608 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ChatActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/ChatActivity.java @@ -106,6 +106,8 @@ public class ChatActivity extends BaseActivity { addMsg(message,1); edit_content.setText(""); wsClient.send(gson.toJson(jsonMap)); + if(friendDao.findByNetId(friendNetId, owner.getNetId())==null) + friendDao.insert(currentFriend); } } }); @@ -121,12 +123,13 @@ public class ChatActivity extends BaseActivity { //从intent中取出currentNetId并查出对象 Intent intent = getIntent(); friendNetId = intent.getIntExtra("friendNetId", -1); - Log.d("ChatActivity","当前聊天对象ID："+friendNetId); - currentFriend = friendDao.findByNetId(friendNetId, owner.getNetId()); - Log.d("ChatActivity","当前聊天对象："+currentFriend); - //从数据库中查找聊天记录-默认最近20条记录 + if(friendDao.findByNetId(friendNetId, owner.getNetId())!=null) + currentFriend = friendDao.findByNetId(friendNetId, owner.getNetId()); + else{ + String friendName = intent.getStringExtra("friendName"); + currentFriend = new Friend(friendNetId, friendName, owner.getNetId()); + } messageList = messageDao.findNearlyMessage(friendNetId, owner.getNetId()); - //组装成MessageItemViw msgItemView = new MessageItemView(currentFriend, owner, messageList); } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/GoAnswerActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/GoAnswerActivity.java deleted file mode 100644 index 83ca6c4..0000000 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/GoAnswerActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.leudaemialikeme.Activity; - -import android.os.Bundle; - -import com.example.leudaemialikeme.R; - -public class GoAnswerActivity extends BaseActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_go_answer); - } -} \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java index 317ae51..3899978 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java @@ -5,9 +5,11 @@ import android.os.Bundle; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; +import android.widget.TextView; import android.widget.Toast; import com.example.leudaemialikeme.Fragment.InfoFragment; @@ -74,8 +76,16 @@ public class InfoActivity extends BaseActivity { .commit(); - LinearLayout search = findViewById(R.id.search_linear); - search.setOnClickListener(new View.OnClickListener() { + TextView info_input = findViewById(R.id.info_input); + info_input.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(InfoActivity.this, NewsSearchActivity.class); + startActivity(intent); + } + }); + LinearLayout search_news = findViewById(R.id.search_linear); + search_news.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent intent = new Intent(InfoActivity.this, NewsSearchActivity.class); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/NewsSearchResultActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/NewsSearchResultActivity.java index 78e4b6d..259d626 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/NewsSearchResultActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/NewsSearchResultActivity.java @@ -86,13 +86,6 @@ public class NewsSearchResultActivity extends BaseActivity { public void onFailure(Call call, IOException e) { } - -// @Override -// public void onResponse(Call call, Response response) throws IOException { -// -// } -// }); - @Override public void onResponse(Call call, Response response) throws IOException { Gson gson = new Gson(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/BlogAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/BlogAdapter.java index 34d630c..0b98079 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/BlogAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/BlogAdapter.java @@ -1,7 +1,6 @@ package com.example.leudaemialikeme.Adapter; import android.content.Intent; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -128,7 +127,6 @@ public class BlogAdapter extends RecyclerView.Adapter { private void UpdateBrowseNum(String bid){ final String url = BaseActivity.SERVER_URL + "/browse-servlet?action=UpdateBrowse"; final Map paramMap = new HashMap(); - Log.e("获取浏览量的返回结果","浏览量"); paramMap.put("id", bid); //登录后需要将uid换为这部分 @@ -140,16 +138,7 @@ public class BlogAdapter extends RecyclerView.Adapter { new Thread(new Runnable() { @Override public void run() { - Log.e("获取浏览量的返回结果：uid",String.valueOf(1)); String jsonStr = OkHttpUtil.synPost(url,paramMap); - Log.e("浏览量的返回结果",jsonStr); -// blog.setBbrowse(blog.getBbrowse()+1); -// ((AppCompatActivity) context).runOnUiThread(new Runnable(){ -// @Override -// public void run() { -//// holder.visNum.setText(String.valueOf(blog.getBbrowse())); -// } -// }); } }).start(); } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CommentAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CommentAdapter.java index e3bef6c..37087d3 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CommentAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/CommentAdapter.java @@ -1,6 +1,5 @@ package com.example.leudaemialikeme.Adapter; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommentFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommentFragment.java deleted file mode 100644 index e4a2546..0000000 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommentFragment.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.example.leudaemialikeme.Fragment; - -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.example.leudaemialikeme.R; - -/** - * A simple {@link Fragment} subclass. - * Activities that contain this fragment must implement the - * {@link PrivateMsgFragment.OnFragmentInteractionListener} interface - * to handle interaction events. - * Use the {@link PrivateMsgFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class CommentFragment extends Fragment implements ViewPager.OnPageChangeListener { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - private View view; - - private OnFragmentInteractionListener mListener; - - public CommentFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment PrivateMsgFragment. - */ - // TODO: Rename and change types and number of parameters - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - // return inflater.inflate(R.layout.fragment_private_msg2, container, false); - super.onCreate(savedInstanceState); - View view = inflater.inflate(R.layout.fragment_private_msg,container,false); - return view; - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof OnFragmentInteractionListener) { - mListener = (OnFragmentInteractionListener) context; - } else { - throw new RuntimeException(context.toString() - + " must implement OnFragmentInteractionListener"); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { - - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - - /** - * This interface must be implemented by activities that contain this - * fragment to allow an interaction in this fragment to be communicated - * to the activity and potentially other fragments contained in that - * activity. - *

- * See the Android Training lesson Communicating with Other Fragments for more information. - */ - public interface OnFragmentInteractionListener { - // TODO: Update argument type and name - void onFragmentInteraction(Uri uri); - } -} diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java index ef78696..9dbb8d0 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java @@ -21,7 +21,6 @@ import androidx.fragment.app.FragmentManager; import androidx.viewpager.widget.ViewPager; import com.example.leudaemialikeme.Activity.BlogSearchActivity; -import com.example.leudaemialikeme.Activity.GoAnswerActivity; import com.example.leudaemialikeme.Activity.SendInvitationActivity; import com.example.leudaemialikeme.Activity.SendQuestionActivity; import com.example.leudaemialikeme.Adapter.InvitationPageFragmentAdapter; @@ -44,7 +43,6 @@ public class CommunityFragment extends Fragment implements ViewPager.OnPageChang private ImageButton tab_add; private Button bar_send_invitation; private Button bar_send_question; - private Button bar_answer; private LinearLayout blog_search; static List> resourceList=new ArrayList<>(); static List blogList=new ArrayList<>(); @@ -99,7 +97,6 @@ public class CommunityFragment extends Fragment implements ViewPager.OnPageChang }); bar_send_invitation = (Button)popupWindow_view.findViewById(R.id.bar_send_invitation); bar_send_question = (Button)popupWindow_view.findViewById(R.id.bar_send_question); - bar_answer = (Button)popupWindow_view.findViewById(R.id.bar_answer); bar_send_invitation.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -114,13 +111,6 @@ public class CommunityFragment extends Fragment implements ViewPager.OnPageChang startActivity(intent); } }); - bar_answer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent=new Intent(getActivity(), GoAnswerActivity.class); - startActivity(intent); - } - }); } }); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/FansFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/FansFragment.java deleted file mode 100644 index 88874cc..0000000 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/FansFragment.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.example.leudaemialikeme.Fragment; - -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.example.leudaemialikeme.R; - -/** - * A simple {@link Fragment} subclass. - * Activities that contain this fragment must implement the - * {@link PrivateMsgFragment.OnFragmentInteractionListener} interface - * to handle interaction events. - * Use the {@link PrivateMsgFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class FansFragment extends Fragment implements ViewPager.OnPageChangeListener { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - private View view; - - private OnFragmentInteractionListener mListener; - - public FansFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment PrivateMsgFragment. - */ - // TODO: Rename and change types and number of parameters - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - // return inflater.inflate(R.layout.fragment_private_msg2, container, false); - super.onCreate(savedInstanceState); - View view = inflater.inflate(R.layout.fragment_fans,container,false); - return view; - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof OnFragmentInteractionListener) { - mListener = (OnFragmentInteractionListener) context; - } else { - throw new RuntimeException(context.toString() - + " must implement OnFragmentInteractionListener"); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { - - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - - /** - * This interface must be implemented by activities that contain this - * fragment to allow an interaction in this fragment to be communicated - * to the activity and potentially other fragments contained in that - * activity. - *

- * See the Android Training lesson Communicating with Other Fragments for more information. - */ - public interface OnFragmentInteractionListener { - // TODO: Update argument type and name - void onFragmentInteraction(Uri uri); - } -} diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java index ca8a75c..ed7bfae 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java @@ -2,7 +2,6 @@ package com.example.leudaemialikeme.Fragment; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -36,6 +35,8 @@ import okhttp3.Call; import okhttp3.Callback; import okhttp3.Response; +//import android.util.Log; + public class IndexFragment extends Fragment { @@ -204,7 +205,6 @@ public class IndexFragment extends Fragment { @Override public void onResponse(Call call, Response response) throws IOException { String jsonStr = response.body().string();//这里就调用InfoResponse响应 - Log.e("首页Info的json", jsonStr); getInfoResponse(jsonStr); } @@ -226,9 +226,6 @@ public class IndexFragment extends Fragment { }.getType(); // 把获取到的信息集合存到 newsList 中 newsLists = gson.fromJson(jsonStr, listType); - Log.e("jsonStr", jsonStr); - Log.e("object", String.valueOf(newsLists)); - Log.e("newsLists最后", String.valueOf(newsLists)); newsLists = gson.fromJson(jsonStr, listType); adapter.setRecnewsList(newsLists);//这里设置数据源 recyclerView.setAdapter(adapter); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/InvitationChannelFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/InvitationChannelFragment.java index a7f5daa..9fb86b2 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/InvitationChannelFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/InvitationChannelFragment.java @@ -2,7 +2,6 @@ package com.example.leudaemialikeme.Fragment; import android.os.Build; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -168,7 +167,6 @@ public class InvitationChannelFragment extends Fragment { @Override public void onResponse(Call call, Response response) throws IOException { String jsonStr = response.body().string(); - Log.e("帖子推荐",jsonStr); Gson gson = new Gson(); recommendBlog = gson.fromJson(jsonStr, new TypeToken>(){}.getType()); getActivity().runOnUiThread(new Runnable(){ @@ -378,7 +376,6 @@ public class InvitationChannelFragment extends Fragment { @RequiresApi(api = Build.VERSION_CODES.O) @Override public void run() { - Log.e("jsonStr", jsonStr); Gson gson = new Gson(); // 使用 gson 库解析 JSON 数据 Type listType = new TypeToken>>() { }.getType(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java index df08f27..a263559 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java @@ -26,7 +26,7 @@ public class MessageChannelFragment extends Fragment { private TextView mTitleField; private List chatList = new ArrayList(); private RecyclerView recyclerView; - + private boolean isPause = false; public MessageChannelFragment() { // Required empty public constructor } @@ -83,17 +83,7 @@ public class MessageChannelFragment extends Fragment { chatList = chatService.findChatList(BaseActivity.owner.getNetId()); Log.d("chatlist:", String.valueOf(chatList.size())); } -// @Override -// public void onResume() { -// System.out.println("-----------------------"); -// super.onResume(); -// System.out.println("-----------------------"); -// getMsgList(); -// MsgAdapter adapter = new MsgAdapter(chatList); -// System.out.println("onresume:" + recyclerView); -// recyclerView.setAdapter(adapter); -// recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); -// } + public void updateUi(){ getMsgList(); getActivity().runOnUiThread(new Runnable() { @@ -107,4 +97,22 @@ public class MessageChannelFragment extends Fragment { public String getMessageCategoryTitle(){ return messageCategoryTitle; } + + @Override + public void onPause() { + super.onPause(); + isPause = true; //记录页面已经被暂停 + } + + @Override + public void onResume() { + super.onResume(); + if (isPause) { //判断是否暂停 + isPause = false; + if (messageCategoryTitle.equals(" 私信 ")) { + getMsgList(); + updateUi(); + } + } + } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/NiceFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/NiceFragment.java deleted file mode 100644 index 68b14d0..0000000 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/NiceFragment.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.example.leudaemialikeme.Fragment; - -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.example.leudaemialikeme.R; - - -public class NiceFragment extends Fragment implements ViewPager.OnPageChangeListener { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - private View view; - - private OnFragmentInteractionListener mListener; - - public NiceFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment PrivateMsgFragment. - */ - // TODO: Rename and change types and number of parameters - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - // return inflater.inflate(R.layout.fragment_private_msg2, container, false); - super.onCreate(savedInstanceState); - View view = inflater.inflate(R.layout.fragment_nice,container,false); - return view; - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onFragmentInteraction(uri); - } - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof OnFragmentInteractionListener) { - mListener = (OnFragmentInteractionListener) context; - } else { - throw new RuntimeException(context.toString() - + " must implement OnFragmentInteractionListener"); - } - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - - } - - @Override - public void onPageSelected(int position) { - - } - - @Override - public void onPageScrollStateChanged(int state) { - - } - - /** - * This interface must be implemented by activities that contain this - * fragment to allow an interaction in this fragment to be communicated - * to the activity and potentially other fragments contained in that - * activity. - *

- * See the Android Training lesson Communicating with Other Fragments for more information. - */ - public interface OnFragmentInteractionListener { - // TODO: Update argument type and name - void onFragmentInteraction(Uri uri); - } -} diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/QuestionHistoryFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/QuestionHistoryFragment.java index 145256f..1741777 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/QuestionHistoryFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/QuestionHistoryFragment.java @@ -131,8 +131,13 @@ public class QuestionHistoryFragment extends Fragment { if (message.equals("success")) { List questionList = gson.fromJson(jsonMap.get("questionList"), new TypeToken >(){}.getType()); questionAllList = questionList; - HistoryQuestionAdapter adapter = new HistoryQuestionAdapter(questionAllList, getContext());//创建适配器 - recyclerView.setAdapter(adapter); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + HistoryQuestionAdapter adapter = new HistoryQuestionAdapter(questionAllList, getContext());//创建适配器 + recyclerView.setAdapter(adapter); + } + }); } } }; diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_blogdetail.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_blogdetail.xml index 825f87e..d20d1e8 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_blogdetail.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_blogdetail.xml @@ -57,27 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_info.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_info.xml index 927a5dd..fccf19e 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_info.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_info.xml @@ -35,14 +35,14 @@ android:layout_width="wrap_content" android:layout_height="match_parent" /> - + android:hint="资讯查询" /> diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/collect_blog_item.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/collect_blog_item.xml index a4d32dd..9376410 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/collect_blog_item.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/collect_blog_item.xml @@ -3,7 +3,7 @@ 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_width="wrap_content" android:layout_height="wrap_content"> +