Compare commits
2 Commits
43e289e2a9
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
292e0b8964 | ||
|
|
cc66d8a355 |
@@ -379,7 +379,7 @@ android {
|
||||
implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
|
||||
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
|
||||
implementation 'com.github.eralpyucel:CircleProgressView:v1.1'
|
||||
//implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
|
||||
// implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
|
||||
implementation 'com.shuyu:GSYVideoPlayer:8.1.0'
|
||||
|
||||
implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
|
||||
@@ -401,7 +401,9 @@ android {
|
||||
implementation 'com.github.Dimezis:BlurView:version-3.1.0'
|
||||
|
||||
implementation "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-x"
|
||||
implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6" //3.0.2更换了很多API
|
||||
// implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6" //3.0.2更换了很多API
|
||||
|
||||
// implementation 'io.github.carguo:gsyvideoplayer:12.1.0'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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<IntimacyBean, BaseViewHold
|
||||
SimpleDraweeView user_head = baseViewHolder.getView(R.id.user_head);
|
||||
TextView tv_nick_name = baseViewHolder.getView(R.id.tv_nick_name);
|
||||
TextView tv_intimacy = baseViewHolder.getView(R.id.tv_intimacy);
|
||||
RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
|
||||
ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
|
||||
TextView tv_level = baseViewHolder.getView(R.id.tv_level);
|
||||
LinearLayout ll_unlock = baseViewHolder.getView(R.id.ll_unlock);
|
||||
TextView tv_unlock_desc = baseViewHolder.getView(R.id.tv_unlock_desc);
|
||||
TextView tv_lock = baseViewHolder.getView(R.id.tv_lock);
|
||||
|
||||
user_head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
|
||||
tv_nick_name.setText(bean.getNickname());
|
||||
tv_intimacy.setText(bean.getTotal_consume_coin() + "");
|
||||
|
||||
int unlock_status = bean.getUnlock_status();
|
||||
if (unlock_status == 1) {
|
||||
ll_unlock.setVisibility(View.GONE);
|
||||
tv_lock.setVisibility(View.VISIBLE);
|
||||
}else {
|
||||
ll_unlock.setVisibility(View.VISIBLE);
|
||||
tv_unlock_desc.setText(bean.getUnlock_desc());
|
||||
}
|
||||
|
||||
int level = bean.getLevel();
|
||||
tv_level.setText(level + "");
|
||||
if (bean.getGender() == 1) {
|
||||
if (level > 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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<MemberInfoList> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<MemberInfoList> 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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_content_layout"
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
@@ -76,6 +77,38 @@
|
||||
android:layout_marginLeft="@dimen/dp8"
|
||||
android:src="@drawable/ic_pvip" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rl_level"
|
||||
android:layout_width="42dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:background="@mipmap/ic_modle_bg1">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="4dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_level"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="16dp"
|
||||
android:src="@mipmap/ic_modle_1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_level"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="22"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="10dp" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- <TextView-->
|
||||
@@ -99,7 +132,7 @@
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:src="@drawable/ic_guard_love"/>
|
||||
android:src="@mipmap/ic_qmb_xin"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_intimacy"
|
||||
@@ -113,73 +146,45 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- <LinearLayout-->
|
||||
<!-- android:id="@+id/ll_visit_time"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_alignParentRight="true"-->
|
||||
<!-- android:layout_centerVertical="true"-->
|
||||
<!-- android:layout_marginRight="16dp"-->
|
||||
<!-- android:orientation="vertical"-->
|
||||
<!-- android:visibility="gone">-->
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="16dp">
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:layout_gravity="end|right"-->
|
||||
<!-- android:id="@+id/tv_add_time"-->
|
||||
<!-- android:layout_marginTop="@dimen/dp6"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:text="01/25访问"-->
|
||||
<!-- android:textColor="@color/three_text"-->
|
||||
<!-- android:textSize="12sp" />-->
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_unlock"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<!-- <LinearLayout-->
|
||||
<!-- android:layout_marginTop="@dimen/dp6"-->
|
||||
<!-- android:layout_gravity="center_vertical"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:orientation="horizontal">-->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="right"
|
||||
android:text="未解锁"
|
||||
android:textColor="@color/two_text"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:text="共 "-->
|
||||
<!-- android:textColor="@color/three_text"-->
|
||||
<!-- android:textSize="14sp"-->
|
||||
<!-- />-->
|
||||
<TextView
|
||||
android:id="@+id/tv_unlock_desc"
|
||||
android:textColor="@color/three_text"
|
||||
android:textSize="12sp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="还差18888"/>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:id="@+id/tv_visit_number"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:text="1次"-->
|
||||
<!-- android:textColor="@color/yellow_ffd33e"-->
|
||||
<!-- android:textSize="14sp"-->
|
||||
<!-- />-->
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:text=" 访问"-->
|
||||
<!-- android:textColor="@color/three_text"-->
|
||||
<!-- android:textSize="14sp"-->
|
||||
<!-- />-->
|
||||
<!-- </LinearLayout>-->
|
||||
<!-- </LinearLayout>-->
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- android:id="@+id/tv_chat"-->
|
||||
<!-- android:layout_width="60dp"-->
|
||||
<!-- android:layout_height="30dp"-->
|
||||
<!-- android:layout_alignParentRight="true"-->
|
||||
<!-- android:layout_centerVertical="true"-->
|
||||
<!-- android:layout_marginRight="16dp"-->
|
||||
<!-- android:background="@drawable/shape_button_enable"-->
|
||||
<!-- android:gravity="center"-->
|
||||
<!-- android:text="发消息"-->
|
||||
<!-- android:textColor="@color/white"-->
|
||||
<!-- android:textSize="12sp" />-->
|
||||
<TextView
|
||||
android:id="@+id/tv_lock"
|
||||
android:visibility="gone"
|
||||
android:textColor="@color/yellow_ffd33e"
|
||||
android:textSize="14sp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="已解锁"/>
|
||||
</RelativeLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
BIN
app/src/main/res/mipmap-xhdpi/ic_qmb_xin.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_qmb_xin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Reference in New Issue
Block a user