From 5c311b43093b630ef4f92578532feb9cfaf94142 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Mon, 6 Nov 2023 14:32:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onetoone/activity/ExchangeRecordActivity.java | 4 ++-- .../onetoone/activity/fragments/MyFragment.java | 1 + .../activity/fragments/home/HomeRankFragment.java | 5 +++-- .../onetoone/adapter/HomeRankListAdapter.java | 15 +++++++++++++-- .../com/shayu/onetoone/bean/HomeRankBean.java | 11 +++++++++++ .../com/shayu/onetoone/utils/UserManager.java | 2 +- .../src/main/res/layout/activity_msg_config.xml | 1 + OneToOne/src/main/res/layout/activity_search.xml | 1 + .../src/main/res/layout/item_home_recommend.xml | 1 + 9 files changed, 34 insertions(+), 7 deletions(-) diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java index a2ef40e51..b9d2805db 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/ExchangeRecordActivity.java @@ -41,8 +41,8 @@ public class ExchangeRecordActivity extends AbsOTOActivity { @Override protected void main(Bundle savedInstanceState) { - if (getIntent() != null && getIntent().getBundleExtra("bundle") != null) { - mType = getIntent().getBundleExtra("bundle").getString("type"); + if (getIntent() != null && getIntent().getExtras() != null) { + mType = getIntent().getExtras().getString("type"); if (TextUtils.equals(mType, "yuanbao")) { type = "11"; } else { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java index b1273a7bd..17e541c61 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java @@ -279,6 +279,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener 8) { gold.setText(golds.substring(0, golds.length() - 6) + "M"); } else if (golds.length() > 6) { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java index 5408eb0d5..f5c3c1655 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java @@ -73,7 +73,7 @@ public class HomeRankFragment extends BaseFragment { rootView = findViewById(R.id.rootView); mRecyclerView = findViewById(R.id.recyclerView); mRefreshLayout = findViewById(R.id.swipeRefreshLayout); - adapter = new HomeRankListAdapter(getContext()); + adapter = new HomeRankListAdapter(getContext(), type); hv = new HeadView(rootView); mRecyclerView.setAdapter(adapter); mRefreshLayout.setRefreshHeader(new RongRefreshHeader(this.getContext())); @@ -201,7 +201,8 @@ public class HomeRankFragment extends BaseFragment { getItem(position, mVotes1, mVotes2, mVotes3).setText(user.getMoney()); if (user.isFollow()) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE); - } else if (CommonAppConfig.getInstance().getUserBean().getId().equals(user.getId())) { + } + if (user.getUid().equals(UserManager.getUserBean().getUser().getId() + "")) { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.GONE); } else { getItem(position, mBtnFollow1, mBtnFollow2, mBtnFollow3).setVisibility(View.VISIBLE); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java index 3d36f2d28..26ef95789 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRankListAdapter.java @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.makeramen.roundedimageview.RoundedImageView; import com.shayu.onetoone.R; +import com.shayu.onetoone.activity.fragments.home.HomeRankFragment; import com.shayu.onetoone.bean.FollowBean; import com.shayu.onetoone.bean.HomeRankBean; import com.shayu.onetoone.manager.OTONetManager; @@ -29,9 +30,11 @@ import java.util.List; public class HomeRankListAdapter extends RecyclerView.Adapter { private Context mContext; private List list; + private int type; - public HomeRankListAdapter(Context mContext) { + public HomeRankListAdapter(Context mContext, int type) { this.mContext = mContext; + this.type = type; list = new ArrayList<>(); } @@ -90,7 +93,6 @@ public class HomeRankListAdapter extends RecyclerView.Adapter diff --git a/OneToOne/src/main/res/layout/activity_search.xml b/OneToOne/src/main/res/layout/activity_search.xml index 83d226f5f..5c2b65090 100644 --- a/OneToOne/src/main/res/layout/activity_search.xml +++ b/OneToOne/src/main/res/layout/activity_search.xml @@ -2,6 +2,7 @@ diff --git a/OneToOne/src/main/res/layout/item_home_recommend.xml b/OneToOne/src/main/res/layout/item_home_recommend.xml index 821bca472..60854b3d5 100644 --- a/OneToOne/src/main/res/layout/item_home_recommend.xml +++ b/OneToOne/src/main/res/layout/item_home_recommend.xml @@ -107,6 +107,7 @@ android:layout_gravity="center" android:layout_width="10dp" android:layout_height="12dp" + android:scaleType="centerCrop" android:layout_marginStart="5dp" app:srcCompat="@mipmap/icon_level" />