From ecb44e510aa099f607af3e8de8f1b048fad706d5 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Wed, 16 Oct 2024 13:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E7=89=A9=E5=B1=95=E9=A6=86=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=9B=BF=E6=8D=A2=E6=88=90=E6=96=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/tmp/full-r8-config.txt | 12 ++++----- .../yunbao/live/views/LiveRoomViewHolder.java | 25 ++++++++++--------- .../main/activity/UserHomeActivity.java | 25 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index 1a86edd43..b2e167dd7 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -421,7 +421,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # End of content from D:\AndroidProject\pandorapanP\app\proguard-rules.pro -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt -keep class androidx.core.app.CoreComponentFactory { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.core.content.FileProvider4Utils { (); } @@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclassmembers class * { *** videoEditClick(android.view.View); } -# End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanP\app\build\intermediates\aapt_proguard_file\link_onlineRelease\processLink_onlineReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanP\lib_faceunity\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt # Generated keep rule for Lifecycle observer adapter. -if class com.lxj.xpopup.core.BasePopupView { @@ -1157,9 +1157,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapanP\lib_google\build\intermediates\consumer_proguard_dir\link_onlineRelease\exportLink_onlineReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt -keepattributes *Annotation* 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 d08350b45..0a98d5c52 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -4221,18 +4221,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { - GiftWallDialog giftWallDialog = new GiftWallDialog(); - Bundle bundle = new Bundle(); - bundle.putString(Constants.LIVE_UID, mLiveUid); - bundle.putString(Constants.LIVE_STREAM, mStream); - bundle.putString("mAnchorName", mAnchorName); - bundle.putString("mAvatarUrl", mAvatarUrl); - bundle.putString("toUid", toUid); - bundle.putInt("isAttention", isAttention); - bundle.putBoolean("isLive", isAnchor); - bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)); - giftWallDialog.setArguments(bundle); - giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); + // GiftWallDialog giftWallDialog = new GiftWallDialog(); + new com.yunbao.common.dialog.GiftWallDialog(mContext, toUid, mAnchorName, toUid, isAnchor).setFullWindows(false).showDialog(); +// Bundle bundle = new Bundle(); +// bundle.putString(Constants.LIVE_UID, mLiveUid); +// bundle.putString(Constants.LIVE_STREAM, mStream); +// bundle.putString("mAnchorName", mAnchorName); +// bundle.putString("mAvatarUrl", mAvatarUrl); +// bundle.putString("toUid", toUid); +// bundle.putInt("isAttention", isAttention); +// bundle.putBoolean("isLive", isAnchor); +// bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)); +// giftWallDialog.setArguments(bundle); +// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); } diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java index e4776463c..d3304b32b 100644 --- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java @@ -77,8 +77,6 @@ import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.GradientDrawable; import com.yunbao.common.views.UserHomeImgsViewHolder; import com.yunbao.live.activity.LiveRyAnchorActivity; -import com.yunbao.live.dialog.GiftWallDialog; -import com.yunbao.live.views.ShowBigPhoto; import com.yunbao.video.activity.VideoPlayActivity; import com.yunbao.video.utils.VideoStorge; @@ -788,17 +786,18 @@ public class UserHomeActivity extends AbsActivity { itemLayout03.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - GiftWallDialog giftWallDialog = new GiftWallDialog(); - Bundle bundle = new Bundle(); - bundle.putString(Constants.LIVE_UID, uid); - bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name()); - bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar()); - bundle.putString("toUid", uid); - bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention()); - bundle.putBoolean("isLive", isAnchor); - bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity)); - giftWallDialog.setArguments(bundle); - giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); + new com.yunbao.common.dialog.GiftWallDialog(mContext, uid,userInfo.getUserHomeTopInfo().getUser_name(), null,isAnchor).setFullWindows(true).showDialog(); +// GiftWallDialog giftWallDialog = new GiftWallDialog(); +// Bundle bundle = new Bundle(); +// bundle.putString(Constants.LIVE_UID, uid); +// bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name()); +// bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar()); +// bundle.putString("toUid", uid); +// bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention()); +// bundle.putBoolean("isLive", isAnchor); +// bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity)); +// giftWallDialog.setArguments(bundle); +// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); } }); itemLayout04.setOnClickListener(new View.OnClickListener() {