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

房间bugfix

Browse Source
This commit is contained in:
oujunhui
2020-05-19 19:30:09 +08:00
parent a6138e0e48
commit a2b865c5a3
2 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -26,7 +26,7 @@
android:id="@+id/room_back"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_alignBottom="@+id/layout_id"
android:layout_alignBottom="@+id/ll_room_info"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginBottom="0dp"
android:padding="10dp"
@@ -34,90 +34,93 @@
android:src="@drawable/arrow_left_white" />
<LinearLayout
android:id="@+id/ll_title"
android:id="@+id/ll_room_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/room_back"
android:gravity="center_vertical">
android:orientation="vertical">
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_title"
<LinearLayout
android:id="@+id/ll_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginRight="@dimen/dp_5"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:maxWidth="170dp"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="15sp"
tools:text="和你一起分享"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:focusable="true"
android:focusableInTouchMode="true"
/>
android:gravity="center_vertical">
<ImageView
android:id="@+id/iv_high_audio"
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:maxWidth="170dp"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="15sp"
tools:text="和你一起分享"
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:focusable="true"
android:focusableInTouchMode="true"
/>
<ImageView
android:id="@+id/iv_high_audio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:src="@drawable/ic_high_audio"
android:visibility="gone"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_close_gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_close_gift"
android:visibility="@{hasAnimationEffect?View.GONE:View.VISIBLE}" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_5"
android:src="@drawable/ic_high_audio"
android:visibility="gone"
tools:visibility="visible" />
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_close_gift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/room_title"
android:layout_toRightOf="@id/room_title"
android:src="@drawable/ic_close_gift"
android:visibility="@{hasAnimationEffect?View.GONE:View.VISIBLE}" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_room_good_number"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/room_nums"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="@dimen/sp_9"
tools:text="8888"
/>
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="9sp"
android:layout_marginStart="5dp"
tools:text="8888" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/layout_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_title"
android:layout_toEndOf="@id/room_back"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_room_good_number"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/room_nums"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="@dimen/sp_9"
tools:text="8888"
/>
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="9sp"
android:layout_marginStart="5dp"
tools:text="8888" />
</LinearLayout>
<TextView
android:id="@+id/tv_follow_room"
android:layout_width="wrap_content"
@@ -126,7 +129,7 @@
android:textStyle="bold"
android:textSize="@dimen/sp_13"
android:textColor="@color/white"
android:layout_toEndOf="@+id/ll_title"
android:layout_toEndOf="@+id/ll_room_info"
android:layout_marginStart="@dimen/dp_9"
android:gravity="center"
android:layout_marginTop="@dimen/dp_5"
@@ -141,7 +144,7 @@
android:id="@+id/room_more"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_alignBottom="@+id/layout_id"
android:layout_alignBottom="@+id/ll_room_info"
android:layout_alignParentEnd="true"
android:layout_marginEnd="3dp"
android:layout_marginBottom="0dp"
@@ -156,7 +159,7 @@
android:id="@+id/iv_room_share"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_alignBottom="@+id/layout_id"
android:layout_alignBottom="@+id/ll_room_info"
android:layout_marginEnd="3dp"
android:layout_toStartOf="@id/room_more"
android:paddingStart="10dp"
@@ -170,7 +173,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/layout_id"
android:layout_below="@+id/ll_room_info"
android:layout_marginTop="4dp" />
<ImageView

9
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -1,6 +1,7 @@
package com.yizhuan.xchat_android_core.room.giftvalue.helper;
import android.annotation.SuppressLint;
import android.os.Handler;
import android.text.TextUtils;
import android.util.LongSparseArray;
import android.util.SparseArray;
@@ -252,7 +253,13 @@ public class GiftValueMrg {
public void acceptThrowable(RoomGiftValue values, Throwable throwable) {
super.acceptThrowable(values, throwable);
sendRoomGiftValueMsg(values);
updateAllMicGiftValueByMsg(values);
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
updateAllMicGiftValueByMsg(values);
}
}, 1200);
}
});
}