diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f69bab5..665daf0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -115,7 +115,6 @@ android:usesCleartextTraffic="true" tools:replace="android:label,android:allowBackup" tools:targetApi="r"> - + @@ -527,7 +528,7 @@ + android:value="7c66fa0f782771bc2b2829158b6c6aac" /> diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java index e6e0f33..c8e8798 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java @@ -63,7 +63,7 @@ public class Constant { //飘屏通知 public final static String FLUTTER_NOTICE = "flutter_notice"; - public final static String AES_PASSWORD = "KBqTS1K3qj0flRE9"; + public final static String AES_PASSWORD = "!qianyan20260315"; public static boolean IS_LOGIN_AGREEMENT_CHECK = false; } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java index 45efd8c..b063384 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java @@ -136,7 +136,7 @@ public class DynamicsAdapter extends BaseAdapter { public View getView(int i, View view, ViewGroup viewGroup) { Holder holder = null; if (null == view) { - view = View.inflate(mContext, R.layout.item_dynamic_list, null); + view = View.inflate(mContext, R.layout.item_dynamic_list1, null); holder = initView(view); } else { holder = (Holder) view.getTag(R.id.tag_second); @@ -147,14 +147,16 @@ public class DynamicsAdapter extends BaseAdapter { } else { holder.msgBtn.setVisibility(View.VISIBLE); } - holder.likeCountLabel.setText(bean.getLike_count() + ""); - holder.commentCountLabel.setText(bean.getComment_count() + ""); + //holder.likeCountLabel.setText(bean.getLike_count() + ""); + //holder.commentCountLabel.setText(bean.getComment_count() + ""); final int index = i; holder.name.setText(bean.getNickname()); holder.head.setImageURI(ConstUrl.IMAGE_URL + bean.getAvatar()); holder.newPeopleImageView.setVisibility(View.GONE); holder.realPeopleImageView.setVisibility(View.GONE); + holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览"); + if (bean.getGender() == 1) { holder.realPeopleImageView.setVisibility(View.VISIBLE); if (bean.getMark() == 2) { @@ -194,7 +196,7 @@ public class DynamicsAdapter extends BaseAdapter { NimUIKit.startChat(bean.getUser_id(), mContext); } }); - holder.commentImageView.setOnClickListener(new View.OnClickListener() { + /*holder.commentImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (dynamicCommentCallback != null) { @@ -205,7 +207,7 @@ public class DynamicsAdapter extends BaseAdapter { mContext.startActivity(intent); } } - }); + });*/ if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) { holder.getMenu.setImageResource(R.mipmap.feed_del); } else { @@ -241,11 +243,11 @@ public class DynamicsAdapter extends BaseAdapter { addImageView(holder, bean.getImages()); - if (bean.getIs_like() == 1) { + /*if (bean.getIs_like() == 1) { holder.likeImageView.setImageResource(R.mipmap.feed_heart_); } else { holder.likeImageView.setImageResource(R.mipmap.feed_heart); - } + }*/ holder.head.setOnClickListener(new View.OnClickListener() { @Override @@ -255,13 +257,22 @@ public class DynamicsAdapter extends BaseAdapter { mContext.startActivity(intent); } }); - holder.likeImageView.setOnClickListener(new View.OnClickListener() { + /* holder.likeImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (likeDynamicCallback != null) { likeDynamicCallback.likeDynamic(bean); } } + });*/ + + holder.giftLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mGiftListener != null) { + mGiftListener.onSend(bean,bean.getReward_count()); + } + } }); view.setTag(R.id.tag_second, holder); @@ -439,13 +450,14 @@ public class DynamicsAdapter extends BaseAdapter { holder.imageListView2 = v.findViewById(R.id.dynamic_list_image_list_2); holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3); holder.msgBtn = v.findViewById(R.id.msgBtn); - holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); - holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); - holder.likeImageView = v.findViewById(R.id.likeImageView); - holder.commentImageView = v.findViewById(R.id.commentImageView); + //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); + //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); + //holder.likeImageView = v.findViewById(R.id.likeImageView); + //holder.commentImageView = v.findViewById(R.id.commentImageView); holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView); holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView); holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item); + holder.tv_see_count = v.findViewById(R.id.tv_see_count); return holder; } @@ -456,19 +468,20 @@ public class DynamicsAdapter extends BaseAdapter { TextView years; ImageView iv_sex; ExpandLayout info; - TextView commentCountLabel; - TextView likeCountLabel; + //TextView commentCountLabel; + //TextView likeCountLabel; LinearLayout imageListView1; LinearLayout imageListView2; LinearLayout imageListView3; View giftLayout; ImageView getMenu; ImageView msgBtn; - ImageView likeImageView; - ImageView commentImageView; + //ImageView likeImageView; + //ImageView commentImageView; ImageView realPeopleImageView; ImageView newPeopleImageView; RelativeLayout rl_dynamic_item; + TextView tv_see_count; } public void delete(int index) { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java index 7e479b1..0938e67 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java @@ -193,10 +193,10 @@ public class DynamicsAdapter1 extends BaseAdapter { if (bean.getUser_id().equals(String.valueOf(selfID))) { holder.msgBtn.setVisibility(View.INVISIBLE); } else { - holder.msgBtn.setVisibility(View.VISIBLE); + holder.msgBtn.setVisibility(View.INVISIBLE); } - holder.likeCountLabel.setText(bean.getLike_count() + ""); - holder.commentCountLabel.setText(bean.getComment_count() + ""); + //holder.likeCountLabel.setText(bean.getLike_count() + ""); + // holder.commentCountLabel.setText(bean.getComment_count() + ""); final int index = i; holder.name.setText(bean.getNickname()); holder.head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext)); @@ -230,7 +230,7 @@ public class DynamicsAdapter1 extends BaseAdapter { // holder.info.setText(bean.getContent()); //TODO 显示浏览次数 - holder.tv_see_count.setText("已有0次浏览"); + holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览"); //TODO 显示话题 holder.tv_topic.setText("# 只想发个自拍"); @@ -248,7 +248,7 @@ public class DynamicsAdapter1 extends BaseAdapter { NimUIKit.startChat(bean.getUser_id(), mContext); } }); - holder.commentImageView.setOnClickListener(new View.OnClickListener() { + /*holder.commentImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (dynamicCommentCallback != null) { @@ -259,7 +259,7 @@ public class DynamicsAdapter1 extends BaseAdapter { mContext.startActivity(intent); } } - }); + });*/ holder.getMenu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -295,11 +295,11 @@ public class DynamicsAdapter1 extends BaseAdapter { addImageView(holder, bean.getImages()); - if (bean.getIs_like() == 1) { + /* if (bean.getIs_like() == 1) { holder.likeImageView.setImageResource(R.mipmap.feed_heart_); } else { holder.likeImageView.setImageResource(R.mipmap.feed_heart); - } + }*/ holder.head.setOnClickListener(new View.OnClickListener() { @Override @@ -309,7 +309,7 @@ public class DynamicsAdapter1 extends BaseAdapter { mContext.startActivity(intent); } }); - holder.likeImageView.setOnClickListener(new View.OnClickListener() { + /* holder.likeImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (likeDynamicCallback != null) { @@ -317,7 +317,7 @@ public class DynamicsAdapter1 extends BaseAdapter { } } - }); + });*/ view.setTag(R.id.tag_second, holder); return view; @@ -539,10 +539,10 @@ public class DynamicsAdapter1 extends BaseAdapter { holder.dynamic_image_num = v.findViewById(R.id.dynamic_image_num); holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3); holder.msgBtn = v.findViewById(R.id.msgBtn); - holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); - holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); - holder.likeImageView = v.findViewById(R.id.likeImageView); - holder.commentImageView = v.findViewById(R.id.commentImageView); + // holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); + //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); + // holder.likeImageView = v.findViewById(R.id.likeImageView); + // holder.commentImageView = v.findViewById(R.id.commentImageView); holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView); holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView); holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item); @@ -558,8 +558,8 @@ public class DynamicsAdapter1 extends BaseAdapter { TextView years; ImageView iv_sex; ExpandLayout info; - TextView commentCountLabel; - TextView likeCountLabel; + // TextView commentCountLabel; + // TextView likeCountLabel; LinearLayout imageListView1; ConstraintLayout imageListView2; SimpleDraweeView dynamic_image1; @@ -571,8 +571,8 @@ public class DynamicsAdapter1 extends BaseAdapter { TextView tv_see_count; ImageView getMenu; ImageView msgBtn; - ImageView likeImageView; - ImageView commentImageView; + //ImageView likeImageView; + // ImageView commentImageView; ImageView realPeopleImageView; ImageView newPeopleImageView; RelativeLayout rl_dynamic_item; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java index 735c5ca..28947b3 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java @@ -195,8 +195,8 @@ public class DynamicsTopicAdapter extends BaseAdapter { } else { holder.msgBtn.setVisibility(View.VISIBLE); } - holder.likeCountLabel.setText(bean.getLike_count() + ""); - holder.commentCountLabel.setText(bean.getComment_count() + ""); + //holder.likeCountLabel.setText(bean.getLike_count() + ""); + //holder.commentCountLabel.setText(bean.getComment_count() + ""); final int index = i; holder.name.setText(bean.getNickname()); holder.head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext)); @@ -245,7 +245,7 @@ public class DynamicsTopicAdapter extends BaseAdapter { NimUIKit.startChat(bean.getUser_id(), mContext); } }); - holder.commentImageView.setOnClickListener(new View.OnClickListener() { + /* holder.commentImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (dynamicCommentCallback != null) { @@ -256,7 +256,7 @@ public class DynamicsTopicAdapter extends BaseAdapter { mContext.startActivity(intent); } } - }); + });*/ holder.getMenu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -292,11 +292,11 @@ public class DynamicsTopicAdapter extends BaseAdapter { addImageView(holder, bean.getImages()); - if (bean.getIs_like() == 1) { + /*if (bean.getIs_like() == 1) { holder.likeImageView.setImageResource(R.mipmap.feed_heart_); } else { holder.likeImageView.setImageResource(R.mipmap.feed_heart); - } + }*/ holder.head.setOnClickListener(new View.OnClickListener() { @Override @@ -306,7 +306,7 @@ public class DynamicsTopicAdapter extends BaseAdapter { mContext.startActivity(intent); } }); - holder.likeImageView.setOnClickListener(new View.OnClickListener() { + /*holder.likeImageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (likeDynamicCallback != null) { @@ -314,7 +314,7 @@ public class DynamicsTopicAdapter extends BaseAdapter { } } - }); + });*/ view.setTag(R.id.tag_second, holder); return view; @@ -536,10 +536,10 @@ public class DynamicsTopicAdapter extends BaseAdapter { holder.dynamic_image_num = v.findViewById(R.id.dynamic_image_num); holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3); holder.msgBtn = v.findViewById(R.id.msgBtn); - holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); - holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); - holder.likeImageView = v.findViewById(R.id.likeImageView); - holder.commentImageView = v.findViewById(R.id.commentImageView); + //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel); + //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel); + //holder.likeImageView = v.findViewById(R.id.likeImageView); + // holder.commentImageView = v.findViewById(R.id.commentImageView); holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView); holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView); holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item); @@ -554,8 +554,8 @@ public class DynamicsTopicAdapter extends BaseAdapter { TextView years; ImageView iv_sex; ExpandLayout info; - TextView commentCountLabel; - TextView likeCountLabel; + //TextView commentCountLabel; + // TextView likeCountLabel; LinearLayout imageListView1; ConstraintLayout imageListView2; SimpleDraweeView dynamic_image1; @@ -567,8 +567,8 @@ public class DynamicsTopicAdapter extends BaseAdapter { TextView tv_see_count; ImageView getMenu; ImageView msgBtn; - ImageView likeImageView; - ImageView commentImageView; + //ImageView likeImageView; + // ImageView commentImageView; ImageView realPeopleImageView; ImageView newPeopleImageView; RelativeLayout rl_dynamic_item; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt index b7aa6cf..48bedba 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt @@ -7,6 +7,7 @@ import android.os.CountDownTimer 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.BaseDelegateMultiAdapter import com.chad.library.adapter.base.delegate.BaseMultiTypeDelegate @@ -61,8 +62,8 @@ class MainChannelAdapter1(private val mContext: Context, val key: String) : val mPhoto = holder.getView(R.id.channel_anchor_id_photo_1) val mCost = holder.getView(R.id.channel_anchor_id_cost_1) val mScore = holder.getView(R.id.channel_anchor_id_score_1) - val nmpp = holder.getView(R.id.iv_anchor_nm_img) - val online = holder.getView(R.id.iv_anchor_online) + val nmpp = holder.getView(R.id.iv_anchor_nm_img) + val online = holder.getView(R.id.iv_anchor_online) val mLocation = holder.getView(R.id.channel_anchor_location_1) val newPeopleImageView = holder.getView(R.id.newPeopleImageView) val iv_anchor_tag = holder.getView(R.id.iv_anchor_tag) diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java index ba5df74..3f017af 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java @@ -18,5 +18,6 @@ public enum SettingOptions { HELLOW,//招呼设置 ITEMS,//我的道具 VIDEO, //视频聊天 + TASK, //每日任务 DETAIL//账单明细 } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java index 5e188c2..c219640 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java @@ -17,5 +17,4 @@ public class Constans { public final static String CUSTOMER_TAG_STICKY = "CUSTOMER_TAG_STICKY";//取消默认客服置顶 public final static String USER_MOBILE = "USER_MOBILE"; public final static String IS_FIRST_RECHARGE = "IS_FIRST_RECHARGE"; - public final static String IS_SET_HOME_ACTIVITY = "IS_SET_HOME_ACTIVITY"; } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java index 52c2a4f..2622470 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java @@ -1,6 +1,8 @@ package com.xuebiping.bolizhuzi.model.dynamics; -public class CommentBean { +import java.io.Serializable; + +public class CommentBean implements Serializable { private int id; private int dynamic_id; private int uid; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java index 5e17ae5..49e69fd 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java @@ -1,6 +1,8 @@ package com.xuebiping.bolizhuzi.model.dynamics; -public class DynamicImage { +import java.io.Serializable; + +public class DynamicImage implements Serializable { private String url; private int width; private int height; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java index 5192c09..dcfa087 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java @@ -1,8 +1,9 @@ package com.xuebiping.bolizhuzi.model.dynamics; +import java.io.Serializable; import java.util.List; -public class DynamicsItemBean { +public class DynamicsItemBean implements Serializable { private String avatar; private String nickname; private int age; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java index 78436de..9243432 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java @@ -132,38 +132,38 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mCityFragment = new SameCityDynamicFragment(); mRecent = new RecentDynamicFragment(); mFocusFragment = new FollowUsersDynamicFragment(); - dynamicTopicFragment = new DynamicTopicFragment(); + // dynamicTopicFragment = new DynamicTopicFragment(); mDynamicFragments.add(mRecent); mDynamicFragments.add(mFocusFragment); if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) != 0 && SPUtils.getInt(getContext(), ConsUser.TYPE) != 2) { mDynamicFragments.add(mCityFragment); } - mDynamicFragments.add(dynamicTopicFragment); + //mDynamicFragments.add(dynamicTopicFragment); mDynamicViewPager.setAdapter(mViewPagerAdapter); mDynamicViewPager.setCurrentItem(0, false); - mDynamicViewPager.setOffscreenPageLimit(3); + mDynamicViewPager.setOffscreenPageLimit(2); mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));//加粗 mTitleBottom1.setVisibility(View.VISIBLE); mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); - mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleBottom2.setVisibility(View.GONE); mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleBottom3.setVisibility(View.GONE); mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleBottom4.setVisibility(View.GONE); + mTitleBottom4.setVisibility(View.GONE);*/ if (!TextUtils.isEmpty(SPUtils.getString(getActivity(), ConsUser.DYNAMIC_CITY))) { mTitleText3.setText(SPUtils.getString(getActivity(), ConsUser.DYNAMIC_CITY)); @@ -187,17 +187,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mTitleBottom1.setVisibility(View.VISIBLE); - mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleBottom4.setVisibility(View.GONE); + mTitleBottom4.setVisibility(View.GONE);*/ - mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom2.setVisibility(View.GONE); - mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom3.setVisibility(View.GONE); @@ -211,17 +211,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mTitleBottom2.setVisibility(View.VISIBLE); - mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + /* mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleBottom4.setVisibility(View.GONE); + mTitleBottom4.setVisibility(View.GONE);*/ - mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom1.setVisibility(View.GONE); - mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom3.setVisibility(View.GONE); @@ -235,17 +235,17 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mTitleText3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mTitleBottom3.setVisibility(View.VISIBLE); - mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + /*mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - mTitleBottom4.setVisibility(View.GONE); + mTitleBottom4.setVisibility(View.GONE);*/ - mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom2.setVisibility(View.GONE); - mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom1.setVisibility(View.GONE); @@ -253,7 +253,7 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mIvMoreCity.setImageResource(R.drawable.ic_bou_mo2); isReClick = true; break; - case 4: + /* case 4: mTitleText4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText4.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));//加粗 mTitleText4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); @@ -276,7 +276,7 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1); isReClick = false; - break; + break;*/ } } @@ -294,22 +294,22 @@ public class DynamicViewPagerFragment extends Fragment implements View.OnClickLi mTitleTag1 = mTitleView.findViewById(R.id.dynamic_title_view_1); mTitleTag2 = mTitleView.findViewById(R.id.dynamic_title_view_2); mTitleTag3 = mTitleView.findViewById(R.id.dynamic_title_view_3); - mTitleTag4 = mTitleView.findViewById(R.id.dynamic_title_view_4); + // mTitleTag4 = mTitleView.findViewById(R.id.dynamic_title_view_4); mTitleText1 = mTitleView.findViewById(R.id.dynamic_title_name_1); mTitleText2 = mTitleView.findViewById(R.id.dynamic_title_name_2); mTitleText3 = mTitleView.findViewById(R.id.dynamic_title_name_3); - mTitleText4 = mTitleView.findViewById(R.id.dynamic_title_name_4); + //mTitleText4 = mTitleView.findViewById(R.id.dynamic_title_name_4); mTitleBottom1 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_1); mTitleBottom2 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_2); mTitleBottom3 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_3); - mTitleBottom4 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_4); + //mTitleBottom4 = mTitleView.findViewById(R.id.dynamic_title_bottom_line_4); mIvMoreCity = mTitleView.findViewById(R.id.iv_more_city); mTitlePost = mTitleView.findViewById(R.id.dynamic_title_post); mTitleTextMydynamic.setOnClickListener(this); mTitleTag1.setOnClickListener(this); mTitleTag2.setOnClickListener(this); mTitleTag3.setOnClickListener(this); - mTitleTag4.setOnClickListener(this); + // mTitleTag4.setOnClickListener(this); mTitlePost.setOnClickListener(this); if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 0 || SPUtils.getInt(getContext(), ConsUser.TYPE) == 2) { iv_address.setVisibility(View.INVISIBLE); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java index 04e18bf..7fad2fd 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java @@ -21,6 +21,7 @@ import android.widget.TextView; import androidx.core.content.ContextCompat; import com.blankj.utilcode.util.ActivityUtils; +import com.fengliyan.device.DeviceManager; import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.XXPermissions; import com.fengliyan.http.httprequest.HttpCallback; @@ -52,6 +53,7 @@ import com.xuebiping.bolizhuzi.view.config.BaseUIConfig; import com.xuebiping.bolizhuzi.view.config.CustomXmlConfig; import com.xuebiping.bolizhuzi.view.config.OnOneKeyCustomClickListener; import com.xuebiping.bolizhuzi.view.login.utils.LoginUtils; +import com.xuebiping.bolizhuzi.view.main.MainActivity; import com.xuebiping.bolizhuzi.view.main.dialog.PermissionDialog; import com.xuebiping.bolizhuzi.view.main.dialog.UpdateDialog; import com.xuebiping.bolizhuzi.view.register.RegisterActivity; @@ -473,6 +475,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener, public void onSuccess(BaseActivity activity, LoginBean result, String message) { LoginUtils.checkLoginStatus(LoginActivity.this, result, 0); NoClearSPUtils.saveString(activity, Constans.USER_MOBILE, userName); + } @Override @@ -499,6 +502,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener, public void onSuccess(BaseActivity activity, LoginBean result, String tips) { LoginUtils.checkLoginStatus(LoginActivity.this, result, 0); NoClearSPUtils.saveString(activity, Constans.USER_MOBILE, userName); + } @Override diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java index 93bfe4c..bb0aa84 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java @@ -66,12 +66,12 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck // private AppBarLayout app_bar_layout; private LinearLayout rl_main_title; private RelativeLayout title_view_0, title_view_1; - private ConstraintLayout title_view_2; + private RelativeLayout title_view_2; private TextView tv_0, tv_1, tv_2; private View title_bottom_line_0, title_bottom_line_1, title_bottom_line_2; private ImageView iv_luck_rank, iv_luck_hi, iv_luck_search; - // private ConstraintLayout lin_video_speed; -// private ConstraintLayout lin_voice_speed; + private RelativeLayout lin_video_speed; + private RelativeLayout lin_voice_speed; // private CoverFlowView cf_luck_img; private RelativeLayout main_yaoqing_layout; private ImageView main_yaoqing, main_yaoqing_end; @@ -144,8 +144,8 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck iv_luck_hi = view.findViewById(R.id.iv_luck_hi); iv_luck_search = view.findViewById(R.id.iv_luck_search); // cf_luck_img = view.findViewById(R.id.cf_luck_img); -// lin_video_speed = view.findViewById(R.id.lin_video_speed); -// lin_voice_speed = view.findViewById(R.id.lin_voice_speed); + lin_video_speed = view.findViewById(R.id.lin_video_speed); + lin_voice_speed = view.findViewById(R.id.lin_voice_speed); main_yaoqing_layout = view.findViewById(R.id.main_yaoqing_layout); main_yaoqing = view.findViewById(R.id.main_yaoqing); main_yaoqing_end = view.findViewById(R.id.main_yaoqing_end); @@ -163,8 +163,8 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck } private void initListener() { -// lin_video_speed.setOnClickListener(this); -// lin_voice_speed.setOnClickListener(this); + lin_video_speed.setOnClickListener(this); + lin_voice_speed.setOnClickListener(this); title_view_0.setOnClickListener(this); title_view_1.setOnClickListener(this); title_view_2.setOnClickListener(this); @@ -315,10 +315,10 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); - tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); title_bottom_line_0.setVisibility(View.VISIBLE); @@ -326,13 +326,13 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck title_bottom_line_2.setVisibility(View.GONE); break; case 1: - tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); - tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); title_bottom_line_0.setVisibility(View.GONE); @@ -340,10 +340,10 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck title_bottom_line_2.setVisibility(View.GONE); break; case 2: - tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_0.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_0.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_0.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); - tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + tv_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); tv_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); tv_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); tv_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); @@ -506,7 +506,7 @@ public class LuckFragment extends Fragment implements View.OnClickListener, Luck show_alipay_pay_type = result.getShow_alipay_pay_type(); // 1=已经首充过、0=没有首充过 if (UserManager.getUserInfo().getGender() == 2 && result.getIs_first_recharge() == 0) { - main_yaoqing.setImageResource(R.drawable.ic_lqhl); + main_yaoqing.setImageResource(R.drawable.iv_first_chong); is_first_recharge = true; main_yaoqing_layout.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java index adc7174..97daa13 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.RelativeLayout; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -47,10 +48,10 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic private int mItemCount; private LuckListAdapter mAdapter; private SwipeRefreshLayout mRefresh; - private View headerView; - private ConstraintLayout lin_video_speed; - private ConstraintLayout lin_voice_speed; - private ImageView iv_luck_video_speed_bg; + // private View headerView; + // private RelativeLayout lin_video_speed; + // private RelativeLayout lin_voice_speed; + //private ImageView iv_luck_video_speed_bg; @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -106,18 +107,18 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic } }); - headerView = getLayoutInflater().inflate(R.layout.layout_main_top_view, null); - lin_video_speed = headerView.findViewById(R.id.lin_video_speed); - lin_voice_speed = headerView.findViewById(R.id.lin_voice_speed); - iv_luck_video_speed_bg = headerView.findViewById(R.id.iv_luck_video_speed_bg); - lin_video_speed.setOnClickListener(this); - lin_voice_speed.setOnClickListener(this); - if (UserManager.getUserInfo().isWomen()) { + // headerView = getLayoutInflater().inflate(R.layout.layout_main_top_view, null); + //lin_video_speed = headerView.findViewById(R.id.lin_video_speed); + // lin_voice_speed = headerView.findViewById(R.id.lin_voice_speed); + //iv_luck_video_speed_bg = headerView.findViewById(R.id.iv_luck_video_speed_bg); + // lin_video_speed.setOnClickListener(this); + // lin_voice_speed.setOnClickListener(this); + /*if (UserManager.getUserInfo().isWomen()) { iv_luck_video_speed_bg.setImageResource(R.mipmap.icon_main_video_speed_man); } else { iv_luck_video_speed_bg.setImageResource(R.mipmap.icon_main_video_speed_women); - } - mAdapter.addHeaderView(headerView); + }*/ + // mAdapter.addHeaderView(headerView); mRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override @@ -238,7 +239,7 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic @Override public void onClick(View v) { switch (v.getId()) { - case R.id.lin_video_speed://视频速配 + /* case R.id.lin_video_speed://视频速配 if (StrU.isFastClick()) { Intent videoSpeedIntent = new Intent(getActivity(), SpeedDatingActivity.class); videoSpeedIntent.putExtra(SpeedDatingActivity.SPEED_TYPE, 0); @@ -253,7 +254,21 @@ public class LuckListFragment extends Fragment implements LuckListAdapter.OnClic voiceSpeedIntent.putStringArrayListExtra(SpeedDatingActivity.IMAGE_LIST, imageList); startActivity(voiceSpeedIntent); } - break; + + *//*niMingPiPeiDialog = new NiMingPiPeiDialog(getActivity(), R.style.SelectiveDialog); + niMingPiPeiDialog.show(); + niMingPiPeiDialog.setOnDialogClickListener(new NiMingPiPeiDialog.OnDialogLeftClickListener() { + @Override + public void leftClick() { + ToastHelper.showToast(getActivity(),"语音匿名匹配"); + } + }, new NiMingPiPeiDialog.OnDialogRightClickListener() { + @Override + public void rightClick() { + ToastHelper.showToast(getActivity(),"视频匿名匹配"); + } + });*//* + break;*/ } } } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java index ef954ba..96478c4 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java @@ -80,7 +80,7 @@ public class CoverActivity extends BaseActivity { if (!SPUtils.getBoolean(CoverActivity.this, ConsUser.IS_LOGIN_AGREEMENT_CHECK, false)) { showLoginDialog(); } else { -// oneKeyLoginInit(); + // oneKeyLoginInit(); checkUpdate(); } } @@ -402,6 +402,7 @@ public class CoverActivity extends BaseActivity { showLoginDialog(); } else { getMarketStatus(); + // startTimer(); } SPUtils.saveInt(this, ConsUser.DYNAMICS_TYPE, 0); } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java index c460cd7..0bea63f 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java @@ -81,43 +81,37 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe private ImageView mIvTitleSearch; private View mVyaoqingLayout; private LinearLayout main_turntable; - private LinearLayout main_first_chong_layout; private ImageView main_turntable_end, iv_main_turntable; - private ImageView main_first_chong_end, main_first_chong; - private LinearLayout ll_main_home_title; - private RelativeLayout rl_video_pp; - private RelativeLayout rl_audio_pp; - private NiMingPiPeiDialog niMingPiPeiDialog; - private TextView tv_suaixuan; + private DefaultRecommendFragment defaultRecommendFragment; - private ShaiXuanDialog shaiXuanDialog; + private View v; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View v = inflater.inflate(R.layout.fragment_main_recommend, container, false); - ll_main_home_title = v.findViewById(R.id.ll_main_home_title); - initTitle(); + v = inflater.inflate(R.layout.fragment_main_recommend, container, false); + initTitle(v); initView(v); EventBus.getDefault().register(this); // getIndexStuff(); return v; } - private View mSearchView; + // private View mSearchView; private ImageView mGenderView; private ImageView iv_title_rank; - private void initTitle() { + private void initTitle(View mSearchView) { /*Title title = ((BaseActivity) getActivity()).getCustomTitle(); title.setVisibility(View.VISIBLE); - title.findViewById(R.id.title_bg).setBackgroundColor(Color.WHITE); + title.setTitleBackground(Color.TRANSPARENT); + //title.findViewById(R.id.title_bg).setBackgroundColor(Color.TRANSPARENT); title.dismissBottomLine(); title.dimissRight(); title.dismissLeft(); title.setTitle("");*/ - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); + /*int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); if(isSetHome == 0){//未设置成为主页 mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout_1, null); tv_suaixuan = mSearchView.findViewById(R.id.tv_suaixuan); @@ -135,8 +129,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe }); } }); - } else { //设置成为主页 - mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout, null); + } else { */ //设置成为主页 + // mSearchView = View.inflate(getActivity(), R.layout.item_main_home_page_layout, null); mRecommend_recommend = mSearchView.findViewById(R.id.title_view_1); mRecommend_active = mSearchView.findViewById(R.id.title_view_2); mRecommend_people = mSearchView.findViewById(R.id.title_view_3); @@ -172,7 +166,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mRecommend_recommend.setOnClickListener(this); mRecommend_active.setOnClickListener(this); mRecommend_people.setOnClickListener(this); - } + //} mIvTitleSearch = mSearchView.findViewById(R.id.iv_title_search); mGenderView = mSearchView.findViewById(R.id.iv_title_gender); @@ -184,8 +178,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe // mGenderView.setText("男生"); // } - //title.addViewTo(mSearchView, POSTION_CENTER); - ll_main_home_title.addView(mSearchView); + // title.addViewTo(mSearchView, POSTION_CENTER); + iv_title_rank.setOnClickListener(new View.OnClickListener() { @Override @@ -266,23 +260,13 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mIvAd.setOnClickListener(this); v.findViewById(R.id.main_yaoqing_end).setOnClickListener(this); - rl_video_pp = v.findViewById(R.id.rl_video_pp); - rl_audio_pp = v.findViewById(R.id.rl_audio_pp); - mMainViewPager = v.findViewById(R.id.main_view_pager); - main_turntable = v.findViewById(R.id.main_turntable); - main_first_chong_layout = v.findViewById(R.id.main_first_chong_layout); main_turntable_end = v.findViewById(R.id.main_turntable_end); - main_first_chong_end = v.findViewById(R.id.main_first_chong_end); iv_main_turntable = v.findViewById(R.id.iv_main_turntable); - main_first_chong = v.findViewById(R.id.main_first_chong); main_turntable.setOnClickListener(this); - main_first_chong_layout.setOnClickListener(this); + main_turntable_end.setOnClickListener(this); - main_first_chong_end.setOnClickListener(this); - rl_video_pp.setOnClickListener(this); - rl_audio_pp.setOnClickListener(this); if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 0 || SPUtils.getInt(getContext(), ConsUser.TYPE) == 2) { main_turntable.setVisibility(View.GONE); @@ -296,12 +280,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mMainRecommendPeopleFragment = new MainRecommendPeopleFragment(); mMainRecommendCityFragment = new MainRecommendCityFragment(); - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); - if(isSetHome == 0){ //未设置成为主页 - mChannelFragments.add(defaultRecommendFragment); - }else { - mChannelFragments.add(mRecommendFragment1); - } + mChannelFragments.add(mRecommendFragment1); mChannelFragments.add(mMainRecommendActiveFragment); mChannelFragments.add(mMainRecommendPeopleFragment); @@ -315,9 +294,9 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mMainViewPager.setAdapter(mViewPagerAdapter); mMainViewPager.setOffscreenPageLimit(3); - if(isSetHome != 0) { //未设置成为主页 - viewPagerChange(1); - } + + viewPagerChange(1); + mMainViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override @@ -332,11 +311,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe } else { isReClick = false; } - - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); - if(isSetHome != 0) { - viewPagerChange(position); - } + viewPagerChange(position); } @Override @@ -351,12 +326,8 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe public void RefreshFragment(){ mChannelFragments.clear(); - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); - if(isSetHome == 0){ //未设置成为主页 - mChannelFragments.add(defaultRecommendFragment); - }else { - mChannelFragments.add(mRecommendFragment1); - } + + mChannelFragments.add(mRecommendFragment1); mChannelFragments.add(mMainRecommendActiveFragment); mChannelFragments.add(mMainRecommendPeopleFragment); @@ -370,9 +341,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mMainViewPager.setAdapter(mViewPagerAdapter); mMainViewPager.setOffscreenPageLimit(3); - if(isSetHome != 0) { //未设置成为主页 - viewPagerChange(1); - } + viewPagerChange(1); mMainViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override @@ -387,11 +356,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe } else { isReClick = false; } - - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); - if(isSetHome != 0) { - viewPagerChange(position); - } + viewPagerChange(position); } @Override @@ -407,11 +372,11 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe @Override public void onHiddenChanged(boolean hidden) { if (!hidden) { - initTitle(); - int isSetHome = StorageManager.getInstance(getActivity()).getInt(Constans.IS_SET_HOME_ACTIVITY); - if(isSetHome != 0) { - viewPagerChange(mIndex); - } + ((BaseActivity) getActivity()).hideTitleBar(); + initTitle(v); + + viewPagerChange(mIndex); + // if (UserManager.getUserInfo().getGender() == 2) { // getRechargeInfo(); // } @@ -446,17 +411,17 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mRecommend_title_bottom_line_1.setVisibility(View.VISIBLE); - mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_2.setVisibility(View.GONE); - mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_3.setVisibility(View.GONE); - mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_4.setVisibility(View.GONE); @@ -464,7 +429,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1); break; case 1: - mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_1.setVisibility(View.GONE); @@ -474,12 +439,12 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mRecommend_title_bottom_line_2.setVisibility(View.VISIBLE); - mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_3.setVisibility(View.GONE); - mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_4.setVisibility(View.GONE); @@ -487,12 +452,12 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1); break; case 2: - mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_1.setVisibility(View.GONE); - mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_2.setVisibility(View.GONE); @@ -502,7 +467,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mRecommend_title_bottom_line_3.setVisibility(View.VISIBLE); - mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_4.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_4.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_4.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_4.setVisibility(View.GONE); @@ -510,17 +475,17 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe mIvMoreCity.setImageResource(R.drawable.ic_bou_mo1); break; case 3: - mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_1.setVisibility(View.GONE); - mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_2.setVisibility(View.GONE); - mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mRecommend_title_name_3.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mRecommend_title_name_3.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mRecommend_title_name_3.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mRecommend_title_bottom_line_3.setVisibility(View.GONE); @@ -587,29 +552,6 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe dialog.show(); } else if (view.getId() == R.id.main_turntable_end) { main_turntable.setVisibility(View.GONE); - } else if (view.getId() == R.id.main_first_chong_layout) { - //TODO 首充特惠 - } else if (view.getId() == R.id.main_first_chong_end) { - main_first_chong_layout.setVisibility(View.GONE); - }else if (view.getId() == R.id.rl_video_pp) { - //TODO 视频交友 - startActivity(new Intent(getActivity(),VideoFriendActivity.class)); - }else if (view.getId() == R.id.rl_audio_pp) { - //TODO 匿名匹配 - niMingPiPeiDialog = new NiMingPiPeiDialog(getActivity(), R.style.SelectiveDialog); - niMingPiPeiDialog.show(); - niMingPiPeiDialog.setOnDialogClickListener(new NiMingPiPeiDialog.OnDialogLeftClickListener() { - @Override - public void leftClick() { - ToastHelper.showToast(getActivity(),"语音匿名匹配"); - } - }, new NiMingPiPeiDialog.OnDialogRightClickListener() { - @Override - public void rightClick() { - ToastHelper.showToast(getActivity(),"视频匿名匹配"); - } - }); - } } @@ -671,7 +613,7 @@ public class MainRecommendFragment extends Fragment implements View.OnClickListe StorageManager.getInstance(activity).putInt(Constans.IS_FIRST_RECHARGE, result.getIs_first_recharge()); // 1=已经首充过、0=没有首充过 if (UserManager.getUserInfo().getGender() == 2 && result.getIs_first_recharge() == 0) { - mIvAd.setImageResource(R.drawable.ic_lqhl); + mIvAd.setImageResource(R.drawable.iv_first_chong); is_first_recharge = true; mVyaoqingLayout.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java index 65dd0e1..735ec65 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java @@ -41,13 +41,13 @@ public class VideoFriendActivity extends BaseActivity { tv_set_home.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if(StorageManager.getInstance(VideoFriendActivity.this).getInt(Constans.IS_SET_HOME_ACTIVITY) == 0) { + /*if(StorageManager.getInstance(VideoFriendActivity.this).getInt(Constans.IS_SET_HOME_ACTIVITY) == 0) { StorageManager.getInstance(VideoFriendActivity.this).putInt(Constans.IS_SET_HOME_ACTIVITY, 1); tv_set_home.setText("取消首页"); }else { StorageManager.getInstance(VideoFriendActivity.this).putInt(Constans.IS_SET_HOME_ACTIVITY, 0); tv_set_home.setText("设为首页"); - } + }*/ } }); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java index 9b65b8a..15c4c2c 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java @@ -235,7 +235,7 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mTitleBottom1.setVisibility(View.VISIBLE); - mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText2.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText2.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom2.setVisibility(View.GONE); @@ -246,7 +246,7 @@ public class MainMessageFragment extends Fragment implements View.OnClickListene mTitleText2.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20); mTitleBottom2.setVisibility(View.VISIBLE); - mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_text)); + mTitleText1.setTextColor(ContextCompat.getColor(getActivity(), R.color.one_text)); mTitleText1.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));//常规 mTitleText1.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 16); mTitleBottom1.setVisibility(View.GONE); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java index 31536a3..0306125 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java @@ -1120,9 +1120,11 @@ public class InfoEditActivity extends BaseActivity implements View.OnClickListen String s = SysSPUtils.getString(this, ConsUser.PROFILE); Gson gson = new Gson(); GlobalConfigBean.ProfileBean bean = gson.fromJson(s, GlobalConfigBean.ProfileBean.class); - for (int i = 0; i < bean.getJob_list().size(); i++) { - options1Items.add(bean.getJob_list().get(i).getName()); - options2Items.add(bean.getJob_list().get(i).getMenu()); + if(bean != null && bean.getJob_list().size() > 0) { + for (int i = 0; i < bean.getJob_list().size(); i++) { + options1Items.add(bean.getJob_list().get(i).getName()); + options2Items.add(bean.getJob_list().get(i).getMenu()); + } } /** * 注意 ：如果是三级联动的数据(省市区等)，请参照 JsonDataActivity 类里面的写法。 diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java index d1cec7c..b52d857 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java @@ -110,7 +110,7 @@ public class SettingFragment extends Fragment implements View.OnClickListener { private Banner image_banner; //男女生内容互换 - private ConstraintLayout cl_income; + private LinearLayout cl_income; private LinearLayout ll_income; private TextView tv_income; // private TextView tv_income_hint; @@ -368,6 +368,7 @@ public class SettingFragment extends Fragment implements View.OnClickListener { mOptions1.add(SettingOptions.CUSTOMER); mOptions1.add(SettingOptions.MEMBER); mOptions1.add(SettingOptions.DETAIL); + mOptions1.add(SettingOptions.TASK); if (NoClearSPUtils.getInt(getContext(), ConsUser.TURNTABLE_COUPON_SWITCH) == 1) { mOptions1.add(SettingOptions.ITEMS); } @@ -432,12 +433,12 @@ public class SettingFragment extends Fragment implements View.OnClickListener { && StrU.equals("1", NoClearSPUtils.getString(getActivity(), ConsUser.WECHAT_STATUS))) { mOptions1.add(SettingOptions.ADDWECHAT); } + mOptions1.add(SettingOptions.TASK); mOptions1.add(SettingOptions.HELLOW); mOptions1.add(SettingOptions.BEAUTY); mOptions1.add(SettingOptions.DETAIL); addOption(mOptions1, lin_my_list1); mOptions2.add(SettingOptions.GODDESSPRIVILEGE); - mOptions2.add(SettingOptions.MEMBER); if (NoClearSPUtils.getInt(getContext(), Constans.MARKET_STATUS) == 1 && SPUtils.getInt(getContext(), ConsUser.TYPE) != 2) { mOptions2.add(SettingOptions.GUIDE); } @@ -817,6 +818,20 @@ public class SettingFragment extends Fragment implements View.OnClickListener { } }); break; + case TASK: + /* if (gender == 2) { + mLogo.setImageResource(R.mipmap.ic_task_mine); + } else {*/ + mLogo.setImageResource(R.mipmap.ic_task_mine); + //} + mName.setText("每日任务"); + view.setOnClickListener(view16 -> { + if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { + Intent intent = new Intent(getActivity(), MissionActivity.class); + startActivity(intent); + } + }); + break; case BEAUTY: mSwitch.setVisibility(View.GONE); mHint.setVisibility(View.GONE); @@ -844,13 +859,17 @@ public class SettingFragment extends Fragment implements View.OnClickListener { mLogo.setImageResource(R.mipmap.ic_my_vip); mHint.setVisibility(View.GONE); } - mName.setText("会员特权"); + mName.setText("会员权限"); view.setOnClickListener(v -> { if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { // LotteryNineDialog dialog = new LotteryNineDialog(ActivityUtils.getTopActivity(), null); // dialog.show(); - Intent intent = new Intent(getActivity(), MemberActivity.class); + /* Intent intent = new Intent(getActivity(), MemberActivity.class); intent.putExtra("index", 0); + startActivity(intent);*/ + + Intent intent = new Intent(getActivity(), PrivilegeSettingActivity.class); + intent.putExtra("isVip", isVip); startActivity(intent); } }); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java index fe815bb..f0ae587 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java @@ -72,7 +72,7 @@ public class SystemSettingActivity extends BaseActivity implements View.OnClickL } if (!UserManager.getUserInfo().isWomen()) { - system_setting_vip.setVisibility(View.VISIBLE); + system_setting_vip.setVisibility(View.GONE); } else { system_setting_vip.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java index 3756ac6..363199d 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java @@ -1,10 +1,12 @@ package com.xuebiping.bolizhuzi.view.settings; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import com.xuebiping.bolizhuzi.R; @@ -18,9 +20,10 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener public static final int REQUEST_RECHARGE = 110; private TextView mWalletRecharge; private TextView mWalletIncoming; - private Button mRechargeButton; - private Button mExchangeButton; - private Button mWithdrawButton; + private LinearLayout mRechargeButton; + private LinearLayout mExchangeButton; + private LinearLayout mWithdrawButton; + private LinearLayout wallet_bill_button; private TextView mCaiBeiRecharge; private TextView mCaiBeiImcome; private View mCaiBeiRechargeButton; @@ -29,12 +32,12 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener super.onCreate(onSavedInstance); setContentView(R.layout.activity_wallet); Title title = getCustomTitle(); - title.setTitleBackgroundResource(R.drawable.shape_backgound); + title.setTitleBackground(Color.TRANSPARENT); title.dismissBottomLine(); title.findViewById(R.id.title_bg).getBackground().setAlpha(255); ImageView left = findViewById(R.id.left_image); - left.setImageResource(R.drawable.ic_return_white); - title.setTitleWhite("芊颜钱包", "账单明细", null, new Title.OnFunctionalAreaClickListener() { + left.setImageResource(R.mipmap.ic_back_white); + title.setTitleWhite("我的钱包", null, null, new Title.OnFunctionalAreaClickListener() { @Override public void onLeftClick(View v) { finish(); @@ -57,6 +60,7 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener mWalletIncoming = findViewById(R.id.wallet_income_amount); mRechargeButton = findViewById(R.id.wallet_recharge_button); mExchangeButton = findViewById(R.id.wallet_exchange_button); + wallet_bill_button = findViewById(R.id.wallet_bill_button); mWithdrawButton = findViewById(R.id.wallet_cash_button); mCaiBeiRecharge = findViewById(R.id.wallet_caibei_recharge); mCaiBeiImcome = findViewById(R.id.wallet_caibei_income); @@ -64,6 +68,7 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener mRechargeButton.setOnClickListener(this); mExchangeButton.setOnClickListener(this); mWithdrawButton.setOnClickListener(this); + wallet_bill_button.setOnClickListener(this); mCaiBeiRechargeButton.setOnClickListener(this); } @@ -103,6 +108,10 @@ public class WalletActivity extends BaseActivity implements View.OnClickListener }else if(view == mExchangeButton){ Intent intent = new Intent(this, ExchangeActivity.class); startActivityForResult(intent, REQUEST_RECHARGE); + }else if(view == wallet_bill_button){ + Intent intent = new Intent(WalletActivity.this, BillActivity.class); + intent.putExtra("type", 0); + startActivity(intent); } } diff --git a/app/src/main/res/drawable-xhdpi/bg_dibu.png b/app/src/main/res/drawable-xhdpi/bg_dibu.png index 28608c6..b7981aa 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_dibu.png and b/app/src/main/res/drawable-xhdpi/bg_dibu.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_rank1.png b/app/src/main/res/drawable-xhdpi/ic_rank1.png index 03f95f2..c38c99e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_rank1.png and b/app/src/main/res/drawable-xhdpi/ic_rank1.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_rank2.png b/app/src/main/res/drawable-xhdpi/ic_rank2.png index e8580de..8281ed1 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_rank2.png and b/app/src/main/res/drawable-xhdpi/ic_rank2.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_rank3.png b/app/src/main/res/drawable-xhdpi/ic_rank3.png index 4beaf83..d3212a8 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_rank3.png and b/app/src/main/res/drawable-xhdpi/ic_rank3.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_sign_bg.png b/app/src/main/res/drawable-xhdpi/ic_sign_bg.png deleted file mode 100644 index e61adf4..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_sign_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bg_dibu.png b/app/src/main/res/drawable-xxhdpi/bg_dibu.png deleted file mode 100644 index 5fad4a9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/bg_dibu.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_rank1.png b/app/src/main/res/drawable-xxhdpi/ic_rank1.png deleted file mode 100644 index 59469e8..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_rank1.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_rank2.png b/app/src/main/res/drawable-xxhdpi/ic_rank2.png deleted file mode 100644 index 6c76091..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_rank2.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_rank3.png b/app/src/main/res/drawable-xxhdpi/ic_rank3.png deleted file mode 100644 index a549104..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_rank3.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_sign_bg.png b/app/src/main/res/drawable-xxhdpi/ic_sign_bg.png deleted file mode 100644 index 9df4762..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_sign_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/bg_dibu.png b/app/src/main/res/drawable-xxxhdpi/bg_dibu.png deleted file mode 100644 index eeddfca..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/bg_dibu.png and /dev/null differ diff --git a/app/src/main/res/drawable/bg_rank.xml b/app/src/main/res/drawable/bg_rank.xml new file mode 100644 index 0000000..998b7d1 --- /dev/null +++ b/app/src/main/res/drawable/bg_rank.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app/src/main/res/drawable/shape_daka_rank_frame.xml b/app/src/main/res/drawable/shape_daka_rank_frame.xml index 24b8550..5080cd3 100644 --- a/app/src/main/res/drawable/shape_daka_rank_frame.xml +++ b/app/src/main/res/drawable/shape_daka_rank_frame.xml @@ -1,6 +1,6 @@ - + \ 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 598ccf2..a52d14b 100644 --- a/app/src/main/res/drawable/switch_thumb_on.xml +++ b/app/src/main/res/drawable/switch_thumb_on.xml @@ -2,7 +2,8 @@ + android:angle="270" + android:endColor="#EE7874" + android:startColor="#F3C89B" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/top_corner_bg.xml b/app/src/main/res/drawable/top_corner_bg.xml index 0971194..f93076c 100644 --- a/app/src/main/res/drawable/top_corner_bg.xml +++ b/app/src/main/res/drawable/top_corner_bg.xml @@ -3,6 +3,5 @@ + android:radius="10dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_dynamic_post.xml b/app/src/main/res/layout/activity_dynamic_post.xml index 87b39c9..a1b4a07 100644 --- a/app/src/main/res/layout/activity_dynamic_post.xml +++ b/app/src/main/res/layout/activity_dynamic_post.xml @@ -15,6 +15,7 @@ android:layout_marginHorizontal="@dimen/dp20" android:layout_marginTop="@dimen/dp15" android:layout_marginBottom="@dimen/dp20" + android:visibility="gone" android:orientation="horizontal"> @@ -12,7 +12,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - android:src="@drawable/ic_sign_bg" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -90,7 +89,6 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:layout_marginEnd="16dp" - android:background="@drawable/shape_white_bg_r14" android:orientation="vertical" android:paddingTop="14dp" android:paddingBottom="14dp" @@ -102,129 +100,137 @@ android:id="@+id/tv_mission_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="14dp" android:layout_marginBottom="8dp" android:text="每日任务" android:textColor="@color/black" android:textSize="16dp" android:textStyle="bold" /> - + android:layout_height="wrap_content" + android:background="@drawable/shape_white_bg_r14" + android:orientation="vertical"> - + - + - + - - + - + + - + - + + + + + + + + + - - - @@ -257,15 +258,16 @@ android:layout_width="match_parent" android:layout_height="54dp" android:layout_marginTop="@dimen/dp16" - android:background="@android:color/white"> + android:layout_marginHorizontal="@dimen/dp20" + android:background="@drawable/shape_button_enable"> diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml index b0da53e..d55c242 100644 --- a/app/src/main/res/layout/activity_wallet.xml +++ b/app/src/main/res/layout/activity_wallet.xml @@ -1,120 +1,255 @@ + android:background="@color/mainBg" + android:orientation="vertical" + tools:viewBindingIgnore="true"> + - + fresco:arcHeight="20dp"/>--> - + + + - + + + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> - + + + + + + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> - + - - -