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

礼物展馆全部替换成新的

Browse Source
This commit is contained in:
ningwenqiang 2024-10-16 13:58:44 +08:00
parent 6b9d951c55
commit ecb44e510a
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/tmp/full-r8-config.txt
View File

@ -421,7 +421,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
# End of content from D:\AndroidProject\pandorapanP\app\proguard-rules.pro # 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 { <init>(); } -keep class androidx.core.app.CoreComponentFactory { <init>(); }
-keep class androidx.core.content.FileProvider { <init>(); } -keep class androidx.core.content.FileProvider { <init>(); }
-keep class androidx.core.content.FileProvider4Utils { <init>(); } -keep class androidx.core.content.FileProvider4Utils { <init>(); }
@ -1094,10 +1094,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
-keepclassmembers class * { *** videoEditClick(android.view.View); } -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 # 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_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.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 # 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. # Generated keep rule for Lifecycle observer adapter.
-if class com.lxj.xpopup.core.BasePopupView { -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 # 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 # 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* -keepattributes *Annotation*

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

@ -4221,18 +4221,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) { public void showGiftWall(String toUid, boolean isAnchor, String mAnchorName, String mAvatarUrl) {
GiftWallDialog giftWallDialog = new GiftWallDialog(); // GiftWallDialog giftWallDialog = new GiftWallDialog();
Bundle bundle = new Bundle(); new com.yunbao.common.dialog.GiftWallDialog(mContext, toUid, mAnchorName, toUid, isAnchor).setFullWindows(false).showDialog();
bundle.putString(Constants.LIVE_UID, mLiveUid); // Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_STREAM, mStream); // bundle.putString(Constants.LIVE_UID, mLiveUid);
bundle.putString("mAnchorName", mAnchorName); // bundle.putString(Constants.LIVE_STREAM, mStream);
bundle.putString("mAvatarUrl", mAvatarUrl); // bundle.putString("mAnchorName", mAnchorName);
bundle.putString("toUid", toUid); // bundle.putString("mAvatarUrl", mAvatarUrl);
bundle.putInt("isAttention", isAttention); // bundle.putString("toUid", toUid);
bundle.putBoolean("isLive", isAnchor); // bundle.putInt("isAttention", isAttention);
bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity)); // bundle.putBoolean("isLive", isAnchor);
giftWallDialog.setArguments(bundle); // bundle.putBoolean("SBW", !(mContext instanceof LiveSwAnchorActivity || mContext instanceof LiveRyAnchorActivity));
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); // giftWallDialog.setArguments(bundle);
// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
} }

25
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@ -77,8 +77,6 @@ import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.GradientDrawable; import com.yunbao.common.views.GradientDrawable;
import com.yunbao.common.views.UserHomeImgsViewHolder; import com.yunbao.common.views.UserHomeImgsViewHolder;
import com.yunbao.live.activity.LiveRyAnchorActivity; 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.activity.VideoPlayActivity;
import com.yunbao.video.utils.VideoStorge; import com.yunbao.video.utils.VideoStorge;
@ -788,17 +786,18 @@ public class UserHomeActivity extends AbsActivity {
itemLayout03.setOnClickListener(new View.OnClickListener() { itemLayout03.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
GiftWallDialog giftWallDialog = new GiftWallDialog(); new com.yunbao.common.dialog.GiftWallDialog(mContext, uid,userInfo.getUserHomeTopInfo().getUser_name(), null,isAnchor).setFullWindows(true).showDialog();
Bundle bundle = new Bundle(); // GiftWallDialog giftWallDialog = new GiftWallDialog();
bundle.putString(Constants.LIVE_UID, uid); // Bundle bundle = new Bundle();
bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name()); // bundle.putString(Constants.LIVE_UID, uid);
bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar()); // bundle.putString("mAnchorName", userInfo.getUserHomeTopInfo().getUser_name());
bundle.putString("toUid", uid); // bundle.putString("mAvatarUrl", userInfo.getUserHomeTopInfo().getUser_avatar());
bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention()); // bundle.putString("toUid", uid);
bundle.putBoolean("isLive", isAnchor); // bundle.putInt("isAttention", userInfo.getUserHomeTopInfo().getIs_attention());
bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity)); // bundle.putBoolean("isLive", isAnchor);
giftWallDialog.setArguments(bundle); // bundle.putBoolean("SBW", !(mContext instanceof LiveRyAnchorActivity));
giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog"); // giftWallDialog.setArguments(bundle);
// giftWallDialog.show(((AbsActivity) mContext).getSupportFragmentManager(), "GiftWallDialog");
} }
}); });
itemLayout04.setOnClickListener(new View.OnClickListener() { itemLayout04.setOnClickListener(new View.OnClickListener() {