diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20b817d..a82eb30 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -483,6 +483,12 @@ + + { +public class MainRecommendAdapter extends BaseQuickAdapter { private Context mContext; private int mTabType; //1代表推荐 2代表语聊 0代表其他 @@ -36,14 +42,38 @@ public class MainRecommendAdapter extends BaseQuickAdapter httpUiCallBack) { + HttpWithUiTask task = new HttpWithUiTask(activity, httpUiCallBack) { + @Override + protected HttpResult run() throws Exception { + final String url = ConstUrl.HOME_DATA; + HttpRequest.Builder builder = new HttpRequest.Builder() + .setResultType(new TType>() { + + }).setHttpMethod(HttpMethod.POST) + .addParam("type", type) + .addParam("page", page + "") + .setUrl(url); + + HttpRequest request = builder.build(); + return request.request(); + } + }; + // task.start(); task.start(false); } @@ -600,7 +625,7 @@ public class MainManager { .setResultType(new TType>() { }).setHttpMethod(HttpMethod.POST) - .addParam("status", status + "") + .addParam("value", status + "") .setUrl(url); HttpRequest request = builder.build(); @@ -611,6 +636,28 @@ public class MainManager { task.start(); } + public static void changeVideoStatus2(BaseActivity activity, + final int status, + HttpUiCallBack httpUiCallBack) { + HttpWithUiTask task = new HttpWithUiTask(activity, httpUiCallBack) { + @Override + protected HttpResult run() throws Exception { + final String url = ConstUrl.SET_DO_NOT_DISTURB; + HttpRequest.Builder builder = new HttpRequest.Builder() + .setResultType(new TType>() { + + }).setHttpMethod(HttpMethod.POST) + .addParam("do_not_disturb", status + "") + .setUrl(url); + + HttpRequest request = builder.build(); + return request.request(); + } + }; + + task.start(false); + } + public static void changeswitchServiceNum(BaseActivity activity, final int status, HttpUiCallBack httpUiCallBack) { @@ -904,6 +951,30 @@ public class MainManager { task.start(); } + public static void getGenderActiveList(BaseActivity activity, + final int gender, + final int page, + HttpUiCallBack httpUiCallBack) { + HttpWithUiTask task = new HttpWithUiTask(activity, httpUiCallBack) { + @Override + protected HttpResult run() throws Exception { + String url = ConstUrl.GET_ACTIVE_USERS; + HttpRequest.Builder builder = new HttpRequest.Builder() + .setResultType(new TType>() { + + }).setHttpMethod(HttpMethod.POST) + .addParam("gender", gender + "") + .addParam("page", page + "") + .setUrl(url); + + HttpRequest request = builder.build(); + return request.request(); + } + }; + + task.start(false); + } + public static void getSystemVersion(BaseActivity activity, HttpUiCallBack httpUiCallBack) { HttpWithUiTask task = new HttpWithUiTask(activity, httpUiCallBack) { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/GenderActiveAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/GenderActiveAdapter.java new file mode 100644 index 0000000..6e26a5a --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/GenderActiveAdapter.java @@ -0,0 +1,87 @@ +package com.xuebiping.bolizhuzi.controller.settings.adapter; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Color; +import android.text.TextUtils; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.viewholder.BaseViewHolder; +import com.facebook.drawee.view.SimpleDraweeView; +import com.flyco.roundview.RoundTextView; +import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit; +import com.xuebiping.bolizhuzi.model.settings.UserInfoBean; +import com.xuebiping.bolizhuzi.utils.StrU; +import com.xuebiping.bolizhuzi.view.main.MainPageActivity; + +import org.jetbrains.annotations.NotNull; + +public class GenderActiveAdapter extends BaseQuickAdapter { + + private Context mContext; + + public GenderActiveAdapter(int layoutResId, Context context) { + super(layoutResId); + this.mContext = context; + } + + @Override + protected void convert(@NotNull BaseViewHolder baseViewHolder, UserInfoBean bean) { + LinearLayout lin_gender_item = baseViewHolder.getView(R.id.lin_gender_item); + SimpleDraweeView user_head = baseViewHolder.getView(R.id.user_head); + View view_online_status = baseViewHolder.getView(R.id.view_online_status); + TextView tv_nick_name = baseViewHolder.getView(R.id.tv_nick_name); + ImageView iv_member_sign = baseViewHolder.getView(R.id.iv_member_sign); + TextView tv_user_info = baseViewHolder.getView(R.id.tv_user_info); + TextView iv_luck_hi = baseViewHolder.getView(R.id.iv_luck_hi); + + user_head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext)); + + if (bean.getOnline_status() == 0) { + view_online_status.setBackgroundResource(R.drawable.shape_999999_oval_bg); + }else if (bean.getOnline_status() == 1) { + view_online_status.setBackgroundResource(R.drawable.shape_6ce4b7_oval_bg); + }else if (bean.getOnline_status() == 2) { + view_online_status.setBackgroundResource(R.drawable.shape_f2b854_oval_bg); + } + + tv_nick_name.setText(bean.getNickname()); + + if (0 == bean.getVip()) { + iv_member_sign.setVisibility(View.VISIBLE); + iv_member_sign.setImageResource(R.drawable.ic_pvip); + } else if (1 == bean.getVip()) { + iv_member_sign.setVisibility(View.VISIBLE); + iv_member_sign.setImageResource(R.drawable.ic_gvip); + } else { + iv_member_sign.setVisibility(View.GONE); + } + + if (TextUtils.isEmpty(bean.getCity())) { + tv_user_info.setText((bean.getGender() == 2 ? "男" : "女") + " | " + bean.getAge()); + }else { + tv_user_info.setText(bean.getCity() + " | " + (bean.getGender() == 2 ? "男" : "女") + " | " + bean.getAge()); + } + + iv_luck_hi.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + NimUIKit.startP2PSession(mContext, bean.getUser_id() + ""); + } + }); + + lin_gender_item.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(mContext, MainPageActivity.class); + intent.putExtra("userId", bean.getUserid()); + mContext.startActivity(intent); + } + }); + } +} 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 new file mode 100644 index 0000000..69b600c --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/IntimacyAdapter.java @@ -0,0 +1,48 @@ +package com.xuebiping.bolizhuzi.controller.settings.adapter; + +import android.content.Context; +import android.content.Intent; +import android.view.View; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.viewholder.BaseViewHolder; +import com.facebook.drawee.view.SimpleDraweeView; +import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.model.settings.IntimacyBean; +import com.xuebiping.bolizhuzi.utils.StrU; +import com.xuebiping.bolizhuzi.view.main.MainPageActivity; + +import org.jetbrains.annotations.NotNull; + +public class IntimacyAdapter extends BaseQuickAdapter { + + private Context mContext; + + public IntimacyAdapter(int layoutResId, Context context) { + super(layoutResId); + this.mContext = context; + } + + @Override + protected void convert(@NotNull BaseViewHolder baseViewHolder, IntimacyBean bean) { + RelativeLayout rl_item = baseViewHolder.getView(R.id.rl_item); + 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); + + user_head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext)); + tv_nick_name.setText(bean.getNickname()); + tv_intimacy.setText(bean.getTotal_consume_coin() + ""); + + rl_item.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(mContext, MainPageActivity.class); + intent.putExtra("userId", bean.getUser_id()); + mContext.startActivity(intent); + } + }); + } +} diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/manager/SettingManager.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/manager/SettingManager.java index ec3f0ee..3dc611e 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/manager/SettingManager.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/manager/SettingManager.java @@ -19,6 +19,7 @@ import com.xuebiping.bolizhuzi.model.settings.CancellationBean; import com.xuebiping.bolizhuzi.model.settings.ChatPriceBean; import com.xuebiping.bolizhuzi.model.settings.GoddessPrivilegeBean; import com.xuebiping.bolizhuzi.model.settings.GreetingBean; +import com.xuebiping.bolizhuzi.model.settings.IntimacyListBean; import com.xuebiping.bolizhuzi.model.settings.InvitationBean; import com.xuebiping.bolizhuzi.model.settings.InviteDataListBean; import com.xuebiping.bolizhuzi.model.settings.MemberBean; @@ -315,6 +316,27 @@ public class SettingManager { task.start(); } + public static void getIntimacyList(BaseActivity activity, final int page, + HttpUiCallBack httpUiCallBack) { + HttpWithUiTask task = new HttpWithUiTask(activity, httpUiCallBack) { + @Override + protected HttpResult run() throws Exception { + final String url = ConstUrl.INTIMACY_LIST; + HttpRequest.Builder builder = new HttpRequest.Builder() + .setResultType(new TType>() { + + }).setHttpMethod(HttpMethod.POST) + .addParam("page", page + "") + .setUrl(url); + + HttpRequest request = builder.build(); + return request.request(); + } + }; + + task.start(false); + } + public static void rankWealth(BaseActivity activity, final int type, final int page, HttpUiCallBack httpUiCallBack) { @@ -537,7 +559,7 @@ public class SettingManager { } }; - task.start(); + task.start(false); } public static void getContactList(BaseActivity activity, diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorBean.java index ed28f7e..a802dd5 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorBean.java @@ -23,6 +23,33 @@ public class AnchorBean implements Serializable { private boolean isVideo; private boolean is_follow;//true关注false未关注 private int anchor_tag;// 1=王牌 2=人气 + private int member_discount_price; //会员优惠价格 + private int star_level; //星级 + private int voice_price; //语聊价格 + + public int getVoice_price() { + return voice_price; + } + + public void setVoice_price(int voice_price) { + this.voice_price = voice_price; + } + + public int getStar_level() { + return star_level; + } + + public void setStar_level(int star_level) { + this.star_level = star_level; + } + + public int getMember_discount_price() { + return member_discount_price; + } + + public void setMember_discount_price(int member_discount_price) { + this.member_discount_price = member_discount_price; + } public int getPrice() { return price; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorListBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorListBean.java index 75c9969..42832d6 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorListBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/AnchorListBean.java @@ -8,9 +8,18 @@ public class AnchorListBean { private String skill_name; private String skill_icon; private int total; + private int total_page; private List anchors = new ArrayList<>(); private List list = new ArrayList<>(); + public int getTotal_page() { + return total_page; + } + + public void setTotal_page(int total_page) { + this.total_page = total_page; + } + public List getAnchors() { return anchors; } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageAnchorBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageAnchorBean.java index 027dc0e..1f43462 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageAnchorBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/MainPageAnchorBean.java @@ -4,6 +4,15 @@ public class MainPageAnchorBean { private int open_video_status; private int open_voice_status; private int video_status; + private int do_not_disturb; + + public int getDo_not_disturb() { + return do_not_disturb; + } + + public void setDo_not_disturb(int do_not_disturb) { + this.do_not_disturb = do_not_disturb; + } public int getOpen_video_status() { return open_video_status; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/UserGenderBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/UserGenderBean.java index c99d877..556109d 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/main/UserGenderBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/main/UserGenderBean.java @@ -8,6 +8,7 @@ import java.util.List; public class UserGenderBean { private int total; private int page; + private int total_page; private List list = new ArrayList<>(); public int getTotal() { @@ -33,4 +34,12 @@ public class UserGenderBean { public void setList(List list) { this.list = list; } + + public int getTotal_page() { + return total_page; + } + + public void setTotal_page(int total_page) { + this.total_page = total_page; + } } 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 new file mode 100644 index 0000000..d49971f --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyBean.java @@ -0,0 +1,41 @@ +package com.xuebiping.bolizhuzi.model.settings; + +public class IntimacyBean { + + private int user_id; + private int total_consume_coin; + private String nickname; + private String avatar; + + public int getUser_id() { + return user_id; + } + + public void setUser_id(int user_id) { + this.user_id = user_id; + } + + public int getTotal_consume_coin() { + return total_consume_coin; + } + + public void setTotal_consume_coin(int total_consume_coin) { + this.total_consume_coin = total_consume_coin; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } +} diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyListBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyListBean.java new file mode 100644 index 0000000..6cf971e --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/IntimacyListBean.java @@ -0,0 +1,35 @@ +package com.xuebiping.bolizhuzi.model.settings; + +import java.util.ArrayList; +import java.util.List; + +public class IntimacyListBean { + + private int page; + private int total_page; + private List list = new ArrayList<>(); + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getTotal_page() { + return total_page; + } + + public void setTotal_page(int total_page) { + this.total_page = total_page; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/UserInfoBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/UserInfoBean.java index 0b30da9..4b3dc67 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/UserInfoBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/UserInfoBean.java @@ -40,6 +40,24 @@ public class UserInfoBean { private String signature; private UserFrameBean user_frame; private int user_type; + private int online_status; + private int do_not_disturb; + + public int getDo_not_disturb() { + return do_not_disturb; + } + + public void setDo_not_disturb(int do_not_disturb) { + this.do_not_disturb = do_not_disturb; + } + + public int getOnline_status() { + return online_status; + } + + public void setOnline_status(int online_status) { + this.online_status = online_status; + } public int getUser_type() { return user_type; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFiveStarFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFiveStarFragment.java index 377a7b5..263aeaa 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFiveStarFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFiveStarFragment.java @@ -11,12 +11,18 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import org.jetbrains.annotations.NotNull; @@ -25,12 +31,15 @@ import java.util.List; public class MainFiveStarFragment extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "five_star"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); private LinearLayoutManager mLinearLayoutManager; @Nullable @@ -57,21 +66,42 @@ public class MainFiveStarFragment extends Fragment implements OnRefreshLoadMoreL } private void getData(int page) { + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - if (page == 1) { - mData.clear(); - } + if (mPage == 1) { + mData.clear(); + } - for (int i = 0; i < 10; i++) { - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } + } - } + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } - finishFresh(); - mAdapter.setList(mData); + @Override + public void onException(BaseActivity activity, Throwable e) { + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } public void finishFresh() { @@ -82,7 +112,12 @@ public class MainFiveStarFragment extends Fragment implements OnRefreshLoadMoreL @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFourStarFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFourStarFragment.java index 0ed719d..d9183fc 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFourStarFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainFourStarFragment.java @@ -11,12 +11,19 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import org.jetbrains.annotations.NotNull; @@ -25,12 +32,15 @@ import java.util.List; public class MainFourStarFragment extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "four_star"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); private LinearLayoutManager mLinearLayoutManager; @Nullable @@ -57,21 +67,42 @@ public class MainFourStarFragment extends Fragment implements OnRefreshLoadMoreL } private void getData(int page) { + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - if (page == 1) { - mData.clear(); - } + if (mPage == 1) { + mData.clear(); + } - for (int i = 0; i < 10; i++) { - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } + } - } + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } - finishFresh(); - mAdapter.setList(mData); + @Override + public void onException(BaseActivity activity, Throwable e) { + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } public void finishFresh() { @@ -82,7 +113,12 @@ public class MainFourStarFragment extends Fragment implements OnRefreshLoadMoreL @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainNewPeopleFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainNewPeopleFragment.java index 94d541a..9205d3c 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainNewPeopleFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainNewPeopleFragment.java @@ -11,12 +11,18 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import org.jetbrains.annotations.NotNull; @@ -25,12 +31,15 @@ import java.util.List; public class MainNewPeopleFragment extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "new"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); private LinearLayoutManager mLinearLayoutManager; @Nullable @@ -57,21 +66,42 @@ public class MainNewPeopleFragment extends Fragment implements OnRefreshLoadMore } private void getData(int page) { + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - if (page == 1) { - mData.clear(); - } + if (mPage == 1) { + mData.clear(); + } - for (int i = 0; i < 10; i++) { - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } + } - } + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } - finishFresh(); - mAdapter.setList(mData); + @Override + public void onException(BaseActivity activity, Throwable e) { + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } public void finishFresh() { @@ -82,7 +112,12 @@ public class MainNewPeopleFragment extends Fragment implements OnRefreshLoadMore @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommend2Fragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommend2Fragment.java index c44882c..147b1d3 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommend2Fragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommend2Fragment.java @@ -22,9 +22,12 @@ import androidx.viewpager.widget.ViewPager; import com.fengliyan.uikit.UiUtils; import com.fengliyan.uikit.toast.MaleToast; import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.controller.constant.Constant; import com.xuebiping.bolizhuzi.controller.main.adapter.MainViewPagerAdapter; import com.xuebiping.bolizhuzi.controller.main.adapter.ScaleTransitionPagerTitleView; +import com.xuebiping.bolizhuzi.controller.user.manager.UserManager; import com.xuebiping.bolizhuzi.im.uikit.common.ToastHelper; +import com.xuebiping.bolizhuzi.utils.NoClearSPUtils; import com.xuebiping.bolizhuzi.view.base.BaseActivity; import com.xuebiping.bolizhuzi.view.main.dialog.ShaiXuanDialog; @@ -62,7 +65,7 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList private MainNewPeopleFragment mNewPeopleFragment; private MainFiveStarFragment mFiveStarFragment; private MainFourStarFragment mFourStarFragment; - private MainRecommendActiveFragment mThreeStarFragment; + private MainThreeStarFragment mThreeStarFragment; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -97,7 +100,7 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList mNewPeopleFragment = new MainNewPeopleFragment(); mFiveStarFragment = new MainFiveStarFragment(); mFourStarFragment = new MainFourStarFragment(); - mThreeStarFragment = new MainRecommendActiveFragment(); + mThreeStarFragment = new MainThreeStarFragment(); mChannelFragments.add(mLookMeFragment); mChannelFragments.add(mRecommendFragment); @@ -145,6 +148,7 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList mViewPagerAdapter.notifyDataSetChanged(); mMainViewPager.setCurrentItem(mIndex); + mMainViewPager.setOffscreenPageLimit(7); } private void initMagicIndicator() { @@ -286,7 +290,7 @@ public class MainRecommend2Fragment extends Fragment implements View.OnClickList shaiXuanDialog.setRightOnClickListener(new ShaiXuanDialog.OnDialogRightClickListener() { @Override public void rightClick(int isSelect) { - ToastHelper.showToast(getContext(),"选择了 " + isSelect); + NoClearSPUtils.saveInt(getActivity(), UserManager.getUserInfo().getUser_id() + Constant.FRIEND_SELECT, isSelect); } }); }else if (view == mRl_home_change) { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainThreeStarFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainThreeStarFragment.java index 212cd5c..71d0703 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainThreeStarFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainThreeStarFragment.java @@ -11,12 +11,18 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import org.jetbrains.annotations.NotNull; @@ -25,12 +31,15 @@ import java.util.List; public class MainThreeStarFragment extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "three_star"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); private LinearLayoutManager mLinearLayoutManager; @Nullable @@ -57,21 +66,42 @@ public class MainThreeStarFragment extends Fragment implements OnRefreshLoadMore } private void getData(int page) { + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - if (page == 1) { - mData.clear(); - } + if (mPage == 1) { + mData.clear(); + } - for (int i = 0; i < 10; i++) { - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } + } - } + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } - finishFresh(); - mAdapter.setList(mData); + @Override + public void onException(BaseActivity activity, Throwable e) { + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } public void finishFresh() { @@ -82,7 +112,12 @@ public class MainThreeStarFragment extends Fragment implements OnRefreshLoadMore @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainVoiceFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainVoiceFragment.java index 2719cae..359a7fa 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainVoiceFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainVoiceFragment.java @@ -12,14 +12,19 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; -import com.xuebiping.bolizhuzi.model.main.BannerBean; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; import com.xuebiping.bolizhuzi.utils.SPUtils; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import org.jetbrains.annotations.NotNull; @@ -28,12 +33,15 @@ import java.util.List; public class MainVoiceFragment extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "voice"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); private GridLayoutManager mGridLayoutManager; private LinearLayoutManager mLinearLayoutManager; @@ -84,20 +92,42 @@ public class MainVoiceFragment extends Fragment implements OnRefreshLoadMoreList private void getData(int page) { - if (page == 1) { - mData.clear(); - } + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - for (int i = 0; i < 10; i++) { - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + if (mPage == 1) { + mData.clear(); + } - } + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } + } - finishFresh(); - mAdapter.setList(mData); + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } + + @Override + public void onException(BaseActivity activity, Throwable e) { + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } public void finishFresh() { @@ -108,7 +138,12 @@ public class MainVoiceFragment extends Fragment implements OnRefreshLoadMoreList @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/RecommendFragment2.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/RecommendFragment2.java index 28a317d..49c4220 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/RecommendFragment2.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/RecommendFragment2.java @@ -1,6 +1,7 @@ package com.xuebiping.bolizhuzi.view.main; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,16 +15,22 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; +import com.fengliyan.uikit.toast.MaleToast; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.main.adapter.MainRecommendAdapter; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.model.main.AnchorBean; +import com.xuebiping.bolizhuzi.model.main.AnchorListBean; import com.xuebiping.bolizhuzi.model.main.BannerBean; -import com.xuebiping.bolizhuzi.model.main.LookMeBean; +import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean; import com.xuebiping.bolizhuzi.utils.BaseUtils; import com.xuebiping.bolizhuzi.utils.GlideImageLoader; import com.xuebiping.bolizhuzi.utils.SPUtils; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; import com.xuebiping.bolizhuzi.view.main.utils.JumpUtils; import com.youth.banner.Banner; import com.youth.banner.listener.OnBannerListener; @@ -35,19 +42,23 @@ import java.util.List; public class RecommendFragment2 extends Fragment implements OnRefreshLoadMoreListener { + private String mType = "new"; + private SmartRefreshLayout mSmart_refresh; private RecyclerView mRv_list; private Banner mBn_recommend; private MainRecommendAdapter mAdapter; private int mPage = 1; - private List mData = new ArrayList<>(); - private List mData2 = new ArrayList<>(); + private int mTotalPage; + private List mData = new ArrayList<>(); + private List mBanner = new ArrayList<>(); List images = new ArrayList<>(); private GridLayoutManager mGridLayoutManager; private LinearLayoutManager mLinearLayoutManager; private RelativeLayout mRl_banner; + @Nullable @org.jetbrains.annotations.Nullable @Override @@ -96,41 +107,62 @@ public class RecommendFragment2 extends Fragment implements OnRefreshLoadMoreLis } private void getData(int page) { + MainManager.getHomeData((BaseActivity) getActivity(), mType, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, ChannelAnchorBean result, String message) { + finishFresh(); + if (result != null) { - if (page == 1) { - mData.clear(); - mData2.clear(); - } + if (mPage == 1) { + mBanner.clear(); + mBanner = result.getBanner(); + if (mBanner != null && mBanner.size() > 0) { + mRl_banner.setVisibility(View.VISIBLE); + banner(mBanner); + }else { + mRl_banner.setVisibility(View.GONE); + } - for (int i = 0; i < 10; i++) { - if (i < 3 && page == 1) { - BannerBean bannerBean = new BannerBean(); - bannerBean.setImage("https://img.boxinxinc.cn/images/banner/050ba52eec6c9211436bf82aecfd3f81.jpg"); - mData2.add(bannerBean); + mData.clear(); + } + + AnchorListBean list1 = result.getList(); + if (list1 != null) { + mTotalPage = list1.getTotal_page(); + List list = list1.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + } + if (mData != null && mData.size() > 0) { + mAdapter.setList(mData); + } } - LookMeBean lookMeBean = new LookMeBean(); - lookMeBean.setId(i + ""); - lookMeBean.setAvatar_url("uploads/admin/202403/25/04cf409ab9148f11c0052bb254b5c155.jpg"); - mData.add(lookMeBean); + @Override + public void onFailure(BaseActivity activity, String tip) { + finishFresh(); + MaleToast.showFailureMsg(activity, tip); + } - } - - finishFresh(); - if (page == 1) { - banner(mData2); - } - mAdapter.setList(mData); + @Override + public void onException(BaseActivity activity, Throwable e) { + Log.d("nail", "onException: " + e); + finishFresh(); + MaleToast.showFailureMsg(activity, "请重试"); + } + }); } - private void banner(List mBanners) { + private void banner(List banners) { images.clear(); - if (null != mBanners) { - if (mBanners.size() != 0) { - for (int i = 0; i < mBanners.size(); i++) { + if (null != banners) { + if (banners.size() != 0) { + for (int i = 0; i < banners.size(); i++) { // images.add(StrU.getResourcePath(mBanners.get(i).getImage(), mContext)); - images.add(mBanners.get(i).getImage()); + images.add(banners.get(i).getImage()); } } } @@ -141,12 +173,12 @@ public class RecommendFragment2 extends Fragment implements OnRefreshLoadMoreLis .setOnBannerListener(new OnBannerListener() { @Override public void OnBannerClick(int position) { - if (null != mBanners) { - int size = mBanners.size(); + if (null != banners) { + int size = banners.size(); if (size != 0) { int i = position % size; - JumpUtils.jump(mBanners.get(i).getLink_type(), - mBanners.get(i).getLink_url(), getActivity()); + JumpUtils.jump(banners.get(i).getLink_type(), + banners.get(i).getLink_url(), getActivity()); // mRv_list.setLayoutManager(mLinearLayoutManager); // mAdapter.notifyDataSetChanged(); } @@ -186,7 +218,12 @@ public class RecommendFragment2 extends Fragment implements OnRefreshLoadMoreLis @Override public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { mPage++; - getData(mPage); + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getData(mPage); + } } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/ShaiXuanDialog.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/ShaiXuanDialog.java index 67404de..5f7afbd 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/ShaiXuanDialog.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/dialog/ShaiXuanDialog.java @@ -17,6 +17,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.controller.constant.Constant; +import com.xuebiping.bolizhuzi.controller.user.manager.UserManager; +import com.xuebiping.bolizhuzi.utils.NoClearSPUtils; public class ShaiXuanDialog extends Dialog implements View.OnClickListener { @@ -72,7 +75,16 @@ public class ShaiXuanDialog extends Dialog implements View.OnClickListener { tv_boy = findViewById(R.id.tv_boy); tv_girl = findViewById(R.id.tv_girl); - setTxtStyle(tv_all,tv_boy,tv_girl); + int select = NoClearSPUtils.getInt(mContext, UserManager.getUserInfo().getUser_id() + Constant.FRIEND_SELECT, isSelect); + if (select == 0) { + setTxtStyle(tv_all,tv_boy,tv_girl); + }else if (select == 1) { + setTxtStyle(tv_boy,tv_all,tv_girl); + }else if (select == 2) { + setTxtStyle(tv_girl,tv_boy,tv_all); + } + +// setTxtStyle(tv_all,tv_boy,tv_girl); ll_nm_video_call = findViewById(R.id.ll_nm_video_call); @@ -111,7 +123,7 @@ public class ShaiXuanDialog extends Dialog implements View.OnClickListener { public void setTxtStyle(TextView textView1,TextView textView2,TextView textView3){ textView1.setTextColor(Color.parseColor("#ffffff")); - textView1.setBackground(mContext.getResources().getDrawable(R.drawable.bg_fb65fd)); + textView1.setBackground(mContext.getResources().getDrawable(R.drawable.shape_button_enable)); textView2.setTextColor(Color.parseColor("#999999")); textView2.setBackground(mContext.getResources().getDrawable(R.drawable.bg_999999_t10)); textView3.setTextColor(Color.parseColor("#999999")); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/BindPhoneActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/BindPhoneActivity.java index 6164814..8a1b482 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/BindPhoneActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/BindPhoneActivity.java @@ -87,12 +87,12 @@ public class BindPhoneActivity extends BaseActivity implements View.OnClickListe mBindWeiboView.setOnClickListener(this); rl_delete_account.setOnClickListener(this);//注销账号 - if (UserManager.getUserInfo().isWomen()) { - bind_certification.setVisibility(View.VISIBLE); - getSelfieExample(); - } else { - bind_certification.setVisibility(View.GONE); - } +// if (UserManager.getUserInfo().isWomen()) { +// bind_certification.setVisibility(View.VISIBLE); +// getSelfieExample(); +// } else { +// bind_certification.setVisibility(View.GONE); +// } } private BindInfoBean mBindInfoBean; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GenderActiveActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GenderActiveActivity.java new file mode 100644 index 0000000..a5a9f57 --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/GenderActiveActivity.java @@ -0,0 +1,129 @@ +package com.xuebiping.bolizhuzi.view.settings; + +import android.os.Bundle; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.fengliyan.uikit.toast.MaleToast; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; +import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.controller.settings.adapter.GenderActiveAdapter; +import com.xuebiping.bolizhuzi.controller.user.manager.UserManager; +import com.xuebiping.bolizhuzi.model.main.UserGenderListBean; +import com.xuebiping.bolizhuzi.model.settings.UserInfoBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; + +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; + +public class GenderActiveActivity extends BaseActivity implements OnRefreshLoadMoreListener { + + private int mPage = 1; + private int mTotalPage; + + private SmartRefreshLayout mSmart_refresh; + private RecyclerView mRv_recommend_list; + private LinearLayout mRl_no_data; + private GenderActiveAdapter mGenderActiveAdapter; + private List mData = new ArrayList<>(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_gender_activity); + setTitleName("活跃"); + initView(); + getGenderUserInfo(mPage); + } + + private void initView() { + mSmart_refresh = findViewById(R.id.smart_refresh); + mRv_recommend_list = findViewById(R.id.rv_recommend_list); + mRl_no_data = findViewById(R.id.rl_no_data); + mRv_recommend_list.setLayoutManager(new LinearLayoutManager(this)); + mGenderActiveAdapter = new GenderActiveAdapter(R.layout.item_gender_active, this); + mRv_recommend_list.setAdapter(mGenderActiveAdapter); + + mSmart_refresh.setOnRefreshLoadMoreListener(this); + } + + public void getGenderUserInfo(int page){ + int gender = 1; + if(UserManager.getUserInfo().getGender() == 1){ + gender = 2; + } + + MainManager.getGenderActiveList(this, gender, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, UserGenderListBean result, String message) { + finishFresh(); + if (result.getList() != null) { + mTotalPage = result.getList().getTotal_page(); + if (mPage == 1) { + mData.clear(); + } + List list = result.getList().getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + if (mData != null && mData.size() > 0) { + if (mPage == 1) { + mRl_no_data.setVisibility(View.GONE); + mRv_recommend_list.setVisibility(View.VISIBLE); + } + mGenderActiveAdapter.setList(mData); + } else { + if (mPage == 1) { + mRl_no_data.setVisibility(View.VISIBLE); + mRv_recommend_list.setVisibility(View.GONE); + } + } + } + + @Override + public void onFailure(BaseActivity activity, String tip) { + MaleToast.showMessage(activity, tip); + finishFresh(); + } + + @Override + public void onException(BaseActivity activity, Throwable e) { + MaleToast.showFailureMsg(activity, "请重试"); + finishFresh(); + } + }); + } + + public void finishFresh() { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.finishRefresh(); + } + + @Override + public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { + mPage++; + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getGenderUserInfo(mPage); + } + } + + @Override + public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) { + mPage = 1; + getGenderUserInfo(mPage); + } +} 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 caddcfc..c283db3 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 @@ -81,7 +81,7 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe private int type = 0; private List mPrivileges = new ArrayList<>(); - private Boolean isVip = false; + private String mSelectedPayMethod = "alipay"; //默认微信 private MemberPayDialog mPayDialog; @@ -183,17 +183,16 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe if (!TextUtils.isEmpty(result.getInfo().getExpire_date_new())) { tv_member_time.setText("有效期至：" + result.getInfo().getExpire_date_new()); - isVip = true; lin_member_bottom_btn.setVisibility(View.VISIBLE); tv_member_open.setVisibility(View.GONE); + + SPUtils.saveBoolean(getActivity(), ConsUser.USER_VIP, true); } else { tv_member_time.setText("你还未开通VIP"); - isVip = false; lin_member_bottom_btn.setVisibility(View.GONE); tv_member_open.setVisibility(View.VISIBLE); tv_member_open.setText("立即开通"); } -// SPUtils.saveBoolean(getActivity(), ConsUser.USER_VIP, isVip); if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { lin_member_bottom_btn.setVisibility(View.GONE); @@ -203,24 +202,59 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe List list = result.getInfo().getList(); if (list != null && list.size() > 0) { - price1 = (int) Double.parseDouble(list.get(0).getPrice()) + list.get(0).getExpires_title(); - tv_vip_shift_name1.setText(list.get(0).getName()); - tv_vip_price1.setText((int) Double.parseDouble(list.get(0).getPrice()) + ""); - tv_vip_price_hint1.setText("原价￥" + list.get(0).getOrigin_price()); - price2 = (int) Double.parseDouble(list.get(1).getPrice()) + list.get(1).getExpires_title(); - tv_vip_shift_name2.setText(list.get(1).getName()); - tv_vip_price2.setText((int) Double.parseDouble(list.get(1).getPrice()) + ""); - tv_vip_price_hint2.setText("原价￥" + list.get(1).getOrigin_price()); + if (list.size() == 1) { + lin_vip_shift1.setVisibility(View.VISIBLE); + lin_vip_shift2.setVisibility(View.GONE); + lin_vip_shift3.setVisibility(View.GONE); - price3 = (int) Double.parseDouble(list.get(2).getPrice()) + list.get(2).getExpires_title(); - tv_vip_shift_name3.setText(list.get(2).getName()); - tv_vip_price3.setText((int) Double.parseDouble(list.get(2).getPrice()) + ""); - tv_vip_price_hint3.setText("原价￥" + list.get(2).getOrigin_price()); + price1 = (int) Double.parseDouble(list.get(0).getPrice()) + list.get(0).getExpires_title(); + tv_vip_shift_name1.setText(list.get(0).getName()); + tv_vip_price1.setText((int) Double.parseDouble(list.get(0).getPrice()) + ""); + tv_vip_price_hint1.setText("原价￥" + list.get(0).getOrigin_price()); - goodsId1 = list.get(0).getId(); - goodsId2 = list.get(1).getId(); - goodsId3 = list.get(2).getId(); + goodsId1 = list.get(0).getId(); + }else if (list.size() == 2) { + lin_vip_shift1.setVisibility(View.VISIBLE); + lin_vip_shift2.setVisibility(View.VISIBLE); + lin_vip_shift3.setVisibility(View.GONE); + + price1 = (int) Double.parseDouble(list.get(0).getPrice()) + list.get(0).getExpires_title(); + tv_vip_shift_name1.setText(list.get(0).getName()); + tv_vip_price1.setText((int) Double.parseDouble(list.get(0).getPrice()) + ""); + tv_vip_price_hint1.setText("原价￥" + list.get(0).getOrigin_price()); + + price2 = (int) Double.parseDouble(list.get(1).getPrice()) + list.get(1).getExpires_title(); + tv_vip_shift_name2.setText(list.get(1).getName()); + tv_vip_price2.setText((int) Double.parseDouble(list.get(1).getPrice()) + ""); + tv_vip_price_hint2.setText("原价￥" + list.get(1).getOrigin_price()); + + goodsId1 = list.get(0).getId(); + goodsId2 = list.get(1).getId(); + }else { + lin_vip_shift1.setVisibility(View.VISIBLE); + lin_vip_shift2.setVisibility(View.VISIBLE); + lin_vip_shift3.setVisibility(View.VISIBLE); + + price1 = (int) Double.parseDouble(list.get(0).getPrice()) + list.get(0).getExpires_title(); + tv_vip_shift_name1.setText(list.get(0).getName()); + tv_vip_price1.setText((int) Double.parseDouble(list.get(0).getPrice()) + ""); + tv_vip_price_hint1.setText("原价￥" + list.get(0).getOrigin_price()); + + price2 = (int) Double.parseDouble(list.get(1).getPrice()) + list.get(1).getExpires_title(); + tv_vip_shift_name2.setText(list.get(1).getName()); + tv_vip_price2.setText((int) Double.parseDouble(list.get(1).getPrice()) + ""); + tv_vip_price_hint2.setText("原价￥" + list.get(1).getOrigin_price()); + + price3 = (int) Double.parseDouble(list.get(2).getPrice()) + list.get(2).getExpires_title(); + tv_vip_shift_name3.setText(list.get(2).getName()); + tv_vip_price3.setText((int) Double.parseDouble(list.get(2).getPrice()) + ""); + tv_vip_price_hint3.setText("原价￥" + list.get(2).getOrigin_price()); + + goodsId1 = list.get(0).getId(); + goodsId2 = list.get(1).getId(); + goodsId3 = list.get(2).getId(); + } } mAdapter.setVip_day_free_send(result.getInfo().getVip_day_free_send()); } @@ -256,41 +290,41 @@ public class GeneralMemberFragment extends Fragment implements View.OnClickListe public void onClick(View v) { if (v == tv_member_setting) { Intent intent = new Intent(getContext(), PrivilegeSettingActivity.class); - intent.putExtra("isVip", isVip); + intent.putExtra("isVip", SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)); startActivity(intent); } else if (v == lin_vip_shift1) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg2); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg1); + lin_vip_shift1.setBackgroundResource(R.mipmap.new_vip_select_bg2); + lin_vip_shift2.setBackgroundResource(R.mipmap.new_vip_select_bg1); + lin_vip_shift3.setBackgroundResource(R.mipmap.new_vip_select_bg1); defaultType = 0; - if (goodsId1 == 1011) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("半价无限畅聊"); - list.get(1).setDesc("每日可享1次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId1 == 1011) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("半价无限畅聊"); +// list.get(1).setDesc("每日可享1次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == lin_vip_shift2) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg2); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg1); + lin_vip_shift1.setBackgroundResource(R.mipmap.new_vip_select_bg1); + lin_vip_shift2.setBackgroundResource(R.mipmap.new_vip_select_bg2); + lin_vip_shift3.setBackgroundResource(R.mipmap.new_vip_select_bg1); defaultType = 1; - if (goodsId2 == 1012) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("半价无限畅聊"); - list.get(1).setDesc("每日可享2次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId2 == 1012) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("半价无限畅聊"); +// list.get(1).setDesc("每日可享2次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == lin_vip_shift3) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg2); + lin_vip_shift1.setBackgroundResource(R.mipmap.new_vip_select_bg1); + lin_vip_shift2.setBackgroundResource(R.mipmap.new_vip_select_bg1); + lin_vip_shift3.setBackgroundResource(R.mipmap.new_vip_select_bg2); defaultType = 2; - if (goodsId3 == 1013) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("尊享无限文字畅聊"); - list.get(1).setDesc("每日可享3次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId3 == 1013) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("尊享无限文字畅聊"); +// list.get(1).setDesc("每日可享3次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == tv_member_sure) { if (defaultType == 1) { goodsId = goodsId2; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/IntimacyListActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/IntimacyListActivity.java new file mode 100644 index 0000000..2a13160 --- /dev/null +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/IntimacyListActivity.java @@ -0,0 +1,129 @@ +package com.xuebiping.bolizhuzi.view.settings; + +import android.os.Bundle; +import android.view.View; +import android.widget.LinearLayout; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.fengliyan.uikit.toast.MaleToast; +import com.scwang.smartrefresh.layout.SmartRefreshLayout; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; +import com.xuebiping.bolizhuzi.R; +import com.xuebiping.bolizhuzi.controller.main.manager.MainManager; +import com.xuebiping.bolizhuzi.controller.settings.adapter.GenderActiveAdapter; +import com.xuebiping.bolizhuzi.controller.settings.adapter.IntimacyAdapter; +import com.xuebiping.bolizhuzi.controller.settings.manager.SettingManager; +import com.xuebiping.bolizhuzi.controller.user.manager.UserManager; +import com.xuebiping.bolizhuzi.model.main.UserGenderListBean; +import com.xuebiping.bolizhuzi.model.settings.IntimacyBean; +import com.xuebiping.bolizhuzi.model.settings.IntimacyListBean; +import com.xuebiping.bolizhuzi.model.settings.UserInfoBean; +import com.xuebiping.bolizhuzi.view.base.BaseActivity; +import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack; + +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; + +public class IntimacyListActivity extends BaseActivity implements OnRefreshLoadMoreListener { + + private int mPage = 1; + private int mTotalPage; + + private SmartRefreshLayout mSmart_refresh; + private RecyclerView mRv_recommend_list; + private LinearLayout mRl_no_data; + private IntimacyAdapter mAdapter; + private List mData = new ArrayList<>(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_intimacy); + setTitleName("我的亲密度"); + initView(); + getIntimacyList(mPage); + } + + private void initView() { + mSmart_refresh = findViewById(R.id.smart_refresh); + mRv_recommend_list = findViewById(R.id.rv_recommend_list); + mRl_no_data = findViewById(R.id.rl_no_data); + mRv_recommend_list.setLayoutManager(new LinearLayoutManager(this)); + mAdapter = new IntimacyAdapter(R.layout.item_intimacy_list, this); + mRv_recommend_list.setAdapter(mAdapter); + + mSmart_refresh.setOnRefreshLoadMoreListener(this); + } + + public void getIntimacyList(int page){ + + SettingManager.getIntimacyList(this, page, new HttpUiCallBack() { + @Override + public void onSuccess(BaseActivity activity, IntimacyListBean result, String message) { + finishFresh(); + if (result.getList() != null) { + mTotalPage = result.getTotal_page(); + if (mPage == 1) { + mData.clear(); + } + List list = result.getList(); + if (list != null && list.size() > 0) { + mData.addAll(list); + } + } + if (mData != null && mData.size() > 0) { + if (mPage == 1) { + mRl_no_data.setVisibility(View.GONE); + mRv_recommend_list.setVisibility(View.VISIBLE); + } + mAdapter.setList(mData); + } else { + if (mPage == 1) { + mRl_no_data.setVisibility(View.VISIBLE); + mRv_recommend_list.setVisibility(View.GONE); + } + } + } + + @Override + public void onFailure(BaseActivity activity, String tip) { + MaleToast.showMessage(activity, tip); + finishFresh(); + } + + @Override + public void onException(BaseActivity activity, Throwable e) { + MaleToast.showFailureMsg(activity, "请重试"); + finishFresh(); + } + }); + } + + public void finishFresh() { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.finishRefresh(); + } + + @Override + public void onLoadMore(@NonNull @NotNull RefreshLayout refreshLayout) { + mPage++; + if (mPage > mTotalPage) { + mSmart_refresh.finishLoadMore(); + mSmart_refresh.setNoMoreData(true); + } else { + getIntimacyList(mPage); + } + } + + @Override + public void onRefresh(@NonNull @NotNull RefreshLayout refreshLayout) { + mPage = 1; + getIntimacyList(mPage); + } +} diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java index a8b15cd..b5442ee 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java @@ -34,6 +34,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity; import com.xuebiping.bolizhuzi.R; import com.xuebiping.bolizhuzi.controller.constant.ConsUser; import com.xuebiping.bolizhuzi.controller.constant.ConstUrl; +import com.xuebiping.bolizhuzi.controller.constant.Constant; import com.xuebiping.bolizhuzi.controller.eventBus.BeAnchorEvent; import com.xuebiping.bolizhuzi.controller.eventBus.RegisterInfoEvent; import com.xuebiping.bolizhuzi.controller.eventBus.SocialToSettingEvent; @@ -49,6 +50,7 @@ import com.xuebiping.bolizhuzi.model.settings.UserFrameBean; import com.xuebiping.bolizhuzi.model.settings.UserHomeBean; import com.xuebiping.bolizhuzi.model.settings.WalletIndexBean; import com.xuebiping.bolizhuzi.model.user.bean.BaseUserInfo; +import com.xuebiping.bolizhuzi.utils.NoClearSPUtils; import com.xuebiping.bolizhuzi.utils.SPUtils; import com.xuebiping.bolizhuzi.utils.StrU; import com.xuebiping.bolizhuzi.view.base.BaseActivity; @@ -128,6 +130,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { private LinearLayout ll_go_edit_layout; private String mUsercode; private TextView mTv_go_open; + private int mDo_not_disturb; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -313,20 +316,22 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { rtv_new_scan_num.setVisibility(View.GONE); } tv_foot_num.setText(result.getUsercount().getFootprint_count()); - if (result.getSwitchX() != null) { - mVideoEnableFlag = result.getSwitchX().getOpen_video_status(); - } +// if (result.getSwitchX() != null) { +// mVideoEnableFlag = result.getSwitchX().getOpen_video_status(); +// } + mDo_not_disturb = result.getUserinfo().getDo_not_disturb(); mOptions1.clear(); mOptions1.add(SettingOptions.RANK); mOptions1.add(SettingOptions.DONOTMODEL); mOptions1.add(SettingOptions.MEMBER); - mOptions1.add(SettingOptions.SETFRIEND); +// mOptions1.add(SettingOptions.SETFRIEND); mOptions1.add(SettingOptions.WALLET); mOptions1.add(SettingOptions.TASK); mOptions1.add(SettingOptions.MYMYINTIMACY); mOptions1.add(SettingOptions.UPAUTH); mOptions1.add(SettingOptions.CUSTOMER); + mOptions1.add(SettingOptions.BEAUTY); mOptions1.add(SettingOptions.SETTING); addOption(mOptions1, lin_my_list1); @@ -432,27 +437,62 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { }); } - private void changeVideoStatus() { - MainManager.changeVideoStatus((BaseActivity) getActivity(), - (mVideoEnableFlag == 1 ? 0 : 1), new HttpUiCallBack() { + private void changeVideoStatus2(Switch mSwitch) { + MainManager.changeVideoStatus2((BaseActivity) getActivity(), + (mDo_not_disturb == 1 ? 0 : 1), new HttpUiCallBack() { @Override public void onSuccess(BaseActivity activity, MainPageAnchorBean result, String message) { - mVideoEnableFlag = result.getOpen_video_status(); + mDo_not_disturb = result.getDo_not_disturb(); + + if (mDo_not_disturb == 1) { //已开启勿扰模式 + MaleToast.showMessage(activity, "勿扰模式开启成功"); + }else { + MaleToast.showMessage(activity, "勿扰模式关闭成功"); + } } @Override public void onFailure(BaseActivity activity, String tip) { MaleToast.showMessage(activity, tip); - + if (mDo_not_disturb == 1) { //已开启勿扰模式 + mSwitch.setChecked(true); + }else { + mSwitch.setChecked(false); + } } @Override public void onException(BaseActivity activity, Throwable e) { - + if (mDo_not_disturb == 1) { //已开启勿扰模式 + mSwitch.setChecked(true); + }else { + mSwitch.setChecked(false); + } } }); } +// private void changeVideoStatus() { +// MainManager.changeVideoStatus((BaseActivity) getActivity(), +// (mVideoEnableFlag == 1 ? 0 : 1), new HttpUiCallBack() { +// @Override +// public void onSuccess(BaseActivity activity, MainPageAnchorBean result, String message) { +// mVideoEnableFlag = result.getOpen_video_status(); +// } +// +// @Override +// public void onFailure(BaseActivity activity, String tip) { +// MaleToast.showMessage(activity, tip); +// +// } +// +// @Override +// public void onException(BaseActivity activity, Throwable e) { +// +// } +// }); +// } + private void showSVGA(String effect) { SVGAParser mSVGAParser = SVGAParser.Companion.shareParser(); mSVGAParser.init(requireActivity()); @@ -553,7 +593,8 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { } break; case R.id.ll_mine_video_chat: - MaleToast.showMessage(getActivity(),"我的视频，暂定"); + intent = new Intent(getActivity(), GenderActiveActivity.class); + startActivity(intent); break; } } @@ -604,6 +645,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { TextView mName = view.findViewById(R.id.setting_option_name); ImageView mArrow = view.findViewById(R.id.iv_option_arrow); TextView mHint = view.findViewById(R.id.tv_option_hint); + TextView tv_option_hint2 = view.findViewById(R.id.tv_option_hint2); Switch mSwitch = view.findViewById(R.id.st_option_switch); SettingOptions options = list.get(i); switch (options) { @@ -611,14 +653,16 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mSwitch.setChecked(mVideoEnableFlag == 1); mSwitch.setVisibility(View.VISIBLE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.GONE); mLogo.setImageResource(R.mipmap.icon_my_video); mName.setText("视频聊天"); - mSwitch.setOnClickListener(v -> changeVideoStatus()); +// mSwitch.setOnClickListener(v -> changeVideoStatus2()); break; case CONTRACT: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.drawable.ic_my_certified); mName.setText("价格设置"); @@ -630,6 +674,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case GUIDE: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.drawable.ic_my_guide); mName.setText("用户指南"); @@ -656,29 +701,10 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { } }); break; - - case BEAUTY: - mSwitch.setVisibility(View.GONE); - mHint.setVisibility(View.GONE); - mArrow.setVisibility(View.VISIBLE); - if (gender == 2) { - mLogo.setImageResource(R.drawable.ic_my_beauty); - } else { - mLogo.setImageResource(R.drawable.ic_my_beauty1); - } - mName.setText("美颜设置"); - view.setOnClickListener(view17 -> { - if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - Intent intent = new Intent(getActivity(), BeautySettingActivity.class); - startActivity(intent); - } - }); - break; - - case GODDESSPRIVILEGE: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_ntequan); mName.setText("up主认证"); @@ -691,6 +717,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case VIOLATION: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wd_weigui); mName.setText("违规公布"); @@ -705,6 +732,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case ADDWECHAT: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wd_addwechat); mName.setText("微信设置"); @@ -718,6 +746,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case HELLOW: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wd_hellow_set); mName.setText("招呼设置"); @@ -730,6 +759,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case ITEMS: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wd_items1); mName.setText("红包卡券"); @@ -743,6 +773,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case RANK: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wd_rank); mName.setText("排行榜"); @@ -755,11 +786,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case DONOTMODEL: mSwitch.setVisibility(View.VISIBLE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.VISIBLE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_do_not_model); mName.setText("勿扰模式"); - if (mVideoEnableFlag == 1) { //已开启勿扰模式 + if (mDo_not_disturb == 1) { //已开启勿扰模式 mSwitch.setChecked(true); }else { mSwitch.setChecked(false); @@ -768,7 +800,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean b) { - changeVideoStatus(); + changeVideoStatus2(mSwitch); } }); break; @@ -776,11 +808,12 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { mSwitch.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_vip); - if (gender == 2) { - mHint.setVisibility(View.VISIBLE); - } else { - mHint.setVisibility(View.GONE); - } + mHint.setVisibility(View.GONE); +// if (gender == 2) { +// mHint.setVisibility(View.VISIBLE); +// } else { +// mHint.setVisibility(View.GONE); +// } mName.setText("会员权限"); view.setOnClickListener(v -> { Intent intent = new Intent(getActivity(), PrivilegeSettingActivity.class); @@ -791,6 +824,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case SETFRIEND: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_set_friend); mName.setText("交友偏好"); @@ -800,7 +834,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { shaiXuanDialog.setRightOnClickListener(new ShaiXuanDialog.OnDialogRightClickListener() { @Override public void rightClick(int isSelect) { - ToastHelper.showToast(getContext(),"选择了 " + isSelect); + NoClearSPUtils.saveInt(getActivity(), UserManager.getUserInfo().getUser_id() + Constant.FRIEND_SELECT, isSelect); } }); }); @@ -808,6 +842,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case WALLET: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_wallet); mName.setText("我的钱包"); @@ -819,6 +854,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case TASK: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_task_mine); mName.setText("任务中心"); @@ -830,16 +866,18 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case MYMYINTIMACY: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_intimacy); mName.setText("我的亲密度"); view.setOnClickListener(view16 -> { - MaleToast.showMessage(getActivity(),"我的亲密度"); + startActivity(new Intent(getActivity(), IntimacyListActivity.class)); }); break; case UPAUTH: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_ntequan); mName.setText("up主认证"); @@ -850,6 +888,7 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { case CUSTOMER: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_service); mName.setText("在线客服"); @@ -857,9 +896,22 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { NimUIKit.startP2PSession(getActivity(), "4"); }); break; + case BEAUTY: + mSwitch.setVisibility(View.GONE); + mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); + mArrow.setVisibility(View.VISIBLE); + mLogo.setImageResource(R.mipmap.ic_set_friend); + mName.setText("美颜设置"); + view.setOnClickListener(view17 -> { + Intent intent = new Intent(getActivity(), BeautySettingActivity.class); + startActivity(intent); + }); + break; case SETTING: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); + tv_option_hint2.setVisibility(View.GONE); mArrow.setVisibility(View.VISIBLE); mLogo.setImageResource(R.mipmap.ic_my_setting_new); mName.setText("系统设置"); 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 9b3e81d..e9f3273 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 @@ -76,7 +76,7 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen private int type = 1; private List mPrivileges = new ArrayList<>(); - private Boolean isVip = false; + private String mSelectedPayMethod = "alipay"; //默认微信 private MemberPayDialog mPayDialog; @@ -178,17 +178,16 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen if (!TextUtils.isEmpty(result.getInfo().getExpire_date_new())) { tv_member_time.setText("有效期至：" + result.getInfo().getExpire_date_new()); - isVip = true; lin_member_bottom_btn.setVisibility(View.VISIBLE); tv_member_open.setVisibility(View.GONE); + + SPUtils.saveBoolean(getActivity(), ConsUser.USER_VIP, true); } else { tv_member_time.setText("你还未开通SVIP"); - isVip = false; lin_member_bottom_btn.setVisibility(View.GONE); tv_member_open.setVisibility(View.VISIBLE); tv_member_open.setText("立即开通"); } -// SPUtils.saveBoolean(getActivity(), ConsUser.USER_VIP, isVip); if (SPUtils.getInt(getActivity(), ConsUser.GENDER) == 1) { lin_member_bottom_btn.setVisibility(View.GONE); @@ -290,41 +289,41 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen public void onClick(View v) { if (v == tv_member_setting) { Intent intent = new Intent(getContext(), PrivilegeSettingActivity.class); - intent.putExtra("isVip", isVip); + intent.putExtra("isVip", SPUtils.getBoolean(getActivity(), ConsUser.USER_VIP, false)); startActivity(intent); } else if (v == lin_vip_shift1) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg2); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg1); + lin_vip_shift1.setBackgroundResource(R.mipmap.svip_select_bg2); + lin_vip_shift2.setBackgroundResource(R.mipmap.svip_select_bg1); + lin_vip_shift3.setBackgroundResource(R.mipmap.svip_select_bg1); defaultType = 0; - if (goodsId1 == 1011) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("半价无限畅聊"); - list.get(1).setDesc("每日可享1次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId1 == 1011) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("半价无限畅聊"); +// list.get(1).setDesc("每日可享1次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == lin_vip_shift2) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg2); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg1); + lin_vip_shift1.setBackgroundResource(R.mipmap.svip_select_bg1); + lin_vip_shift2.setBackgroundResource(R.mipmap.svip_select_bg2); + lin_vip_shift3.setBackgroundResource(R.mipmap.svip_select_bg1); defaultType = 1; - if (goodsId2 == 1012) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("半价无限畅聊"); - list.get(1).setDesc("每日可享2次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId2 == 1012) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("半价无限畅聊"); +// list.get(1).setDesc("每日可享2次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == lin_vip_shift3) { - lin_vip_shift1.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift2.setBackgroundResource(R.drawable.vip_select_bg1); - lin_vip_shift3.setBackgroundResource(R.drawable.vip_select_bg2); + lin_vip_shift1.setBackgroundResource(R.mipmap.svip_select_bg1); + lin_vip_shift2.setBackgroundResource(R.mipmap.svip_select_bg1); + lin_vip_shift3.setBackgroundResource(R.mipmap.svip_select_bg2); defaultType = 2; - if (goodsId3 == 1013) { - List list = mAdapter.getmOptions(); - list.get(0).setDesc("尊享无限文字畅聊"); - list.get(1).setDesc("每日可享3次免费视频，单次最长1分钟"); - mAdapter.setOptions(list); - } +// if (goodsId3 == 1013) { +// List list = mAdapter.getmOptions(); +// list.get(0).setDesc("尊享无限文字畅聊"); +// list.get(1).setDesc("每日可享3次免费视频，单次最长1分钟"); +// mAdapter.setOptions(list); +// } } else if (v == tv_member_sure) { if (defaultType == 1) { goodsId = goodsId2; @@ -364,7 +363,7 @@ public class SuperMember2Fragment extends Fragment implements View.OnClickListen SettingManager.payConfig((BaseActivity) getActivity(), new HttpUiCallBack() { @Override public void onSuccess(BaseActivity activity, PayConfigBean result, String tips) { - mPayDialog = new MemberPayDialog(getActivity(), result, "VIP " + price); + mPayDialog = new MemberPayDialog(getActivity(), result, "SVIP " + price); mPayDialog.setOnClickPayListener(new MemberPayDialog.OnClickPayListener() { @Override public void onClickPayListener(String selectedPayMethod) { diff --git a/app/src/main/res/drawable-xhdpi/ic_general_member_header_bg.png b/app/src/main/res/drawable-xhdpi/ic_general_member_header_bg.png index 61811e9..f43c543 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_general_member_header_bg.png and b/app/src/main/res/drawable-xhdpi/ic_general_member_header_bg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_general_member_header_bg.png b/app/src/main/res/drawable-xxhdpi/ic_general_member_header_bg.png index 1029b4e..efdeb30 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_general_member_header_bg.png and b/app/src/main/res/drawable-xxhdpi/ic_general_member_header_bg.png differ diff --git a/app/src/main/res/drawable/bg_online_round.xml b/app/src/main/res/drawable/shape_6ce4b7_oval_bg.xml similarity index 56% rename from app/src/main/res/drawable/bg_online_round.xml rename to app/src/main/res/drawable/shape_6ce4b7_oval_bg.xml index b3310c7..2087a11 100644 --- a/app/src/main/res/drawable/bg_online_round.xml +++ b/app/src/main/res/drawable/shape_6ce4b7_oval_bg.xml @@ -3,7 +3,5 @@ android:shape="oval"> - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_999999_oval_bg.xml b/app/src/main/res/drawable/shape_999999_oval_bg.xml new file mode 100644 index 0000000..a9eef45 --- /dev/null +++ b/app/src/main/res/drawable/shape_999999_oval_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_f2b854_oval_bg.xml b/app/src/main/res/drawable/shape_f2b854_oval_bg.xml new file mode 100644 index 0000000..175717b --- /dev/null +++ b/app/src/main/res/drawable/shape_f2b854_oval_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_thumb_on.xml b/app/src/main/res/drawable/switch_thumb_on.xml index a52d14b..6d0663c 100644 --- a/app/src/main/res/drawable/switch_thumb_on.xml +++ b/app/src/main/res/drawable/switch_thumb_on.xml @@ -1,9 +1,10 @@ - + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml index 820af87..f9a69c9 100644 --- a/app/src/main/res/layout/activity_bind_phone.xml +++ b/app/src/main/res/layout/activity_bind_phone.xml @@ -184,6 +184,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_intimacy.xml b/app/src/main/res/layout/activity_intimacy.xml new file mode 100644 index 0000000..e02856e --- /dev/null +++ b/app/src/main/res/layout/activity_intimacy.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_privilege_setting.xml b/app/src/main/res/layout/activity_privilege_setting.xml index 142dc2a..0231950 100644 --- a/app/src/main/res/layout/activity_privilege_setting.xml +++ b/app/src/main/res/layout/activity_privilege_setting.xml @@ -396,7 +396,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="28dp" android:layout_marginEnd="16dp" - android:background="@drawable/open_vip_btn" + android:background="@drawable/shape_button_enable" android:gravity="center" android:text="开通会员" android:textColor="@color/white" diff --git a/app/src/main/res/layout/fragment_general_member.xml b/app/src/main/res/layout/fragment_general_member.xml index c3165ee..cf617ec 100644 --- a/app/src/main/res/layout/fragment_general_member.xml +++ b/app/src/main/res/layout/fragment_general_member.xml @@ -51,7 +51,7 @@ android:layout_marginLeft="6dp" android:layout_weight="1" android:text="特权" - android:textColor="@color/white" + android:textColor="#814D1A" android:textSize="16sp" android:textStyle="bold" /> @@ -67,7 +67,7 @@ android:layout_height="16dp" android:scaleType="fitXY" app:roundAsCircle="true" - app:roundingBorderColor="@color/white" + app:roundingBorderColor="#814D1A" app:roundingBorderWidth="2dp" /> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="聊天倾诉，一路陪伴美好时光" - android:textColor="@color/white" + android:textColor="@color/one_text" android:textSize="15sp" android:textStyle="bold" /> @@ -134,7 +134,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="7dp" android:layout_weight="1" - android:background="@drawable/vip_select_bg2" + android:background="@mipmap/new_vip_select_bg2" android:orientation="vertical" android:paddingTop="16dp"> @@ -166,7 +166,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="￥" - android:textColor="#F9C644" + android:textColor="@color/white" android:textSize="12dp" /> @@ -185,7 +185,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥38" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" @@ -200,7 +200,7 @@ android:layout_marginStart="7dp" android:layout_marginEnd="7dp" android:layout_weight="1" - android:background="@drawable/vip_select_bg1" + android:background="@mipmap/new_vip_select_bg1" android:orientation="vertical"> @@ -251,7 +251,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥228" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" @@ -273,7 +273,7 @@ android:layout_height="wrap_content" android:layout_marginStart="7dp" android:layout_weight="1" - android:background="@drawable/vip_select_bg1" + android:background="@mipmap/new_vip_select_bg1" android:orientation="vertical"> @@ -324,7 +324,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥38" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_main_recommend2.xml b/app/src/main/res/layout/fragment_main_recommend2.xml index 8ade0c2..3d6dd62 100644 --- a/app/src/main/res/layout/fragment_main_recommend2.xml +++ b/app/src/main/res/layout/fragment_main_recommend2.xml @@ -11,6 +11,7 @@ android:layout_height="@dimen/dp48"> + android:layout_marginBottom="@dimen/dp50" /> diff --git a/app/src/main/res/layout/fragment_recommend2.xml b/app/src/main/res/layout/fragment_recommend2.xml index 7379a31..08be925 100644 --- a/app/src/main/res/layout/fragment_recommend2.xml +++ b/app/src/main/res/layout/fragment_recommend2.xml @@ -69,7 +69,7 @@ android:layout_marginTop="@dimen/dp10" android:layout_marginLeft="@dimen/dp5" android:layout_marginRight="@dimen/dp5" - android:layout_marginBottom="@dimen/dp10" + android:layout_marginBottom="@dimen/dp50" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/app/src/main/res/layout/fragment_super_member2.xml b/app/src/main/res/layout/fragment_super_member2.xml index 4290ebd..eece771 100644 --- a/app/src/main/res/layout/fragment_super_member2.xml +++ b/app/src/main/res/layout/fragment_super_member2.xml @@ -43,7 +43,7 @@ + android:src="@mipmap/ic_svip_tag" /> @@ -166,7 +166,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="￥" - android:textColor="#F9C644" + android:textColor="@color/white" android:textSize="12dp" /> @@ -185,7 +185,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥38" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" @@ -200,7 +200,7 @@ android:layout_marginStart="7dp" android:layout_marginEnd="7dp" android:layout_weight="1" - android:background="@drawable/vip_select_bg1" + android:background="@mipmap/svip_select_bg1" android:orientation="vertical"> @@ -251,7 +251,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥228" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" @@ -273,7 +273,7 @@ android:layout_height="wrap_content" android:layout_marginStart="7dp" android:layout_weight="1" - android:background="@drawable/vip_select_bg1" + android:background="@mipmap/svip_select_bg1" android:orientation="vertical"> @@ -324,7 +324,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="￥38" - android:textColor="#80FFFFFF" + android:textColor="@color/white" android:textSize="12dp" fresco:layout_constraintBottom_toBottomOf="parent" fresco:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_gender_active.xml b/app/src/main/res/layout/item_gender_active.xml new file mode 100644 index 0000000..0cc8a5a --- /dev/null +++ b/app/src/main/res/layout/item_gender_active.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_recommend.xml b/app/src/main/res/layout/item_home_recommend.xml index bf87060..4281c3e 100644 --- a/app/src/main/res/layout/item_home_recommend.xml +++ b/app/src/main/res/layout/item_home_recommend.xml @@ -89,12 +89,14 @@ android:layout_height="@dimen/dp20"> + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_intimacy_list.xml b/app/src/main/res/layout/item_intimacy_list.xml new file mode 100644 index 0000000..98d429b --- /dev/null +++ b/app/src/main/res/layout/item_intimacy_list.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_setting_option.xml b/app/src/main/res/layout/item_setting_option.xml index 0a09401..0d2922d 100644 --- a/app/src/main/res/layout/item_setting_option.xml +++ b/app/src/main/res/layout/item_setting_option.xml @@ -45,6 +45,19 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + android:textSize="@dimen/dp13" /> + android:background="@drawable/bg_999999_t10"/> diff --git a/app/src/main/res/mipmap-xhdpi/ic_member_vip.png b/app/src/main/res/mipmap-xhdpi/ic_member_vip.png index abee51b..4a8e5c0 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_member_vip.png and b/app/src/main/res/mipmap-xhdpi/ic_member_vip.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_svip_tag.png b/app/src/main/res/mipmap-xhdpi/ic_svip_tag.png new file mode 100644 index 0000000..5e257ba Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_svip_tag.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_vip_tag.png b/app/src/main/res/mipmap-xhdpi/ic_vip_tag.png index 0ec8bc0..7cca44d 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_vip_tag.png and b/app/src/main/res/mipmap-xhdpi/ic_vip_tag.png differ diff --git a/app/src/main/res/mipmap-xhdpi/new_vip_select_bg1.png b/app/src/main/res/mipmap-xhdpi/new_vip_select_bg1.png new file mode 100644 index 0000000..0344d74 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/new_vip_select_bg1.png differ diff --git a/app/src/main/res/mipmap-xhdpi/new_vip_select_bg2.png b/app/src/main/res/mipmap-xhdpi/new_vip_select_bg2.png new file mode 100644 index 0000000..707c29d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/new_vip_select_bg2.png differ diff --git a/app/src/main/res/mipmap-xhdpi/svip_select_bg1.png b/app/src/main/res/mipmap-xhdpi/svip_select_bg1.png new file mode 100644 index 0000000..efc9979 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/svip_select_bg1.png differ diff --git a/app/src/main/res/mipmap-xhdpi/svip_select_bg2.png b/app/src/main/res/mipmap-xhdpi/svip_select_bg2.png new file mode 100644 index 0000000..7d100c2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/svip_select_bg2.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_member_vip.png b/app/src/main/res/mipmap-xxhdpi/ic_member_vip.png index 05bb542..d8c94c2 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_member_vip.png and b/app/src/main/res/mipmap-xxhdpi/ic_member_vip.png differ