Merge branch 'v1.5.0/optimize' into v1.5.0/test

This commit is contained in:
Max
2023-11-08 10:32:10 +08:00

View File

@@ -71,8 +71,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level" android:id="@+id/iv_noble_level"
android:layout_width="36dp" android:layout_width="17dp"
android:layout_height="19dp" android:layout_height="17dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:visibility="gone" android:visibility="gone"
tools:src="@mipmap/ic_user_level_king" tools:src="@mipmap/ic_user_level_king"
@@ -90,8 +90,8 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charm_level" android:id="@+id/iv_charm_level"
android:layout_width="@dimen/dp_19" android:layout_width="36dp"
android:layout_height="@dimen/dp_19" android:layout_height="19dp"
android:layout_marginEnd="2dp" android:layout_marginEnd="2dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"