admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
jinyuer
2021-04-08 11:29:32 +08:00
parent d6360a58d9
commit 0ee43d6300
6 changed files with 339 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/runConfigurations.xml generated
View File

@@ -3,6 +3,7 @@
<component name="RunConfigurationProducerService"> <component name="RunConfigurationProducerService">
<option name="ignoredProducers"> <option name="ignoredProducers">
<set> <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.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

95
app/src/main/java/com/sl/house_property/MainFragment.java
View File

@@ -42,6 +42,7 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.selectpicker.OptionsPopupWindow; import com.selectpicker.OptionsPopupWindow;
import com.sl.house_property.databinding.FragmentMainBinding; import com.sl.house_property.databinding.FragmentMainBinding;
import com.sl.house_property.databinding.ItemCommentBinding; import com.sl.house_property.databinding.ItemCommentBinding;
import com.sl.house_property.databinding.ItemDiscoveryBinding; import com.sl.house_property.databinding.ItemDiscoveryBinding;
import com.sl.house_property.db.CommentBeanData; import com.sl.house_property.db.CommentBeanData;
@@ -788,12 +789,15 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
commentDialog.dismiss(); commentDialog.dismiss();
like(discoveryListEntity.getGoods_id(), position); like(discoveryListEntity.getGoods_id(), position);
} else if (type == 3) { } else if (type == 3) {
itemIndex = -1;
mDataBinding.llComment.setVisibility(View.VISIBLE); mDataBinding.llComment.setVisibility(View.VISIBLE);
mDataBinding.etComment.requestFocus(); mDataBinding.etComment.requestFocus();
mDataBinding.etComment.setHint("评论"); mDataBinding.etComment.setHint("评论");
MainTabActivity activity = (MainTabActivity) getActivity(); if (getActivity() instanceof MainTabActivity) {
MainTabActivity activity = (MainTabActivity) getActivity();
activity.visibilyBottom(View.GONE);
}
KeyboardUtil.showSoftInput(getContext()); KeyboardUtil.showSoftInput(getContext());
activity.visibilyBottom(View.GONE);
commentPosition = position; commentPosition = position;
commentDialog.dismiss(); commentDialog.dismiss();
mDataBinding.etComment.setText(""); mDataBinding.etComment.setText("");
@@ -805,6 +809,23 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y); mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
} }
}, 300); }, 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) { } 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(); final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
@Override @Override
public void onBindViewHolder(Object b, int position) { public void onBindViewHolder(Object b, final int itemPosition) {
ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b; ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ": "); if (dis_content.get(itemPosition).getReply().isEmpty()) {
itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
if (dis_content.get(position).getReply().isEmpty()) {
itemCommentBinding.llHf.setVisibility(View.GONE); 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 { } else {
itemCommentBinding.ll.setVisibility(View.GONE);
itemCommentBinding.llHf.setVisibility(View.VISIBLE); itemCommentBinding.llHf.setVisibility(View.VISIBLE);
itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname()); itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
itemCommentBinding.tvInfo2.setText("回复"); itemCommentBinding.tvInfo2.setText("回复");
itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":"); itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
itemCommentBinding.tvInfo3.setText(dis_content.get(position).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); baseRecycleViewAdapter.setData(dis_content);
@@ -943,12 +995,13 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
mDataBinding.llComment.setVisibility(View.GONE); mDataBinding.llComment.setVisibility(View.GONE);
activity.visibilyBottom(View.VISIBLE); activity.visibilyBottom(View.VISIBLE);
Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id()); 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 commentPosition = -1;
private int itemIndex = -1;
@Override @Override
public boolean onTouch(MotionEvent ev) { public boolean onTouch(MotionEvent ev) {
switch (ev.getAction()) { switch (ev.getAction()) {
@@ -1042,7 +1095,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
baseActivity.addSubscription(subscription); 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 = final RegisterUser user =
Config.getInstance(getContext()).getUser(); Config.getInstance(getContext()).getUser();
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
@@ -1054,8 +1107,13 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
map.put("app", "Goods"); map.put("app", "Goods");
map.put("class", "DisGoods"); map.put("class", "DisGoods");
map.put("goods_id", goodsId); map.put("goods_id", goodsId);
if (!TextUtils.isEmpty(reply_id)) { if (itemIndex!=-1){
map.put("reply_id", reply_id); 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("contents", content);
@@ -1076,18 +1134,21 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
baseActivity.setToast(1, resultcode.msg); baseActivity.setToast(1, resultcode.msg);
} }
if (resultcode.status == 0) { if (resultcode.status == 0) {
String nickname = user.getNickname(); String nickname = user.getNickname();
BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
dis_content.setContents(content); dis_content.setContents(content);
dis_content.setNickname(nickname); dis_content.setNickname(nickname);
dis_content.setReply("");
DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position); DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content(); 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); dis_content1.add(dis_content);
discoveryListEntity.setDis_content(dis_content1); discoveryListEntity.setDis_content(dis_content1);
adapter.upDateOne(position,discoveryListEntity); adapter.upDateOne(position, discoveryListEntity);
// BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); // BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
// if (discoveryListEntities.get(position).getDis_content().isEmpty()) { // if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
// DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); // DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();

2
app/src/main/java/com/sl/house_property/MainTabActivity.java
View File

@@ -98,7 +98,7 @@ public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
for (MyOnTouchListener listener : onTouchListeners) { for (MyOnTouchListener listener : onTouchListeners) {
// listener.onTouch(ev); //listener.onTouch(ev);
} }
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }

124
app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
View File

@@ -385,26 +385,47 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
commentDialog.dismiss(); commentDialog.dismiss();
like(discoveryListEntity.getGoods_id(), position); like(discoveryListEntity.getGoods_id(), position);
} else if (type == 3) { } else if (type == 3) {
itemIndex = -1;
mDataBinding.llComment.setVisibility(View.VISIBLE); mDataBinding.llComment.setVisibility(View.VISIBLE);
mDataBinding.etComment.requestFocus(); mDataBinding.etComment.requestFocus();
mDataBinding.etComment.setHint("评论"); mDataBinding.etComment.setHint("评论");
MainTabActivity activity = (MainTabActivity) getActivity(); if (getActivity() instanceof MainTabActivity) {
MainTabActivity activity = (MainTabActivity) getActivity();
activity.visibilyBottom(View.GONE);
}
KeyboardUtil.showSoftInput(getContext()); KeyboardUtil.showSoftInput(getContext());
activity.visibilyBottom(View.GONE); commentPosition = position;
commentDialog.dismiss(); commentDialog.dismiss();
mDataBinding.etComment.setText(""); mDataBinding.etComment.setText("");
commentPosition = position;
homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() { homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
int y = getCoordinateY(mDataBinding.llComment) - 20; int y = getCoordinateY(mDataBinding.llComment) - 20;
//评论时滑动到对应item底部和输入框顶部对齐 //评论时滑动到对应item底部和输入框顶部对齐
mDataBinding.sv.smoothScrollBy(0, mBottomY - y); mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
} }
}, 300); }, 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) { } else if (type == 4) {
// addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.) // 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(); final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
@Override @Override
public void onBindViewHolder(Object b, int position) { public void onBindViewHolder(Object b, final int itemPosition) {
ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b; ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ": "); // itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ": ");
itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents()); // itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
if (dis_content.get(position).getReply().isEmpty()) { // 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.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 { } else {
itemCommentBinding.ll.setVisibility(View.GONE);
itemCommentBinding.llHf.setVisibility(View.VISIBLE); itemCommentBinding.llHf.setVisibility(View.VISIBLE);
itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname()); itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
itemCommentBinding.tvInfo2.setText("回复"); itemCommentBinding.tvInfo2.setText("回复");
itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":"); itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
itemCommentBinding.tvInfo3.setText(dis_content.get(position).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); baseRecycleViewAdapter.setData(dis_content);
@@ -544,7 +609,7 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
mDataBinding.llComment.setVisibility(View.GONE); mDataBinding.llComment.setVisibility(View.GONE);
activity.visibilyBottom(View.VISIBLE); activity.visibilyBottom(View.VISIBLE);
Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id()); 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); baseActivity.addSubscription(subscription);
} }
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 = final RegisterUser user =
Config.getInstance(getContext()).getUser(); Config.getInstance(getContext()).getUser();
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
@@ -790,8 +855,13 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
map.put("app", "Goods"); map.put("app", "Goods");
map.put("class", "DisGoods"); map.put("class", "DisGoods");
map.put("goods_id", goodsId); map.put("goods_id", goodsId);
if (!TextUtils.isEmpty(reply_id)) { if (itemIndex!=-1){
map.put("reply_id", reply_id); 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("contents", content);
@@ -817,13 +887,27 @@ public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> im
DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
dis_content.setContents(content); dis_content.setContents(content);
dis_content.setNickname(nickname); dis_content.setNickname(nickname);
dis_content.setReply("");
DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position); DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content(); 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); dis_content1.add(dis_content);
discoveryListEntity.setDis_content(dis_content1); discoveryListEntity.setDis_content(dis_content1);
adapter.upDateOne(position, discoveryListEntity); 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(); // BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
// if (discoveryListEntities.get(position).getDis_content().isEmpty()) { // if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
// DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); // DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();

237
app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
View File

@@ -84,14 +84,14 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
return R.layout.fragment_history_record; 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(); HistoryRecordFragment fragment = new HistoryRecordFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt("param1", param1); args.putInt("param1", param1);
args.putString("param2", param2); args.putString("param2", param2);
args.putInt("num",i); args.putInt("num", i);
args.putInt("dataType",num); args.putInt("dataType", num);
args.putString("wy_id",wy_id); args.putString("wy_id", wy_id);
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@@ -113,9 +113,9 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
activity.registerMyOnTouchListener(this); activity.registerMyOnTouchListener(this);
} else if (getActivity() instanceof HistoryRecordActivity) { } else if (getActivity() instanceof HistoryRecordActivity) {
((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this); ((HistoryRecordActivity) getActivity()).registerMyOnTouchListener(this);
}else if (getActivity() instanceof LikeActivity){ } else if (getActivity() instanceof LikeActivity) {
((LikeActivity) getActivity()).registerMyOnTouchListener(this); ((LikeActivity) getActivity()).registerMyOnTouchListener(this);
}else if (getActivity() instanceof HistoryRecordActivitytwo){ } else if (getActivity() instanceof HistoryRecordActivitytwo) {
((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this); ((HistoryRecordActivitytwo) getActivity()).registerMyOnTouchListener(this);
} }
@@ -160,6 +160,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
MainTabActivity activity = (MainTabActivity) getActivity(); MainTabActivity activity = (MainTabActivity) getActivity();
activity.visibilyBottom(View.VISIBLE); activity.visibilyBottom(View.VISIBLE);
} }
mDataBinding.llComment.setVisibility(View.GONE); mDataBinding.llComment.setVisibility(View.GONE);
} }
break; break;
@@ -207,8 +208,23 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
} else if (View.GONE == visibility) { } 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); CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
} }
} }
@@ -256,7 +272,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE); homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
StringBuilder likeString = new StringBuilder(); StringBuilder likeString = new StringBuilder();
for (int i = 0; i < discoveryListEntity.getLike().size(); i++) { for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
if (i != 0 ) { if (i != 0) {
likeString.append(","); likeString.append(",");
} }
likeString.append(discoveryListEntity.getLike().get(i).getNickname()); 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(); final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
@Override @Override
public void onBindViewHolder(Object b, int position) { public void onBindViewHolder(Object b, final int itemPosition) {
ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b; 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 { } else {
itemCommentBinding.ll.setVisibility(View.GONE);
itemCommentBinding.llHf.setVisibility(View.VISIBLE); itemCommentBinding.llHf.setVisibility(View.VISIBLE);
itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname()); itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
itemCommentBinding.tvInfo2.setText("回复"); itemCommentBinding.tvInfo2.setText("回复");
itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":"); itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
itemCommentBinding.tvInfo3.setText(dis_content.get(position).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); 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 imageInfo = new ImageInfo();
imageInfo.setType(1); imageInfo.setType(1);
imageInfo.setBigImageUrl(discoveryListEntity.getThumb()); imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
@@ -360,6 +410,7 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
commentDialog.dismiss(); commentDialog.dismiss();
like(discoveryListEntity.getGoods_id(), position); like(discoveryListEntity.getGoods_id(), position);
} else if (type == 3) { } else if (type == 3) {
itemIndex = -1;
mDataBinding.llComment.setVisibility(View.VISIBLE); mDataBinding.llComment.setVisibility(View.VISIBLE);
mDataBinding.etComment.requestFocus(); mDataBinding.etComment.requestFocus();
mDataBinding.etComment.setHint("评论"); mDataBinding.etComment.setHint("评论");
@@ -412,22 +463,22 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE); mDataBinding.llComment.setVisibility(View.GONE);
activity.visibilyBottom(View.VISIBLE); 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) { } else if (getActivity() instanceof HistoryRecordActivity) {
CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE); 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); CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE); 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); CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
mDataBinding.llComment.setVisibility(View.GONE); 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 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 = final RegisterUser user =
Config.getInstance(getContext()).getUser(); Config.getInstance(getContext()).getUser();
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
@@ -449,10 +501,16 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
map.put("app", "Goods"); map.put("app", "Goods");
map.put("class", "DisGoods"); map.put("class", "DisGoods");
map.put("goods_id", goodsId); map.put("goods_id", goodsId);
if (!TextUtils.isEmpty(reply_id)) { if (itemIndex!=-1){
map.put("reply_id", reply_id); 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("contents", content);
map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret)); map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
progressDialog.setMessage("提交中"); progressDialog.setMessage("提交中");
@@ -477,11 +535,13 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
dis_content.setContents(content); dis_content.setContents(content);
dis_content.setNickname(nickname); dis_content.setNickname(nickname);
dis_content.setReply("");
DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position); DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content(); 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); dis_content1.add(dis_content);
discoveryListEntity.setDis_content(dis_content1); discoveryListEntity.setDis_content(dis_content1);
adapter.upDateOne(position, discoveryListEntity); adapter.upDateOne(position, discoveryListEntity);
} }
@@ -645,10 +705,10 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
if (resultcode.status == 0) { if (resultcode.status == 0) {
BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
if (discoveryListEntities.get(position).getIs_like() == 1) { if (discoveryListEntities.get(position).getIs_like() == 1) {
if (getArguments().getInt("dataType")==3){ if (getArguments().getInt("dataType") == 3) {
discoveryListEntities.remove(position); discoveryListEntities.remove(position);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
}else { } else {
discoveryListEntities.get(position).setIs_like(0); discoveryListEntities.get(position).setIs_like(0);
ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike(); ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
for (int i = 0; i < like.size(); i++) { for (int i = 0; i < like.size(); i++) {
@@ -704,17 +764,17 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
map.put("type", type + ""); map.put("type", type + "");
map.put("app", "Goods"); map.put("app", "Goods");
if (getArguments().getInt("dataType")==1){ if (getArguments().getInt("dataType") == 1) {
// String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,""); // String wy_id=(String) SPUtils.getSp(getActivity(), DoConfig.MY_HOUST_WYID,"");
Log.e("物业id",wy_id); Log.e("物业id", wy_id);
map.put("userid", wy_id); map.put("userid", wy_id);
map.put("class", "WyGoodsLists"); map.put("class", "WyGoodsLists");
map.put("sign", Md5.md5("Goods" + "WyGoodsLists" + Md5.secret)); 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("userid", userId);
map.put("class", "UpGoodsLists"); map.put("class", "UpGoodsLists");
map.put("sign", Md5.md5("Goods" + "UpGoodsLists" + Md5.secret)); map.put("sign", Md5.md5("Goods" + "UpGoodsLists" + Md5.secret));
}else { } else {
map.put("userid", userId); map.put("userid", userId);
map.put("class", "MyGoodsLists"); map.put("class", "MyGoodsLists");
map.put("sign", Md5.md5("Goods" + "MyGoodsLists" + Md5.secret)); map.put("sign", Md5.md5("Goods" + "MyGoodsLists" + Md5.secret));
@@ -750,65 +810,64 @@ public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBin
e.printStackTrace(); e.printStackTrace();
} }
Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() { Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
}.getType(); }.getType();
if (page == 1) { if (page == 1) {
if (num == 1) { if (num == 1) {
mDataBinding.rl1.setVisibility(View.GONE); 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++;
} else { } else {
ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type); mDataBinding.rl1.setVisibility(View.VISIBLE);
discoveryListEntities.addAll(o); String fengmian = null;
try {
BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); fengmian = jsonObject.getString("fengmian");
baseRecycleViewAdapter.setData(discoveryListEntities); } catch (JSONException e) {
Log.e("sizi", discoveryListEntities.size() + ""); e.printStackTrace();
// int count = jsonObject.getInt("count");
if (o.isEmpty()) {
mDataBinding.dw.finishLoadMoreWithNoMoreData();
} else {
page++;
} }
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 { } else {
Log.e("xxxxx","fffff"); Log.e("xxxxx", "fffff");
} }
} }
}, new Action1<Throwable>() { }, new Action1<Throwable>() {

9
app/src/main/res/layout/item_comment.xml
View File

@@ -2,11 +2,14 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"> <layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
android:id="@+id/ll_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/ll"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -38,11 +41,12 @@
android:id="@+id/tv_name2" android:id="@+id/tv_name2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="1111"
android:textColor="@color/light_color_blue" android:textColor="@color/light_color_blue"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:text="回复"
android:id="@+id/tv_info2" android:id="@+id/tv_info2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -50,6 +54,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:text="3333"
android:id="@+id/tv_name3" android:id="@+id/tv_name3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -57,7 +62,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:text="12163"
android:id="@+id/tv_info3" android:id="@+id/tv_info3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"