diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt index 076e3446e..11e2ac0b3 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomNewFriendsAdapter.kt @@ -57,8 +57,8 @@ class RoomNewFriendsAdapter : tvGenderAge.setGender(item.gender) //设置星座 - val star = StarUtils.getConstellationString(Date(item.birth)) - helper.setText(R.id.tv_constellation, star) + val star = StarUtils.getConstellation(Date(item.birth)) + helper.setImageResource(R.id.iv_constellation, star) val tvTalk = helper.getView(R.id.tv_talk) diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java index 58d27d690..258448abc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java @@ -306,12 +306,6 @@ public class LoginPasswordActivity extends BaseActivity { } private void login() { - //发起登录 - HashMap map = new HashMap<>(3); - map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); - ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map); - getDialogManager().showProgressDialog(this, getString(R.string.login_is_logining)); AuthModel.get().login( "", @@ -344,6 +338,13 @@ public class LoginPasswordActivity extends BaseActivity { dealWithLoginError(e); } }); + + //发起登录 + HashMap map = new HashMap<>(3); + map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE); + map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map); + } /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java index 67c6e1010..347420952 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/MainIndicatorAdapter.java @@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.user.adapter; import android.content.Context; import android.graphics.Canvas; import android.graphics.LinearGradient; +import android.util.TypedValue; import android.widget.TextView; import androidx.core.content.ContextCompat; @@ -44,7 +45,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter { scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_767585)); scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_1F1A4E)); scaleTransitionPagerTitleView.setMinScale(minScale); - scaleTransitionPagerTitleView.setTextSize(textSize); + scaleTransitionPagerTitleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources().getDimensionPixelSize(R.dimen.sp_16)); int padding = UIUtil.dip2px(context, 12); scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0); scaleTransitionPagerTitleView.setText(mTitleList.get(i)); @@ -114,6 +115,7 @@ public class MainIndicatorAdapter extends CommonNavigatorAdapter { indicator.setLineHeight(context.getResources().getDimensionPixelOffset(R.dimen.dp_8)); indicator.setLineWidth(context.getResources().getDimensionPixelOffset(R.dimen.dp_35)); indicator.setRoundRadius(context.getResources().getDimensionPixelOffset(R.dimen.dp_5)); + indicator.setYOffset(context.getResources().getDimensionPixelOffset(R.dimen.dp_4)); return indicator; } diff --git a/app/src/main/res/drawable-xhdpi/bg_home_top.webp b/app/src/main/res/drawable-xhdpi/bg_home_top.webp index 54adec30c..eafde770a 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_home_top.webp and b/app/src/main/res/drawable-xhdpi/bg_home_top.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_masking_party.png b/app/src/main/res/drawable-xhdpi/bg_masking_party.png deleted file mode 100644 index 132967a64..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_masking_party.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.png b/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.png deleted file mode 100644 index 081f6a4c4..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.webp b/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.webp new file mode 100644 index 000000000..d1e191fd4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_recommend_hour_list.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.png b/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.png deleted file mode 100644 index b8f1b2816..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.webp b/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.webp new file mode 100644 index 000000000..697f36320 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_recommend_weekly_list.webp differ diff --git a/app/src/main/res/drawable/bg_mask_home_item.xml b/app/src/main/res/drawable/bg_mask_home_item.xml new file mode 100644 index 000000000..cf36056fc --- /dev/null +++ b/app/src/main/res/drawable/bg_mask_home_item.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_masking_party.xml b/app/src/main/res/drawable/bg_masking_party.xml new file mode 100644 index 000000000..bfe4609b1 --- /dev/null +++ b/app/src/main/res/drawable/bg_masking_party.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_home_online.xml b/app/src/main/res/drawable/shape_home_online.xml index fe3f4b7f9..5c54a12b3 100644 --- a/app/src/main/res/drawable/shape_home_online.xml +++ b/app/src/main/res/drawable/shape_home_online.xml @@ -2,7 +2,8 @@ + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 160e2a2e5..2eae5a261 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -8,7 +8,7 @@ + android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_8" /> diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml index 4d4a85bf5..1abb93f30 100644 --- a/app/src/main/res/layout/fragment_recommend.xml +++ b/app/src/main/res/layout/fragment_recommend.xml @@ -21,7 +21,6 @@ android:id="@+id/mRecyclerRoom" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_6" android:layout_marginStart="@dimen/dp_8" android:layout_marginEnd="@dimen/dp_8" android:overScrollMode="never" diff --git a/app/src/main/res/layout/item_room_new_friends.xml b/app/src/main/res/layout/item_room_new_friends.xml index 91a4ac84b..364a7feab 100644 --- a/app/src/main/res/layout/item_room_new_friends.xml +++ b/app/src/main/res/layout/item_room_new_friends.xml @@ -38,11 +38,11 @@ app:layout_constraintStart_toStartOf="@+id/view_aperture" app:layout_constraintTop_toTopOf="@+id/view_aperture" /> - @@ -53,16 +53,16 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_2" android:src="@drawable/iv_party" - app:layout_constraintBottom_toBottomOf="@+id/iv_mask_party" - app:layout_constraintEnd_toEndOf="@+id/iv_mask_party" - app:layout_constraintStart_toStartOf="@+id/iv_mask_party" /> + app:layout_constraintBottom_toBottomOf="@+id/v_mask_party" + app:layout_constraintEnd_toEndOf="@+id/v_mask_party" + app:layout_constraintStart_toStartOf="@+id/v_mask_party" /> - + app:layout_constraintStart_toEndOf="@id/iv_constellation" + app:layout_constraintTop_toTopOf="@id/iv_constellation" /> + app:layout_constraintTop_toBottomOf="@id/iv_constellation" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5be3860ba..2efd88ce7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -624,6 +624,7 @@ #13E2F5 #CC66FF #9168FA + #339168FA #0D344D #75FBE2 #A8041D @@ -689,7 +690,6 @@ #8651E0 #7748C7 #A974FF - #339168FA #ff80cc #6bb3ff #7147E6 @@ -697,5 +697,7 @@ #A3A0AD #5CF1FF #CF70FF + #A974FF + #C2A66FFF