礼物的贵族实现替换

app/tmp/full-r8-config.txt

@@ -1378,7 +1378,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.davemorrissey.labs.subscaleview.** { *; }
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\ee31731bfec871ceb9cdfd12b05817bc\transformed\appcompat-1.6.1\proguard.txt
 # Copyright (C) 2018 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -1402,7 +1402,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
   <methods>;
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ee31731bfec871ceb9cdfd12b05817bc\transformed\appcompat-1.6.1\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt
 #Picasso Proguard Config https://github.com/square/picasso
 -dontwarn com.squareup.okhttp.**
@@ -1639,6 +1639,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 }
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
+# 本库模块专用的混淆规则
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt
 -dontwarn jp.co.cyberagent.android.gpuimage.**
 
@@ -1882,10 +1886,135 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 }
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
-# 本库模块专用的混淆规则
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+#################### FaceUnity  #######################
+-keep class com.faceunity.wrapper.faceunity {*;}
+-keep class com.faceunity.wrapper.faceunity$RotatedImage {*;}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
+# Proguard rules specific to the core module.
+
+# Constructors accessed via reflection in DefaultRenderersFactory
+-dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer
+-keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer {
+  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
+}
+-dontnote com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer
+-keepclassmembers class com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer {
+  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
+}
+-dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer
+-keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer {
+  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
+}
+-dontnote com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer
+-keepclassmembers class com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer {
+  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
+}
+-dontnote com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer
+-keepclassmembers class com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer {
+  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
+}
+
+# Constructors accessed via reflection in DefaultDownloaderFactory
+-dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader {
+  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
+}
+-dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader {
+  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader
+-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader {
+  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
+}
+
+# Constructors accessed via reflection in DefaultMediaSourceFactory
+-dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory
+-keepclasseswithmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+}
+-dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory
+-keepclasseswithmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+}
+-dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory
+-keepclasseswithmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory {
+  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
+}
+-dontnote com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory
+-keepclasseswithmembers class com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory {
+  <init>();
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# keep setters in VectorDrawables so that animations can still work.
+-keepclassmembers class androidx.vectordrawable.graphics.drawable.VectorDrawableCompat$* {
+   void set*(***);
+   *** get*();
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2d0bd167b8e4c9403f38fc379546639f\transformed\transition-1.4.1\proguard.txt
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Keep a field in transition that is used to keep a reference to weakly-referenced object
+-keepclassmembers class androidx.transition.ChangeBounds$* extends android.animation.AnimatorListenerAdapter {
+  androidx.transition.ChangeBounds$ViewBounds mViewBounds;
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2d0bd167b8e4c9403f38fc379546639f\transformed\transition-1.4.1\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
@@ -1945,7 +2074,92 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 }
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the license found in the
+# LICENSE file in the root directory of this source tree.
+
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+-keepclassmembers class * implements java.io.Serializable {
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Prevent Parcelable objects from being removed or renamed.
+-keep class android.support.v4.media.** implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+
+# Prevent Parcelable objects from being removed or renamed.
+-keep class androidx.media.** implements android.os.Parcelable {
+    public static final android.os.Parcelable$Creator *;
+}
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d8c3626714f2e560684e4c222f456210\transformed\core-1.13.0\proguard.txt
+# Never inline methods, but allow shrinking and obfuscation.
+-keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.ViewCompat$Api* {
+  <methods>;
+}
+-keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.WindowInsetsCompat$*Impl* {
+  <methods>;
+}
+-keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.app.NotificationCompat$*$Api*Impl {
+  <methods>;
+}
+-keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.os.UserHandleCompat$Api*Impl {
+  <methods>;
+}
+-keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.widget.EdgeEffectCompat$Api*Impl {
+  <methods>;
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d8c3626714f2e560684e4c222f456210\transformed\core-1.13.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\6ece486db0154bb73a7bdce438b43da9\transformed\jetified-lifecycle-process-2.6.2\proguard.txt
+# this rule is need to work properly when app is compiled with api 28, see b/142778206
+-keepclassmembers class * extends androidx.lifecycle.EmptyActivityLifecycleCallbacks { *; }
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\6ece486db0154bb73a7bdce438b43da9\transformed\jetified-lifecycle-process-2.6.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8e869a6a6c2530a8e446d599f2764da5\transformed\lifecycle-viewmodel-2.6.2\proguard.txt
 -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel {
     <init>();
 }
@@ -1954,8 +2168,33 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     <init>(android.app.Application);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8e869a6a6c2530a8e446d599f2764da5\transformed\lifecycle-viewmodel-2.6.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\ce0e6750868f3f66322f188d971f1ef3\transformed\lifecycle-runtime-2.6.2\proguard.txt
+-keepattributes AnnotationDefault,
+                RuntimeVisibleAnnotations,
+                RuntimeVisibleParameterAnnotations,
+                RuntimeVisibleTypeAnnotations
+
+-keepclassmembers enum androidx.lifecycle.Lifecycle$Event {
+    <fields>;
+}
+
+-keep !interface * implements androidx.lifecycle.LifecycleObserver {
+}
+
+-keep class * implements androidx.lifecycle.GeneratedAdapter {
+    <init>(...);
+}
+
+-keepclassmembers class ** {
+    @androidx.lifecycle.OnLifecycleEvent *;
+}
+
+# this rule is need to work properly when app is compiled with api 28, see b/142778206
+# Also this rule prevents registerIn from being inlined.
+-keepclassmembers class androidx.lifecycle.ReportFragment$LifecycleCallbacks { *; }
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ce0e6750868f3f66322f188d971f1ef3\transformed\lifecycle-runtime-2.6.2\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\bd00b9047184418faa7306a460ee0581\transformed\jetified-lifecycle-viewmodel-savedstate-2.6.2\proguard.txt
 -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel {
     <init>(androidx.lifecycle.SavedStateHandle);
 }
@@ -1964,8 +2203,28 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     <init>(android.app.Application,androidx.lifecycle.SavedStateHandle);
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\bd00b9047184418faa7306a460ee0581\transformed\jetified-lifecycle-viewmodel-savedstate-2.6.2\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3ada8249efd76aa45d398a9ccd7df9fd\transformed\jetified-savedstate-1.2.1\proguard.txt
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+-keepclassmembers,allowobfuscation class * implements androidx.savedstate.SavedStateRegistry$AutoRecreated {
+    <init>();
+}
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3ada8249efd76aa45d398a9ccd7df9fd\transformed\jetified-savedstate-1.2.1\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\31bdcbe39d5085657b9e9934bb01ff50\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
 # When editing this file, update the following files as well:
 # - META-INF/proguard/coroutines.pro
 # - META-INF/com.android.tools/proguard/coroutines.pro
@@ -1993,8 +2252,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 # An annotation used for build tooling, won't be directly accessed.
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\31bdcbe39d5085657b9e9934bb01ff50\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\8a5acccede271ffbd4cb8a39c6aa6b22\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
 # Allow R8 to optimize away the FastServiceLoader.
 # Together with ServiceLoader optimization in R8
 # this results in direct instantiation when loading Dispatchers.Main
@@ -2006,8 +2265,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     boolean ANDROID_DETECTED return true;
 }
 
--keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-
 # Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher
 -assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt {
     boolean SUPPORT_MISSING return false;
@@ -2019,7 +2276,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
     boolean getDEBUG() return false;
     boolean getRECOVER_STACK_TRACES() return false;
 }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
+
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\8a5acccede271ffbd4cb8a39c6aa6b22\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt
 #GSON
 # Retain Annotations for model objects
@@ -2869,261 +3127,21 @@ native <methods>;
 }
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\9fef6e1dea59ce01cbe6739f12545786\transformed\jetified-SudASR-1.4.3.1201\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
+# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\04cfd08a3f97a34725fadda3af782615\transformed\jetified-startup-runtime-1.1.1\proguard.txt
-# Add project specific ProGuard rules here.
+# It's important that we preserve initializer names, given they are used in the AndroidManifest.xml.
-# You can control the set of applied configuration files using the
+-keepnames class * extends androidx.startup.Initializer
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
+# These Proguard rules ensures that ComponentInitializers are are neither shrunk nor obfuscated,
-# and specify the fully qualified class name to the JavaScript interface
+# and are a part of the primary dex file. This is because they are discovered and instantiated
-# class:
+# during application startup.
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+-keep class * extends androidx.startup.Initializer {
-#   public *;
+    # Keep the public no-argument constructor while allowing other methods to be optimized.
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#################### FaceUnity  #######################
--keep class com.faceunity.wrapper.faceunity {*;}
--keep class com.faceunity.wrapper.faceunity$RotatedImage {*;}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\d5594233d50b1d727f4630790ca89a13\transformed\jetified-core-8.7.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
-# Proguard rules specific to the core module.
-
-# Constructors accessed via reflection in DefaultRenderersFactory
--dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer {
-  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
-}
--dontnote com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer {
-  <init>(long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int);
-}
--dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer {
-  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
-}
--dontnote com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer {
-  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
-}
--dontnote com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer
--keepclassmembers class com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer {
-  <init>(android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink);
-}
-
-# Constructors accessed via reflection in DefaultDownloaderFactory
--dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader
--keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader {
-  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
-}
--dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader
--keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader {
-  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
-}
--dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader
--keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader {
-  <init>(com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor);
-}
-
-# Constructors accessed via reflection in DefaultMediaSourceFactory
--dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory
--keepclasseswithmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory {
-  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-}
--dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory
--keepclasseswithmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory {
-  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-}
--dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory
--keepclasseswithmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory {
-  <init>(com.google.android.exoplayer2.upstream.DataSource$Factory);
-}
--dontnote com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory
--keepclasseswithmembers class com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory {
     <init>();
 }
 
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt
+-assumenosideeffects class androidx.startup.StartupLogger { public static <methods>; }
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
-# Copyright (C) 2019 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
--keepclassmembers,allowobfuscation class * implements androidx.savedstate.SavedStateRegistry$AutoRecreated {
+# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\04cfd08a3f97a34725fadda3af782615\transformed\jetified-startup-runtime-1.1.1\proguard.txt
-    <init>();
-}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Keep a field in transition that is used to keep a reference to weakly-referenced object
--keepclassmembers class androidx.transition.ChangeBounds$* extends android.animation.AnimatorListenerAdapter {
-  androidx.transition.ChangeBounds$ViewBounds mViewBounds;
-}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# keep setters in VectorDrawables so that animations can still work.
--keepclassmembers class androidx.vectordrawable.graphics.drawable.VectorDrawableCompat$* {
-   void set*(***);
-   *** get*();
-}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE file in the root directory of this source tree.
-
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--keepclassmembers class * implements java.io.Serializable {
-    private static final java.io.ObjectStreamField[] serialPersistentFields;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Prevent Parcelable objects from being removed or renamed.
--keep class android.support.v4.media.** implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
-}
-
-# Prevent Parcelable objects from being removed or renamed.
--keep class androidx.media.** implements android.os.Parcelable {
-    public static final android.os.Parcelable$Creator *;
-}
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
-# Never inline methods, but allow shrinking and obfuscation.
--keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.ViewCompat$Api* {
-  <methods>;
-}
--keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.WindowInsetsCompat$*Impl* {
-  <methods>;
-}
--keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.app.NotificationCompat$*$Api*Impl {
-  <methods>;
-}
--keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.os.UserHandleCompat$Api*Impl {
-  <methods>;
-}
--keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.widget.EdgeEffectCompat$Api*Impl {
-  <methods>;
-}
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\c6ec9c31a3362678dbcc66f2e9ea7260\transformed\core-1.10.1\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
--keepattributes AnnotationDefault,
-                RuntimeVisibleAnnotations,
-                RuntimeVisibleParameterAnnotations,
-                RuntimeVisibleTypeAnnotations
-
--keepclassmembers enum androidx.lifecycle.Lifecycle$Event {
-    <fields>;
-}
-
--keep !interface * implements androidx.lifecycle.LifecycleObserver {
-}
-
--keep class * implements androidx.lifecycle.GeneratedAdapter {
-    <init>(...);
-}
-
--keepclassmembers class ** {
-    @androidx.lifecycle.OnLifecycleEvent *;
-}
-
-# this rule is need to work properly when app is compiled with api 28, see b/142778206
-# Also this rule prevents registerIn from being inlined.
--keepclassmembers class androidx.lifecycle.ReportFragment$LifecycleCallbacks { *; }
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt
 # Proguard rules specific to the DataSource module.
 
@@ -3205,17 +3223,6 @@ native <methods>;
 -dontwarn com.google.auto.value.AutoValue$Builder
 
 # End of content from C:\Users\CVB88\.gradle\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt
-# The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
-# This Proguard rule ensures that ComponentInitializers are are neither shrunk nor obfuscated.
-# This is because they are discovered and instantiated during application initialization.
--keep class * extends androidx.startup.Initializer {
-    # Keep the public no-argument constructor while allowing other methods to be optimized.
-    <init>();
-}
-
--assumenosideeffects class androidx.startup.StartupLogger
-
-# End of content from C:\Users\CVB88\.gradle\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt
 # The proguard configuration file for the following section is C:\Users\CVB88\.gradle\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt
 -dontwarn com.google.firebase.components.Component$Instantiation
 -dontwarn com.google.firebase.components.Component$ComponentType

common/src/main/res/layout/dialog_live_gift_popup2.xml

@@ -347,17 +347,33 @@
         android:layout_marginEnd="2dp"
         android:maxWidth="29dp"
         android:src="@mipmap/ic_open_noble_3"
+        android:visibility="visible"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
         app:layout_constraintEnd_toStartOf="@+id/openVipTv"
         app:layout_constraintTop_toTopOf="@+id/openVipTv" />
 
+    <ImageView
+        android:id="@+id/vipIdentityImg"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="2dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="1dp"
+        android:visibility="gone"
+        tools:visibility="gone"
+        app:layout_constraintDimensionRatio="1"
+        android:src="@mipmap/ic_open_noble_3"
+        app:layout_constraintBottom_toBottomOf="@+id/openVipBg"
+        app:layout_constraintEnd_toStartOf="@+id/openVipImg"
+        app:layout_constraintTop_toTopOf="@+id/openVipBg" />
+
     <ImageView
         android:id="@+id/openVipArrowImg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="2dp"
         android:src="@mipmap/ic_gift_right_arrow"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
         app:layout_constraintStart_toEndOf="@+id/openVipTv"
         app:layout_constraintTop_toTopOf="@+id/openVipTv" />
@@ -369,12 +385,12 @@
         android:layout_marginStart="-6dp"
         android:layout_marginTop="-4dp"
         android:layout_marginEnd="-7dp"
-        android:layout_marginBottom="-7dp"
+        android:layout_marginBottom="-5dp"
         android:background="@drawable/bg_gift_openvip"
-        app:layout_constraintBottom_toBottomOf="@+id/openVipImg"
+        app:layout_constraintBottom_toBottomOf="@+id/openVipTv"
         app:layout_constraintEnd_toEndOf="@+id/openVipArrowImg"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/openVipImg"
+        app:layout_constraintStart_toStartOf="@+id/vipIdentityImg"
         app:layout_constraintTop_toTopOf="@+id/openVipTv"
         app:layout_constraintVertical_bias="1.0" />
 

live/src/main/java/com/yunbao/live/adapter/FrameGiftNewAdapter.java

@@ -111,7 +111,7 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
         private View isSelectView, loadImgClickView;
         private ImageView giftIconImg;
         private TextView giftNameTv;
-        private TextView priceTv;
+        private TextView priceTv,price2Tv;
         private ImageView payIco;
         private ImageView giftNamingBg, loadImgImageView;
         private RoundedImageView avatar;
@@ -139,7 +139,7 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
             loadImgImageView = findViewById(R.id.loadImgImageView);
             loadImgGroup = findViewById(R.id.loadImgGroup);
             loadImgClickView = findViewById(R.id.loadImgClickView);
-
+            price2Tv = findViewById(R.id.price2Tv);
             mAnimation = new ScaleAnimation(0.9f, 1.1f, 0.9f, 1.1f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
             mAnimation.setInterpolator(new AccelerateDecelerateInterpolator());
             mAnimation.setDuration(400);
@@ -182,13 +182,17 @@ public class FrameGiftNewAdapter extends RecyclerView.Adapter {
             //特殊礼物红包
             if (model.getType() == 9999999) {
                 payIco.setVisibility(View.GONE);
-                priceTv.setText(getContext().getString(R.string.build_up_popularity));
+                priceTv.setVisibility(View.GONE);
-                priceTv.setTextColor(Color.parseColor("#db8c4a"));
+                price2Tv.setVisibility(View.VISIBLE);
-                priceTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 8);
+                price2Tv.setText(getContext().getString(R.string.build_up_popularity));
+//                priceTv.setTextColor(Color.parseColor("#db8c4a"));
+//                priceTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 8);
             } else {
-                priceTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11);
+//                priceTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11);
-                priceTv.setTextColor(Color.parseColor("#c8c8c8"));
+//                priceTv.setTextColor(Color.parseColor("#c8c8c8"));
+                priceTv.setVisibility(View.VISIBLE);
                 payIco.setVisibility(View.VISIBLE);
+                price2Tv.setVisibility(View.GONE);
                 //普通礼物
                 if (model.getSendType() != null && model.getSendType().equals("1")) {
                     if (model.isChecked()) {

live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup2.java

@@ -133,7 +133,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
     private ImageView continuousClicksBg;
     private TextView lianText, liveGiftSendTv;
     private androidx.constraintlayout.widget.Group continuousClickGroup,emptyGroup;
-    private ImageView operateImage, openVipArrowImg;
+    private ImageView operateImage, openVipArrowImg,vipIdentityImg;
     private View blindBox;
     private ImageView giftSponsorBgImg;
     private ImageView giftItle;
@@ -289,6 +289,7 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
         giftSendGroup = findViewById(R.id.giftSendGroup);
         openVipArrowImg = findViewById(R.id.openVipArrowImg);
         emptyGroup = findViewById(R.id.emptyGroup);
+        vipIdentityImg =findViewById(R.id.vipIdentityImg);
         //赞助信息
         giftSponsorGroup.setVisibility(View.GONE);
         //设置礼物弹窗背景 这里不设置
@@ -1143,12 +1144,15 @@ public class LiveGiftPopup2 extends AbsDialogFragment {
                             int nobleId = user.getIntValue("noble_id");
                             int resId = NobleUtil.nobleIdToImageResId(nobleId);
                             if (resId != -1) {
-                                openVipImg.setImageResource(resId);
+                                openVipImg.setVisibility(View.GONE);
+                                vipIdentityImg.setVisibility(View.VISIBLE);
+                                vipIdentityImg.setImageResource(resId);
                                 openVipTv.setText(user.getString("noble_name"));
                                 openVipArrowImg.setVisibility(View.VISIBLE);
                             } else {
+                                openVipImg.setVisibility(View.VISIBLE);
+                                vipIdentityImg.setVisibility(View.GONE);
                                 openVipArrowImg.setVisibility(View.GONE);
-                                openVipImg.setImageResource(R.mipmap.ic_open_noble_3);
                                 openVipTv.setText(R.string.open_vip_live);
                             }
                         }

live/src/main/res/layout/item_frame_gift_new.xml

@@ -70,6 +70,17 @@
         app:layout_constraintTop_toBottomOf="@+id/giftNameTv"
         tools:text="2000" />
 
+    <TextView
+        android:id="@+id/price2Tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/white"
+        android:layout_marginTop="1dp"
+        android:textSize="9sp"
+        app:layout_constraintEnd_toEndOf="@+id/giftIconImg"
+        app:layout_constraintStart_toStartOf="@+id/giftIconImg"
+        app:layout_constraintTop_toBottomOf="@+id/giftNameTv"
+        tools:text="2000" />
     <ImageView
         android:id="@+id/pay_ico"
         android:layout_width="9dp"
@@ -156,10 +167,10 @@
         android:layout_marginBottom="4dp"
         android:background="#C0000000"
         android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/isSelectView"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/isSelectView"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/isSelectView"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/isSelectView"
         app:layout_constraintWidth_percent="0.80"
         tools:visibility="visible" />