diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index d9e5d6f57..7d4628502 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -1,4 +1,4 @@ -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 # This is a configuration file for ProGuard. # http://proguard.sourceforge.net/index.html#manual/usage.html # @@ -95,8 +95,8 @@ # These classes are duplicated between android.jar and core-lambda-stubs.jar. -dontnote java.lang.invoke.** -# End of content from D:\AndroidProject\pandorapanL\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\proguard-rules.pro +# End of content from D:\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\app\proguard-rules.pro # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified # in /Users/macpro/Library/Android/sdk/tools/proguard/proguard-android.txt @@ -420,8 +420,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -ignorewarnings -# End of content from D:\AndroidProject\pandorapanL\app\proguard-rules.pro -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt +# 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\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\pandorapanL\app\build\intermediates\aapt_proguard_file\google_onlineRelease\processGoogle_onlineReleaseResources\aapt_rules.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\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\pandorapanL\lib_faceunity\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\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\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\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\pandorapanL\lib_google\build\intermediates\consumer_proguard_dir\google_onlineRelease\exportGoogle_onlineReleaseConsumerProguardFiles\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* @@ -1510,9 +1510,9 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public boolean isLayoutSuppressed(); } # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt -# The proguard configuration file for the following section is D:\AndroidProject\pandorapanL\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt +# The proguard configuration file for the following section is D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from D:\AndroidProject\pandorapanL\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt +# End of content from D:\AndroidProject\pandorapan\TabLayout\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java index 0d340e0a4..9c0e116c0 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java @@ -93,6 +93,7 @@ public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow { sayBg = anchorDemo.findViewById(R.id.anchorSayBg); list = findViewById(R.id.anchor_say_list); + saySwitch = findViewById(R.id.say_switch); sayEdit = findViewById(R.id.anchor_say_edit); titleEdit = findViewById(R.id.titleEdit); 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 6f0775a87..dd82f9f85 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -292,6 +292,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis public static ImageView newMessage, atMessage; + //多人PK static TextView time; @@ -3403,6 +3404,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis private void startNewPart2Flipper(View view){ if(view == null) return; + if (newPart2Flipper.getVisibility() != View.VISIBLE){ + newPart2Flipper.setVisibility(View.VISIBLE); + } // 获取当前翻转动画器中的视图数量 newPart2Flipper.getChildCount(); // 检查传入的视图是否已存在于翻转动画器中 @@ -3469,13 +3473,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (flipper.getChildCount() > 0) { flipper.removeAllViews(); } - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16)); - LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - textParams.leftMargin = DpUtil.dp2px(5); - params.leftMargin = DpUtil.dp2px(5); - View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null); +// LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(16), DpUtil.dp2px(16)); +// LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); +// textParams.leftMargin = DpUtil.dp2px(5); +// params.leftMargin = DpUtil.dp2px(5); + View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list2, null); hotView.setTag("hotView"); - View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null); + View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list2, null); hourView.setTag("hourView"); ImageView hotPic = hotView.findViewById(R.id.wish_pic); ImageView hourPic = hourView.findViewById(R.id.wish_pic); @@ -3483,15 +3487,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mHourRank = hourView.findViewById(R.id.wish_index); mHotText.setText("0"); mHourRank.setText("熱度加成"); - mHotText.setLayoutParams(textParams); - mHourRank.setLayoutParams(textParams); +// mHotText.setLayoutParams(textParams); +// mHourRank.setLayoutParams(textParams); mHotText.setGravity(Gravity.CENTER); mHourRank.setGravity(Gravity.CENTER); setHourRankData(Long.parseLong(model.getRank())); hotPic.setImageResource(R.mipmap.ic_live_hour_rank); - hourPic.setImageResource(R.drawable.icon_heat_new); - hotPic.setLayoutParams(params); - hourPic.setLayoutParams(params); + hourPic.setImageResource(R.mipmap.ic_live_hot_rank); +// hotPic.setLayoutParams(params); +// hourPic.setLayoutParams(params); flipper.addView(hotView); flipper.addView(hourView); flipper.startFlipping(); @@ -3542,7 +3546,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mHotText.setGravity(Gravity.CENTER); mHourRank.setGravity(Gravity.CENTER); setHourRankData(info.get(0).getRank()); - hotPic.setImageResource(R.drawable.icon_time_new); + hotPic.setImageResource(R.mipmap.ic_live_hour_rank); hourPic.setImageResource(R.drawable.icon_heat_new); hotPic.setLayoutParams(params); hourPic.setLayoutParams(params); @@ -3878,9 +3882,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } public static int pkEndIndex = 0; - //PK结束，结果展示 public static void pkEndList(int result) { + if (result == 0) { img_pk_fist_l.setBackgroundResource(R.mipmap.icon_red_no1); img_pk_fist_r.setBackgroundResource(R.mipmap.icon_blue_no1); @@ -3978,6 +3982,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //双人pk显示 public void UpPkTwo() { + //if if (lt_pk_line.getVisibility() == View.VISIBLE) return; ScreenDimenUtil util = ScreenDimenUtil.getInstance(); int mScreenWdith = util.getScreenWdith(); @@ -4011,6 +4016,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //双人pk关闭 public void closePkTwo() { + Log.e("LiveRoomViewHolder", "closePkTwo: 隐藏PK信息" + goto_room_view.getVisibility()); mPkRankTopIcon.setVisibility(View.GONE); lt_pk_line.setVisibility(View.GONE); diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml index 401326a48..29bf0f5a6 100644 --- a/live/src/main/res/layout/view_live_room_part2.xml +++ b/live/src/main/res/layout/view_live_room_part2.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:layout_height="36dp"> + tools:layout_height="30dp"> @@ -163,7 +163,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFC949 " - android:textSize="12sp" + android:textSize="9sp" app:layout_constraintStart_toStartOf="@+id/newWishTitleTv" app:layout_constraintTop_toBottomOf="@+id/newWishTitleTv" tools:text="5" /> @@ -174,7 +174,7 @@ android:layout_height="wrap_content" android:gravity="bottom" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="9sp" app:layout_constraintBottom_toBottomOf="@+id/newWishNowTv" app:layout_constraintStart_toEndOf="@+id/newWishNowTv" tools:text="/26" /> @@ -185,6 +185,7 @@ android:layout_width="0dp" android:layout_height="2dp" android:layout_marginEnd="10dp" + android:layout_marginStart="1dp" android:progressDrawable="@drawable/bg_gift_progressbar" app:layout_constraintEnd_toStartOf="@+id/newWishImg" app:layout_constraintStart_toStartOf="@+id/newWishTitleTv" @@ -197,7 +198,7 @@ android:layout_height="wrap_content" android:visibility="gone" app:constraint_referenced_ids="newWishBgView,newWishImg,newWishTitleTv,newWishNowTv,newWishTotalTv,wish_progressbar" - tools:visibility="invisible" /> + tools:visibility="visible" /> @@ -265,7 +267,7 @@ android:layout_height="wrap_content" android:gravity="bottom" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="9sp" app:layout_constraintBottom_toBottomOf="@+id/newWeekNowTv" app:layout_constraintStart_toEndOf="@+id/newWeekNowTv" tools:text="/26" /> @@ -276,6 +278,7 @@ android:layout_width="0dp" android:layout_height="2dp" android:layout_marginEnd="10dp" + android:layout_marginStart="1dp" android:progressDrawable="@drawable/bg_gift_progressbar" app:layout_constraintEnd_toStartOf="@+id/newWeekImg" app:layout_constraintStart_toStartOf="@+id/newWeekTitleTv" @@ -307,10 +310,11 @@ android:layout_width="0dp" android:layout_height="0dp" android:src="@mipmap/icon_arrow_right_3" + android:layout_marginEnd="4dp" app:layout_constraintBottom_toBottomOf="@+id/goddessSayBgView" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toEndOf="@+id/goddessSayBgView" - app:layout_constraintHeight_percent="0.5" + app:layout_constraintHeight_percent="0.34" app:layout_constraintTop_toTopOf="@+id/goddessSayBgView" /> + tools:visibility="visible" /> diff --git a/live/src/main/res/layout/view_live_room_part2_item.xml b/live/src/main/res/layout/view_live_room_part2_item.xml index cf91794b8..e29a855ce 100644 --- a/live/src/main/res/layout/view_live_room_part2_item.xml +++ b/live/src/main/res/layout/view_live_room_part2_item.xml @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFC949 " - android:textSize="12sp" + android:textSize="9sp" app:layout_constraintStart_toStartOf="@+id/newItemTitleTv" app:layout_constraintTop_toBottomOf="@+id/newItemTitleTv" tools:text="5" /> @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:gravity="bottom" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="9sp" app:layout_constraintBottom_toBottomOf="@+id/newItemNowTv" app:layout_constraintStart_toEndOf="@+id/newItemNowTv" tools:text="/26" /> @@ -69,6 +69,7 @@ android:layout_width="0dp" android:layout_height="2dp" android:layout_marginEnd="10dp" + android:layout_marginStart="1dp" android:progressDrawable="@drawable/bg_gift_progressbar" app:layout_constraintEnd_toStartOf="@+id/newItemImg" app:layout_constraintStart_toStartOf="@+id/newItemTitleTv" diff --git a/live/src/main/res/layout/view_wish_list2.xml b/live/src/main/res/layout/view_wish_list2.xml new file mode 100644 index 000000000..d05e16598 --- /dev/null +++ b/live/src/main/res/layout/view_wish_list2.xml @@ -0,0 +1,41 @@ + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/mipmap-hdpi/ic_live_hot_rank.png b/live/src/main/res/mipmap-hdpi/ic_live_hot_rank.png new file mode 100644 index 000000000..7414e0d86 Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_live_hot_rank.png differ diff --git a/live/src/main/res/mipmap-mdpi/ic_live_hot_rank.png b/live/src/main/res/mipmap-mdpi/ic_live_hot_rank.png new file mode 100644 index 000000000..26a13882a Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_live_hot_rank.png differ diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_hot_rank.png b/live/src/main/res/mipmap-xhdpi/ic_live_hot_rank.png new file mode 100644 index 000000000..aefc446fd Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_live_hot_rank.png differ diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_hot_rank.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_hot_rank.png new file mode 100644 index 000000000..5672a37dc Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_live_hot_rank.png differ