1:修改家族展示续签按钮位置
2:修改购买爵位前,先请求一次接口 3:修改所有CP更改为心动 4:修改挚友,初始获取数据变更成40条 5:未实名认证不能进行歌手认证
This commit is contained in:
@@ -82,7 +82,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@mipmap/icon_dialog_u_cp_left_top"
|
||||
android:gravity="center"
|
||||
android:text="CP"
|
||||
android:text="心动"
|
||||
android:textColor="@color/white" />
|
||||
|
||||
<LinearLayout
|
||||
@@ -93,7 +93,7 @@
|
||||
android:layout_toStartOf="@+id/ll_middle"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
<com.xscm.moduleutil.widget.CircularImage
|
||||
android:id="@+id/user_nav1"
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
@@ -162,7 +162,7 @@
|
||||
android:layout_toEndOf="@+id/ll_middle"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
<com.xscm.moduleutil.widget.CircularImage
|
||||
android:id="@+id/user_nav2"
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_today"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/dp_4"
|
||||
android:drawableStart="@mipmap/zs_tb"
|
||||
@@ -158,9 +158,10 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_num"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_5"
|
||||
android:layout_marginEnd="@dimen/dp_8"
|
||||
app:layout_constraintStart_toEndOf="@+id/l1"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tv_renew"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintHorizontal_weight="1"
|
||||
android:layout_marginBottom="@dimen/dp_12"
|
||||
@@ -188,7 +189,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_yesterday"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/dp_4"
|
||||
android:drawableStart="@mipmap/zs_tb"
|
||||
@@ -199,15 +200,13 @@
|
||||
tools:text="9999.99"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_renew"
|
||||
android:layout_width="0dp"
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="续租"
|
||||
app:layout_constraintStart_toEndOf="@+id/l2"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:layout_marginBottom="@dimen/dp_12"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tv_num"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
android:layout_marginEnd="@dimen/dp_8"
|
||||
android:paddingHorizontal="@dimen/dp_5"
|
||||
@@ -215,10 +214,8 @@
|
||||
android:textColor="@color/white"
|
||||
android:background="@drawable/cs"
|
||||
android:textSize="@dimen/sp_12"
|
||||
app:layout_constraintHorizontal_weight="0.7"
|
||||
android:gravity="center"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
android:visibility="gone"/>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
@@ -330,7 +330,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@mipmap/icon_dialog_u_cp_left_top"
|
||||
android:gravity="center"
|
||||
android:text="CP"
|
||||
android:text="心动"
|
||||
android:textColor="@color/white" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
Reference in New Issue
Block a user