From 7046a6a64197abadbe7ea2d8c14b2778839c93a2 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Tue, 26 Jan 2021 15:18:52 +0800 Subject: [PATCH] 1 --- .../com/sl/house_property/MainFragment.java | 46 +++++++----- .../discovery/DiscoveryFragment.java | 56 ++++++++++----- .../discovery/HistoryRecordFragment.java | 66 ++++++++++-------- app/src/main/res/layout/dialog_comment.xml | 9 +-- app/src/main/res/layout/item_discovery.xml | 3 +- app/src/main/res/mipmap-xhdpi/gm.png | Bin 0 -> 1071 bytes app/src/main/res/mipmap-xhdpi/gwc3.png | Bin 0 -> 871 bytes app/src/main/res/mipmap-xxhdpi/like.png | Bin 0 -> 1737 bytes 8 files changed, 112 insertions(+), 68 deletions(-) create mode 100644 app/src/main/res/mipmap-xhdpi/gm.png create mode 100644 app/src/main/res/mipmap-xhdpi/gwc3.png create mode 100644 app/src/main/res/mipmap-xxhdpi/like.png diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index 5052902..158422b 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -11,6 +11,7 @@ import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.text.TextPaint; import android.text.TextUtils; +import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -616,17 +617,7 @@ public class MainFragment extends BaseFragment implements V // .placeholder(R.mipmap.icon_default_rectangle) // .transform(new PicassoRoundTransform()) // .into(homeGridAdapterItemBinding.imageHead); - mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - MainTabActivity activity = (MainTabActivity) getActivity(); - CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); - mDataBinding.llComment.setVisibility(View.GONE); - activity.visibilyBottom(View.VISIBLE); - comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString()); - } - }); homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View v) { @@ -649,7 +640,7 @@ public class MainFragment extends BaseFragment implements V MainTabActivity activity = (MainTabActivity) getActivity(); KeyboardUtil.showSoftInput(getContext()); activity.visibilyBottom(View.GONE); - + commentPosition = position; commentDialog.dismiss(); mDataBinding.etComment.setText(""); homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() { @@ -686,13 +677,11 @@ public class MainFragment extends BaseFragment implements V homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE); StringBuilder likeString = new StringBuilder(); for (int i = 0; i < discoveryListEntity.getLike().size(); i++) { - if (i == 0) { - likeString.append("❤"); - - } else { + if (i != 0 && i != discoveryListEntity.getLike().size() - 1) { likeString.append(","); } likeString.append(discoveryListEntity.getLike().get(i).getNickname()); + } homeGridAdapterItemBinding.tvLike.setText(likeString.toString()); @@ -786,8 +775,22 @@ public class MainFragment extends BaseFragment implements V mDataBinding.recyView.setAdapter(baseRecycleViewAdapter); baseRecycleViewAdapter.setData(discoveryListEntities); - } + mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (commentPosition != -1) { + MainTabActivity activity = (MainTabActivity) getActivity(); + CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); + mDataBinding.llComment.setVisibility(View.GONE); + activity.visibilyBottom(View.VISIBLE); + Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id()); + comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString()); + } + } + }); + } + private int commentPosition = -1; @Override public boolean onTouch(MotionEvent ev) { switch (ev.getAction()) { @@ -915,7 +918,18 @@ public class MainFragment extends BaseFragment 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 dis_content1 = discoveryListEntity.getDis_content(); + dis_content1.add(dis_content); + discoveryListEntity.setDis_content(dis_content1); + adapter.upDateOne(position,discoveryListEntity); // BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); // if (discoveryListEntities.get(position).getDis_content().isEmpty()) { // DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); diff --git a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java index eb08a68..33bff09 100644 --- a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java @@ -118,7 +118,7 @@ public class DiscoveryFragment extends BaseFragment im public void onSelect(int position, String text) { Intent intent = new Intent(getContext(), AddDiscoveryActivity.class); intent.putExtra("type", position); - startActivityForResult(intent,14); + startActivityForResult(intent, 14); } }).show(); @@ -315,6 +315,7 @@ public class DiscoveryFragment extends BaseFragment im return coordinate[1]; } + private int commentPosition = -1; private void intRecycleView() { mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() { @@ -333,6 +334,7 @@ public class DiscoveryFragment extends BaseFragment im return false; } }); + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity); mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动 mDataBinding.recyView.setLayoutManager(linearLayoutManager); @@ -354,17 +356,7 @@ public class DiscoveryFragment extends BaseFragment im // .placeholder(R.mipmap.icon_default_rectangle) // .transform(new PicassoRoundTransform()) // .into(homeGridAdapterItemBinding.imageHead); - mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - MainTabActivity activity = (MainTabActivity) getActivity(); - CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); - mDataBinding.llComment.setVisibility(View.GONE); - activity.visibilyBottom(View.VISIBLE); - comment(discoveryListEntity.getGoods_id(), position, "", mDataBinding.etComment.getText().toString()); - } - }); homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View v) { @@ -390,12 +382,14 @@ public class DiscoveryFragment extends BaseFragment im commentDialog.dismiss(); mDataBinding.etComment.setText(""); + commentPosition = position; homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() { @Override public void run() { int y = getCoordinateY(mDataBinding.llComment) - 20; //评论时滑动到对应item底部和输入框顶部对齐 mDataBinding.sv.smoothScrollBy(0, mBottomY - y); + } }, 300); @@ -424,13 +418,11 @@ public class DiscoveryFragment extends BaseFragment im homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE); StringBuilder likeString = new StringBuilder(); for (int i = 0; i < discoveryListEntity.getLike().size(); i++) { - if (i == 0) { - likeString.append("❤"); - - } else { + if (i != 0 && i != discoveryListEntity.getLike().size() - 1) { likeString.append(","); } likeString.append(discoveryListEntity.getLike().get(i).getNickname()); + } homeGridAdapterItemBinding.tvLike.setText(likeString.toString()); @@ -492,7 +484,7 @@ public class DiscoveryFragment extends BaseFragment im if (discoveryListEntity.getPic().size() > 0) { - // Log.e("pic", discoveryListEntity.getPic().get(0)); + // Log.e("pic", discoveryListEntity.getPic().get(0)); for (int i = 0; i < discoveryListEntity.getPic().size(); i++) { if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) { ImageInfo imageInfo = new ImageInfo(); @@ -524,6 +516,21 @@ public class DiscoveryFragment extends BaseFragment im mDataBinding.recyView.setAdapter(baseRecycleViewAdapter); baseRecycleViewAdapter.setData(discoveryListEntities); + mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // discoveryListEntity. + if (commentPosition != -1) { + MainTabActivity activity = (MainTabActivity) getActivity(); + CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment); + mDataBinding.llComment.setVisibility(View.GONE); + activity.visibilyBottom(View.VISIBLE); + Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id()); + comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, "", mDataBinding.etComment.getText().toString()); + } + + } + }); } private void getGankList(String myurl, Map map, String msg, final int requstecode) { @@ -567,6 +574,7 @@ public class DiscoveryFragment extends BaseFragment im .placeholder(R.mipmap.icon_default_rectangle) .transform(new PicassoRoundTransform()) .into(mDataBinding.head); + ArrayList o = new Gson().fromJson(array.toString(), type); discoveryListEntities.clear(); discoveryListEntities.addAll(o); @@ -579,7 +587,7 @@ public class DiscoveryFragment extends BaseFragment im BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); baseRecycleViewAdapter.setData(discoveryListEntities); - // Log.e("sizi", discoveryListEntities.size() + ""); + // Log.e("sizi", discoveryListEntities.size() + ""); // int count = jsonObject.getInt("count"); if (o.isEmpty()) { mDataBinding.dw.finishLoadMoreWithNoMoreData(); @@ -749,6 +757,7 @@ public class DiscoveryFragment extends BaseFragment im Map map = new HashMap<>(); if (user != null) { map.put("userid", user.getUserid()); + } else { map.put("userid", 0 + ""); } @@ -777,7 +786,18 @@ public class DiscoveryFragment extends BaseFragment im baseActivity.setToast(1, resultcode.msg); } if (resultcode.status == 0) { + String nickname = user.getNickname(); + BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); + DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); + dis_content.setContents(content); + dis_content.setNickname(nickname); + dis_content.setReply(""); + DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position); + ArrayList dis_content1 = discoveryListEntity.getDis_content(); + dis_content1.add(dis_content); + discoveryListEntity.setDis_content(dis_content1); + adapter.upDateOne(position,discoveryListEntity); // BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); // if (discoveryListEntities.get(position).getDis_content().isEmpty()) { // DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); @@ -808,7 +828,7 @@ public class DiscoveryFragment extends BaseFragment im @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode==14&&resultCode==200){ + if (requestCode == 14 && resultCode == 200) { page = 1; getlist(1); } diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java index cbf2ca4..7b41876 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java @@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.app.FragmentActivity; import android.support.v7.widget.LinearLayoutManager; import android.text.TextUtils; import android.util.Log; @@ -236,36 +237,18 @@ public class HistoryRecordFragment extends BaseFragment dis_content1 = discoveryListEntity.getDis_content(); + dis_content1.add(dis_content); - - adapter.upDateOne(position, discoveryListEntities.get(position)); + discoveryListEntity.setDis_content(dis_content1); + adapter.upDateOne(position,discoveryListEntity); } } diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml index 3448001..24835f8 100644 --- a/app/src/main/res/layout/dialog_comment.xml +++ b/app/src/main/res/layout/dialog_comment.xml @@ -6,6 +6,7 @@ android:orientation="horizontal"> + /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_discovery.xml b/app/src/main/res/layout/item_discovery.xml index 2cac3a7..a35b6a7 100644 --- a/app/src/main/res/layout/item_discovery.xml +++ b/app/src/main/res/layout/item_discovery.xml @@ -75,12 +75,13 @@ + /> VMCx~^E^Lo3{V z766u;!36^g24?iYe~ystn}E|g=zT)cA8m5BZv#&0pr@Z5a79;* zz$!_9)#Yv90=(EmPan|(lFrNvmH^n^51ije6L71fml^;(2i)FMS0C}+k~YSI3V`kF zf!C6TJ;1gJ+JdPVuSmMNl(l^f5cB7z|F;0&^|5Y@>_f!~*(7Oa2Jk9yLt40A(mUfe zv>o%;B$*w+F5oNRGT<&?eVY3RIIiiKO#{gGb-?Rs?HiJ=%>c@?zfMxH&^l_0#))o| zv~?O|o7UKl`@hH*EGN@c59%r#*)QkQ5#T+z(s~TmpOxd<;A< z>6@WEpY;sNz|h8Z(YFB5#Y^*)Sul`1P&)Z*Nx#+-*-|M|hU12{)v}t*@xU2L-$6+S z8+1<}Mq6s7*ko4@nFY;NoNkC9kz+OiKc=~(B}LeciXd`Egyx-+LS|&le1r-B*|5mo zQN11stPYQL0T94!zW_wVdY`22wvPb987E|2a|Mv8xBVHgCUSwKeLVm~sU0lrm$b(A zoxn3~-XA29l?(&`+mXDYjtXO<=J~xVfMif+;YQ#dU~QZChXzn*_X0_u*EVUr1Nm;) z&MdqSTshABLj%a=_T{O({UxeUNpJUIpvFS{tnN`;E*bO^7k40+xO*k7wS78p05~k^ z#3Bksnf-JeIZ1KxtI-Cy3B$VX^3 za4B#quvJp^e_?FI{120{5#M7h-IwKLpkz2QalBFQExa0l9xGmEF?Be3e|x$3|2{(X zj>XTwAxVF?oY}L|CI12VBxl?P0M%a|UV_6uXxgI1y#Am063@%9u6h>$x_W9}a)UEq zJ3s1A22KJZA{_#DjLWFg0vr^8?G3=gEp3%32Of~Lds<`Xl8K8renEl!>z{kd-EGH%zb~Vc07S_?64@4? pStq${-t!9v=I!B0`d2&y{{ol5u}^J7V3_~_002ovPDHLkV1m-7^-BN% literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/gwc3.png b/app/src/main/res/mipmap-xhdpi/gwc3.png new file mode 100644 index 0000000000000000000000000000000000000000..ecbf145f267300bb835943896db6f5c860540d92 GIT binary patch literal 871 zcmV-t1DO1YP)3k3{V~e zLyv?3BU)Ntd+T(&_nv*uclhp+UAuekz31%p|LwikUTg0oYF<=x{rnpMW_Awv3_J#& z0WTzdsl({V%!UH*nuvW0+ySmgy3(mI-BZZS`UB&EaSfkQ_i0JXI}xI-5182sU?(sF zm@VmAr$OX8v6<}(5NjkIuOq-r;3m)|$zeLGq>R7@;1J+WeI581>WA?83HT)GYj2RH z0BiydB#Qf%0d&v^>DS$$jaAam#I~E>mIAOD*bm$WjsinM9h|xL-{SY&HXD>QLN^7? zf=l`y+sHL$W?O)L4j{?>p=~jlsz9oXGT03mz01z;ghk z;EW&hqyWSX&F^y|GwTENTFqvvDFAUpQ`>_rKk$9hY0GGwU%4aTH^wC^yg#_q0X`5V zyiEcK5HTWmkba82VluN~z%<}&3yLM-II#*yKm5wG^D=n^q9QZ%w>5KGD7-3ZZWZdy z%%|$SJUfK|%xom^I!E9rNpE@rQN&JBfQi6^9C4E*J?tSsvYny;J}=+rh#M-&kJU>T zGfTEp2q3IR7k~vV)LoRcu(a~bgJzawr!YW(xCcyb5PDzIlq$q$7K~gwr2qoNGGJCP xc0{%nP2DhitiKmr^5gM002ovPDHLkV1lF~jobhL literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/like.png b/app/src/main/res/mipmap-xxhdpi/like.png new file mode 100644 index 0000000000000000000000000000000000000000..8db1f4e2a0242c69f44633c1a2b5d2b1bdafb4ed GIT binary patch literal 1737 zcmV;)1~&PLP)I&_Jmg6}2|i7=GF|rUmxR)B=_&4VtDuc88tm=gkTrR?83g-fyz+QzNqU;pmCAIiX&?Vc7 zWHiMCE>K~-z$byzfIfw7mhh|!n~UHLn}M>g^HljJ1Eh=CRuvu$9eKE(bII2`L~(&n z6#)abs?r-)Wc5(~bp>>+*0U{(mB7t)2L4lEhr$`aCx!ri_@sAmwl0%{rvHK`^n`bJ z;{$ip@jnFY1P&ybJ$bN?!bVY61Qq$?;J%{-bgb4{3HkJ?9}rj<34ccTRoEr3rXZbF zJy|WzSLJ%(Cg7A@fDL0{ZlqX|U@~%5u5Y`-W0tb<#C`lV6>9p+KhSX;=1PPs6mHCo z>1RO1vb=~R1lXQl2RxB;cuga&59iBYMoRfv-`7%G8;-z&%-4ukEZ{Rq+nWe0Px==< zdD25++n(MIJP3?QeMGsnR*|*Y|LkdcIw^uJIj~KED^o`zKDgiZ^-7c;;GBG)!q2sx z#k=N-nJ$HG{2Cp5Fk&+>F&$*VkaTgtP!L0=ABdAiYH@m%(GmMV7wuc<|M z{@rN=x9sZ|Re2^8Axx_|vLVhusj90)SeSHn2d>=LNRU>KDS5h9U``U}M}aH1#R6 z7Q3p;5bidSBjt0uD)L;*S&Sk;M^!Jkgx|&x%00)wfO1tAs<0{+q|6R0^5`fYP|Jtf zzTTFs^dM)C2PTq(3SNqXVO4`K?~XTz?JjUt;7nEc;A8wy`dxNa@|0f)(t87 z`iLmsNZ!})g%!Cg7EoTJ6Ex!aB=p;d`oH??RXqeJCL}x+I5KnKXJVaebaE8&hxGKLa9QZe?~erqB~L#q z@VkV|VasA_Uzfy(uOp6>B~OoViLr zI<`H|!h|GMYXe7a{V@5Le7)0DBoYoU95}?(w-(8N>IyK8$(eRzHkFhG!_{S4DX!$} z3{jp;rw+o^fg``p$E;fyvOVpBxQ>(B)WDTZtt2}b+pg;8O&KTG?gXx^8SFP?WzP20 z)N)K&BQ}k=xJY@W86pQQSO&5uaHU>RZ201??ddOpFJz>YOY2p~nn60nDEWGWD39kb z*9T{DEnk)XdT~aqPTQVl+YAFB!WA_~2KM7kwz8*l6tbd~DLGoo#eEfdXQ)sk3W#59 zPxk>IOF=B*nm$L&i{3OV`8r#a-aKHxMd|NdvTL{?g#;ub_5!D7?}RWjbeePgELZjG zDm<1aYFSK47ptZSFd$`5wrm-JQS#Ui+cGmwJi z4-`pT&j}XJ&Mqe0n2e{>LOXS_68==y$fFu)UjW8n8`oC%3)IOH4ygFC@ktbv>L;8hYfmykBbMLS;a3#Ou zzAqi45?~@Fw=^qNnVUrx`UP&TIkL{QCDlK(qkQk8LU>3bmJaugFQR1B0@5JKcic>a zGt)K^dQ~xZVA+-gcuR%u(2*Y(Avlsx(*&469jo=z$^F`wh6wz06tQ&Ie0gOgVnzF# zDj*GNd-@&Vo