From 4f81d720fdba6f7f31f0816f29b27041c3940804 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Tue, 24 Sep 2024 15:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E6=A0=8F=E6=9B=B4=E9=AB=98=E4=B8=80=E4=BA=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/MainMessageChatFragment.java | 1 - .../yunbao/common/utils/DateFormatUtil.java | 8 +- .../yunbao/live/views/LiveRoomViewHolder.java | 87 +++--- .../live/views/PortraitLiveManager.java | 3 + live/src/main/res/layout/view_live_room.xml | 5 +- .../main/res/layout/view_live_room_pk_ad.xml | 263 ------------------ 6 files changed, 63 insertions(+), 304 deletions(-) delete mode 100644 live/src/main/res/layout/view_live_room_pk_ad.xml diff --git a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatFragment.java b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatFragment.java index 8befd42ba..f6ef485ee 100644 --- a/common/src/main/java/com/yunbao/common/fragment/MainMessageChatFragment.java +++ b/common/src/main/java/com/yunbao/common/fragment/MainMessageChatFragment.java @@ -56,7 +56,6 @@ public class MainMessageChatFragment extends ConversationListFragment { public void onChanged(List uiConversations) { int hashCode = uiConversations.hashCode(); if (listHashCode != hashCode) { - Log.i("nwq", "刷新数据"); listHashCode = hashCode; ((MainConversationListAdapter) mAdapter).onFinish(); } diff --git a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java index d0bc8c30f..ae554c183 100644 --- a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java @@ -70,10 +70,14 @@ public class DateFormatUtil { StringBuilder stringBuilder = new StringBuilder(); if (days > 0) { stringBuilder.append(days).append(day).append(" "); - } else if (hours > 0) { + } + if (hours > 0) { stringBuilder.append(hours).append(hour).append(" "); - } else if (minutes > 0) { + } + if (minutes > 0) { stringBuilder.append(minutes).append(minute); + }else { + stringBuilder.append("0"+minute); } return stringBuilder.toString(); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 897efe0c0..801c7cbc7 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -292,7 +292,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public static ImageView newMessage, atMessage; - //多人PK static TextView time; @@ -954,7 +953,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis }; - private void setTrickyMsg(){ + private void setTrickyMsg() { if (tricky_layout_name != null) { tricky_layout_name.setVisibility(View.VISIBLE); } @@ -1003,7 +1002,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void run() { //TODO 这里报了类型错误 android.widget.LinearLayout$LayoutParams cannot be cast to android.widget.RelativeLayout$LayoutParams - ViewGroup.LayoutParams params1 = sud_layout_name.getLayoutParams(); + ViewGroup.LayoutParams params1 = sud_layout_name.getLayoutParams(); params1.width = mChatRecyclerView.getWidth() - DpUtil.dp2px(85); sud_layout_name.setLayoutParams(params1); } @@ -1700,7 +1699,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis goddessSayBgView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(!isHinde){ + if (!isHinde) { mAnchorSay.setVisibility(View.VISIBLE); newGodSayGroup.setVisibility(View.GONE); mLiveRoomHandler.removeMessages(LiveRoomHandler.WHAT_ANCHOR_GOD_SHOW_HIDE); @@ -1937,6 +1936,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //聊天栏 mChatRecyclerView = (RecyclerView) findViewById(R.id.chat_recyclerView); + if (isAnchorLive()) {//普通用户的聊天栏更高一些 + RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams(); + //将layout_marginBottom修改为0 其余不变 + params1.bottomMargin = 0; + mChatRecyclerView.setLayoutParams(params1); + } + ScreenDimenUtil util = ScreenDimenUtil.getInstance(); int mScreenWdith = util.getScreenWdith(); @@ -2962,12 +2968,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } - /** * 隐藏女神说 */ private void hideAnchorSay() { - if (mAnchorSay.getVisibility() == View.VISIBLE){ + if (mAnchorSay.getVisibility() == View.VISIBLE) { mAnchorSay.setVisibility(View.GONE); newGodSayGroup.setVisibility(View.VISIBLE); } @@ -3049,12 +3054,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (LivePushTxViewHolder.mTRTCCloud != null || LivePushSwViewHolder.rtcRoom != null) { fans_btn.setVisibility(View.GONE); } - tricky_layout_name.setVisibility(View.GONE); - sud_layout_name.setVisibility(View.GONE); + if (tricky_layout_name != null) { + tricky_layout_name.setVisibility(View.GONE); + } + if (sud_layout_name != null) { + sud_layout_name.setVisibility(View.GONE); + } mRedVal.setVisibility(View.GONE); mBlueVal.setVisibility(View.GONE); mPkRankTopIcon.setVisibility(View.GONE); - // mAnchorLayout.setBackgroundResource(R.drawable.bg_live_ico); + // mAnchorLayout.setBackgroundResource(R.drawable.bg_live_ico); mGoodNumberIcon.setVisibility(View.GONE); mAnchorSay.setVisibility(View.INVISIBLE); showAnchorSayAndCallAnchor(); @@ -3442,10 +3451,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * * @param view 要添加到翻转动画器的视图 */ - private void startNewPart2Flipper(View view){ - if(view == null) + private void startNewPart2Flipper(View view) { + if (view == null) return; - if (newPart2Flipper.getVisibility() != View.VISIBLE){ + if (newPart2Flipper.getVisibility() != View.VISIBLE) { newPart2Flipper.setVisibility(View.VISIBLE); } // 获取当前翻转动画器中的视图数量 @@ -3468,8 +3477,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis * * @param view 要从翻页器中移除的视图 */ - private void stopPart2Flipper(View view){ - if(view == null) + private void stopPart2Flipper(View view) { + if (view == null) return; // 获取翻页器中当前的子视图数量，以判断是否满足停止翻页的条件 newPart2Flipper.getChildCount(); @@ -3481,7 +3490,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis // 如果翻页器中的子视图数量小于等于1，则停止翻页器的翻页动作 // 这是因为翻页器通常需要至少两个视图来展示翻页效果，当视图数量不足时翻页变得没有意义 - if (newPart2Flipper.getChildCount() <=1) { + if (newPart2Flipper.getChildCount() <= 1) { newPart2Flipper.stopFlipping(); } } @@ -3494,17 +3503,17 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis this.wishlist = wishlist; //wishlistLayout.setVisibility(View.VISIBLE); Log.i("nwq", "initWishList VISIBLE"); - if (isAnchorLive()){ + if (isAnchorLive()) { startNewPart2Flipper(wishFlipperRoot); - }else { + } else { newWishGroup.setVisibility(View.VISIBLE); } } else { //wishlistLayout.setVisibility(View.GONE); Log.i("nwq", "initWishList GONE"); - if (isAnchorLive()){ + if (isAnchorLive()) { stopPart2Flipper(wishFlipperRoot); - }else { + } else { newWishGroup.setVisibility(View.GONE); } } @@ -3923,6 +3932,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public static int pkEndIndex = 0; + //PK结束，结果展示 public static void pkEndList(int result) { @@ -3960,7 +3970,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //头像显示 public void setHeadData(LivePKUserListBean bean) { if (bean == null) return; - Log.e("更新礼物进度", bean.toString()); + Log.i("nwq", "setHeadData"); livePKUserListBean = bean; String mLiveuid = LiveRoomViewHolder.mLiveUid; if (livePKUserListBean != null) { @@ -3971,6 +3981,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis params.height = mScreenWdith * 720 / PK_LINE_HEIGHT; //params.bottomMargin = (mScreenWdith * 720 / 960); lt_pk_line.requestLayout(); + Log.i("nwq", "lt_pk_line.setVisibility(View.VISIBLE)"); lt_pk_line.setVisibility(View.VISIBLE); } Boolean idB = true; @@ -4023,14 +4034,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //双人pk显示 public void UpPkTwo() { //if + Log.i("nwq", "更新PK"); if (lt_pk_line.getVisibility() == View.VISIBLE) return; ScreenDimenUtil util = ScreenDimenUtil.getInstance(); int mScreenWdith = util.getScreenWdith(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) lt_pk_line.getLayoutParams(); + if (isAnchorLive()) {//因为主播的比较短所以往上移动 + params.setMargins(0, 0, DpUtil.dp2px(R.dimen.live_top), 0); + } params.height = mScreenWdith * 720 / PK_LINE_HEIGHT; + //params.bottomMargin=(mScreenWdith * 720 / 960); lt_pk_line.requestLayout(); - lt_pk_line.setVisibility(View.VISIBLE); img_pk_fist_l.setBackgroundResource(R.mipmap.icon_red_no1); img_pk_fist_r.setBackgroundResource(R.mipmap.icon_blue_no1); @@ -4506,7 +4521,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (isAnchorLive()) { View view = newPart2Flipper.findViewWithTag("giftWall"); stopPart2Flipper(view); - }else { + } else { newWeekGroup.setVisibility(View.GONE); } } @@ -5706,7 +5721,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private static final int WHAT_FIRST_LOOK_LIVE = 7;//用户首次进入该直播间计时 private static final int WHAT_LOOK_5_MIN_LIVE = 8;//用户首次进入该直播间计时 private static final int WHAT_TASK_INLET_LIVE = 9;//打开活动页 - static final int WHAT_ANCHOR_GOD_SHOW_HIDE = 10; //延迟十秒收起女神说 + static final int WHAT_ANCHOR_GOD_SHOW_HIDE = 10; //延迟十秒收起女神说 public LiveRoomHandler(LiveRoomViewHolder liveRoomViewHolder) { mLiveRoomViewHolder = new WeakReference<>(liveRoomViewHolder).get(); @@ -6345,8 +6360,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis hideAnchorSayAndCallAnchor(); break; case LIVE_PK_END: - //Pk结束可以展开女神说 - showAnchorSayAndCallAnchor(); + //Pk结束可以展开女神说 + showAnchorSayAndCallAnchor(); break; case LIVE_FONT_SIZE: int fount = event.getNums(); @@ -6374,9 +6389,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis newWishTotalTv.setText("/" + model.getWishlistNum()); wish_progressbar.setMax(Integer.parseInt(model.getWishlistNum())); wish_progressbar.setProgress(Integer.parseInt(model.getWishlistProgress())); - if (isAnchorLive()){ + if (isAnchorLive()) { startNewPart2Flipper(wishFlipperRoot); - }else { + } else { newWishGroup.setVisibility(View.VISIBLE); } Log.i("nwq", "initWishListData"); @@ -7026,10 +7041,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis contentTv.setText(data.getLivePreview().getContent()); // ImgLoader.display(mContext, preview.getStyleImage(), mAnchorSayImage); if (preview.getIsShow() == 1) { - if(isHinde){ + if (isHinde) { mAnchorSay.setVisibility(View.GONE); newGodSayGroup.setVisibility(View.GONE); - }else { + } else { mAnchorSay.setVisibility(View.VISIBLE); newGodSayGroup.setVisibility(View.GONE); } @@ -7037,7 +7052,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mAnchorSay.setVisibility(View.INVISIBLE); newGodSayGroup.setVisibility(View.GONE); } - mLiveRoomHandler.sendEmptyMessageDelayed(LiveRoomHandler.WHAT_ANCHOR_GOD_SHOW_HIDE,10000); + mLiveRoomHandler.sendEmptyMessageDelayed(LiveRoomHandler.WHAT_ANCHOR_GOD_SHOW_HIDE, 10000); } else { mAnchorSay.setVisibility(View.INVISIBLE); } @@ -7080,7 +7095,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public void hideAnchorSayAndCallAnchor() { isHinde = true; - if(mAnchorSay.getVisibility() == View.VISIBLE){ + if (mAnchorSay.getVisibility() == View.VISIBLE) { mAnchorSay.setVisibility(View.GONE); newGodSayGroup.setVisibility(View.VISIBLE); } @@ -7121,17 +7136,17 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis initWishListData(wishListProgress); //wishlistLayout.setVisibility(View.VISIBLE); Log.i("nwq", "updateTopBanner VISIBLE"); - if (isAnchorLive()){ + if (isAnchorLive()) { startNewPart2Flipper(wishFlipperRoot); - }else { + } else { newWishGroup.setVisibility(View.VISIBLE); } } else { //wishlistLayout.setVisibility(View.GONE); Log.i("nwq", "updateTopBanner GONE"); - if (isAnchorLive()){ + if (isAnchorLive()) { stopPart2Flipper(wishFlipperRoot); - }else { + } else { newWishGroup.setVisibility(View.GONE); } } @@ -7151,7 +7166,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis TextView newItemTitleTv = wishFlipperRoot.findViewById(R.id.newItemTitleTv); newItemTitleTv.setText(R.string.live_room_wishlist); newWishTotalTv = wishFlipperRoot.findViewById(R.id.newItemTotalTv); - wish_progressbar= wishFlipperRoot.findViewById(R.id.itemProgressbar); + wish_progressbar = wishFlipperRoot.findViewById(R.id.itemProgressbar); } else { newWishBgView = findViewById(R.id.newWishBgView); newWishImg = findViewById(R.id.newWishImg); diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index a2c1ca4ee..c52a5ad87 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -911,6 +911,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe L.e("getIsFirstEntry:"+data.getEnterRoomInfo().getIsFirstEntry()); L.e("getIsNewUser:"+data.getEnterRoomInfo().getIsNewUser()); L.e("getIsattention:"+data.getEnterRoomInfo().getIsattention()); + + if(data.getEnterRoomInfo().getIsNewUser().equals("1")){ //检测是否是首次观看该直播间 if(data.getEnterRoomInfo().getIsFirstEntry().equals("1")){ @@ -923,6 +925,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe //观看200秒之后，推送活动入口im消息 mLiveRoomViewHolder.firstTaskInlet1Notify(); } + } @Override diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 74ab1bfd9..18065b3ca 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -202,7 +202,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentBottom="true" - android:layout_marginTop="370dp" + android:layout_marginTop="385dp" android:overScrollMode="never" android:scrollbars="none" /> @@ -1800,7 +1800,8 @@ android:id="@+id/lt_pk_line" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="180dp" + android:layout_marginTop="158dp" + android:layout_marginBottom="10dp" android:visibility="gone" tools:visibility="visible"> diff --git a/live/src/main/res/layout/view_live_room_pk_ad.xml b/live/src/main/res/layout/view_live_room_pk_ad.xml deleted file mode 100644 index e01282baf..000000000 --- a/live/src/main/res/layout/view_live_room_pk_ad.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file