diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
index 4351480..dcbc8b7 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
-
@@ -65,18 +64,9 @@
-
-
-
-
-
-
-
-
-
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 6d81a48..dc10f56 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
@@ -19,7 +19,6 @@ import com.example.leudaemialikeme.Model.Blog;
import com.example.leudaemialikeme.Model.Comment;
import com.example.leudaemialikeme.Model.User;
import com.example.leudaemialikeme.R;
-import com.example.leudaemialikeme.Utils.Data;
import com.example.leudaemialikeme.Utils.OkHttpUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -86,15 +85,7 @@ public class BlogDetailActivity extends BaseActivity {
}
- private Blog getBlogByBid(String bid){
- new Thread(new Runnable() {
- @Override
- public void run() {
- }
- }).start();
- return null;
- }
private void initComments() {
new Thread(new Runnable() {
@@ -190,7 +181,7 @@ public class BlogDetailActivity extends BaseActivity {
private void setData(){
setBlogAuthorName(String.valueOf(blog.getUid()));
// setBColNumViewImage(blog.getBid(),BaseActivity.owner.getNetId()); 需要传入登录用户的id
- setBColNumViewImage(blog.getBid(),1,2);
+ setBColNumViewImage(blog.getBid(),BaseActivity.owner.getNetId(),2);
bViewNumView.setText(String.valueOf(blog.getBbrowse()));
bTitleView.setText(blog.getBtittle());
bContentView.setText(blog.getBcontent());
@@ -246,10 +237,9 @@ public class BlogDetailActivity extends BaseActivity {
public void onClick(View v) {
String cont = comEditView.getText().toString();
-//获取已登录的用户的信息获取后的结果为user:需要把这两句改成owner获取的user对象。
- Data app= (Data) getApplication();
- User user=app.getUser();
-
+ User user=new User();
+ user.setIduser(BaseActivity.owner.getNetId());
+ user.setUsername(BaseActivity.owner.getUsername());
long timeCurrent = System.currentTimeMillis();
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
@@ -296,7 +286,7 @@ public class BlogDetailActivity extends BaseActivity {
public void onClick(View v) {
Map paramMap=new HashMap();
paramMap.put("bid",blog.getBid());
- paramMap.put("uid", 1);
+ paramMap.put("uid", BaseActivity.owner.getNetId());
paramMap.put("type",2);
String url_collect=BaseActivity.SERVER_URL+"/collect-servlet?action=InsertCollect";
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
index 2189228..3dc95d0 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
@@ -70,7 +70,7 @@ public class SendInvitationActivity extends BaseActivity {
Log.e("输入的time:", time);
Data app = (Data)getApplication();
Map paramMap = new HashMap();
- paramMap.put("uid",String.valueOf(app.getUser().getIduser()));//需要获取登录用户的id
+ paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId()));//需要获取登录用户的id
paramMap.put("btype",type);
paramMap.put("btittle",title);
paramMap.put("bcontent",detail);
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java
index 15a08de..1e9b0c9 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java
@@ -68,7 +68,7 @@ public class SendQuestionActivity extends BaseActivity {
Map paramMap = new HashMap();
Data app = (Data)getApplication();
- paramMap.put("uid",String.valueOf(app.getUser().getIduser())); // 需要获取登陆用户的id:需改
+ paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId())); // 需要获取登陆用户的id:需改
// Log.e("uid",String.valueOf(app.uid));
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 9b55316..e96ddd5 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
@@ -133,7 +133,7 @@ public class BlogAdapter extends RecyclerView.Adapter {
//登录后需要将uid换为这部分
// paramMap.put("uid", String.valueOf(BaseActivity.owner.getNetId()));
- paramMap.put("uid", String.valueOf(1));
+ paramMap.put("uid", String.valueOf(BaseActivity.owner.getNetId()));
// 只对帖子进行更新
paramMap.put("type", String.valueOf(2));
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 217e68a..ef8d685 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
@@ -486,7 +486,7 @@ public class InvitationChannelFragment extends Fragment {
allRecyclerView.setAdapter(allAdapter);
}else if(invitationCategoryTitleNum == 4) {
getQuestionListRequest();
- QuestionAdapter questionAdapter = new QuestionAdapter(allQuestion);
+ QuestionAdapter questionAdapter = new QuestionAdapter(allQuestion, getContext());
questionRecyclerView.setAdapter(questionAdapter);
}else if(invitationCategoryTitleNum == 2) {
Map paramMap = new HashMap();
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/Question.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/Question.java
index 4b05d60..3da7541 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/Question.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Model/Question.java
@@ -1,7 +1,5 @@
package com.example.leudaemialikeme.Model;
-import com.google.gson.Gson;
-
import java.io.Serializable;
import java.sql.Timestamp;
@@ -17,11 +15,11 @@ public class Question implements Serializable {
private int qbrowseNum;
private int flag;
- public Question() {
+ public Question() {}
public Question(int uid,String qtitle,String qcontent,Timestamp qtime,
int qfollowNum,int qanswerNum,int qbrowseNum,int flag) {
this.uid=uid;
- this.qtitle=qtitle;
+ this.qtittle=qtitle;
this.qcontent=qcontent;
this.qtime=qtime;
this.qfollowNum=qfollowNum;