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

修复：

Browse Source 
新人引导送礼与快捷消息布局冲突问题
This commit is contained in:
18401019693 2022-08-30 17:55:15 +08:00
parent b755b4f3a1
commit 40a8d604b0
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -857,7 +857,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10);
}
});
loadWishlistData();
//打招呼消息
fastMsgRecyclerView = (RecyclerView) findViewById(R.id.room_fast_msg);
fastMsgRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));

18
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -273,6 +273,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onRemove() {
end();
if (mLiveAudienceViewHolder != null) {
mLiveAudienceViewHolder.removeFromParent();
mLiveAudienceViewHolder.countDownTimerTrickery = null;
@ -1286,20 +1287,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLivePlayViewHolder.release();
}
mLivePlayViewHolder = null;
onRemove();
}
public void end() {
if (mLiveRoomViewHolder != null)
mLiveRoomViewHolder.clearList();
boolean canBackPressed = true;
if (mContext instanceof LiveAudienceActivity) {
canBackPressed = ((LiveAudienceActivity) mContext).canBackPressed();
}
IMLoginManager.get(mContext).setisNewUserOne(false);
if (!mEnd && !canBackPressed) {
return;
}
if (countDownTimer != null) {
countDownTimer.cancel();
countDownTimer = null;
@ -1309,13 +1304,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
if (LiveRoomViewHolder.isAttention == 0) {
if (isStayRoomfive) {
LiveRoomViewHolder.showFollowDialog(LiveRoomViewHolder.mNameText, LiveRoomViewHolder.mAvatarUrl, mContext);
} else {
backIndex = 1;
((LiveAudienceActivity) mContext).onBackPressed();
}
} else {
backIndex = 1;
((LiveAudienceActivity) mContext).onBackPressed();
}
} else {
exitLiveRoom();
@ -1367,7 +1356,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
}
});
endPlay();
mContext.finish();
} catch (Exception e) {
e.printStackTrace();
}

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

@ -227,11 +227,12 @@
android:layout_height="30dp"
android:layout_marginTop="4dp"
android:src="@mipmap/live_users_more" />
<ImageView
android:id="@+id/btn_close"
android:layout_marginStart="6dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="6dp"
android:layout_marginTop="4dp"
android:src="@mipmap/icon_live_close_3" />
</LinearLayout>
@ -239,7 +240,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/hour_rank_layout"
android:layout_width="wrap_content"
@ -713,7 +713,7 @@
android:id="@+id/chat_recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="430dp"
android:layout_marginTop="370dp"
android:overScrollMode="never"
android:scrollbars="none" />
@ -846,6 +846,7 @@
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_below="@id/lin">