From 143768409f1b81670d99f4eb36f432eee4dbf7c8 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Mon, 31 Aug 2020 16:16:44 +0800 Subject: [PATCH] d --- .../seven/main/find/CommentActivity.java | 3 +- .../main/find/adapter/CommentAdapter.java | 27 ++-- .../seven/main/find/entity/CommentBean.java | 139 ++++++++++++++++++ .../seven/main/find/ui/CommentFragment.java | 68 ++++++--- .../main/find/ui/PrivateletterFragment.java | 2 +- .../seven/main/kehu/Dialog/RreplyDialog.java | 17 ++- .../kehu/activity/FpOrderInfoActivitytwo.java | 2 +- .../seven/main/kehu/activity/ShowAty.java | 5 +- .../fenghoo/seven/okgonet/HttpConstants.java | 9 ++ app/src/main/res/layout/comment_item.xml | 2 + app/src/main/res/layout/reply_dialog.xml | 14 +- 11 files changed, 242 insertions(+), 46 deletions(-) create mode 100644 app/src/main/java/com/fenghoo/seven/main/find/entity/CommentBean.java diff --git a/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java b/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java index b2ee9e5..fe5582a 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/CommentActivity.java @@ -21,7 +21,8 @@ public class CommentActivity extends BaseActivity { mTitleBar = findViewById(R.id.title_bar); initNormalBack(); String num = getIntent().getStringExtra("num"); + String aweme_id = getIntent().getStringExtra("aweme_id"); mTitleBar.setTitle("新评论"+"("+num+")"); - getSupportFragmentManager().beginTransaction().replace(R.id.container,new CommentFragment()).commit(); + getSupportFragmentManager().beginTransaction().replace(R.id.container,new CommentFragment(aweme_id)).commit(); } } diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/CommentAdapter.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/CommentAdapter.java index 545d955..6f94cb6 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/CommentAdapter.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/CommentAdapter.java @@ -2,19 +2,23 @@ package com.fenghoo.seven.main.find.adapter; import android.content.Context; import android.view.View; +import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.fenghoo.seven.R; +import com.fenghoo.seven.main.find.entity.CommentBean; import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; +import com.fenghoo.seven.utils.GlideTools; import com.fenghoo.seven.utils.WidgetTools; +import com.fenghoo.seven.widget.CircleImageView; import java.util.List; -public class CommentAdapter extends BaseQuickAdapter { +public class CommentAdapter extends BaseQuickAdapter { Context mcontext; OnViewClickListener onViewClickListener; @@ -24,8 +28,12 @@ public class CommentAdapter extends BaseQuickAdapter data; + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getSuccess() { + return success; + } + + public void setSuccess(int success) { + this.success = success; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * comment_time : 2020-08-27 18:38:00 + * if_read : 0 + * nick_name : 装** + * nick_img : https://p3-dy-ipv6.byteimg.com/aweme/720x720/3175a000b17fe75a7379b.webp?from=2956013662 + * comment_id : 6865611188630503435 + * content : [赞][赞][赞] + */ + + private String comment_time; + private String if_read; + private String nick_name; + private String nick_img; + private String comment_id; + private String content; + + public String getComment_time() { + return comment_time; + } + + public void setComment_time(String comment_time) { + this.comment_time = comment_time; + } + + public String getIf_read() { + return if_read; + } + + public void setIf_read(String if_read) { + this.if_read = if_read; + } + + public String getNick_name() { + return nick_name; + } + + public void setNick_name(String nick_name) { + this.nick_name = nick_name; + } + + public String getNick_img() { + return nick_img; + } + + public void setNick_img(String nick_img) { + this.nick_img = nick_img; + } + + public String getComment_id() { + return comment_id; + } + + public void setComment_id(String comment_id) { + this.comment_id = comment_id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + } + } +} diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java index 39bf97d..274aff6 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/CommentFragment.java @@ -1,15 +1,17 @@ package com.fenghoo.seven.main.find.ui; +import com.chad.library.adapter.base.BaseQuickAdapter; import com.fenghoo.seven.JsonUtils; import com.fenghoo.seven.R; +import com.fenghoo.seven.base.BaseBean; import com.fenghoo.seven.main.find.adapter.CommentAdapter; -import com.fenghoo.seven.main.kehu.Bean.CustomerListBean; +import com.fenghoo.seven.main.find.entity.CommentBean; import com.fenghoo.seven.main.kehu.Dialog.RreplyDialog; import com.fenghoo.seven.main.kehu.fragment.MobanFragment; -import com.fenghoo.seven.main.kehu.activity.ShowAty; import com.fenghoo.seven.okgonet.HttpConstants; import com.fenghoo.seven.okgonet.NetApi; import com.fenghoo.seven.okgonet.Observer; +import com.fenghoo.seven.utils.ToastUtils; import com.fenghoo.seven.utils.checkVersionsUtils.ProfileSpUtils; import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.Response; @@ -20,35 +22,61 @@ import androidx.recyclerview.widget.LinearLayoutManager; public class CommentFragment extends MobanFragment { + String aweme_id; - - public CommentFragment() { + public CommentFragment( String aweme_id) { super(); + this.aweme_id=aweme_id; } @Override public void initAdapter() { mMarkingFragmentRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); CommentAdapter markingtwoAdapter = new CommentAdapter(mContext, null); + markingtwoAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { + @Override + public void onLoadMoreRequested() { + loadMore(); + } + }); getAdpter(markingtwoAdapter); mMarkingFragmentRecyclerView.setAdapter(markingtwoAdapter); markingtwoAdapter.operationListenner(new CommentAdapter.OnViewClickListener() { @Override - public void reply(CustomerListBean.ResultBean.DataBean item) { + public void reply(final CommentBean.ResultBean.DataBean item) { new RreplyDialog(getActivity(), R.style.dialog, new RreplyDialog.OnCloseListener() { //回复 @Override - public void uploadAvatar() { - + public void reply(String content) { + replyComment(item.getComment_id(),content); } }).show(); } - + }); + } + private void replyComment(String comment_id,String content){ + final HttpParams paramsPost = new HttpParams(); + paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); + paramsPost.put("comment_id", comment_id); + paramsPost.put("content", content); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_replyComment).subscribe(new Observer() { @Override - public void enterCusDetail(CustomerListBean.ResultBean.DataBean item) { - //进入查看评论 - ShowAty.CustomerDetailActivity(getActivity(),item); + public void onNext(Response response) { + String body = (String) response.body(); + BaseBean.ResultBean result = JsonUtils.fromJson(body, BaseBean.class).getResult(); + if(result.getSuccess()==0){ + IS_LOADED=false; + sendMessage(); + }else { + ToastUtils.showToast(getActivity(),result.getMsg()); + } + } + @Override + public void onError(Exception e) { + e.printStackTrace(); + markingtwoAdapter.setEmptyView(errorView); + mSwl.setRefreshing(false); } }); } @@ -57,21 +85,21 @@ public class CommentFragment extends MobanFragment { public void requestData() { final HttpParams paramsPost = new HttpParams(); paramsPost.put("uid", ProfileSpUtils.getInstance().getUserProfie().getData().getUuid()); - paramsPost.put("search", ""); - new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppCustomer_fpList).subscribe(new Observer() { + paramsPost.put("aweme_id", aweme_id); + paramsPost.put("page", mNextRequestPage); + new NetApi().getPostData(paramsPost, HttpConstants.URi_device_AppDouyin_comment).subscribe(new Observer() { @Override public void onNext(Response response) { String body = (String) response.body(); - CustomerListBean.ResultBean result = JsonUtils.fromJson(body, CustomerListBean.class).getResult(); + CommentBean.ResultBean result = JsonUtils.fromJson(body, CommentBean.class).getResult(); mSwl.setRefreshing(false); if (result != null && String.valueOf(result.getSuccess()).equals("0")) { - - List data = result.getData(); - if (data.size() == 0) { - markingtwoAdapter.setEmptyView(notDataView); - return; - } + List data = result.getData(); if (mNextRequestPage == 1) { + if (data.size() == 0) { + markingtwoAdapter.setEmptyView(notDataView); + return; + } setData(true, data); } else { setData(false, data); diff --git a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java index 75e3a65..d55ccce 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/ui/PrivateletterFragment.java @@ -48,7 +48,7 @@ public class PrivateletterFragment extends MobanFragment { @Override public void enterCusDetail(awemeBean.ResultBean.DataBean item) { //进入查看评论 - ShowAty.CommentActivity(getActivity(),20); + ShowAty.CommentActivity(getActivity(),item.getComment_num(),item.getAweme_id()); } }); } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java index 6ab5064..33b1d86 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/Dialog/RreplyDialog.java @@ -7,6 +7,7 @@ import android.view.Gravity; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; @@ -43,6 +44,7 @@ public class RreplyDialog extends Dialog implements View.OnClickListener { private EditText reply_etSearchh; private RecyclerView reply_rcey; private boolean flag=false; + private Button btn_send; public RreplyDialog(Context context) { super(context); @@ -74,6 +76,8 @@ public class RreplyDialog extends Dialog implements View.OnClickListener { private void initView() { rl_tv_uploadAvatar = (RelativeLayout) findViewById(R.id.rl_tv_uploadAvatar); rl_tv_uploadAvatar.setOnClickListener(this); + btn_send = (Button) findViewById(R.id.btn_send); + btn_send.setOnClickListener(this); reply_ima = (ImageView) findViewById(R.id.reply_ima); reply_ima.setOnClickListener(this); reply_etSearchh = (EditText) findViewById(R.id.reply_etSearchh); @@ -129,9 +133,9 @@ public class RreplyDialog extends Dialog implements View.OnClickListener { @Override public void onClick(View view) { switch (view.getId()) { - case R.id.rl_tv_uploadAvatar://上传头像 + case R.id.btn_send://上传头像 if (listener != null) { - listener.uploadAvatar(); + listener.reply(reply_etSearchh.getText().toString()); } dismiss(); break; @@ -150,8 +154,13 @@ public class RreplyDialog extends Dialog implements View.OnClickListener { } public interface OnCloseListener { - - void uploadAvatar(); + + /** + * @description 回复消息 + * @param + * @return + */ + void reply(String content); } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java index 03dd194..1208d63 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivitytwo.java @@ -37,7 +37,7 @@ public class FpOrderInfoActivitytwo extends MoActivity { new RreplyDialog(FpOrderInfoActivitytwo.this, R.style.dialog, new RreplyDialog.OnCloseListener() { //回复 @Override - public void uploadAvatar() { + public void reply(String content) { } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java index 8c24d84..9abc631 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/ShowAty.java @@ -61,9 +61,10 @@ public class ShowAty { i.putExtra("customer_id",item.getCustomer_id()); ctx.startActivity(i); } - public static void CommentActivity(Context ctx,int num) { + public static void CommentActivity(Context ctx,String num,String aweme_id) { Intent i = new Intent(ctx, CommentActivity.class); - i.putExtra("num",num+""); + i.putExtra("num",num); + i.putExtra("aweme_id",aweme_id); ctx.startActivity(i); } diff --git a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java index ae38669..f59bd6d 100644 --- a/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java +++ b/app/src/main/java/com/fenghoo/seven/okgonet/HttpConstants.java @@ -94,6 +94,15 @@ public class HttpConstants { */ public static String URi_device_AppDouyin_commonWords = URiBase + "/device/AppDouyin/commonWords"; + /** + * 评论 + */ + public static String URi_device_AppDouyin_comment = URiBase + "/device/AppDouyin/comment"; + + /** + * 回复评论 + */ + public static String URi_device_AppDouyin_replyComment = URiBase + "/device/AppDouyin/replyComment"; } diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index 137f18e..9e83fd0 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -36,6 +36,7 @@ /> +