diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java
index 5052902..158422b 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -11,6 +11,7 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextPaint;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -616,17 +617,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
 //                            .placeholder(R.mipmap.icon_default_rectangle)
 //                            .transform(new PicassoRoundTransform())
 //                            .into(homeGridAdapterItemBinding.imageHead);
-                    mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
 
-                            MainTabActivity activity = (MainTabActivity) getActivity();
-                            CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                            mDataBinding.llComment.setVisibility(View.GONE);
-                            activity.visibilyBottom(View.VISIBLE);
-                            comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString());
-                        }
-                    });
                     homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(final View v) {
@@ -649,7 +640,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                                         MainTabActivity activity = (MainTabActivity) getActivity();
                                         KeyboardUtil.showSoftInput(getContext());
                                         activity.visibilyBottom(View.GONE);
-
+                                        commentPosition = position;
                                         commentDialog.dismiss();
                                         mDataBinding.etComment.setText("");
                                         homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
@@ -686,13 +677,11 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
                         StringBuilder likeString = new StringBuilder();
                         for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                            if (i == 0) {
-                                likeString.append("❤");
-
-                            } else {
+                            if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
                                 likeString.append(",");
                             }
                             likeString.append(discoveryListEntity.getLike().get(i).getNickname());
+
                         }
                         homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
 
@@ -786,8 +775,22 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
         mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
 
         baseRecycleViewAdapter.setData(discoveryListEntities);
-    }
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
 
+                if (commentPosition != -1) {
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    activity.visibilyBottom(View.VISIBLE);
+                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
+                }
+            }
+        });
+    }
+    private int commentPosition = -1;
     @Override
     public boolean onTouch(MotionEvent ev) {
         switch (ev.getAction()) {
@@ -915,7 +918,18 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                     baseActivity.setToast(1, resultcode.msg);
                 }
                 if (resultcode.status == 0) {
+                    String nickname = user.getNickname();
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+                    dis_content.setContents(content);
+                    dis_content.setNickname(nickname);
+                    dis_content.setReply("");
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.add(dis_content);
 
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(position,discoveryListEntity);
 //                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
 //                    if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
 //                        DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
diff --git a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
index eb08a68..33bff09 100644
--- a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
@@ -118,7 +118,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                     public void onSelect(int position, String text) {
                         Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
                         intent.putExtra("type", position);
-                        startActivityForResult(intent,14);
+                        startActivityForResult(intent, 14);
                     }
                 }).show();
 
@@ -315,6 +315,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         return coordinate[1];
     }
 
+    private int commentPosition = -1;
 
     private void intRecycleView() {
         mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
@@ -333,6 +334,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                 return false;
             }
         });
+
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity);
         mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动
         mDataBinding.recyView.setLayoutManager(linearLayoutManager);
@@ -354,17 +356,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
 //                            .placeholder(R.mipmap.icon_default_rectangle)
 //                            .transform(new PicassoRoundTransform())
 //                            .into(homeGridAdapterItemBinding.imageHead);
-                    mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
 
-                            MainTabActivity activity = (MainTabActivity) getActivity();
-                            CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                            mDataBinding.llComment.setVisibility(View.GONE);
-                            activity.visibilyBottom(View.VISIBLE);
-                            comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString());
-                        }
-                    });
                     homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(final View v) {
@@ -390,12 +382,14 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
 
                                         commentDialog.dismiss();
                                         mDataBinding.etComment.setText("");
+                                        commentPosition = position;
                                         homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
                                             @Override
                                             public void run() {
                                                 int y = getCoordinateY(mDataBinding.llComment) - 20;
                                                 //评论时滑动到对应item底部和输入框顶部对齐
                                                 mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+
                                             }
                                         }, 300);
 
@@ -424,13 +418,11 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
                         StringBuilder likeString = new StringBuilder();
                         for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                            if (i == 0) {
-                                likeString.append("❤");
-
-                            } else {
+                            if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
                                 likeString.append(",");
                             }
                             likeString.append(discoveryListEntity.getLike().get(i).getNickname());
+
                         }
                         homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
 
@@ -492,7 +484,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
 
                     if (discoveryListEntity.getPic().size() > 0) {
 
-                      //  Log.e("pic", discoveryListEntity.getPic().get(0));
+                        //  Log.e("pic", discoveryListEntity.getPic().get(0));
                         for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
                             if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
                                 ImageInfo imageInfo = new ImageInfo();
@@ -524,6 +516,21 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
 
         baseRecycleViewAdapter.setData(discoveryListEntities);
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // discoveryListEntity.
+                if (commentPosition != -1) {
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    activity.visibilyBottom(View.VISIBLE);
+                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
+                }
+
+            }
+        });
     }
 
     private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
@@ -567,6 +574,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                                     .placeholder(R.mipmap.icon_default_rectangle)
                                     .transform(new PicassoRoundTransform())
                                     .into(mDataBinding.head);
+
                             ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
                             discoveryListEntities.clear();
                             discoveryListEntities.addAll(o);
@@ -579,7 +587,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
 
                             BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
                             baseRecycleViewAdapter.setData(discoveryListEntities);
-                        //    Log.e("sizi", discoveryListEntities.size() + "");
+                            //    Log.e("sizi", discoveryListEntities.size() + "");
                             //   int count = jsonObject.getInt("count");
                             if (o.isEmpty()) {
                                 mDataBinding.dw.finishLoadMoreWithNoMoreData();
@@ -749,6 +757,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         Map<String, String> map = new HashMap<>();
         if (user != null) {
             map.put("userid", user.getUserid());
+
         } else {
             map.put("userid", 0 + "");
         }
@@ -777,7 +786,18 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                     baseActivity.setToast(1, resultcode.msg);
                 }
                 if (resultcode.status == 0) {
+                    String nickname = user.getNickname();
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+                    dis_content.setContents(content);
+                    dis_content.setNickname(nickname);
+                    dis_content.setReply("");
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.add(dis_content);
 
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(position,discoveryListEntity);
 //                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
 //                    if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
 //                        DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
@@ -808,7 +828,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode==14&&resultCode==200){
+        if (requestCode == 14 && resultCode == 200) {
             page = 1;
             getlist(1);
         }
diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
index cbf2ca4..7b41876 100644
--- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -236,36 +237,18 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                     homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
                     homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
 
-                    mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            if (getActivity() instanceof MainTabActivity) {
-                                MainTabActivity activity = (MainTabActivity) getActivity();
-                                CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                                mDataBinding.llComment.setVisibility(View.GONE);
-                                activity.visibilyBottom(View.VISIBLE);
-                                comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString());
-                            } else if (getActivity() instanceof HistoryRecordActivity) {
-                                CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                                mDataBinding.llComment.setVisibility(View.GONE);
-                                comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString());
-                            }
 
-                        }
-                    });
                     if (discoveryListEntity.getLike().isEmpty()) {
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
                     } else {
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
                         StringBuilder likeString = new StringBuilder();
                         for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                            if (i == 0) {
-                                likeString.append("❤");
-
-                            } else {
+                            if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
                                 likeString.append(",");
                             }
                             likeString.append(discoveryListEntity.getLike().get(i).getNickname());
+
                         }
                         homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
 
@@ -367,10 +350,12 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                                         mDataBinding.llComment.setVisibility(View.VISIBLE);
                                         mDataBinding.etComment.requestFocus();
                                         mDataBinding.etComment.setHint("评论");
-                                        MainTabActivity activity = (MainTabActivity) getActivity();
+                                        if (getActivity() instanceof MainTabActivity){
+                                            MainTabActivity activity = (MainTabActivity) getActivity();
+                                            activity.visibilyBottom(View.GONE);
+                                        }
                                         KeyboardUtil.showSoftInput(getContext());
-                                        activity.visibilyBottom(View.GONE);
-
+                                        commentPosition = position;
                                         commentDialog.dismiss();
                                         mDataBinding.etComment.setText("");
                                         homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
@@ -406,8 +391,27 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
         mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
 
         baseRecycleViewAdapter.setData(discoveryListEntities);
-    }
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (getActivity() instanceof MainTabActivity) {
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    activity.visibilyBottom(View.VISIBLE);
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
 
+                } else if (getActivity() instanceof HistoryRecordActivity) {
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
+
+                }
+
+            }
+        });
+    }
+    private int commentPosition = -1;
     private void comment(String goodsId, final int position, String reply_id, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
@@ -443,14 +447,18 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                 }
                 if (resultcode.status == 0) {
 
+                    String nickname = user.getNickname();
                     BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
                     DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
-                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                    dis_content.setContents(adta.get("contents").toString());
-                    //  dis_content.set(adta.get("goods_id").toString());
+                    dis_content.setContents(content);
+                    dis_content.setNickname(nickname);
+                    dis_content.setReply("");
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.add(dis_content);
 
-
-                    adapter.upDateOne(position, discoveryListEntities.get(position));
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(position,discoveryListEntity);
                 }
 
             }
diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml
index 3448001..24835f8 100644
--- a/app/src/main/res/layout/dialog_comment.xml
+++ b/app/src/main/res/layout/dialog_comment.xml
@@ -6,6 +6,7 @@
     android:orientation="horizontal">
 
     <TextView
+
         android:id="@+id/tv_zan"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -57,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:drawableLeft="@mipmap/buy"
+        android:drawableLeft="@mipmap/gm"
         android:drawablePadding="5dp"
         android:gravity="center"
         android:paddingLeft="14dp"
@@ -72,13 +73,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:drawableLeft="@mipmap/gwc1"
-        android:drawablePadding="5dp"
+        android:drawableLeft="@mipmap/gwc3"
         android:gravity="center"
         android:paddingLeft="14dp"
         android:paddingTop="5dp"
+        android:drawablePadding="5dp"
         android:paddingRight="14dp"
         android:paddingBottom="5dp"
         android:textColor="@color/white"
-        android:textSize="16sp" />
+     />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_discovery.xml b/app/src/main/res/layout/item_discovery.xml
index 2cac3a7..a35b6a7 100644
--- a/app/src/main/res/layout/item_discovery.xml
+++ b/app/src/main/res/layout/item_discovery.xml
@@ -75,12 +75,13 @@
 
 
             <TextView
+                android:drawableLeft="@mipmap/like"
                 android:padding="3dp"
                 android:id="@+id/tv_like"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="#15Dddddd"
-                android:text="❤ 哈哈哈，呵呵呵" />
+                 />
 
             <android.support.v7.widget.RecyclerView
                 android:paddingLeft="3dp"
diff --git a/app/src/main/res/mipmap-xhdpi/gm.png b/app/src/main/res/mipmap-xhdpi/gm.png
new file mode 100644
index 0000000..be41a90
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/gm.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/gwc3.png b/app/src/main/res/mipmap-xhdpi/gwc3.png
new file mode 100644
index 0000000..ecbf145
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/gwc3.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/like.png b/app/src/main/res/mipmap-xxhdpi/like.png
new file mode 100644
index 0000000..8db1f4e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/like.png differ