From d73f3d270635d16abb3634872afb6c4b4d379777 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Wed, 7 Apr 2021 11:24:39 +0800
Subject: [PATCH 1/8] d

---
 app/src/main/res/layout/activity_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 684bd16..aee35c7 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -201,7 +201,7 @@
                         android:onClick="yinagreementEvent"
                         android:layout_gravity="center_vertical"
                         android:gravity="center_vertical"
-                        android:text="@string/agreewhitemeg1"
+                        android:text="@string/agreewhitemeg2"
                         android:textSize="16sp"/>
 
                 </LinearLayout>

From 0ee43d630066a52d48707ca79073cb65895a4fbf Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Thu, 8 Apr 2021 11:29:32 +0800
Subject: [PATCH 2/8] 1

---
 .idea/runConfigurations.xml                   |   1 +
 .../com/sl/house_property/MainFragment.java   |  95 +++++--
 .../sl/house_property/MainTabActivity.java    |   2 +-
 .../discovery/DiscoveryFragment.java          | 124 +++++++--
 .../discovery/HistoryRecordFragment.java      | 237 +++++++++++-------
 app/src/main/res/layout/item_comment.xml      |   9 +-
 6 files changed, 339 insertions(+), 129 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
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 9bf73f4..aadd997 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -42,6 +42,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.selectpicker.OptionsPopupWindow;
 import com.sl.house_property.databinding.FragmentMainBinding;
+
 import com.sl.house_property.databinding.ItemCommentBinding;
 import com.sl.house_property.databinding.ItemDiscoveryBinding;
 import com.sl.house_property.db.CommentBeanData;
@@ -788,12 +789,15 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                                         commentDialog.dismiss();
                                         like(discoveryListEntity.getGoods_id(), position);
                                     } else if (type == 3) {
+                                        itemIndex = -1;
                                         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("");
@@ -805,6 +809,23 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                                                 mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
                                             }
                                         }, 300);
+//                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+//                                        mDataBinding.etComment.requestFocus();
+//                                        mDataBinding.etComment.setHint("评论");
+//                                        MainTabActivity activity = (MainTabActivity) getActivity();
+//                                        KeyboardUtil.showSoftInput(getContext());
+//                                        activity.visibilyBottom(View.GONE);
+//                                        commentPosition = position;
+//                                        commentDialog.dismiss();
+//                                        mDataBinding.etComment.setText("");
+//                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+//                                            @Override
+//                                            public void run() {
+//                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+//                                                //评论时滑动到对应item底部和输入框顶部对齐
+//                                                mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+//                                            }
+//                                        }, 300);
 
 
                                     } else if (type == 4) {
@@ -857,21 +878,52 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                         final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
                         baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
                             @Override
-                            public void onBindViewHolder(Object b, int position) {
+                            public void onBindViewHolder(Object b, final int itemPosition) {
                                 ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
-                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
-                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
-                                if (dis_content.get(position).getReply().isEmpty()) {
+                                if (dis_content.get(itemPosition).getReply().isEmpty()) {
                                     itemCommentBinding.llHf.setVisibility(View.GONE);
-
+                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
+                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
                                 } else {
+                                    itemCommentBinding.ll.setVisibility(View.GONE);
                                     itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
+                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
                                     itemCommentBinding.tvInfo2.setText("回复");
-                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
-                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
+                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
+                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
 
                                 }
+                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+
+                                        itemIndex =itemPosition;
+
+                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                        mDataBinding.etComment.requestFocus();
+                                        mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                        if (getActivity() instanceof MainTabActivity) {
+                                            MainTabActivity activity = (MainTabActivity) getActivity();
+                                            activity.visibilyBottom(View.GONE);
+                                        }
+                                        KeyboardUtil.showSoftInput(getContext());
+                                        commentPosition = position;
+                                        // commentDialog.dismiss();
+                                        mDataBinding.etComment.setText("");
+                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                //评论时滑动到对应item底部和输入框顶部对齐
+                                                mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+                                            }
+                                        }, 300);
+
+
+                                    }
+                                });
                             }
                         });
                         baseRecycleViewAdapter.setData(dis_content);
@@ -943,12 +995,13 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                     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());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
                 }
             }
         });
     }
     private int commentPosition = -1;
+    private int itemIndex = -1;
     @Override
     public boolean onTouch(MotionEvent ev) {
         switch (ev.getAction()) {
@@ -1042,7 +1095,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
         baseActivity.addSubscription(subscription);
     }
 
-    private void comment(String goodsId, final int position, String reply_id, final String content) {
+    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
         Map<String, String> map = new HashMap<>();
@@ -1054,8 +1107,13 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
         map.put("app", "Goods");
         map.put("class", "DisGoods");
         map.put("goods_id", goodsId);
-        if (!TextUtils.isEmpty(reply_id)) {
-            map.put("reply_id", reply_id);
+        if (itemIndex!=-1){
+            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+            String from_id = dis_content1.get(itemIndex).getFrom_id();
+            if (!TextUtils.isEmpty(from_id)) {
+                map.put("reply_id", from_id);
+            }
         }
 
         map.put("contents", content);
@@ -1076,18 +1134,21 @@ 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();
+                    if (itemIndex!=-1){
+                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
+                    }
                     dis_content1.add(dis_content);
-
                     discoveryListEntity.setDis_content(dis_content1);
-                    adapter.upDateOne(position,discoveryListEntity);
+                    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/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java
index 01a9341..2827412 100644
--- a/app/src/main/java/com/sl/house_property/MainTabActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java
@@ -98,7 +98,7 @@ public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         for (MyOnTouchListener listener : onTouchListeners) {
-            // listener.onTouch(ev);
+            //listener.onTouch(ev);
         }
         return super.dispatchTouchEvent(ev);
     }
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 b322d22..4d57298 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
@@ -385,26 +385,47 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                                         commentDialog.dismiss();
                                         like(discoveryListEntity.getGoods_id(), position);
                                     } else if (type == 3) {
+                                        itemIndex = -1;
                                         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("");
-                                        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);
 
+//                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+//                                        mDataBinding.etComment.requestFocus();
+//                                        mDataBinding.etComment.setHint("评论");
+//                                        MainTabActivity activity = (MainTabActivity) getActivity();
+//                                        KeyboardUtil.showSoftInput(getContext());
+//                                        activity.visibilyBottom(View.GONE);
+//
+//                                        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);
+
 
                                     } else if (type == 4) {
                                         //   addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.)
@@ -459,21 +480,65 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                         final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
                         baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
                             @Override
-                            public void onBindViewHolder(Object b, int position) {
+                            public void onBindViewHolder(Object b, final int itemPosition) {
                                 ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
-                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
-                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
-                                if (dis_content.get(position).getReply().isEmpty()) {
+//                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
+//                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
+//                                if (dis_content.get(position).getReply().isEmpty()) {
+//                                    itemCommentBinding.llHf.setVisibility(View.GONE);
+//
+//                                } else {
+//                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
+//                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
+//                                    itemCommentBinding.tvInfo2.setText("回复");
+//                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
+//                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
+//
+//                                }
+                                if (dis_content.get(itemPosition).getReply().isEmpty()) {
                                     itemCommentBinding.llHf.setVisibility(View.GONE);
-
+                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
+                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
                                 } else {
+                                    itemCommentBinding.ll.setVisibility(View.GONE);
                                     itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
+                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
                                     itemCommentBinding.tvInfo2.setText("回复");
-                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
-                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
+                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
+                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
 
                                 }
+                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+
+                                        itemIndex =itemPosition;
+
+                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                        mDataBinding.etComment.requestFocus();
+                                        mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                        if (getActivity() instanceof MainTabActivity) {
+                                            MainTabActivity activity = (MainTabActivity) getActivity();
+                                            activity.visibilyBottom(View.GONE);
+                                        }
+                                        KeyboardUtil.showSoftInput(getContext());
+                                        commentPosition = position;
+                                        // commentDialog.dismiss();
+                                        mDataBinding.etComment.setText("");
+                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                //评论时滑动到对应item底部和输入框顶部对齐
+                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                            }
+                                        }, 300);
+
+
+                                    }
+                                });
                             }
                         });
                         baseRecycleViewAdapter.setData(dis_content);
@@ -544,7 +609,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                     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());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
                 }
 
             }
@@ -776,8 +841,8 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                 });
         baseActivity.addSubscription(subscription);
     }
-
-    private void comment(String goodsId, final int position, String reply_id, final String content) {
+    private int itemIndex = -1;
+    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
         Map<String, String> map = new HashMap<>();
@@ -790,8 +855,13 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         map.put("app", "Goods");
         map.put("class", "DisGoods");
         map.put("goods_id", goodsId);
-        if (!TextUtils.isEmpty(reply_id)) {
-            map.put("reply_id", reply_id);
+        if (itemIndex!=-1){
+            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+            String from_id = dis_content1.get(itemIndex).getFrom_id();
+            if (!TextUtils.isEmpty(from_id)) {
+                map.put("reply_id", from_id);
+            }
         }
 
         map.put("contents", content);
@@ -817,13 +887,27 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                     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();
+                    if (itemIndex!=-1){
+                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
+                    }
                     dis_content1.add(dis_content);
-
                     discoveryListEntity.setDis_content(dis_content1);
                     adapter.upDateOne(position, discoveryListEntity);
+//                    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/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
index d950bc6..62a27a2 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
@@ -84,14 +84,14 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
         return R.layout.fragment_history_record;
     }
 
-    public static HistoryRecordFragment newInstance(int param1, String param2, int i, int num,String wy_id) {
+    public static HistoryRecordFragment newInstance(int param1, String param2, int i, int num, String wy_id) {
         HistoryRecordFragment fragment = new HistoryRecordFragment();
         Bundle args = new Bundle();
         args.putInt("param1", param1);
         args.putString("param2", param2);
-        args.putInt("num",i);
-        args.putInt("dataType",num);
-        args.putString("wy_id",wy_id);
+        args.putInt("num", i);
+        args.putInt("dataType", num);
+        args.putString("wy_id", wy_id);
         fragment.setArguments(args);
         return fragment;
     }
@@ -113,9 +113,9 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
             activity.registerMyOnTouchListener(this);
         } else if (getActivity() instanceof HistoryRecordActivity) {
             ((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this);
-        }else if (getActivity() instanceof  LikeActivity){
+        } else if (getActivity() instanceof LikeActivity) {
             ((LikeActivity) getActivity()).registerMyOnTouchListener(this);
-        }else if (getActivity() instanceof  HistoryRecordActivitytwo){
+        } else if (getActivity() instanceof HistoryRecordActivitytwo) {
             ((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this);
         }
 
@@ -160,6 +160,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                         MainTabActivity activity = (MainTabActivity) getActivity();
                         activity.visibilyBottom(View.VISIBLE);
                     }
+
                     mDataBinding.llComment.setVisibility(View.GONE);
                 }
                 break;
@@ -207,8 +208,23 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
 
         } else if (View.GONE == visibility) {
             //隐藏键盘
-            MainTabActivity activity = (MainTabActivity) getActivity();
-            activity.visibilyBottom(View.VISIBLE);
+
+//            if (getActivity() instanceof MainTabActivity) {
+//                final MainTabActivity activity = (MainTabActivity) getActivity();
+//                activity.registerMyOnTouchListener(this);
+//            } else if (getActivity() instanceof HistoryRecordActivity) {
+//                ((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this);
+//            } else if (getActivity() instanceof LikeActivity) {
+//                ((LikeActivity) getActivity()).registerMyOnTouchListener(this);
+//            } else if (getActivity() instanceof HistoryRecordActivitytwo) {
+//                ((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this);
+//            }
+
+            if (getActivity() instanceof MainTabActivity){
+                MainTabActivity activity = (MainTabActivity) getActivity();
+                activity.visibilyBottom(View.VISIBLE);
+
+            }
             CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
         }
     }
@@ -256,7 +272,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                         homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
                         StringBuilder likeString = new StringBuilder();
                         for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                            if (i != 0 ) {
+                            if (i != 0) {
                                 likeString.append(",");
                             }
                             likeString.append(discoveryListEntity.getLike().get(i).getNickname());
@@ -280,23 +296,57 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                         final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
                         baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
                             @Override
-                            public void onBindViewHolder(Object b, int position) {
+                            public void onBindViewHolder(Object b, final int itemPosition) {
                                 ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
-                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
-                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
-                                if (dis_content.get(position).getReply().isEmpty()) {
-                                    itemCommentBinding.llHf.setVisibility(View.GONE);
 
+                                if (dis_content.get(itemPosition).getReply().isEmpty()) {
+                                    itemCommentBinding.llHf.setVisibility(View.GONE);
+                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
+                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
                                 } else {
+                                    itemCommentBinding.ll.setVisibility(View.GONE);
                                     itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
+                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
                                     itemCommentBinding.tvInfo2.setText("回复");
-                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
-                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
+                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
+                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
 
                                 }
+                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+
+                                            itemIndex =itemPosition;
+
+                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                            mDataBinding.etComment.requestFocus();
+                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                            if (getActivity() instanceof MainTabActivity) {
+                                                MainTabActivity activity = (MainTabActivity) getActivity();
+                                                activity.visibilyBottom(View.GONE);
+                                            }
+                                            KeyboardUtil.showSoftInput(getContext());
+                                            commentPosition = position;
+                                            // commentDialog.dismiss();
+                                            mDataBinding.etComment.setText("");
+                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                    //评论时滑动到对应item底部和输入框顶部对齐
+                                                    mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                                }
+                                            }, 300);
+
+
+                                    }
+                                });
+
                             }
                         });
+
                         baseRecycleViewAdapter.setData(dis_content);
 
                     }
@@ -331,7 +381,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
 
                         }
 
-                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){
+                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())) {
                         ImageInfo imageInfo = new ImageInfo();
                         imageInfo.setType(1);
                         imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
@@ -360,6 +410,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                                         commentDialog.dismiss();
                                         like(discoveryListEntity.getGoods_id(), position);
                                     } else if (type == 3) {
+                                        itemIndex = -1;
                                         mDataBinding.llComment.setVisibility(View.VISIBLE);
                                         mDataBinding.etComment.requestFocus();
                                         mDataBinding.etComment.setHint("评论");
@@ -412,22 +463,22 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                     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());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, 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());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
 
-                }else if (getActivity() instanceof LikeActivity){
+                } else if (getActivity() instanceof LikeActivity) {
                     CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
                     mDataBinding.llComment.setVisibility(View.GONE);
-                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
 
-                }else  if (getActivity() instanceof HistoryRecordActivitytwo){
+                } else if (getActivity() instanceof HistoryRecordActivitytwo) {
                     CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
                     mDataBinding.llComment.setVisibility(View.GONE);
-                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
 
                 }
 
@@ -436,8 +487,9 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
     }
 
     private int commentPosition = -1;
+    private int itemIndex = -1;
 
-    private void comment(String goodsId, final int position, String reply_id, final String content) {
+    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
         Map<String, String> map = new HashMap<>();
@@ -449,10 +501,16 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
         map.put("app", "Goods");
         map.put("class", "DisGoods");
         map.put("goods_id", goodsId);
-        if (!TextUtils.isEmpty(reply_id)) {
-            map.put("reply_id", reply_id);
+        if (itemIndex!=-1){
+            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+            String from_id = dis_content1.get(itemIndex).getFrom_id();
+            if (!TextUtils.isEmpty(from_id)) {
+                map.put("reply_id", from_id);
+            }
         }
 
+
         map.put("contents", content);
         map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
         progressDialog.setMessage("提交中");
@@ -477,11 +535,13 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                     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();
+                    if (itemIndex!=-1){
+                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
+                    }
                     dis_content1.add(dis_content);
-
                     discoveryListEntity.setDis_content(dis_content1);
                     adapter.upDateOne(position, discoveryListEntity);
                 }
@@ -645,10 +705,10 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                 if (resultcode.status == 0) {
                     BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
                     if (discoveryListEntities.get(position).getIs_like() == 1) {
-                        if (getArguments().getInt("dataType")==3){
+                        if (getArguments().getInt("dataType") == 3) {
                             discoveryListEntities.remove(position);
                             adapter.notifyDataSetChanged();
-                        }else {
+                        } else {
                             discoveryListEntities.get(position).setIs_like(0);
                             ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
                             for (int i = 0; i < like.size(); i++) {
@@ -704,17 +764,17 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
 
         map.put("type", type + "");
         map.put("app", "Goods");
-        if (getArguments().getInt("dataType")==1){
-          // String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
-            Log.e("物业id",wy_id);
+        if (getArguments().getInt("dataType") == 1) {
+            // String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
+            Log.e("物业id", wy_id);
             map.put("userid", wy_id);
             map.put("class", "WyGoodsLists");
             map.put("sign", Md5.md5("Goods" + "WyGoodsLists" + Md5.secret));
-        } else if (getArguments().getInt("dataType")==3) {
+        } else if (getArguments().getInt("dataType") == 3) {
             map.put("userid", userId);
             map.put("class", "UpGoodsLists");
             map.put("sign", Md5.md5("Goods" + "UpGoodsLists" + Md5.secret));
-        }else {
+        } else {
             map.put("userid", userId);
             map.put("class", "MyGoodsLists");
             map.put("sign", Md5.md5("Goods" + "MyGoodsLists" + Md5.secret));
@@ -750,65 +810,64 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                         e.printStackTrace();
                     }
                     Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
-                        }.getType();
-                        if (page == 1) {
-                            if (num == 1) {
-                                mDataBinding.rl1.setVisibility(View.GONE);
-                            } else {
-                                mDataBinding.rl1.setVisibility(View.VISIBLE);
-                                String fengmian = null;
-                                try {
-                                    fengmian = jsonObject.getString("fengmian");
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
-                                }
-                                String avatar = null;
-                                try {
-                                    avatar = jsonObject.getString("avatar");
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
-                                }
-                                if (!TextUtils.isEmpty(fengmian)){
-                                    Picasso.with(context).load(fengmian)
-                                            .placeholder(R.mipmap.icon_default_rectangle)
-                                            .into(target);
-                                }
-                                if (!TextUtils.isEmpty(avatar)){
-                                    Picasso.with(context).load(avatar)
-                                            .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);
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            page++;
+                    }.getType();
+                    if (page == 1) {
+                        if (num == 1) {
+                            mDataBinding.rl1.setVisibility(View.GONE);
                         } else {
-                            ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
-                            discoveryListEntities.addAll(o);
-
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            Log.e("sizi", discoveryListEntities.size() + "");
-                            //   int count = jsonObject.getInt("count");
-                            if (o.isEmpty()) {
-                                mDataBinding.dw.finishLoadMoreWithNoMoreData();
-                            } else {
-
-                                page++;
-
+                            mDataBinding.rl1.setVisibility(View.VISIBLE);
+                            String fengmian = null;
+                            try {
+                                fengmian = jsonObject.getString("fengmian");
+                            } catch (JSONException e) {
+                                e.printStackTrace();
                             }
+                            String avatar = null;
+                            try {
+                                avatar = jsonObject.getString("avatar");
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+                            if (!TextUtils.isEmpty(fengmian)) {
+                                Picasso.with(context).load(fengmian)
+                                        .placeholder(R.mipmap.icon_default_rectangle)
+                                        .into(target);
+                            }
+                            if (!TextUtils.isEmpty(avatar)) {
+                                Picasso.with(context).load(avatar)
+                                        .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);
+                        BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                        baseRecycleViewAdapter.setData(discoveryListEntities);
+                        page++;
+                    } else {
+                        ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
+                        discoveryListEntities.addAll(o);
+
+                        BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                        baseRecycleViewAdapter.setData(discoveryListEntities);
+                        Log.e("sizi", discoveryListEntities.size() + "");
+                        //   int count = jsonObject.getInt("count");
+                        if (o.isEmpty()) {
+                            mDataBinding.dw.finishLoadMoreWithNoMoreData();
+                        } else {
+
+                            page++;
+
+                        }
+                    }
 
 
-                }else {
-                    Log.e("xxxxx","fffff");
+                } else {
+                    Log.e("xxxxx", "fffff");
                 }
             }
         }, new Action1<Throwable>() {
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 18e8515..8121b8c 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -2,11 +2,14 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
+        android:id="@+id/ll_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/ll"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -38,11 +41,12 @@
                 android:id="@+id/tv_name2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="1111"
                 android:textColor="@color/light_color_blue"
                 android:textSize="14sp" />
 
             <TextView
-
+                android:text="回复"
                 android:id="@+id/tv_info2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -50,6 +54,7 @@
                 android:textSize="14sp" />
 
             <TextView
+                android:text="3333"
                 android:id="@+id/tv_name3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -57,7 +62,7 @@
                 android:textSize="14sp" />
 
             <TextView
-
+                android:text="12163"
                 android:id="@+id/tv_info3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

From 5a0d4d1cf23feaddf4eaef682e3d2a7e080cac9e Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Thu, 8 Apr 2021 11:35:49 +0800
Subject: [PATCH 3/8] d

---
 .../user/MyPropertyActivity.java              |  5 ++--
 工作记录                                      | 24 -------------------
 开发文档                                      | 17 -------------
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 工作记录
 delete mode 100644 开发文档

diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
index f48ee1c..99cf3b6 100644
--- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
@@ -473,10 +473,11 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
         mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Log.e("dsfsdfdsfs",adding+"");
                 if (!adding) {
                     adding = true;
-                    homegridentityvArrayList.add(new SimpleEntity());
+                    SimpleEntity simpleEntity = new SimpleEntity();
+                    simpleEntity.setString13("1.0");
+                    homegridentityvArrayList.add(simpleEntity);
                     baseRecycleViewAdapterv.setData(homegridentityvArrayList);
 //                    int size = homegridentityvArrayList.size();
 //                    Log.e("dsfsdfsdfs",size+"");
diff --git a/工作记录 b/工作记录
deleted file mode 100644
index c148c76..0000000
--- a/工作记录
+++ /dev/null
@@ -1,24 +0,0 @@
-1.图片白边，下边调窄一点
-2.门禁，房产跳转
-3.门禁，房产跳转登录页面
-4.物业界面
-5.删除家庭成员 删除成功 你提示的获取数据失败
-6.房产那个  重复
-
-
-
-
-
-__________________________________________________________________
-1 临时门禁   添加1天期限的临时密码
-CodeActivity
-ShareCodeActivity
-
-2.物业服务
-map.put("userid", "19");写死的
-
-
-
-
-
-
diff --git a/开发文档 b/开发文档
deleted file mode 100644
index a571b9d..0000000
--- a/开发文档
+++ /dev/null
@@ -1,17 +0,0 @@
-1.支付宝支付
-  MyPayActivity
-  下载官方demo,传入appid 和RSA2_PRIVATE两个参数即可实现支付,demo下载地址：https://opendocs.alipay.com/open/54/104509
-  alipay_demo保存在
-
-
-  Main4Fragment  187
-
-2.首页点赞中间没有逗号修改的地方MainFragment
-    // if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
-                                         if (i != 0 ) {
-                                             likeString.append(",");
-                                         }
-
-
-
-

From c36ee02232832dffbb6e5d6875c81f419f53db15 Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Thu, 8 Apr 2021 17:00:34 +0800
Subject: [PATCH 4/8] 1

---
 .../discovery/DeleteCommentDialog.java        | 50 ++++++++++++++++
 .../discovery/HistoryRecordFragment.java      | 57 +++++++++++++++++--
 .../main/res/layout/dialog_select_delete.xml  | 53 +++++++++++++++++
 app/src/main/res/layout/item_comment.xml      |  4 +-
 4 files changed, 156 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
 create mode 100644 app/src/main/res/layout/dialog_select_delete.xml

diff --git a/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java b/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
new file mode 100644
index 0000000..62d092c
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
@@ -0,0 +1,50 @@
+package com.sl.house_property.discovery;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.View;
+import android.widget.TextView;
+
+import com.lxj.xpopup.core.BottomPopupView;
+import com.sl.house_property.R;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DeleteCommentDialog extends BottomPopupView {
+    private SelectDialog.OnSelectListener listener;
+    private TextView tv1;
+
+    public DeleteCommentDialog(@NonNull @NotNull Context context) {
+        super(context);
+    }
+
+
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.dialog_select_delete;
+
+    }
+    public void setOnSelectListener(SelectDialog.OnSelectListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        findViewById(R.id.btn_delete).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (listener!=null){
+                    listener.select(1);
+                    dismiss();
+                }
+            }
+        });
+        findViewById(R.id.btn_cancel).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+    }
+}
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 62a27a2..505f80d 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
@@ -220,7 +220,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
 //                ((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this);
 //            }
 
-            if (getActivity() instanceof MainTabActivity){
+            if (getActivity() instanceof MainTabActivity) {
                 MainTabActivity activity = (MainTabActivity) getActivity();
                 activity.visibilyBottom(View.VISIBLE);
 
@@ -317,8 +317,19 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                                     @Override
                                     public void onClick(View v) {
                                         final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
-
-                                            itemIndex =itemPosition;
+                                        if (dis_content.get(itemPosition).getFrom_id()==null
+                                        ||userId.equals(dis_content.get(itemPosition).getFrom_id())){
+                                            mDataBinding.llComment.setVisibility(View.GONE);
+                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
+                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                                                @Override
+                                                public void select(int type) {
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),userId,position,itemPosition);
+                                                }
+                                            });
+                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
+                                        }else {
+                                            itemIndex = itemPosition;
 
                                             mDataBinding.llComment.setVisibility(View.VISIBLE);
                                             mDataBinding.etComment.requestFocus();
@@ -339,6 +350,8 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                                                     mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
                                                 }
                                             }, 300);
+                                        }
+
 
 
                                     }
@@ -489,7 +502,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
     private int commentPosition = -1;
     private int itemIndex = -1;
 
-    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
+    private void comment(String goodsId, final int position, final int itemIndex, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
         Map<String, String> map = new HashMap<>();
@@ -501,7 +514,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
         map.put("app", "Goods");
         map.put("class", "DisGoods");
         map.put("goods_id", goodsId);
-        if (itemIndex!=-1){
+        if (itemIndex != -1) {
             DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
             ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
             String from_id = dis_content1.get(itemIndex).getFrom_id();
@@ -538,7 +551,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
 
                     DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
                     ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    if (itemIndex!=-1){
+                    if (itemIndex != -1) {
                         dis_content.setReply(dis_content1.get(itemIndex).getNickname());
                     }
                     dis_content1.add(dis_content);
@@ -902,5 +915,37 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
         }
     };
 
+    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
+        Map<String, String> map = new HashMap<>();
+
+        progressDialog.show();
+        map.put("app", "Goods");
+
+        map.put("class", "DelDis");
+        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
+        map.put("dis_id", dis_id);
+        map.put("userid", userid);
+        loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    Toast.makeText(context, resultcode.msg, Toast.LENGTH_SHORT).show();
+                } else {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.remove(itemPosition);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(superPosition, discoveryListEntity);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                Toast.makeText(context, getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 
 }
diff --git a/app/src/main/res/layout/dialog_select_delete.xml b/app/src/main/res/layout/dialog_select_delete.xml
new file mode 100644
index 0000000..ec2969d
--- /dev/null
+++ b/app/src/main/res/layout/dialog_select_delete.xml
@@ -0,0 +1,53 @@
+<?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="wrap_content"
+    android:layout_margin="8dp"
+    android:background="@null"
+    android:orientation="vertical">
+
+
+    <Button
+        android:id="@+id/btn_edit"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/selector_bottom_dialog_btn"
+        android:paddingBottom="5dp"
+        android:text="删除我的评论"
+        android:textColor="@color/darkgray"
+        android:textAllCaps="false"
+        android:textSize="12sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dip"
+        android:background="@color/LightGray" />
+
+    <Button
+        android:id="@+id/btn_delete"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/selector_bottom_dialog_btn"
+        android:paddingBottom="5dp"
+        android:text="删除"
+        android:textColor="@color/red"
+        android:textAllCaps="false"
+        android:textSize="16sp" />
+
+
+    <Button
+        android:id="@+id/btn_cancel"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/selector_bottom_dialog_btn"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:text="取消"
+        android:textAllCaps="false"
+        android:textSize="16sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 8121b8c..9dc6eeb 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -42,7 +42,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="1111"
-                android:textColor="@color/light_color_blue"
+                android:textColor="@color/text_name"
                 android:textSize="14sp" />
 
             <TextView
@@ -58,7 +58,7 @@
                 android:id="@+id/tv_name3"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/light_color_blue"
+                android:textColor="@color/text_name"
                 android:textSize="14sp" />
 
             <TextView

From 9822d6e7938cd29b197ffac11c880fd2624b6902 Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Thu, 8 Apr 2021 17:16:27 +0800
Subject: [PATCH 5/8] 1

---
 .../com/sl/house_property/MainFragment.java   |  94 ++++++++++---
 .../discovery/DiscoveryFragment.java          | 130 +++++++++++++-----
 .../discovery/HistoryRecordFragment.java      |   9 +-
 .../main/res/layout/dialog_select_delete.xml  |   3 -
 4 files changed, 173 insertions(+), 63 deletions(-)

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 aadd997..696bdd1 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -47,9 +47,11 @@ import com.sl.house_property.databinding.ItemCommentBinding;
 import com.sl.house_property.databinding.ItemDiscoveryBinding;
 import com.sl.house_property.db.CommentBeanData;
 import com.sl.house_property.db.dao.CommentDao;
+import com.sl.house_property.discovery.DeleteCommentDialog;
 import com.sl.house_property.discovery.GoodsInfoDialog;
 import com.sl.house_property.discovery.HistoryRecordActivity;
 import com.sl.house_property.discovery.HistoryRecordActivitytwo;
+import com.sl.house_property.discovery.SelectDialog;
 import com.sl.house_property.okgonet.HttpConstants;
 import com.sl.house_property.okgonet.Observer;
 import com.sl.house_property.order.SettleActivity;
@@ -886,6 +888,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                                     itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
                                     itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
                                 } else {
+
                                     itemCommentBinding.ll.setVisibility(View.GONE);
                                     itemCommentBinding.llHf.setVisibility(View.VISIBLE);
                                     itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
@@ -897,29 +900,48 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                                 itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
                                     @Override
                                     public void onClick(View v) {
-                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
 
-                                        itemIndex =itemPosition;
-
-                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                        mDataBinding.etComment.requestFocus();
-                                        mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
-                                        if (getActivity() instanceof MainTabActivity) {
-                                            MainTabActivity activity = (MainTabActivity) getActivity();
-                                            activity.visibilyBottom(View.GONE);
+                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                                        if (registerUser == null) {
+                                            return;
                                         }
-                                        KeyboardUtil.showSoftInput(getContext());
-                                        commentPosition = position;
-                                        // commentDialog.dismiss();
-                                        mDataBinding.etComment.setText("");
-                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                //评论时滑动到对应item底部和输入框顶部对齐
-                                                mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+                                        if (dis_content.get(itemPosition).getFrom_id()==null
+                                                ||registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())){
+                                            mDataBinding.llComment.setVisibility(View.GONE);
+                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
+                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                                                @Override
+                                                public void select(int type) {
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),registerUser.getUserid(),position,itemPosition);
+                                                }
+                                            });
+                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
+                                        }else {
+                                            itemIndex =itemPosition;
+
+                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                            mDataBinding.etComment.requestFocus();
+                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                            if (getActivity() instanceof MainTabActivity) {
+                                                MainTabActivity activity = (MainTabActivity) getActivity();
+                                                activity.visibilyBottom(View.GONE);
                                             }
-                                        }, 300);
+                                            KeyboardUtil.showSoftInput(getContext());
+                                            commentPosition = position;
+                                            // commentDialog.dismiss();
+                                            mDataBinding.etComment.setText("");
+                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                    //评论时滑动到对应item底部和输入框顶部对齐
+                                                    mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+                                                }
+                                            }, 300);
+                                        }
+
 
 
                                     }
@@ -1574,4 +1596,36 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
                 });
 
     }
+    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
+        Map<String, String> map = new HashMap<>();
+
+        progressDialog.show();
+        map.put("app", "Goods");
+
+        map.put("class", "DelDis");
+        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
+        map.put("dis_id", dis_id);
+        map.put("userid", userid);
+        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
+                } else {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.remove(itemPosition);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(superPosition, discoveryListEntity);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 }
\ No newline at end of file
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 4d57298..d4305d2 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
@@ -15,6 +15,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
@@ -452,13 +453,13 @@ 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 && i != discoveryListEntity.getLike().size() - 1) {
-                           //     likeString.append(",");
-                          //  }
+                            //  if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
+                            //     likeString.append(",");
+                            //  }
 
-                              if (i != 0) {
-                                 likeString.append(",");
-                              }
+                            if (i != 0) {
+                                likeString.append(",");
+                            }
                             likeString.append(discoveryListEntity.getLike().get(i).getNickname());
 
                         }
@@ -512,29 +513,48 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                                 itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
                                     @Override
                                     public void onClick(View v) {
+                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                                        if (registerUser == null) {
+                                            return;
+                                        }
+
                                         final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
 
-                                        itemIndex =itemPosition;
+                                        if (dis_content.get(itemPosition).getFrom_id() == null
+                                                || registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())) {
+                                            mDataBinding.llComment.setVisibility(View.GONE);
+                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
+                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                                                @Override
+                                                public void select(int type) {
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(), registerUser.getUserid(), position, itemPosition);
+                                                }
+                                            });
+                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
+                                        } else {
+                                            itemIndex = itemPosition;
 
-                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                        mDataBinding.etComment.requestFocus();
-                                        mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
-                                        if (getActivity() instanceof MainTabActivity) {
-                                            MainTabActivity activity = (MainTabActivity) getActivity();
-                                            activity.visibilyBottom(View.GONE);
-                                        }
-                                        KeyboardUtil.showSoftInput(getContext());
-                                        commentPosition = position;
-                                        // commentDialog.dismiss();
-                                        mDataBinding.etComment.setText("");
-                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                //评论时滑动到对应item底部和输入框顶部对齐
-                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                            mDataBinding.etComment.requestFocus();
+                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                            if (getActivity() instanceof MainTabActivity) {
+                                                MainTabActivity activity = (MainTabActivity) getActivity();
+                                                activity.visibilyBottom(View.GONE);
                                             }
-                                        }, 300);
+                                            KeyboardUtil.showSoftInput(getContext());
+                                            commentPosition = position;
+                                            // commentDialog.dismiss();
+                                            mDataBinding.etComment.setText("");
+                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                    //评论时滑动到对应item底部和输入框顶部对齐
+                                                    mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                                }
+                                            }, 300);
+
+                                        }
 
 
                                     }
@@ -640,25 +660,25 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                 if (resultcode.status == 0) {
                     // intRecycleView();
                     Gson gs = new Gson();
-       LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                  String s = gs.toJson(adta);
+                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                    String s = gs.toJson(adta);
 
-                //    String s = new GetJsonDataUtil().getJson(getActivity(), "controlStatus.json");//获取assets目录下的json文件数据
+                    //    String s = new GetJsonDataUtil().getJson(getActivity(), "controlStatus.json");//获取assets目录下的json文件数据
                     try {
                         DiscoverEntity discoverEntity = gs.fromJson(s, DiscoverEntity.class);
-                //        JSONObject jsonObject = new JSONObject(s);
-                //        org.json.JSONArray array = jsonObject.getJSONArray("info");
-                //        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
-                 //       }.getType();
+                        //        JSONObject jsonObject = new JSONObject(s);
+                        //        org.json.JSONArray array = jsonObject.getJSONArray("info");
+                        //        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
+                        //       }.getType();
                         if (page == 1) {
                             String fengmian = discoverEntity.getFengmian();
                             String avatar = discoverEntity.getAvatar();
-                            if (!TextUtils.isEmpty(fengmian)){
+                            if (!TextUtils.isEmpty(fengmian)) {
                                 Picasso.with(getActivity()).load(fengmian)
                                         .placeholder(R.mipmap.icon_default_rectangle)
                                         .into(target);
                             }
-                            if (!TextUtils.isEmpty(avatar)){
+                            if (!TextUtils.isEmpty(avatar)) {
                                 Picasso.with(getActivity()).load(avatar)
                                         .placeholder(R.mipmap.icon_default_rectangle)
                                         .transform(new PicassoRoundTransform())
@@ -672,7 +692,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                             baseRecycleViewAdapter.setData(discoveryListEntities);
                             page++;
                         } else {
-                          //  ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
+                            //  ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
                             List<DiscoveryListEntity> info = discoverEntity.getInfo();
                             discoveryListEntities.addAll(info);
 
@@ -841,8 +861,10 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
                 });
         baseActivity.addSubscription(subscription);
     }
+
     private int itemIndex = -1;
-    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
+
+    private void comment(String goodsId, final int position, final int itemIndex, final String content) {
         final RegisterUser user =
                 Config.getInstance(getContext()).getUser();
         Map<String, String> map = new HashMap<>();
@@ -855,7 +877,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         map.put("app", "Goods");
         map.put("class", "DisGoods");
         map.put("goods_id", goodsId);
-        if (itemIndex!=-1){
+        if (itemIndex != -1) {
             DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
             ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
             String from_id = dis_content1.get(itemIndex).getFrom_id();
@@ -890,7 +912,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
 
                     DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
                     ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    if (itemIndex!=-1){
+                    if (itemIndex != -1) {
                         dis_content.setReply(dis_content1.get(itemIndex).getNickname());
                     }
                     dis_content1.add(dis_content);
@@ -944,4 +966,36 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
         }
 
     }
+    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
+        Map<String, String> map = new HashMap<>();
+
+        progressDialog.show();
+        map.put("app", "Goods");
+
+        map.put("class", "DelDis");
+        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
+        map.put("dis_id", dis_id);
+        map.put("userid", userid);
+        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
+                } else {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.remove(itemPosition);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(superPosition, discoveryListEntity);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 }
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 505f80d..b5795f1 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
@@ -316,15 +316,20 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
                                 itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
                                     @Override
                                     public void onClick(View v) {
+                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                                        if (registerUser == null) {
+                                            return;
+                                        }
+
                                         final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
                                         if (dis_content.get(itemPosition).getFrom_id()==null
-                                        ||userId.equals(dis_content.get(itemPosition).getFrom_id())){
+                                        ||registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())){
                                             mDataBinding.llComment.setVisibility(View.GONE);
                                             DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
                                             deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
                                                 @Override
                                                 public void select(int type) {
-                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),userId,position,itemPosition);
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),registerUser.getUserid(),position,itemPosition);
                                                 }
                                             });
                                             new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
diff --git a/app/src/main/res/layout/dialog_select_delete.xml b/app/src/main/res/layout/dialog_select_delete.xml
index ec2969d..ecf4154 100644
--- a/app/src/main/res/layout/dialog_select_delete.xml
+++ b/app/src/main/res/layout/dialog_select_delete.xml
@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:background="@null"
     android:orientation="vertical">
 
 
@@ -45,7 +43,6 @@
         android:layout_marginTop="15dp"
         android:background="@drawable/selector_bottom_dialog_btn"
         android:paddingTop="5dp"
-        android:paddingBottom="5dp"
         android:text="取消"
         android:textAllCaps="false"
         android:textSize="16sp" />

From 7840d87bc36abde9946ba418b891e008c417afba Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Tue, 13 Apr 2021 09:21:22 +0800
Subject: [PATCH 6/8] d

---
 .idea/runConfigurations.xml                   | 1 -
 app/src/main/res/layout/activity_login.xml    | 4 ++--
 app/src/main/res/layout/activity_register.xml | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index e497da9..7f68460 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,7 +3,6 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index aee35c7..acd54cf 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -113,13 +113,13 @@
 
                 <RelativeLayout
                     android:id="@+id/rlzhuce"
-                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dip"
                     android:layout_marginRight="20dip"
                     android:layout_marginTop="16dp"
                     android:gravity="center"
+                    android:visibility="gone"
                     android:textColor="@color/white">
 
                     <TextView
@@ -189,7 +189,7 @@
                         android:id="@+id/agreewhitemegy"
                         android:button="@drawable/checkbox_style"
                         android:layout_width="wrap_content"
-                        android:checked="false"
+                        android:checked="true"
                         android:layout_height="wrap_content" />
                     <TextView
                         android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index bcb4cef..942e825 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -227,7 +227,7 @@
                     android:id="@+id/agreewhitemeg"
                     android:button="@drawable/checkbox_style"
                     android:layout_width="wrap_content"
-                    android:checked="true"
+                    android:checked="false"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:layout_marginStart="10dp"
@@ -255,7 +255,7 @@
                     android:id="@+id/agreewhitemegy"
                     android:button="@drawable/checkbox_style"
                     android:layout_width="wrap_content"
-                    android:checked="true"
+                    android:checked="false"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:layout_marginStart="10dp"
@@ -267,7 +267,7 @@
                     android:onClick="yinagreementEvent"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
-                    android:text="@string/agreewhitemeg1"
+                    android:text="@string/agreewhitemeg2"
                     android:textSize="16sp"/>
 
             </LinearLayout>

From ca62cd201d2ef84eeb6f7681cd993c5d73f3e7f4 Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Fri, 16 Apr 2021 16:36:35 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=9E=81=E5=85=89?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/runConfigurations.xml                   |  1 +
 app/build.gradle                              |  7 ++++
 app/src/main/AndroidManifest.xml              | 20 ++++++++++++
 .../com/sl/house_property/LoginActivity.java  |  2 ++
 .../com/sl/house_property/MyApplication.java  |  3 ++
 .../sl/house_property/SettingActivity.java    |  2 ++
 .../sl/house_property/push/MyReceiver.java    | 32 +++++++++++++++++++
 .../com/sl/house_property/push/XService.java  |  7 ++++
 8 files changed, 74 insertions(+)
 create mode 100644 app/src/main/java/com/sl/house_property/push/MyReceiver.java
 create mode 100644 app/src/main/java/com/sl/house_property/push/XService.java

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 88a09e0..e6e74b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,6 +46,11 @@ android {
             abiFilters  'armeabi-v7a'
 
         }
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY : "b1e5d676de9824fe0afc023b", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+        ]
     }
     buildTypes {
         release {
@@ -149,6 +154,8 @@ android {
 
 
         implementation 'com.lzy.net:okgo:3.0.4'
+        implementation 'cn.jiguang.sdk:jpush:3.6.6'
+        implementation 'cn.jiguang.sdk:jcore:2.3.8'
     }
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff43c7c..4c09f84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -78,6 +78,26 @@
         <!--        <queries>-->
         <!--            <package android:name="com.tencent.mm" />-->
         <!--        </queries>-->
+        <receiver
+            android:name=".push.MyReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
+
+                <category android:name="com.sl.house_property" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".push.XService"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":pushcore">
+            <intent-filter>
+                <action android:name="cn.jiguang.user.service.action" />
+            </intent-filter>
+        </service>
         <provider
             android:name="com.sl.house_property.ImagePickerProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/com/sl/house_property/LoginActivity.java b/app/src/main/java/com/sl/house_property/LoginActivity.java
index 7c7c995..7ff7e76 100644
--- a/app/src/main/java/com/sl/house_property/LoginActivity.java
+++ b/app/src/main/java/com/sl/house_property/LoginActivity.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import cn.jpush.android.api.JPushInterface;
 import entity.RegisterUser;
 import my_loader.Loader;
 import my_loader.Resultcode;
@@ -157,6 +158,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
                         LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
                         String s = gs.toJson(adta);
                         RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
+                        JPushInterface.setAlias(getApplicationContext(),0,user.getUserid());
                         Config.getInstance(LoginActivity.this).putUser(user);
                         Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim());
 
diff --git a/app/src/main/java/com/sl/house_property/MyApplication.java b/app/src/main/java/com/sl/house_property/MyApplication.java
index 7ff6dcd..c498fd9 100644
--- a/app/src/main/java/com/sl/house_property/MyApplication.java
+++ b/app/src/main/java/com/sl/house_property/MyApplication.java
@@ -31,6 +31,7 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.X509TrustManager;
 
+import cn.jpush.android.api.JPushInterface;
 import okhttp3.OkHttpClient;
 import tools.CrashHandler;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
@@ -84,6 +85,8 @@ public class MyApplication extends Application{
         super.onCreate();
         instance = this;
         initOkGo();
+        JPushInterface.init(this);
+        JPushInterface.setDebugMode(true);
 //
 //        CrashHandler crashHandler = CrashHandler.getInstance();
 //  crashHandler.init(this);
diff --git a/app/src/main/java/com/sl/house_property/SettingActivity.java b/app/src/main/java/com/sl/house_property/SettingActivity.java
index 15e1568..62f238a 100644
--- a/app/src/main/java/com/sl/house_property/SettingActivity.java
+++ b/app/src/main/java/com/sl/house_property/SettingActivity.java
@@ -9,6 +9,7 @@ import android.widget.Toast;
 
 import com.sl.house_property.databinding.ActivitySettingBinding;
 
+import cn.jpush.android.api.JPushInterface;
 import tools.APKVersionCodeUtils;
 import tools.Config;
 import utils.CacheDataManager;
@@ -92,6 +93,7 @@ public class SettingActivity extends BaseActivity<ActivitySettingBinding> implem
 
                 break;
             case R.id.loginout:
+                JPushInterface.deleteAlias(getApplicationContext(),0);
                 Config.getInstance(SettingActivity.this).DeleteUser();
                 MyApplication.getApp().existActivitys();
                 intent = new Intent(SettingActivity.this, LoginActivity.class);
diff --git a/app/src/main/java/com/sl/house_property/push/MyReceiver.java b/app/src/main/java/com/sl/house_property/push/MyReceiver.java
new file mode 100644
index 0000000..a58b980
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/push/MyReceiver.java
@@ -0,0 +1,32 @@
+package com.sl.house_property.push;
+
+import android.content.Context;
+import android.util.Log;
+import android.widget.Toast;
+
+
+import cn.jpush.android.api.CustomMessage;
+import cn.jpush.android.api.NotificationMessage;
+import cn.jpush.android.service.JPushMessageReceiver;
+
+public class MyReceiver extends JPushMessageReceiver {
+
+
+    @Override
+    public void onRegister(Context context, String s) {
+        super.onRegister(context, s);
+        Log.e("xxxx", s);
+    }
+
+    @Override
+    public void onMessage(Context context, CustomMessage customMessage) {
+        super.onMessage(context, customMessage);
+        Log.e("message", customMessage.toString());
+    }
+
+    @Override
+    public void onNotifyMessageArrived(Context context, NotificationMessage notificationMessage) {
+        super.onNotifyMessageArrived(context, notificationMessage);
+        Log.e("极光" , "收到了推送消息");
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/push/XService.java b/app/src/main/java/com/sl/house_property/push/XService.java
new file mode 100644
index 0000000..f6f7d50
--- /dev/null
+++ b/app/src/main/java/com/sl/house_property/push/XService.java
@@ -0,0 +1,7 @@
+package com.sl.house_property.push;
+
+import cn.jpush.android.service.JCommonService;
+
+public class XService extends JCommonService {
+
+}

From fa7a351268edf80cd569e486cee8cbe2fa0c9ded Mon Sep 17 00:00:00 2001
From: jinyuer <454386664@qq.com>
Date: Fri, 16 Apr 2021 16:45:53 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=9E=81=E5=85=89?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e6e74b1..4399a30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,7 @@ android {
         }
         manifestPlaceholders = [
                 JPUSH_PKGNAME : applicationId,
-                JPUSH_APPKEY : "b1e5d676de9824fe0afc023b", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey.
                 JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
         ]
     }