androidOne/qianyanAndroid
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排行榜UI修改

Browse Source
This commit is contained in:
被淹死的鱼
2026-03-18 17:29:18 +08:00
parent 2327d4d5d9
commit 659eef7e29
84 changed files with 1164 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@@ -115,7 +115,6 @@
android:usesCleartextTraffic="true"
tools:replace="android:label,android:allowBackup"
tools:targetApi="r">
<activity android:name=".view.dynamics.activity.DynamicDetailTwoActivity"></activity>
<meta-data
android:name="ScopedStorage"
@@ -177,6 +176,8 @@
<activity
android:name=".view.register.RegisterActivity"
android:screenOrientation="portrait" />
<activity android:name=".view.dynamics.activity.DynamicDetailTwoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".view.settings.WithdrawActivity"
android:screenOrientation="portrait" />
@@ -527,7 +528,7 @@
<meta-data
android:name="com.netease.nim.appKey"
android:value="5416101821422e21b3305dc0c3117832" />
android:value="7c66fa0f782771bc2b2829158b6c6aac" />
<meta-data
android:name="TD_APP_ID"
android:value="29B64B08724440F8B620A472CE95A249" />

2
app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java
View File

@@ -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;
}

45
app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java
View File

@@ -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) {

36
app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java
View File

@@ -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;

32
app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java
View File

@@ -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;

5
app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt
View File

@@ -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<SimpleDraweeView>(R.id.channel_anchor_id_photo_1)
val mCost = holder.getView<TextView>(R.id.channel_anchor_id_cost_1)
val mScore = holder.getView<TextView>(R.id.channel_anchor_id_score_1)
val nmpp = holder.getView<TextView>(R.id.iv_anchor_nm_img)
val online = holder.getView<TextView>(R.id.iv_anchor_online)
val nmpp = holder.getView<ImageView>(R.id.iv_anchor_nm_img)
val online = holder.getView<LinearLayout>(R.id.iv_anchor_online)
val mLocation = holder.getView<TextView>(R.id.channel_anchor_location_1)
val newPeopleImageView = holder.getView<ImageView>(R.id.newPeopleImageView)
val iv_anchor_tag = holder.getView<ImageView>(R.id.iv_anchor_tag)

1
app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/constant/SettingOptions.java
View File

@@ -18,5 +18,6 @@ public enum SettingOptions {
HELLOW,//招呼设置
ITEMS,//我的道具
VIDEO, //视频聊天
TASK, //每日任务
DETAIL//账单明细
}

1
app/src/main/java/com/xuebiping/bolizhuzi/im/uikit/common/Constans.java
View File

@@ -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";
}

4
app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/CommentBean.java
View File

@@ -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;

4
app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicImage.java
View File

@@ -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;

3
app/src/main/java/com/xuebiping/bolizhuzi/model/dynamics/DynamicsItemBean.java
View File

@@ -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;

50
app/src/main/java/com/xuebiping/bolizhuzi/view/dynamics/fragment/DynamicViewPagerFragment.java
View File

@@ -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);

4
app/src/main/java/com/xuebiping/bolizhuzi/view/login/LoginActivity.java
View File

@@ -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

28
app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckFragment.java
View File

@@ -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 {

45
app/src/main/java/com/xuebiping/bolizhuzi/view/luck/LuckListFragment.java
View File

@@ -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;*/
}
}
}

3
app/src/main/java/com/xuebiping/bolizhuzi/view/main/CoverActivity.java
View File

@@ -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);
}

142
app/src/main/java/com/xuebiping/bolizhuzi/view/main/MainRecommendFragment.java
View File

@@ -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 {

4
app/src/main/java/com/xuebiping/bolizhuzi/view/main/VideoFriendActivity.java
View File

@@ -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("设为首页");
}
}*/
}
});

4
app/src/main/java/com/xuebiping/bolizhuzi/view/news/fragment/MainMessageFragment.java
View File

@@ -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);

8
app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InfoEditActivity.java
View File

@@ -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 类里面的写法。

27
app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java
View File

@@ -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);
}
});

2
app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SystemSettingActivity.java
View File

@@ -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);
}

21
app/src/main/java/com/xuebiping/bolizhuzi/view/settings/WalletActivity.java
View File

@@ -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);
}
}

BIN
app/src/main/res/drawable-xhdpi/bg_dibu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_rank1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_rank2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_rank3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_sign_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 82 KiB

BIN
app/src/main/res/drawable-xxhdpi/bg_dibu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 139 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_rank1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_rank2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_rank3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_sign_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 178 KiB

BIN
app/src/main/res/drawable-xxxhdpi/bg_dibu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 244 KiB

8
app/src/main/res/drawable/bg_rank.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:type="linear"
android:angle="90"
android:endColor="#EB6EEC"
android:startColor="#EC696F"/>
</shape>

2
app/src/main/res/drawable/shape_daka_rank_frame.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="30dp" />
<solid android:color="#33FFFFFF" />
<solid android:color="#1AFFFFFF" />
</shape>

5
app/src/main/res/drawable/switch_thumb_on.xml
View File

@@ -2,7 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#925BF7"
android:startColor="#E69EFF" />
android:angle="270"
android:endColor="#EE7874"
android:startColor="#F3C89B" />
<corners android:radius="10dp" />
</shape>

3
app/src/main/res/drawable/top_corner_bg.xml
View File

@@ -3,6 +3,5 @@
<solid android:color="@color/white" />
<corners
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />
android:radius="10dp" />
</shape>

1
app/src/main/res/layout/activity_dynamic_post.xml
View File

@@ -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">
<TextView

233
app/src/main/res/layout/activity_mission.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_gray"
android:background="#F7F8FC"
android:orientation="vertical"
tools:viewBindingIgnore="true">
@@ -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" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@android:color/white">
android:layout_height="wrap_content"
android:background="@drawable/shape_white_bg_r14"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_sign_dynamic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_dynamic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
>
<TextView
android:id="@+id/tv_dy1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="发布动态"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_dy2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sign_dynamic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_dynamic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_dy2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="随机记录我的精彩生活 +10金币"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toBottomOf="@+id/tv_dy1" />
<TextView
android:id="@+id/tv_dy1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="发布动态"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_dy2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_go_dy"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去发布"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_dy2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="随机记录我的精彩生活 +10金币"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toBottomOf="@+id/tv_dy1" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mission_invite"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@android:color/white">
<TextView
android:id="@+id/tv_go_dy"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去发布"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_sign_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_invite"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mission_invite"
android:layout_width="match_parent"
android:layout_height="60dp"
>
<TextView
android:id="@+id/tv_invite1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="邀请好友"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_invite2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sign_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_invite"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_invite1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="邀请好友"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_invite2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_invite2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="一起遇见心动开启邂逅"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toBottomOf="@+id/tv_invite1" />
<TextView
android:id="@+id/tv_go_invite"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_invite2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="一起遇见心动开启邂逅"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toBottomOf="@+id/tv_invite1" />
<TextView
android:id="@+id/tv_go_invite"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<ImageView
@@ -233,15 +239,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="54dp"
android:padding="16dp"
android:src="@drawable/ic_return_white"
android:src="@mipmap/ic_black_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每日任务"
android:textColor="@color/white"
android:text="任务中心"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="18dp"
app:layout_constraintBottom_toBottomOf="@+id/iv_sign_finish"
app:layout_constraintEnd_toEndOf="parent"

8
app/src/main/res/layout/activity_system_setting.xml
View File

@@ -52,6 +52,7 @@
android:id="@+id/system_setting_vip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp54"
android:visibility="gone"
android:layout_marginTop="@dimen/dp6"
android:background="@android:color/white">
@@ -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">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginLeft="16dp"
android:textStyle="bold"
android:text="退出登录"
android:textColor="@color/loginText"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>

347
app/src/main/res/layout/activity_wallet.xml
View File

@@ -1,120 +1,255 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mainBg">
android:background="@color/mainBg"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.fengliyan.uikit.specialui.ArcView
<!--<com.fengliyan.uikit.specialui.ArcView
android:id="@+id/wallet_arcview"
android:layout_width="match_parent"
android:layout_height="105dp"
fresco:arcHeight="20dp"/>
fresco:arcHeight="20dp"/>-->
<RelativeLayout
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/ic_wallet_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="@drawable/shape_wallet_header">
<TextView
android:id="@+id/wallet_charge_title"
android:layout_marginTop="@dimen/dp50"
android:layout_marginRight="16dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充值的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="25dp"/>
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/wallet_charge_amount"
<TextView
android:id="@+id/wallet_charge_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="32sp" />
<TextView
android:id="@+id/wallet_charge_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp6"
android:text="充值的金币"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#680ad2"
android:textSize="32sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="12dp"
android:layout_below="@+id/wallet_charge_title"/>
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/wallet_income_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="38dp"
android:layout_below="@+id/wallet_charge_amount"/>
<TextView
android:id="@+id/wallet_income_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="32sp" />
<TextView
android:id="@+id/wallet_income_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#680ad2"
android:textSize="32sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="32dp"
android:layout_below="@+id/wallet_income_title"/>
<Button
android:id="@+id/wallet_recharge_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:layout_marginTop="65dp"
android:text="充值"
android:textSize="14sp"
android:textColor="@color/white"/>
<TextView
android:id="@+id/wallet_income_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp6"
android:text="收益的金币"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<Button
android:id="@+id/wallet_exchange_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:background="@drawable/shape_wallet_button"
android:layout_toLeftOf="@+id/wallet_cash_button"
android:layout_marginRight="12dp"
android:layout_marginTop="175dp"
android:visibility="gone"
android:text="兑换"
android:textSize="14sp"
android:textColor="@color/mainColor"/>
<Button
android:id="@+id/wallet_cash_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:layout_marginTop="175dp"
android:visibility="visible"
android:background="@drawable/shape_wallet_button"
android:text="提现"
android:textSize="14sp"
android:textColor="@color/mainColor"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp10"
android:layout_marginTop="-60dp"
android:background="@drawable/shape_white_dialog_bottom"
android:orientation="vertical">
<LinearLayout
android:id="@+id/wallet_recharge_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_recharge" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="充值"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_bill_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_bill" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="账单明细"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_cash_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_cash" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="提现"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_exchange_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_exchange" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="兑换"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_wallet_header"
android:orientation="vertical"
android:layout_marginLeft="16dp"
android:layout_marginTop="22dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="@drawable/shape_wallet_header"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="85dp"
@@ -124,16 +259,17 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="1">
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充值的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
<TextView
android:id="@+id/wallet_caibei_recharge"
@@ -148,16 +284,18 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="1">
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
<TextView
android:id="@+id/wallet_caibei_income"
android:layout_width="wrap_content"
@@ -173,41 +311,42 @@
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:background="@color/bottomCuttingLine"/>
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/wallet_caibei_recharge_layout"
android:layout_width="match_parent"
android:layout_height="60dp">
<ImageView
android:id="@+id/wallet_shell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:src="@drawable/ic_shell"/>
android:src="@drawable/ic_shell" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/wallet_shell"
android:layout_centerVertical="true"
android:layout_marginLeft="6dp"
android:layout_toRightOf="@+id/wallet_shell"
android:text="金币"
android:textSize="18sp"
android:layout_centerVertical="true"
android:textColor="@color/infoEditTextColor2"/>
android:textColor="@color/infoEditTextColor2"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/group"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16sp"
android:drawableRight="@drawable/group"
android:drawablePadding="5dp"
android:text="充值"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>

20
app/src/main/res/layout/activity_withdraw.xml
View File

@@ -23,6 +23,14 @@
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="可提现金币"
android:textColor="#ffffffff"
android:textSize="14sp" />
<TextView
android:id="@+id/coinLabel"
android:layout_width="wrap_content"
@@ -30,14 +38,6 @@
android:text="0"
android:textColor="#ffffffff"
android:textSize="32sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="我的金币"
android:textColor="#ffffffff"
android:textSize="14sp" />
</LinearLayout>
<TextView
@@ -109,8 +109,10 @@
<TextView
android:id="@+id/bindBtn"
android:layout_width="82dp"
android:layout_height="match_parent"
android:layout_height="@dimen/dp30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp5"
android:background="@drawable/shape_button_enable"
android:gravity="center"
android:text="去绑定"

3
app/src/main/res/layout/activity_zhi_rank.xml
View File

@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="50dp"
android:paddingBottom="50dp"
android:background="@drawable/bg_rank"
tools:viewBindingIgnore="true">
<androidx.viewpager.widget.ViewPager

21
app/src/main/res/layout/fragment_charm_rank.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<RelativeLayout
@@ -17,9 +17,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/bg_dibu"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp280"
android:scaleType="fitEnd"
android:layout_below="@+id/daka_rank_header_layout"
android:src="@drawable/bg_dibu"/>
<FrameLayout
android:id="@+id/fl_top"
android:layout_width="match_parent"
@@ -61,7 +67,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#D8DFE5"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -114,7 +120,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#FBD06A"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -178,7 +184,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#F5C6B4"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -289,7 +295,7 @@
android:background="@drawable/shape_daka_rank_frame1"
android:gravity="center"
android:text="日榜"
android:textColor="#8646F6"
android:textColor="#EB6DD2"
android:textSize="14sp"
android:textStyle="bold" />
@@ -343,7 +349,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_topview"
android:layout_marginTop="-20dp"
android:layout_marginTop="-50dp"
android:layout_marginHorizontal="@dimen/dp10"
android:background="@drawable/top_corner_bg"
android:divider="@color/transparent"
android:paddingTop="20dp"

1
app/src/main/res/layout/fragment_dynamic_view_pager.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:layout_height="match_parent"
android:background="#F6F7FB"
android:layout_marginBottom="50dp">
<androidx.viewpager.widget.ViewPager

182
app/src/main/res/layout/fragment_luck.xml
View File

@@ -4,21 +4,136 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="#F6F7FB"
tools:context=".view.luck.LuckFragment">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp240"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="55dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp85"
android:layout_marginTop="25dp"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/lin_video_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/lin_voice_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp8"
android:layout_marginRight="@dimen/dp20"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="语音匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/rl_main_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:background="@color/white"
android:layout_marginTop="@dimen/dp10"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
@@ -75,53 +190,52 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="新人"
android:textColor="@color/one_text"
android:textColor="@color/black"
android:textSize="16sp" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/title_view_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp">
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_below="@+id/tv_2"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp5"
android:src="@drawable/shape_button_enable"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_2"
app:layout_constraintEnd_toEndOf="@+id/tv_2"
app:layout_constraintStart_toStartOf="@+id/tv_2"
app:layout_constraintTop_toTopOf="@+id/tv_2" />
<ImageView
android:id="@+id/iv_luck_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_luck_location"
app:layout_constraintBottom_toBottomOf="@+id/tv_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_2" />
/>
<TextView
android:id="@+id/tv_2"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:gravity="center"
android:text="附近"
android:textColor="@color/one_text"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_luck_location"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_toRightOf="@+id/iv_luck_location"
android:orientation="vertical">
<TextView
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:gravity="center"
android:text="附近"
android:textColor="@color/one_text"
android:textSize="16sp"
/>
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:src="@drawable/shape_button_enable"
android:layout_gravity="center"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<Space
android:layout_width="0dp"
@@ -146,7 +260,7 @@
android:id="@+id/iv_luck_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_luck_search" />
android:src="@drawable/ic_home_search" />
</LinearLayout>
<androidx.viewpager.widget.ViewPager

364
app/src/main/res/layout/fragment_main_recommend.xml
View File

@@ -5,166 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F6F7FB"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/ctl_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_video_pp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_audio_pp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="匿名匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_main_home_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"
android:orientation="vertical"/>
<!--<include
layout="@layout/item_main_home_page_layout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"/>-->
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
@@ -172,6 +13,185 @@
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_bg" />
<RelativeLayout
android:id="@+id/ll_main_home_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal"
tools:viewBindingIgnore="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_toStartOf="@+id/iv_title_rank"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/title_view_1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="20dp">
<ImageView
android:id="@+id/title_bottom_line_1"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_1"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="推荐"
android:textColor="@color/one_text"
android:textSize="20dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/title_view_2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="20dp">
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_2"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="在线"
android:textColor="@color/one_text"
android:textSize="20dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/title_view_3"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:id="@+id/title_bottom_line_3"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_3"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="新人"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
<ImageView
android:id="@+id/iv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/icon_address" />
<LinearLayout
android:id="@+id/title_view_4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:id="@+id/title_bottom_line_4"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_4"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:singleLine="true"
android:text="同城"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp4"
android:visibility="gone">
<ImageView
android:id="@+id/iv_more_city"
android:layout_width="@dimen/dp12"
android:layout_height="@dimen/dp6"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/dp2"
android:src="@drawable/ic_bou_mo1" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/iv_title_rank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="12dp"
android:layout_toStartOf="@+id/iv_title_gender"
android:src="@drawable/ic_home_rank" />
<ImageView
android:id="@+id/iv_title_gender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/iv_title_search"
android:src="@drawable/ic_home_hi" />
<ImageView
android:id="@+id/iv_title_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="12dp"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_home_search" />
</RelativeLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_main_home_title"
android:background="@color/transparent"/>
<LinearLayout
android:id="@+id/main_turntable"
@@ -224,28 +244,4 @@
android:src="@drawable/ic_video_endw" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/main_first_chong_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp80"
android:visibility="gone">
<ImageView
android:id="@+id/main_first_chong"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/iv_first_chong" />
<ImageView
android:id="@+id/main_first_chong_end"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignRight="@id/main_first_chong"
android:layout_marginRight="5dp"
android:src="@drawable/ic_video_endw" />
</RelativeLayout>
</RelativeLayout>

3
app/src/main/res/layout/fragment_main_recommend_active.xml
View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

3
app/src/main/res/layout/fragment_main_recommend_city.xml
View File

@@ -4,13 +4,14 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

3
app/src/main/res/layout/fragment_main_recommend_recommend.xml
View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

34
app/src/main/res/layout/fragment_personal_main_page.xml
View File

@@ -36,6 +36,7 @@
android:background="@color/three_text"
android:clipChildren="false" />
<LinearLayout
android:id="@+id/view_group"
android:layout_width="match_parent"
@@ -44,6 +45,15 @@
android:layout_marginTop="-25dp"
android:gravity="center"
android:orientation="horizontal" />
<ImageView
android:id="@+id/personal_main_page_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp15"
android:layout_alignBottom="@+id/view_group"
android:src="@mipmap/icon_status1" />
</RelativeLayout>
<RelativeLayout
@@ -240,32 +250,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_toEndOf="@+id/personal_main_page_age"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="4dp">
android:layout_below="@+id/personal_main_page_name">
<ImageView
android:id="@+id/tagVipImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/tag_member"
android:layout_marginRight="4dp"
android:visibility="gone" />
<ImageView
android:id="@+id/tagSVipImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@mipmap/tag_supermember"
android:layout_marginRight="4dp"
android:visibility="gone" />
<ImageView
android:id="@+id/tagNewImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginRight="4dp"
android:src="@mipmap/tag_new"
android:visibility="gone" />
@@ -273,7 +283,7 @@
android:id="@+id/tagRealImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginRight="4dp"
android:src="@mipmap/ag_real"
android:visibility="gone" />
@@ -281,7 +291,6 @@
android:id="@+id/tagPhoneImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@mipmap/tag_phone"
android:visibility="gone" />
</LinearLayout>
@@ -290,22 +299,13 @@
android:id="@+id/personal_main_page_sub_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/personal_main_page_name"
android:layout_below="@+id/tagContainer"
android:layout_marginTop="6dp"
android:text="深圳 | 女神值：289"
android:textColor="#848484"
android:textSize="14sp" />
<ImageView
android:id="@+id/personal_main_page_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/personal_main_page_sub_info"
android:layout_alignParentBottom="@+id/personal_main_page_sub_info"
android:layout_marginStart="10dp"
android:layout_marginEnd="16dp"
android:layout_toEndOf="@+id/personal_main_page_sub_info"
android:src="@mipmap/icon_status1" />
<TextView
android:id="@+id/tv_signer"

3
app/src/main/res/layout/fragment_recommend1.xml
View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

1
app/src/main/res/layout/fragment_setting.xml
View File

@@ -721,6 +721,7 @@
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:visibility="gone"
android:orientation="vertical">
<ImageView

37
app/src/main/res/layout/item_dynamic_list1.xml
View File

@@ -34,9 +34,9 @@
android:id="@+id/dynamic_list_photo"
android:layout_width="40dp"
android:layout_height="40dp"
fresco:roundedCornerRadius="24dp"
fresco:roundingBorderColor="#6CE4B7"
fresco:roundingBorderWidth="@dimen/dp1"
fresco:roundedCornerRadius="24dp" />
fresco:roundingBorderWidth="@dimen/dp1" />
<ImageView
android:id="@+id/iv_sex"
@@ -261,45 +261,46 @@
android:weightSum="3" />
<RelativeLayout
android:id="@+id/rl_bottom_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_3"
android:layout_marginHorizontal="@dimen/dp16"
android:layout_marginTop="15dp"
android:gravity="center_vertical"
android:layout_marginHorizontal="@dimen/dp16"
android:orientation="vertical">
<TextView
android:id="@+id/tv_topic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp12"
android:text="# 只想发个自拍"
android:paddingVertical="@dimen/dp2"
android:paddingHorizontal="@dimen/dp10"
android:visibility="gone"
android:background="@drawable/shape_button_e472ed_t10"
android:textColor="#E472ED"/>
android:paddingHorizontal="@dimen/dp10"
android:paddingVertical="@dimen/dp2"
android:text="# 只想发个自拍"
android:textColor="#E472ED"
android:textSize="@dimen/dp12"
android:visibility="gone" />
<TextView
android:id="@+id/tv_see_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textSize="@dimen/dp12"
android:text="已有0次浏览"
android:textColor="#E472ED"/>
android:textColor="#E472ED"
android:textSize="@dimen/dp12" />
<LinearLayout
android:id="@+id/item_dynamic_gift_layout"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp26"
android:layout_gravity="center"
android:layout_below="@+id/tv_see_count"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp15"
android:gravity="center"
android:background="@drawable/shape_button_enable"
android:gravity="center"
android:orientation="horizontal">
<ImageView
@@ -310,8 +311,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="打赏"
android:layout_marginLeft="@dimen/dp5"
android:text="打赏"
android:textColor="@color/white"
android:textSize="@dimen/dp12"
android:textStyle="bold" />
@@ -371,9 +372,9 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_below="@+id/item_dynamic_gift_layout"
android:layout_marginTop="13dp"
android:background="@color/mainBg"
android:visibility="gone" />
android:layout_below="@+id/rl_bottom_layout"
android:layout_marginTop="@dimen/dp15"
android:background="#F6F7FB"
android:visibility="visible" />
</RelativeLayout>
</LinearLayout>

5
app/src/main/res/layout/item_dynamic_title.xml
View File

@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="关注"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
@@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="同城"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
@@ -120,6 +120,7 @@
android:id="@+id/dynamic_title_view_4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp20"
android:layout_toEndOf="@+id/dynamic_title_view_3">

55
app/src/main/res/layout/item_luck_list.xml
View File

@@ -11,18 +11,19 @@
<com.flyco.roundview.RoundRelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginHorizontal="@dimen/dp20"
android:clipChildren="false"
android:padding="12dp"
app:rv_backgroundColor="@color/white"
app:rv_cornerRadius="8dp">
android:paddingVertical="@dimen/dp12"
app:rv_cornerRadius="10dp">
<com.facebook.drawee.view.SimpleDraweeView
android:layout_marginLeft="@dimen/dp15"
android:id="@+id/user_head"
android:layout_width="72dp"
android:layout_height="72dp"
app:roundedCornerRadius="8dp" />
app:roundedCornerRadius="8dp"
app:roundAsCircle="true"/>
<com.flyco.roundview.RoundTextView
android:id="@+id/iv_status"
@@ -162,36 +163,34 @@
<TextView
android:id="@+id/iv_luck_hi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/user_head"
android:layout_alignParentEnd="true"
android:drawableTop="@mipmap/ic_main_luck_hi"
android:drawablePadding="2dp"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp30"
android:textSize="@dimen/dp12"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp15"
android:gravity="center"
android:text="打招呼"
android:textColor="#935CF8"
android:textSize="10dp" />
android:textColor="#E472ED"
android:background="@drawable/shape_button_e472ed_border"
android:text="聊一聊"/>
<TextView
android:id="@+id/iv_luck_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/user_head"
android:layout_alignParentEnd="true"
android:drawableTop="@mipmap/ic_main_luck_msg"
android:drawablePadding="2dp"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp30"
android:textSize="@dimen/dp12"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp15"
android:gravity="center"
android:text="私信"
android:textColor="#935CF8"
android:textSize="10dp"
android:visibility="gone" />
android:textColor="#E472ED"
android:background="@drawable/shape_button_e472ed_border"
android:visibility="gone"
android:text="聊一聊" />
</com.flyco.roundview.RoundRelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="76dp"
android:layout_marginEnd="16dp"
android:background="#FDEFF6" />
android:layout_height="@dimen/dp12"
android:background="#F6F7FB" />
</LinearLayout>

1
app/src/main/res/layout/item_main_home_page_layout.xml
View File

@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
tools:viewBindingIgnore="true">

2
app/src/main/res/layout/item_main_home_page_layout_1.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/transparent"
android:orientation="horizontal"
tools:viewBindingIgnore="true">

2
app/src/main/res/layout/item_main_message_title.xml
View File

@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="通话"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
</LinearLayout>

2
app/src/main/res/layout/item_setting_option.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp45"
android:background="@color/transparent"
tools:viewBindingIgnore="true">

1
app/src/main/res/layout/item_social_list.xml
View File

@@ -121,6 +121,7 @@
android:text="发消息"
android:textColor="@android:color/white"
android:textSize="14sp"
android:background="@drawable/bg_focus"
android:visibility="gone" />
<TextView

163
app/src/main/res/layout/layout_main_top_view.xml
View File

@@ -1,93 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent">
android:layout_height="@dimen/dp85"
android:background="@color/transparent"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/lin_video_speed"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lin_voice_speed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_marginLeft="@dimen/dp20"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_luck_video_speed_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_video_speed_man" />
android:src="@drawable/ic_home_top_video_bg" />
<TextView
android:id="@+id/tv_video_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="视频速配"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_video_detail"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<TextView
android:id="@+id/tv_video_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="真人视频通话"
android:textColor="#ccffffff"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_video_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/lin_voice_speed"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/lin_video_speed"
app:layout_constraintTop_toTopOf="parent">
android:layout_marginLeft="@dimen/dp8"
android:layout_marginRight="@dimen/dp20"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_voice_speed" />
android:src="@drawable/ic_home_top_audio_bg" />
<TextView
android:id="@+id/tv_voice_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="语音速配"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_voice_detail"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<TextView
android:id="@+id/tv_voice_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="真人语音通话"
android:textColor="#ccffffff"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_voice_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="语音匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/ic_main_luck_hi.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_main_luck_msg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_task_mine.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 608 B

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet_bill.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet_cash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet_exchange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet_recharge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 949 B

BIN
app/src/main/res/mipmap-xhdpi/icon_main_video_speed_man.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_main_video_speed_women.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_main_voice_speed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_main_luck_hi.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_main_luck_msg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_main_video_speed_man.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_main_video_speed_women.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_main_voice_speed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

10
app/src/main/res/values/colors.xml
View File

@@ -7,7 +7,7 @@
<!--登陆页用色-->
<color name="loginLine">#cccccc</color>
<color name="loginText">#333333</color>
<color name="loginText">#000000</color>
<color name="mainColor">#E472ED</color>
<color name="loginText2">#999999</color>
<color name="loginGradientStart">#2bb1f8</color>
@@ -39,8 +39,8 @@
<color name="giftText1">#FF828B</color>
<color name="giftText2">#F32B2B</color>
<color name="verfyNotificationBackground">#F94F2E</color>
<color name="daka1">#D975FF</color>
<color name="daka2">#744DF8</color>
<color name="daka1">#EB6EEC</color>
<color name="daka2">#EC696F</color>
<color name="invitation1">#4769FF</color>
<color name="invitation2">#8517DD</color>
<color name="gender_selected">#FE747B</color>
@@ -52,7 +52,7 @@
<color name="color_2d2d2d">#000000</color>
<!--一级文字-->
<color name="one_text">#333333</color>
<color name="one_text">#000000</color>
<!--二级文字-->
<color name="two_text">#666666</color>
<!--三级文字-->
@@ -60,7 +60,7 @@
<!--分割线-->
<color name="cut_line">#eeeeee</color>
<!--芊颜主题色-->
<color name="yellow_ffd33e">#6B2CC4</color>
<color name="yellow_ffd33e">#EB6DD2</color>
<!--芊颜一级文字-->
<color name="zhimi_one_text">#111111</color>