moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix

Browse Source
This commit is contained in:
Max
2023-11-01 11:34:52 +08:00
parent d0e88440e3 b63b4ba07a
commit 8ebaddad07
2 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
View File

@@ -296,17 +296,16 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
if (roomInfo != null) {
List<GiftReceiver> targetUsers = new ArrayList<>();
int totalCoin = 0;
if (AvRoomDataManager.get().mIsNeedGiftEffect &&
!AvRoomDataManager.get().isSelfGamePlaying()) {
SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
handler.postDelayed(() -> {
removeView(imageView);
imageView.stopAnimation(true);
}, 1800);
}
handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos);
// if (AvRoomDataManager.get().mIsNeedGiftEffect &&
// !AvRoomDataManager.get().isSelfGamePlaying()) {
// SVGAImageView imageView = playLuckyBagAnim(svgaUrl);
// handler.postDelayed(() -> {
// removeView(imageView);
// imageView.stopAnimation(true);
// }, 1800);
// }
// handler.postDelayed(() -> drawLuckyGiftAnimation(roomInfo, giftReceiveInfos, totalCoin, targetUsers, giftReceiveType, isShowAnimation, pos), 1200);
}
}

163
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="11dp"
@@ -11,9 +11,11 @@
<FrameLayout
android:id="@+id/micro_layout"
android:layout_marginStart="@dimen/dp_10"
android:layout_width="@dimen/dp_room_boss_mic_header_wear_radius"
android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius">
android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius"
android:layout_marginStart="@dimen/dp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_halo"
@@ -102,7 +104,7 @@
</RelativeLayout>
<ImageView
<ImageView
android:id="@+id/iv_face"
android:layout_width="80dp"
android:layout_height="80dp"
@@ -123,99 +125,96 @@
android:textColor="@color/color_FFFFFF"
android:textSize="9sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/layout_item_boss_micro_01" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_nick"
android:layout_width="52dp"
<ImageView
android:id="@+id/iv_tag"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginEnd="@dimen/dp_5"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/nick"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/micro_layout"
app:layout_constraintTop_toBottomOf="@id/micro_layout"
tools:layout_width="15dp"
tools:visibility="visible" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_below="@+id/micro_layout"
android:gravity="center_vertical">
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="52dp"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
app:layout_constraintEnd_toEndOf="@id/micro_layout"
app:layout_constraintStart_toEndOf="@+id/iv_tag"
app:layout_constraintTop_toTopOf="@id/iv_tag"
tools:text="Name" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_6"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal"
android:paddingStart="4dp"
android:paddingEnd="4dp"
app:layout_constraintEnd_toEndOf="@id/micro_layout"
app:layout_constraintStart_toStartOf="@id/micro_layout"
app:layout_constraintTop_toBottomOf="@+id/nick">
<ImageView
android:id="@+id/iv_tag"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginEnd="@dimen/dp_5"
android:visibility="gone"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/nick"
app:layout_constraintTop_toTopOf="parent" />
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/nick"
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="52dp"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10"
android:paddingBottom="@dimen/dp_6"
app:layout_constraintStart_toEndOf="@+id/iv_tag"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="0dp"
tools:text="1" />
tools:text="10000" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_gravity="center_horizontal"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal"
android:paddingStart="4dp"
android:paddingEnd="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/nick">
<ImageView
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/fr_title"
android:layout_width="0dp"
android:layout_height="76dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="80dp"
android:layout_marginStart="@dimen/dp_20"
android:background="@drawable/bg_micro_title"
android:layout_toEndOf="@+id/micro_layout"
android:layout_width="match_parent"
android:layout_height="76dp">
android:background="@drawable/bg_micro_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/micro_layout"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_room_desc"
android:textColor="@color/color_75FBE2"
android:textSize="@dimen/sp_10"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/color_75FBE2"
android:textSize="@dimen/sp_10" />
</FrameLayout>
@@ -223,10 +222,12 @@
android:id="@+id/iv_red_package"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="15dp"
android:scaleType="centerInside"
android:src="@drawable/room_red_package_in"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>