From 3642d5ade32e0810b0a0a8b75046c1b07b9ffe4d Mon Sep 17 00:00:00 2001 From: jinyuer <454386664@qq.com> Date: Mon, 1 Feb 2021 16:02:15 +0800 Subject: [PATCH] 1 --- .../com/sl/house_property/MainFragment.java | 4 ++ .../discovery/CreateTypeSelectDialog.java | 55 +++++++++++++++++++ .../discovery/DiscoveryFragment.java | 14 ++++- .../discovery/HistoryRecordActivity.java | 5 +- .../discovery/HistoryRecordFragment.java | 25 ++++++--- .../discovery/LikeFragment.java | 4 +- app/src/main/java/my_view/CommentDialog.java | 7 ++- app/src/main/res/drawable/round_blank.xml | 8 ++- app/src/main/res/drawable/round_white.xml | 6 ++ app/src/main/res/layout/dialog_comment.xml | 6 +- .../res/layout/dialog_select_create_type.xml | 55 +++++++++++++++++++ app/src/main/res/values/styles.xml | 1 - 12 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java create mode 100644 app/src/main/res/drawable/round_white.xml create mode 100644 app/src/main/res/layout/dialog_select_create_type.xml 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 3ba7bf3..0987df4 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -363,6 +363,7 @@ public class MainFragment extends BaseFragment implements V intent.putExtra("userId", user.getUserid()); intent.putExtra("userName", user.getNickname()); intent.putExtra("title", "物业服务"); + intent.putExtra("dataType",1); startActivity(intent); } }); @@ -627,6 +628,7 @@ public class MainFragment extends BaseFragment implements V @Override public void onClick(final View v) { final CommentDialog commentDialog = new CommentDialog(baseActivity); + commentDialog.setShowBug(discoveryListEntity.getType() == 2); commentDialog.setPraise(discoveryListEntity.getIs_like() == 1); final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight(); @@ -669,6 +671,7 @@ public class MainFragment extends BaseFragment implements V } } }); + new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment).asCustom(commentDialog) .show(); @@ -742,6 +745,7 @@ public class MainFragment extends BaseFragment implements V intent.putExtra("userId", discoveryListEntity.getUserid()); intent.putExtra("userName", discoveryListEntity.getNickname()); intent.putExtra("title", discoveryListEntity.getNickname()); + startActivity(intent); } }); diff --git a/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java b/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java new file mode 100644 index 0000000..2df6c5e --- /dev/null +++ b/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java @@ -0,0 +1,55 @@ +package com.sl.house_property.discovery; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.view.View; + +import com.lxj.xpopup.core.BottomPopupView; +import com.lxj.xpopup.interfaces.OnSelectListener; +import com.sl.house_property.R; + +public class CreateTypeSelectDialog extends BottomPopupView { + + private OnSelectListener onSelectListener; + + public CreateTypeSelectDialog(@NonNull Context context) { + super(context); + } + + @Override + protected int getImplLayoutId() { + return R.layout.dialog_select_create_type; + } + + @Override + protected void onCreate() { + super.onCreate(); + findViewById(R.id.btn_1).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if (onSelectListener != null) { + onSelectListener.onSelect(1, "发布商品"); + dismiss(); + } + } + }); + findViewById(R.id.btn_2).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + onSelectListener.onSelect(0, "发布说说"); + dismiss(); + } + }); + findViewById(R.id.btn_cancel).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + + dismiss(); + } + }); + } + + public void setOnSelectListener(OnSelectListener onSelectListener) { + this.onSelectListener = onSelectListener; + } +} 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 2f618aa..7bc8972 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 @@ -113,14 +113,24 @@ public class DiscoveryFragment extends BaseFragment im mDataBinding.ivAdd.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new XPopup.Builder(activity).atView(mDataBinding.ivAdd).asAttachList(data, null, new OnSelectListener() { +// new XPopup.Builder(activity).atView(mDataBinding.ivAdd).asAttachList(data, null, new OnSelectListener() { +// @Override +// public void onSelect(int position, String text) { +// Intent intent = new Intent(getContext(), AddDiscoveryActivity.class); +// intent.putExtra("type", position); +// startActivityForResult(intent, 14); +// } +// }).show(); + CreateTypeSelectDialog createTypeSelectDialog = new CreateTypeSelectDialog(activity); + createTypeSelectDialog.setOnSelectListener(new OnSelectListener() { @Override public void onSelect(int position, String text) { Intent intent = new Intent(getContext(), AddDiscoveryActivity.class); intent.putExtra("type", position); startActivityForResult(intent, 14); } - }).show(); + }); + new XPopup.Builder(activity).asCustom(createTypeSelectDialog).show(); } }); 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 9ea919b..7544e12 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 @@ -91,8 +91,9 @@ public class HistoryRecordActivity extends BaseActivity(); - fragments.add(HistoryRecordFragment.newInstance(1, userId,0)); - fragments.add(HistoryRecordFragment.newInstance(2, userId,0)); + + fragments.add(HistoryRecordFragment.newInstance(1, userId,0,getIntent().getIntExtra("dataType",0))); + fragments.add(HistoryRecordFragment.newInstance(2, userId,0,getIntent().getIntExtra("dataType",0))); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getSupportFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); 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 9a92a0c..4295952 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 @@ -73,19 +73,20 @@ public class HistoryRecordFragment extends BaseFragment discoveryListEntities = new ArrayList<>(); - private int pageType; + private int num; @Override protected int getLayoutId() { return R.layout.fragment_history_record; } - public static HistoryRecordFragment newInstance(int param1, String param2,int num) { + public static HistoryRecordFragment newInstance(int param1, String param2, int i, int num) { HistoryRecordFragment fragment = new HistoryRecordFragment(); Bundle args = new Bundle(); args.putInt("param1", param1); args.putString("param2", param2); - args.putInt("pageType",num); + args.putInt("num",i); + args.putInt("dataType",num); fragment.setArguments(args); return fragment; } @@ -95,7 +96,7 @@ public class HistoryRecordFragment extends BaseFragment() { @Override public void call(Resultcode resultcode) { @@ -700,12 +708,13 @@ public class HistoryRecordFragment extends BaseFragment>() { }.getType(); if (page == 1) { - if (pageType == 1) { + if (num == 1) { mDataBinding.rl1.setVisibility(View.GONE); } else { mDataBinding.rl1.setVisibility(View.VISIBLE); String fengmian = jsonObject.getString("fengmian"); String avatar = jsonObject.getString("avatar"); + Picasso.with(context).load(fengmian) .placeholder(R.mipmap.icon_default_rectangle) .into(target); diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java index 93b48a4..2fe02ff 100644 --- a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java @@ -87,8 +87,8 @@ public class LikeFragment extends BaseFragment { userId = "0"; } - fragments.add(HistoryRecordFragment.newInstance(1, userId,1)); - fragments.add(HistoryRecordFragment.newInstance(2, userId,1)); + fragments.add(HistoryRecordFragment.newInstance(1, userId, 0, 0)); + fragments.add(HistoryRecordFragment.newInstance(2, userId, 0, 0)); MyViewPagerAdapter myViewPagerAdapter = new MyViewPagerAdapter(getChildFragmentManager()); mDataBinding.fl.setAdapter(myViewPagerAdapter); mDataBinding.tb.setupWithViewPager(mDataBinding.fl); diff --git a/app/src/main/java/my_view/CommentDialog.java b/app/src/main/java/my_view/CommentDialog.java index 8985051..168c6fd 100644 --- a/app/src/main/java/my_view/CommentDialog.java +++ b/app/src/main/java/my_view/CommentDialog.java @@ -1,6 +1,7 @@ package my_view; import android.content.Context; +import android.graphics.drawable.Drawable; import android.support.annotation.NonNull; import android.view.View; import android.widget.TextView; @@ -65,7 +66,6 @@ public class CommentDialog extends HorizontalAttachPopupView { @Override protected void onCreate() { super.onCreate(); - } public void setShowBug(boolean type) { @@ -91,6 +91,11 @@ public class CommentDialog extends HorizontalAttachPopupView { } } + @Override + protected Drawable getPopupBackground() { + return getResources().getDrawable(R.drawable.round_blank); + } + public void setOnCommentOperateListener(OnCommentOperateListener li) { listener = li; } diff --git a/app/src/main/res/drawable/round_blank.xml b/app/src/main/res/drawable/round_blank.xml index 47bacd9..0730a03 100644 --- a/app/src/main/res/drawable/round_blank.xml +++ b/app/src/main/res/drawable/round_blank.xml @@ -1,6 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/round_white.xml b/app/src/main/res/drawable/round_white.xml new file mode 100644 index 0000000..33a4955 --- /dev/null +++ b/app/src/main/res/drawable/round_white.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml index 1fc27f6..4d630bd 100644 --- a/app/src/main/res/layout/dialog_comment.xml +++ b/app/src/main/res/layout/dialog_comment.xml @@ -2,7 +2,7 @@ + android:textSize="14sp" /> + android:textSize="14sp" /> + + + + + +