修改我的评论

app/src/main/AndroidManifest.xml

@@ -141,6 +141,10 @@
         <activity android:name=".activity.OrgWriteCommentActivity"
             android:screenOrientation="portrait"/>
 
+        <!--评论列表-->
+        <activity android:name=".activity.OrgCommentListActivity"
+            android:screenOrientation="portrait"/>
+
         <!--定位服务-->
         <meta-data android:name="com.amap.api.v2.apikey" android:value="45fb5d8b52ba4f9f214bfb4fdaf81a72"/>
         <service android:name="com.amap.api.location.APSService"/>

app/src/main/java/com/ynstkz/shitu/android/activity/MineCommentActivity.java

@@ -2,14 +2,18 @@ package com.ynstkz.shitu.android.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.common.library.okhttp.callback.Callback;
+import com.common.library.pulltorefresh.PullToRefreshListView;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.MyCommnetBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
 
+import butterknife.Bind;
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -17,7 +21,14 @@ import okhttp3.Response;
  * 作者：fuchangle on 2018/2/11 15:37
  */
 
-public class MineCommentActivity extends TitleBarActivity{
+public class MineCommentActivity extends TitleBarActivity {
+
+    @Bind(R.id.tv_title)
+    TextView tvTitle;
+    @Bind(R.id.view_title)
+    RelativeLayout viewTitle;
+    @Bind(R.id.pullToRefresh)
+    PullToRefreshListView pullToRefresh;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -33,23 +44,23 @@ public class MineCommentActivity extends TitleBarActivity{
         return R.layout.activity_minecomment;
     }
 
-    private void initView(){
-
+    private void initView() {
+        tvTitle.setText("我的评论");
     }
 
-    private void initData(){
+    private void initData() {
 
         getMyCommnet();
     }
 
-    private void setListener(){
+    private void setListener() {
 
     }
 
     /**
      * 获取我的评论
      */
-    private void getMyCommnet(){
+    private void getMyCommnet() {
 
         RequestGroup.getMyCommentList(new Callback() {
             @Override
@@ -64,7 +75,14 @@ public class MineCommentActivity extends TitleBarActivity{
 
             @Override
             public void onResponse(Object response, int id) {
-
+                MyCommnetBean myCommnetBean = (MyCommnetBean)response;
+                if(myCommnetBean != null){
+                    if("200".equals(myCommnetBean.getCode())){
+
+                    } else {
+                        showToast(myCommnetBean.getMsg());
+                    }
+                }
             }
         });
     }

app/src/main/java/com/ynstkz/shitu/android/activity/OrgCommentItemBean.java

@@ -0,0 +1,130 @@
+package com.ynstkz.shitu.android.activity;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/16 16:44
+ */
+
+public class OrgCommentItemBean extends BaseBean{
+
+    private int score;
+    private long createTime;
+    private String memberName;
+    private int userId;
+    private String headPic;
+    private String content;
+    private int evaluateId;
+    private int memberId;
+    private List<EvaluatePicListBean> evaluatePicList;
+
+    public int getScore() {
+        return score;
+    }
+
+    public void setScore(int score) {
+        this.score = score;
+    }
+
+    public long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(long createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getHeadPic() {
+        return headPic;
+    }
+
+    public void setHeadPic(String headPic) {
+        this.headPic = headPic;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public int getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(int evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public int getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(int memberId) {
+        this.memberId = memberId;
+    }
+
+    public List<EvaluatePicListBean> getEvaluatePicList() {
+        return evaluatePicList;
+    }
+
+    public void setEvaluatePicList(List<EvaluatePicListBean> evaluatePicList) {
+        this.evaluatePicList = evaluatePicList;
+    }
+
+    public static class EvaluatePicListBean {
+        /**
+         * evaluatePicId : 3
+         * evaluateId : 3
+         * picUrl : /upload/evaluate/8/2018-03-16/txnqm3pjtx9rmxiuaerydm2lm4oyh9yk.jpg
+         */
+
+        private int evaluatePicId;
+        private int evaluateId;
+        private String picUrl;
+
+        public int getEvaluatePicId() {
+            return evaluatePicId;
+        }
+
+        public void setEvaluatePicId(int evaluatePicId) {
+            this.evaluatePicId = evaluatePicId;
+        }
+
+        public int getEvaluateId() {
+            return evaluateId;
+        }
+
+        public void setEvaluateId(int evaluateId) {
+            this.evaluateId = evaluateId;
+        }
+
+        public String getPicUrl() {
+            return picUrl;
+        }
+
+        public void setPicUrl(String picUrl) {
+            this.picUrl = picUrl;
+        }
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/activity/OrgCommentListActivity.java

@@ -0,0 +1,80 @@
+package com.ynstkz.shitu.android.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.common.library.okhttp.callback.Callback;
+import com.common.library.pulltorefresh.PullToRefreshListView;
+import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.data.RequestGroup;
+
+import butterknife.Bind;
+import okhttp3.Call;
+import okhttp3.Response;
+
+/**
+ * 作者：fuchangle on 2018/3/15 17:40
+ */
+
+public class OrgCommentListActivity extends TitleBarActivity {
+
+    @Bind(R.id.tv_title)
+    TextView tvTitle;
+    @Bind(R.id.view_title)
+    RelativeLayout viewTitle;
+    @Bind(R.id.pullToRefresh)
+    PullToRefreshListView pullToRefresh;
+
+    private String memberId;
+    private int pageNumber;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+        setListener();
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_org_comment_list;
+    }
+
+    private void initView(){
+        tvTitle.setText(getIntent().getStringExtra("memberTitle"));
+    }
+
+    private void initData(){
+        memberId = getIntent().getStringExtra("memberId");
+        pageNumber = 1;
+        getOrgCommentList();
+    }
+
+    private void setListener(){
+
+    }
+
+    private void getOrgCommentList(){
+
+        RequestGroup.getOrgCommentList(pageNumber+"", memberId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return null;
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+
+            }
+        });
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/activity/OrgDetailActivity.java

@@ -110,6 +110,19 @@ public class OrgDetailActivity extends TitleBarActivity {
                 startActivity(intent);
             }
         });
+
+        /**
+         * 评论列表
+         */
+        tvCommentList.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(OrgDetailActivity.this, OrgCommentListActivity.class);
+                intent.putExtra("memberId", memberId + "");
+                intent.putExtra("memberTitle", dataBean.getMemberName());
+                startActivity(intent);
+            }
+        });
     }
 
     /**

app/src/main/java/com/ynstkz/shitu/android/activity/OrgWriteCommentActivity.java

@@ -62,8 +62,8 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
     GridView gvPic;
     @Bind(R.id.btn_submint)
     Button btnSubmint;
-    private String memberId;
 
+    private String memberId;
     private List<File> listFiles;
     private Map<String, File> fileParam;
     private boolean isTakeFull;
@@ -157,10 +157,10 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
                 OrgCommentSubmintBean orgCommentSubmintBean = (OrgCommentSubmintBean)response;
                 if(orgCommentSubmintBean != null){
                     if("200".equals(orgCommentSubmintBean.getCode())){
-                        showToast("success");
-                    } else {
-                        showToast(orgCommentSubmintBean.getMsg());
+                        finish();
                     }
+                    showToast(orgCommentSubmintBean.getMsg());
+                    progressDialog.dismiss();
                 }
             }
         });
@@ -231,7 +231,7 @@ public class OrgWriteCommentActivity extends TitleBarActivity implements View.On
      */
     private void addTakeImage(File file) {
         listFiles.add(listFiles.size() - 1, file);
-        fileParam.put(System.currentTimeMillis() + "", file);
+        fileParam.put(file.getName(), file);
         if (listFiles.size() > 3) {
             isTakeFull = true;
             listFiles.remove(3);

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -344,6 +344,18 @@ public class RequestGroup {
         params.put("score", score);
         params.put("content", content);
         OkHttpUtils.post().url(UrlCat.URL_COMMENT_SUBMIT).addHeader(KEY_TOKEN,
-                SharedPreferencesUtils.getToken()).files("picList", files).build().execute(callback);
+                SharedPreferencesUtils.getToken()).params(params).files("picList", files).build().execute(callback);
+    }
+
+    /**
+     * 获取评论列表
+     * @param pageNumber
+     * @param callback
+     */
+    public static void getOrgCommentList(String pageNumber, String memberId, Callback callback){
+        Map<String, String> params = getSystemParams();
+        params.put("pageNumber", pageNumber);
+        params.put("memberId", memberId);
+        OkHttpUtils.get().url(UrlCat.URL_ORG_COMMNET_LIST).params(params).build().execute(callback);
     }
 }

app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -142,6 +142,11 @@ public class UrlCat {
      * 机构评论
      */
     public static final String URL_COMMENT_SUBMIT = HOST + "api/evaluate/submit";
+
+    /**
+     * 评论列表
+     */
+    public static final String URL_ORG_COMMNET_LIST = HOST + "api/evaluate/agency/list";
 }
 
 

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

@@ -0,0 +1,14 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/view_title"/>
+
+    <com.common.library.pulltorefresh.PullToRefreshListView
+        android:id="@+id/pullToRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>