yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[修复BUG]

Browse Source
This commit is contained in:
Martin
2024-06-05 13:27:22 +08:00
parent 66822139ba
commit 419e3a7ab5
17 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
live/build.gradle
View File

@@ -1 +1 @@
apply plugin: 'com.android.library'
apply plugin: 'com.android.library'

11
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@@ -1652,15 +1652,15 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
}
break;
case LEAVE_DR_ROOM:
if (mLiveSwLinkMicPkPresenter != null) {
mLiveSwLinkMicPkPresenter.leaveDRRoom();
}
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.seisShowGif(true);
if(isDRPK==1){
if(DRPKing==1){
mLiveRoomViewHolder.endDRGif();
}
}
if (mLiveSwLinkMicPkPresenter != null) {
mLiveSwLinkMicPkPresenter.leaveDRRoom();
}
SWManager.get().setDrPkNumClarity(1);
// if (mLiveRoomViewHolder != null) {
// mLiveRoomViewHolder.hotAddVisibility(false);
@@ -1943,8 +1943,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
}
break;
}
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onAllServerNotifyFFGGGDJANEvent(AllServerNotifyFFGGGDJANEvent event) {
if (mLiveRoomViewHolder != null) {

2
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@@ -104,7 +104,7 @@ public class SocketSwChatUtil {
.param("vip_type", u.getVip().getType())
.param("guard_type", IMLoginManager.get(CommonAppContext.sInstance.getApplicationContext()).getGuardType())
.param("medal_name", u.getMedalName())
.param("medal_level", model.getMedalLevel())
.param("medal_level", u.getMedalLevel())
.param("good_num", u.getGoodnum())
.param("ct", content)
.param("noble_id", String.valueOf(model.getNobleId()))

1
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@@ -335,7 +335,6 @@ public class SocketSwClient {
DRPKing = 1;
} else if (action3 == 5) {//结束PK
// endDRGif();
DRPKing= -1;
LiveRoomViewHolder.d_pk_view.setVisibility(View.GONE);
if (LiveSwAnchorActivity.mLiveAnchorViewHolder != null) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);

4
live/src/main/res/layout/view_live_room.xml
View File

@@ -1491,12 +1491,11 @@
android:visibility="visible" />
<RelativeLayout
android:layout_marginTop="315dp"
android:id="@+id/lt_pk_line"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top"
android:visibility="gone">
<TextView
android:id="@+id/pk_rank_red_val"
android:layout_width="wrap_content"
@@ -1535,6 +1534,7 @@
<LinearLayout
android:id="@+id/pk_red_layout"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content">
<LinearLayout