From 2b905b89f0089db7fe51414395f4f5a73c5a26d5 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Fri, 22 Jan 2021 14:53:58 +0800 Subject: [PATCH 1/5] 1 --- app/src/main/res/layout/item_discovery.xml | 2 +- .../src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/item_discovery.xml b/app/src/main/res/layout/item_discovery.xml index 109a35c..3961193 100644 --- a/app/src/main/res/layout/item_discovery.xml +++ b/app/src/main/res/layout/item_discovery.xml @@ -45,7 +45,7 @@ app:ngv_maxSize="9" app:ngv_mode="grid" app:ngv_singleImageRatio="1" - app:ngv_singleImageSize="100dp" /> + app:ngv_singleImageSize="200dp" /> Date: Mon, 25 Jan 2021 17:29:40 +0800 Subject: [PATCH 2/5] 1 --- .../discovery/HistoryRecordActivity.java | 11 + .../discovery/HistoryRecordFragment.java | 346 +++++++++++++++++- .../discovery/LikeFragment.java | 4 + app/src/main/java/my_view/CommentDialog.java | 7 +- .../drawable-v24/ic_launcher_foreground.xml | 34 -- app/src/main/res/layout/dialog_comment.xml | 2 - .../main/res/layout/fragment_discovery.xml | 19 +- .../res/layout/fragment_history_record.xml | 56 ++- app/src/main/res/layout/item_discovery.xml | 8 +- app/src/main/res/mipmap-xhdpi/xj.png | Bin 0 -> 936 bytes app/src/main/res/mipmap-xhdpi/xj2.png | Bin 0 -> 936 bytes app/src/main/res/mipmap-xxhdpi/xj.png | Bin 0 -> 936 bytes .../java/com/lzy/ninegrid/NineGridView.java | 4 +- .../com/lzy/ninegrid/NineGridViewWrapper.java | 10 +- ninegridview/src/main/res/drawable/bf.png | Bin 0 -> 1355 bytes 15 files changed, 428 insertions(+), 73 deletions(-) delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-xhdpi/xj.png create mode 100644 app/src/main/res/mipmap-xhdpi/xj2.png create mode 100644 app/src/main/res/mipmap-xxhdpi/xj.png create mode 100644 ninegridview/src/main/res/drawable/bf.png diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java index 7fe5855..03b511c 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java @@ -24,6 +24,7 @@ import com.lzy.ninegrid.ImageInfo; import com.lzy.ninegrid.preview.NineGridViewClickAdapter; import com.sl.house_property.BaseActivity; import com.sl.house_property.MainFragment; +import com.sl.house_property.MainTabActivity; import com.sl.house_property.R; import com.sl.house_property.databinding.ItemCommentBinding; import com.sl.house_property.databinding.ItemDiscoveryBinding; @@ -140,7 +141,17 @@ public class HistoryRecordActivity extends BaseActivity onTouchListeners = new ArrayList(); + //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法 + public void registerMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.add(myOnTouchListener); + } + //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法 + public void unregisterMyOnTouchListener(MainTabActivity.MyOnTouchListener myOnTouchListener) { + onTouchListeners.remove(myOnTouchListener); + } class MyViewPagerAdapter extends FragmentPagerAdapter { public MyViewPagerAdapter(FragmentManager fm) { super(fm); 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 be7a2ee..cbf2ca4 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 @@ -1,15 +1,21 @@ package com.sl.house_property.discovery; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; +import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; +import android.text.TextUtils; import android.util.Log; +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; @@ -17,19 +23,23 @@ import com.bumptech.glide.request.RequestOptions; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; +import com.gyf.immersionbar.ImmersionBar; import com.lxj.xpopup.XPopup; import com.lzy.ninegrid.ImageInfo; import com.lzy.ninegrid.preview.NineGridViewClickAdapter; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.sl.house_property.BaseFragment; +import com.sl.house_property.MainTabActivity; import com.sl.house_property.R; import com.sl.house_property.databinding.FragmentHistoryRecordBinding; import com.sl.house_property.databinding.ItemCommentBinding; import com.sl.house_property.databinding.ItemDiscoveryBinding; +import com.sl.house_property.order.SettleActivity; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; +import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Type; @@ -39,6 +49,7 @@ import java.util.Map; import adapter.BaseRecycleViewAdapter; import entity.DiscoveryListEntity; +import entity.GoodsDetailEntity; import entity.RegisterUser; import http.ApiConfig; import my_loader.Loader; @@ -49,10 +60,13 @@ import rx.Subscription; import rx.functions.Action1; import tools.Config; import tools.PicassoRoundTransform; +import utils.CommonUtils; import utils.DateUtils; +import utils.KeyboardUtil; import utils.Md5; +import utils.UtilHelpers; -public class HistoryRecordFragment extends BaseFragment { +public class HistoryRecordFragment extends BaseFragment implements MainTabActivity.MyOnTouchListener { private Context context; private int type = 2; private int page = 1; @@ -79,6 +93,19 @@ public class HistoryRecordFragment extends BaseFragment map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "Goods"); + map.put("class", "DisGoods"); + map.put("goods_id", goodsId); + if (!TextUtils.isEmpty(reply_id)) { + map.put("reply_id", reply_id); + } + + map.put("contents", content); + map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret)); + progressDialog.setMessage("提交中"); + progressDialog.setCancelable(false); +// progressDialog.show(); + + Loader mGankLoader = new Loader(); + Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() { + + + @Override + public void call(Resultcode resultcode) { + + progressDialog.dismiss(); + if (!(resultcode.status == 0)) { + Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show(); + } + if (resultcode.status == 0) { + + BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter(); + DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content(); + LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; + dis_content.setContents(adta.get("contents").toString()); + // dis_content.set(adta.get("goods_id").toString()); + + + adapter.upDateOne(position, discoveryListEntities.get(position)); + } + + } + + + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + Toast.makeText(getContext(), "提交失败", Toast.LENGTH_SHORT).show(); + throwable.printStackTrace(); + } + }); + + + } + + private void getGoodsDetail(final String goodsId, final DiscoveryListEntity entity, final int goodtype) { + final RegisterUser user = + Config.getInstance(getContext()).getUser(); + Map map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "Goods"); + map.put("class", "GoodsInfo"); + map.put("goods_id", goodsId); + map.put("sign", Md5.md5("Goods" + "GoodsInfo" + Md5.secret)); + progressDialog.setMessage("获取信息中"); + progressDialog.setCancelable(false); + Loader mGankLoader = new Loader(); + Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map) + .subscribe(new Action1() { + @Override + public void call(Resultcode resultcode) { + progressDialog.dismiss(); + if (resultcode.status == 0) { + Gson gs = new Gson(); + LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; + String s = gs.toJson(adta); + + try { + + JSONObject jsonObject = new JSONObject(s); + org.json.JSONArray array = jsonObject.getJSONArray("info"); + final Type type = new TypeToken>() { + }.getType(); + ArrayList o = gs.fromJson(array.toString(), type); + + GoodsInfoDialog goodsInfoDialog = new GoodsInfoDialog(getContext(), entity, o); + goodsInfoDialog.setOnConfirmListener(new GoodsInfoDialog.OnGoodsSelectPropertyListener() { + @Override + public void onSelect(String code, int num) { + if (goodtype == 4) { + Intent intent = new Intent(getContext(), SettleActivity.class); + intent.putExtra("goodsType", 1); + intent.putExtra("goods_id", goodsId); + intent.putExtra("product_code", code); + intent.putExtra("sale_num", num + ""); + startActivity(intent); + } else if (goodtype == 5) { + addCart(goodsId, code, num + ""); + } + + } + }); + new XPopup.Builder(getContext()).asCustom(goodsInfoDialog).show(); + + } catch (JSONException e) { + e.printStackTrace(); + } + + } else { + // .setToast(resultcode.msg); + Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show(); + } + } + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + Toast.makeText(getContext(), "获取信息失败", Toast.LENGTH_SHORT).show(); + throwable.printStackTrace(); + } + }); + + } + + private void addCart(String goods_id, String product_code, String goodsNum) { + RegisterUser user = + Config.getInstance(getContext()).getUser(); + Map map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "Goods"); + map.put("class", "AddCart"); + map.put("goods_id", goods_id); + map.put("product_code", product_code); + map.put("num", goodsNum); + map.put("sign", Md5.md5("Goods" + "AddCart" + Md5.secret)); + progressDialog.setMessage("提交中"); + progressDialog.setCancelable(false); + Loader mGankLoader = new Loader(); + Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() { + @Override + public void call(Resultcode resultcode) { + progressDialog.dismiss(); + if (resultcode.status == 0) { + Toast.makeText(getContext(), "成功加入购物车", Toast.LENGTH_SHORT).show(); +// baseActivity.setToast(0, "成功加入购物车"); + } else { + Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show(); + } + } + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + Toast.makeText(getContext(), "提交失败", Toast.LENGTH_SHORT).show(); + throwable.printStackTrace(); + } + }); + + } + private void like(String goodsId, final int position) { final RegisterUser user = Config.getInstance(getContext()).getUser(); @@ -266,7 +598,7 @@ public class HistoryRecordFragment extends BaseFragment() { @@ -275,7 +607,7 @@ public class HistoryRecordFragment extends BaseFragment { } } + private MainTabActivity.MyOnTouchListener myOnTouchListener; + @Override protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) { super.onCreateVew(inflater, savedInstanceState); @@ -83,6 +86,7 @@ public class LikeFragment extends BaseFragment { } else { userId = "0"; } + fragments.add(HistoryRecordFragment.newInstance(1, userId)); fragments.add(HistoryRecordFragment.newInstance(2, userId)); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); diff --git a/app/src/main/java/my_view/CommentDialog.java b/app/src/main/java/my_view/CommentDialog.java index 75d0711..d1965b1 100644 --- a/app/src/main/java/my_view/CommentDialog.java +++ b/app/src/main/java/my_view/CommentDialog.java @@ -60,12 +60,7 @@ public class CommentDialog extends HorizontalAttachPopupView { } }); } - public void setType(){ - findViewById(R.id.tv_comment).setVisibility(View.GONE); - findViewById(R.id.tv_bug).setVisibility(View.GONE); - findViewById(R.id.tv_add).setVisibility(View.GONE); - findViewById(R.id.v).setVisibility(GONE); - } + public void setShowBug(boolean type) { if (type) { diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml index 1fb3560..3448001 100644 --- a/app/src/main/res/layout/dialog_comment.xml +++ b/app/src/main/res/layout/dialog_comment.xml @@ -64,7 +64,6 @@ android:paddingTop="5dp" android:paddingRight="14dp" android:paddingBottom="5dp" - android:text="购买" android:textColor="@color/white" android:textSize="16sp" /> @@ -80,7 +79,6 @@ android:paddingTop="5dp" android:paddingRight="14dp" android:paddingBottom="5dp" - android:text="购物车" android:textColor="@color/white" android:textSize="16sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_discovery.xml b/app/src/main/res/layout/fragment_discovery.xml index d1f02f2..050684a 100644 --- a/app/src/main/res/layout/fragment_discovery.xml +++ b/app/src/main/res/layout/fragment_discovery.xml @@ -18,19 +18,19 @@ android:orientation="vertical"> - + > + android:src="@mipmap/xj2" /> - + - - - - + + + + + + + \ 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 3961193..2cac3a7 100644 --- a/app/src/main/res/layout/item_discovery.xml +++ b/app/src/main/res/layout/item_discovery.xml @@ -44,8 +44,8 @@ app:ngv_gridSpacing="5dp" app:ngv_maxSize="9" app:ngv_mode="grid" - app:ngv_singleImageRatio="1" - app:ngv_singleImageSize="200dp" /> + app:ngv_singleImageRatio="0.8" + app:ngv_singleImageSize="180dp" /> + android:background="#20Dddddd" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/xj.png b/app/src/main/res/mipmap-xhdpi/xj.png new file mode 100644 index 0000000000000000000000000000000000000000..a2c17e1c0321f82b09fb49a9c5b314a0a6eff478 GIT binary patch literal 936 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 Date: Tue, 26 Jan 2021 15:18:52 +0800 Subject: [PATCH 3/5] 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 Date: Wed, 27 Jan 2021 09:47:51 +0800 Subject: [PATCH 4/5] 1 --- app/src/main/java/com/sl/house_property/MainFragment.java | 8 ++++++-- .../java/com/sl/house_property/order/OrderActivity.java | 1 + .../com/sl/house_property/order/OrderDetailActivity.java | 1 + .../java/com/sl/house_property/order/PayActivity.java | 4 +++- 4 files changed, 11 insertions(+), 3 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 158422b..bcc3f57 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -341,7 +341,7 @@ public class MainFragment extends BaseFragment implements V MainTabActivity activity = (MainTabActivity) getActivity(); activity.registerMyOnTouchListener(this); - RegisterUser user = + final RegisterUser user = Config.getInstance(getActivity()).getUser(); Map map = new HashMap<>(); if (user != null) { @@ -357,7 +357,11 @@ public class MainFragment extends BaseFragment implements V mDataBinding.service.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getContext(), PropertyActivity.class); +// Intent intent = new Intent(getContext(), PropertyActivity.class); +// startActivity(intent); + Intent intent = new Intent(getContext(), HistoryRecordActivity.class); + intent.putExtra("userId", user.getUserid()); + intent.putExtra("userName", user.getNickname()); startActivity(intent); } }); diff --git a/app/src/main/java/com/sl/house_property/order/OrderActivity.java b/app/src/main/java/com/sl/house_property/order/OrderActivity.java index e0f6200..8fae9ef 100644 --- a/app/src/main/java/com/sl/house_property/order/OrderActivity.java +++ b/app/src/main/java/com/sl/house_property/order/OrderActivity.java @@ -207,6 +207,7 @@ public class OrderActivity extends BaseActivity { //付款 Intent intent = new Intent(context, PayActivity.class); intent.putExtra("payment_amount", orderListBean.getOrder_money()); + intent.putExtra("order_number",orderListBean.getOrder_number()); startActivityForResult(intent, 18); } else if (b.btnFk.getText().equals("取消订单")) { new XPopup.Builder(context).asConfirm("", "确定要取消订单吗？", new OnConfirmListener() { diff --git a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java index 0abfe6d..ad2bb19 100644 --- a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java +++ b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java @@ -198,6 +198,7 @@ public class OrderDetailActivity extends BaseActivity { private Context context; private String payment_amount; + private String order_number; private BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent1) { @@ -77,7 +78,7 @@ public class PayActivity extends BaseActivity { mDataBinding.tvTitle.setText("支付"); type = intent.getIntExtra("type", 0); payment_amount = intent.getStringExtra("payment_amount"); - + order_number=intent.getStringExtra("order_number"); String wallet = intent.getStringExtra("wallet"); mDataBinding.tv.setText("钱包支付(余额 ¥" + wallet + ")"); mDataBinding.tvAmount.setText(payment_amount); @@ -161,6 +162,7 @@ public class PayActivity extends BaseActivity { map.put("app", "System"); map.put("class", "OrderPrePayId"); map.put("amount", payment_amount); + map.put("order_number", order_number); map.put("sign", Md5.md5("System" + "OrderPrePayId" + Md5.secret)); loader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() { @Override From 0ee1f2589f6f76c66890dd4da241029998e05196 Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Wed, 27 Jan 2021 17:30:58 +0800 Subject: [PATCH 5/5] 1 --- .../com/sl/house_property/discovery/HistoryRecordFragment.java | 1 + 1 file changed, 1 insertion(+) 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 7b41876..900eefa 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 @@ -338,6 +338,7 @@ public class HistoryRecordFragment extends BaseFragment