1.修改BUG
2.礼物添加一键全送功能 3.转盘修改底部按钮展示、音效和特效功能
This commit is contained in:
@@ -87,25 +87,23 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:gravity="center_horizontal"
|
||||
>
|
||||
android:paddingEnd="@dimen/dp_1"
|
||||
android:gravity="center_horizontal">
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/im_user2"
|
||||
android:layout_width="@dimen/dp_44"
|
||||
android:layout_height="@dimen/dp_44"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:layout_marginStart="@dimen/dp_10"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
app:riv_oval="true" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_width="@dimen/dp_55"
|
||||
android:layout_height="@dimen/dp_55"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="@mipmap/huangg2"
|
||||
android:layout_marginStart="@dimen/dp_8"
|
||||
android:layout_marginTop="@dimen/dp_10" />
|
||||
android:scaleType="fitCenter" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
@@ -218,30 +216,31 @@
|
||||
android:layout_gravity="center"
|
||||
android:src="@mipmap/guanb1" />
|
||||
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/r_1_1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center|top"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingEnd="@dimen/dp_1"
|
||||
android:gravity="center_horizontal"
|
||||
>
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/im_user1"
|
||||
android:layout_width="@dimen/dp_44"
|
||||
android:layout_height="@dimen/dp_44"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:layout_marginStart="@dimen/dp_10"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
app:riv_oval="true" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/im1"
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:layout_gravity="center_horizontal|top|center"
|
||||
android:layout_marginStart="@dimen/dp_8"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:layout_width="@dimen/dp_55"
|
||||
android:layout_height="@dimen/dp_55"
|
||||
android:layout_centerInParent="true"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@mipmap/huangg1" />
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -350,12 +349,14 @@
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@mipmap/guanb3" />
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/r_3_1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center|top"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingEnd="@dimen/dp_1"
|
||||
android:gravity="center_horizontal"
|
||||
|
||||
>
|
||||
|
||||
@@ -363,19 +364,16 @@
|
||||
android:id="@+id/im_user3"
|
||||
android:layout_width="@dimen/dp_44"
|
||||
android:layout_height="@dimen/dp_44"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:layout_marginStart="@dimen/dp_17"
|
||||
android:layout_marginTop="@dimen/dp_12"
|
||||
app:riv_oval="true" />
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
app:riv_oval="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/dp_50"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_centerInParent="true"
|
||||
android:src="@mipmap/huangg3"
|
||||
android:layout_marginStart="@dimen/dp_15"
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:layout_marginEnd="@dimen/dp_5"/>
|
||||
android:scaleType="fitCenter"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -398,7 +396,7 @@
|
||||
android:layout_marginTop="@dimen/dp_10"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:rotation="-20"
|
||||
android:src="@mipmap/ic_launcher" />
|
||||
tools:src="@mipmap/ic_launcher" />
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/iv_three_cp2_head"
|
||||
@@ -410,7 +408,7 @@
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_toEndOf="@+id/iv_three_cp1_head"
|
||||
android:rotation="20"
|
||||
android:src="@mipmap/ic_launcher" />
|
||||
tools:src="@mipmap/ic_launcher" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/dp_98"
|
||||
@@ -818,7 +816,7 @@
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
tools:ignore="MissingConstraints"
|
||||
android:visibility="gone">
|
||||
>
|
||||
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
@@ -873,27 +871,30 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
tools:ignore="MissingConstraints"
|
||||
android:visibility="gone">
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/iv_my_cp1_head"
|
||||
android:layout_width="@dimen/dp_30"
|
||||
android:layout_height="@dimen/dp_30"
|
||||
android:src="@mipmap/ic_launcher" />
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:scaleType="fitCenter"/>
|
||||
|
||||
<com.xscm.moduleutil.widget.GifAvatarOvalView
|
||||
android:id="@+id/iv_my_cp2_head"
|
||||
android:layout_width="@dimen/dp_30"
|
||||
android:layout_height="@dimen/dp_30"
|
||||
android:layout_toEndOf="@+id/iv_my_cp1_head"
|
||||
android:src="@mipmap/ic_launcher" />
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:scaleType="fitCenter"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/v_my_cp1_head"
|
||||
android:layout_width="@dimen/dp_60"
|
||||
android:layout_height="@dimen/dp_35"
|
||||
android:paddingBottom="@dimen/dp_7"
|
||||
android:layout_height="@dimen/dp_30"
|
||||
android:src="@mipmap/cp_pt"
|
||||
android:scaleType="fitCenter"
|
||||
android:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
|
||||
Reference in New Issue
Block a user