diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 3a007e4b3..3dbb208bc 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -233,30 +233,30 @@ public class MeFragment extends BaseFragment implements View.OnClickListener { mBinding.tvConstellation.setText(star); // 头像遮罩 - GlideApp.with(mContext) - .load(mUserInfo.getAvatar()) - .dontAnimate() - .centerInside() - .diskCacheStrategy(DiskCacheStrategy.RESOURCE) - .listener(new RequestListener() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, Object o, - Target target, boolean b) { - return false; - } - - @Override - public boolean onResourceReady(Drawable drawable, Object o, - Target target, DataSource dataSource, boolean b) { - drawable.setColorFilter(mContext.getResources().getColor(R.color.black_transparent_20), PorterDuff.Mode.DARKEN); - ViewTarget viewTarget = (ViewTarget) target; - viewTarget.getView().setImageDrawable(drawable); - return true; - } - }) - // “23”:设置模糊度(在0.0到25.0之间),默认”25";"4":图片缩放比例,默认“1”。 - .transforms(new BlurTransformation(mContext, 25, 1)) - .into(mBinding.ivUserAvatarShadow); +// GlideApp.with(mContext) +// .load(mUserInfo.getAvatar()) +// .dontAnimate() +// .centerInside() +// .diskCacheStrategy(DiskCacheStrategy.RESOURCE) +// .listener(new RequestListener() { +// @Override +// public boolean onLoadFailed(@Nullable GlideException e, Object o, +// Target target, boolean b) { +// return false; +// } +// +// @Override +// public boolean onResourceReady(Drawable drawable, Object o, +// Target target, DataSource dataSource, boolean b) { +// drawable.setColorFilter(mContext.getResources().getColor(R.color.black_transparent_20), PorterDuff.Mode.DARKEN); +// ViewTarget viewTarget = (ViewTarget) target; +// viewTarget.getView().setImageDrawable(drawable); +// return true; +// } +// }) +// // “23”:设置模糊度(在0.0到25.0之间),默认”25";"4":图片缩放比例,默认“1”。 +// .transforms(new BlurTransformation(mContext, 25, 1)) +// .into(mBinding.ivUserAvatarShadow); } } diff --git a/app/src/main/res/drawable-xhdpi/ic_female.webp b/app/src/main/res/drawable-xhdpi/ic_female.webp index e9a336ea5..346f25bde 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_female.webp and b/app/src/main/res/drawable-xhdpi/ic_female.webp differ diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 9a89919bd..96d374948 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -18,7 +18,9 @@ + android:layout_height="wrap_content" + + > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="wrap_content" + > + - - - - + android:layout_height="wrap_content" + android:scaleType="fitXY" + android:src="@mipmap/bg_me_top" + /> @@ -143,10 +159,9 @@ android:id="@+id/ll_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="17dp" android:gravity="center_vertical" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_user_name"> + app:layout_constraintLeft_toRightOf="@id/ll_id" + app:layout_constraintTop_toTopOf="@id/ll_id"> + app:layout_constraintTop_toBottomOf="@id/tv_user_name"> @@ -239,20 +254,19 @@ - + + + + + + + + android:textColor="@color/color_CEC0FF" + android:textSize="@dimen/sp_11" /> - + + + + + android:textColor="@color/color_CEC0FF" + android:textSize="@dimen/sp_11"/> @@ -338,6 +352,7 @@ android:layout_weight="1" android:gravity="center" android:onClick="@{click}" + android:visibility="gone" android:orientation="vertical"> - + + + + @@ -402,396 +418,413 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_corner_shadow_12" + android:paddingTop="20dp" + android:paddingBottom="16dp" + android:orientation="vertical" + android:layout_below="@id/rl_user_info" + android:gravity="center_vertical"> + + + + + + + + + + + + + + + + + + + - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_corner_shadow_12" + android:paddingTop="20dp" + android:paddingBottom="16dp" + android:orientation="vertical" + android:gravity="center_vertical"> - - + android:onClick="@{click}" + android:orientation="horizontal" + android:paddingStart="@dimen/dp_me_padding_left" + android:paddingEnd="15dp" + tools:ignore="UseCompoundDrawables"> - + - + - + - - - - - + android:onClick="@{click}" + android:orientation="horizontal" + android:paddingStart="@dimen/dp_me_padding_left" + android:paddingEnd="15dp"> - + - + - + - + - - - - - + android:onClick="@{click}" + android:orientation="horizontal" + android:paddingStart="@dimen/dp_me_padding_left" + android:paddingEnd="15dp" + tools:ignore="UseCompoundDrawables"> + + + + + + + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:layout_marginTop="@dimen/dp_15" + android:background="@drawable/bg_corner_shadow_12" + android:paddingTop="20dp" + android:paddingBottom="16dp" + android:orientation="vertical" + android:gravity="center_vertical"> - - + + + + + + + + + android:onClick="@{click}" + android:orientation="horizontal" + android:paddingStart="@dimen/dp_me_padding_left" + android:paddingEnd="15dp" + tools:ignore="UseCompoundDrawables"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -799,6 +832,7 @@ #E0E0E0 #F3F2F5 #FFF044 + #CEC0FF + + #05a5a5a5 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index edc87eda7..dbd618a18 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -350,7 +350,7 @@ 查看伤害排行榜 获得奖励(%s) 金币 - ID:%s + 66号:%s 伤害 %s 点/次 (%s金币) 钻石可以兑换金币,兑换比率:1钻石=%s金币;\n diff --git a/app/src/module_mentoring_relationship/res/drawable/bg_corner_shadow_12.xml b/app/src/module_mentoring_relationship/res/drawable/bg_corner_shadow_12.xml new file mode 100644 index 000000000..7dbc67baf --- /dev/null +++ b/app/src/module_mentoring_relationship/res/drawable/bg_corner_shadow_12.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file