diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index b0731b31e..a9c636796 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\pandorapan\app\proguard-rules.pro -# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\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\pandorapan\app\build\intermediates\aapt_proguard_file\link_testRelease\processLink_testReleaseResources\aapt_rules.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\google_testRelease\processGoogle_testReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\lib_faceunity\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\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\pandorapan\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\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\link_testRelease\exportLink_testReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\google_testRelease\exportGoogle_testReleaseConsumerProguardFiles\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/dialog/LiveGiftPopup2.java b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java index 7b1cf5daa..9466818a7 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java @@ -419,6 +419,9 @@ public class LiveGiftPopup2 extends AbsDialogFragment { ViewClicksAntiShake.clicksAntiShake(liveGiftSend, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { + if(!liveGiftSend.isSelected()){ + return; + } MobclickAgent.onEvent(mContext, "gif_list_seed_gif", "用户送礼物"); if (liveGiftModel != null && liveGiftModel.getBlindBoxTicket() > 0) { @@ -536,7 +539,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment { ViewClicksAntiShake.clicksAntiShake(giftSendBgV, new ViewClicksAntiShake.ViewClicksCallBack() { @Override public void onViewClicks() { - if (liveGiftModel.getType() == 7 || isWrap) return; + if (liveGiftModel.getType() == 7 ) return; new XPopup.Builder(getContext()) .enableDrag(false) .asCustom(new GiftNumberPopup(getContext())) @@ -922,9 +925,9 @@ public class LiveGiftPopup2 extends AbsDialogFragment { continuousClickGroup.setVisibility(View.INVISIBLE); giftSendGroup.setVisibility(View.VISIBLE); liveGiftSend.setSelected(true); - if (isWrap){ - liveGiftImg.setVisibility(View.INVISIBLE); - } +// if (isWrap){ +// liveGiftImg.setVisibility(View.INVISIBLE); +// } continuousClicksBg.removeCallbacks(newLianSongRunnable); getCoin(); if (liveGiftModel != null) { @@ -1298,9 +1301,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment { liveGiftSend.setEnabled(true); giftSendGroup.setVisibility(View.VISIBLE); liveGiftSend.setSelected(true); - if (isWrap){ - liveGiftImg.setVisibility(View.INVISIBLE); - } + mCount = DEFAULT_COUNT; liveGiftSendTv.setText(mCount); if (giftSendGroup.getVisibility() == View.INVISIBLE) { @@ -1320,7 +1321,10 @@ public class LiveGiftPopup2 extends AbsDialogFragment { } else { operateImage.setVisibility(View.GONE); } - hideLianBtn(); + //hideLianBtn(); + if (liveGiftModel.getType() == 7) { + liveGiftImg.setVisibility(View.INVISIBLE); + } } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java index 99024371e..d5aa74114 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java @@ -120,7 +120,6 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken>() { }.getType()); if (userMoreInfoAdapter != null) { - userMoreInfoAdapter.setHide(outRankHide); } title = mRootView.findViewById(R.id.title); @@ -376,7 +375,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie if (userMoreInfoAdapter != null) { userMoreInfoAdapter.setHide(outRankHide); } - bottom_msg.setVisibility(View.VISIBLE); + //bottom_msg.setVisibility(View.VISIBLE); mRefreshView.setVisibility(View.VISIBLE); title.setVisibility(View.GONE); noMoreText.setVisibility(View.GONE); @@ -384,7 +383,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie params.bottomMargin = DpUtil.dp2px(65); if(Tips.equals("1")){ if (noble){ - bottom_msg.setVisibility(View.GONE); + //bottom_msg.setVisibility(View.GONE); tags.setText(R.string.enjoy_a_lot); btn.setBackgroundResource(R.mipmap.btn_openvip); btn.setText(R.string.live_ktgz); @@ -393,7 +392,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie type = "guanzhong"; }else { - bottom_msg.setVisibility(View.GONE); + //bottom_msg.setVisibility(View.GONE); tags.setText(R.string.enjoy_a_lot); btn.setBackgroundResource(R.mipmap.btn_openvip); btn.setText(R.string.live_ktgz); 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 d89518d14..923350286 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -2251,10 +2251,24 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //点击的消息发送出去 ((LiveActivity) mContext).sendChatMessage(msg, null, null); fastMsgRecyclerView.setVisibility(View.GONE); + RelativeLayout.LayoutParams params4 = (RelativeLayout.LayoutParams) live_bottom_layout.getLayoutParams(); + if(isAnchorLive()){ + params1.bottomMargin = 0; + params4.bottomMargin = 0; + }else { + params1.bottomMargin = DpUtil.dp2px(10); + params4.bottomMargin = DpUtil.dp2px(10); + } + mChatRecyclerView.setLayoutParams(params1); + live_bottom_layout.setLayoutParams(params4); + params1.bottomMargin = DpUtil.dp2px(10); mChatRecyclerView.setLayoutParams(params1); + RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) newMessage.getLayoutParams(); RelativeLayout.LayoutParams params3 = (RelativeLayout.LayoutParams) atMessage.getLayoutParams(); + + if (newMessage.getVisibility() == View.VISIBLE) { params2.bottomMargin = DpUtil.dp2px(8); if (atMessage.getVisibility() == View.VISIBLE) { diff --git a/live/src/main/res/layout/dialog_user_more_list.xml b/live/src/main/res/layout/dialog_user_more_list.xml index f381770c9..bda4fb936 100644 --- a/live/src/main/res/layout/dialog_user_more_list.xml +++ b/live/src/main/res/layout/dialog_user_more_list.xml @@ -146,6 +146,7 @@ android:id="@+id/bottom_msg" android:layout_width="match_parent" android:layout_height="65dp" + android:visibility="gone" android:layout_alignParentBottom="true" android:background="#161616">