diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java index d885a75..387ac5c 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java @@ -7,7 +7,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import android.widget.TextView; import androidx.cardview.widget.CardView; @@ -17,13 +16,9 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder; import com.facebook.drawee.view.SimpleDraweeView; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.model.main.AnchorBean; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; import com.xuebiping.bolizhuzi.utils.SPUtils; import com.xuebiping.bolizhuzi.utils.StrU; import com.xuebiping.bolizhuzi.view.main.MainPageActivity; -import com.xuebiping.bolizhuzi.view.main.utils.UiUtils; - -import net.lucode.hackware.magicindicator.buildins.UIUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java index 69b600c..fa802e5 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java @@ -3,6 +3,8 @@ package com.xuebiping.bolizhuzi.controller.settings.adapter; import android.content.Context; import android.content.Intent; import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; @@ -31,11 +33,70 @@ public class IntimacyAdapter extends BaseQuickAdapter 0 && level <= 15) { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1); + iv_level.setImageResource(R.mipmap.ic_modle_1); + } else if (level > 15 && level <= 30) { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2); + iv_level.setImageResource(R.mipmap.ic_modle_2); + } else if (level > 30 && level <= 45) { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3); + iv_level.setImageResource(R.mipmap.ic_modle_3); + } else if (level > 45 && level <= 60) { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4); + iv_level.setImageResource(R.mipmap.ic_modle_4); + } else if (level > 60 && level <= 75) { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5); + iv_level.setImageResource(R.mipmap.ic_modle_5); + } else { + rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6); + iv_level.setImageResource(R.mipmap.ic_modle_6); + } + }else { + if (level > 0 && level <= 15) { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg1); + iv_level.setImageResource(R.mipmap.ic_use_1); + } else if (level > 15 && level <= 30) { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg2); + iv_level.setImageResource(R.mipmap.ic_use_2); + } else if (level > 30 && level <= 45) { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg3); + iv_level.setImageResource(R.mipmap.ic_use_3); + } else if (level > 45 && level <= 60) { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg4); + iv_level.setImageResource(R.mipmap.ic_use_4); + } else if (level > 60 && level <= 75) { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg5); + iv_level.setImageResource(R.mipmap.ic_use_5); + } else { + rl_level.setBackgroundResource(R.mipmap.ic_use_bg6); + iv_level.setImageResource(R.mipmap.ic_use_6); + } + } + rl_item.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyBean.java index d49971f..c70ff2f 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyBean.java @@ -6,6 +6,42 @@ public class IntimacyBean { private int total_consume_coin; private String nickname; private String avatar; + private int gender; + private int level; + private int unlock_status; + private String unlock_desc; + + public String getUnlock_desc() { + return unlock_desc; + } + + public void setUnlock_desc(String unlock_desc) { + this.unlock_desc = unlock_desc; + } + + public int getUnlock_status() { + return unlock_status; + } + + public void setUnlock_status(int unlock_status) { + this.unlock_status = unlock_status; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + public int getGender() { + return gender; + } + + public void setGender(int gender) { + this.gender = gender; + } public int getUser_id() { return user_id; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GeneralMemberFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GeneralMemberFragment.java index c283db3..96831ac 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GeneralMemberFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GeneralMemberFragment.java @@ -194,11 +194,11 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe tv_member_open.setText("立即开通"); } - if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { - lin_member_bottom_btn.setVisibility(View.GONE); - tv_member_open.setVisibility(View.VISIBLE); - tv_member_open.setText("邀请好友开通"); - } +// if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { +// lin_member_bottom_btn.setVisibility(View.GONE); +// tv_member_open.setVisibility(View.VISIBLE); +// tv_member_open.setText("邀请好友开通"); +// } List list = result.getInfo().getList(); if (list != null && list.size() > 0) { @@ -338,22 +338,34 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe } showPay(goodsId); } else if (v == tv_member_open) { - if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { - Intent intent = new Intent(getContext(), InvitationActivity.class); - startActivity(intent); +// if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { +// Intent intent = new Intent(getContext(), InvitationActivity.class); +// startActivity(intent); +// } else { +// if (defaultType == 1) { +// goodsId = goodsId2; +// price = price2; +// } else if (defaultType == 2) { +// goodsId = goodsId3; +// price = price3; +// } else { +// goodsId = goodsId1; +// price = price1; +// } +// showPay(goodsId); +// } + + if (defaultType == 1) { + goodsId = goodsId2; + price = price2; + } else if (defaultType == 2) { + goodsId = goodsId3; + price = price3; } else { - if (defaultType == 1) { - goodsId = goodsId2; - price = price2; - } else if (defaultType == 2) { - goodsId = goodsId3; - price = price3; - } else { - goodsId = goodsId1; - price = price1; - } - showPay(goodsId); + goodsId = goodsId1; + price = price1; } + showPay(goodsId); } } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SuperMember2Fragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SuperMember2Fragment.java index e9f3273..2fd8137 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SuperMember2Fragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SuperMember2Fragment.java @@ -189,11 +189,11 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen tv_member_open.setText("立即开通"); } - if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { - lin_member_bottom_btn.setVisibility(View.GONE); - tv_member_open.setVisibility(View.VISIBLE); - tv_member_open.setText("邀请好友开通"); - } +// if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { +// lin_member_bottom_btn.setVisibility(View.GONE); +// tv_member_open.setVisibility(View.VISIBLE); +// tv_member_open.setText("邀请好友开通"); +// } List list = result.getInfo().getList(); if (list != null && list.size() > 0) { @@ -337,22 +337,34 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen } showPay(goodsId); } else if (v == tv_member_open) { - if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { - Intent intent = new Intent(getContext(), InvitationActivity.class); - startActivity(intent); +// if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { +// Intent intent = new Intent(getContext(), InvitationActivity.class); +// startActivity(intent); +// } else { +// if (defaultType == 1) { +// goodsId = goodsId2; +// price = price2; +// } else if (defaultType == 2) { +// goodsId = goodsId3; +// price = price3; +// } else { +// goodsId = goodsId1; +// price = price1; +// } +// showPay(goodsId); +// } + + if (defaultType == 1) { + goodsId = goodsId2; + price = price2; + } else if (defaultType == 2) { + goodsId = goodsId3; + price = price3; } else { - if (defaultType == 1) { - goodsId = goodsId2; - price = price2; - } else if (defaultType == 2) { - goodsId = goodsId3; - price = price3; - } else { - goodsId = goodsId1; - price = price1; - } - showPay(goodsId); + goodsId = goodsId1; + price = price1; } + showPay(goodsId); } } diff --git a/app/src/main/res/layout/activity_intimacy.xml b/app/src/main/res/layout/activity_intimacy.xml index e02856e..08df21e 100644 --- a/app/src/main/res/layout/activity_intimacy.xml +++ b/app/src/main/res/layout/activity_intimacy.xml @@ -5,7 +5,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:viewBindingIgnore="true"> + tools:viewBindingIgnore="true" + android:background="@color/white"> + + + + + + + + + + + @@ -99,7 +132,7 @@ + android:src="@mipmap/ic_qmb_xin"/> - - - - - - - - - + - - - - - - - - - + - - - - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_qmb_xin.png b/app/src/main/res/mipmap-xhdpi/ic_qmb_xin.png new file mode 100644 index 0000000..6bd0417 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_qmb_xin.png differ