diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index 479801774..a63e5e796 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 E:\pdlnew\pdlivexp\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 # This is a configuration file for ProGuard. # http://proguard.sourceforge.net/index.html#manual/usage.html # @@ -114,8 +114,8 @@ # These classes are duplicated between android.jar and core-lambda-stubs.jar. -dontnote java.lang.invoke.** -# End of content from E:\pdlnew\pdlivexp\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 -# The proguard configuration file for the following section is E:\pdlnew\pdlivexp\app\proguard-rules.pro +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 +# The proguard configuration file for the following section is C:\Users\58381\Documents\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 @@ -411,8 +411,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.shayu.lib_google.**{*;} -keep class com.shayu.lib_huawei.**{*;} -# End of content from E:\pdlnew\pdlivexp\app\proguard-rules.pro -# The proguard configuration file for the following section is E:\pdlnew\pdlivexp\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\proguard-rules.pro +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt -keep class androidx.core.app.CoreComponentFactory { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.profileinstaller.ProfileInstallReceiver { (); } @@ -1008,8 +1008,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclassmembers class * { *** videoEditClick(android.view.View); } -# End of content from E:\pdlnew\pdlivexp\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt # Generated keep rule for Lifecycle observer adapter. -if class com.lxj.xpopup.core.BasePopupView { (...); @@ -1018,8 +1018,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (...); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1067,16 +1067,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt -# The proguard configuration file for the following section is E:\pdlnew\pdlivexp\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt -# End of content from E:\pdlnew\pdlivexp\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ed66c105a335711d7f5b077c74eab485\jetified-linesdk-5.0.1\proguard.txt +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd28fe822c831bcca06e71f1991f8163\jetified-linesdk-5.0.1\proguard.txt -keepattributes *Annotation* -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ed66c105a335711d7f5b077c74eab485\jetified-linesdk-5.0.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd28fe822c831bcca06e71f1991f8163\jetified-linesdk-5.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt # To enable ProGuard in your project, edit project.properties # to define the proguard.config property as described in that file. # @@ -1116,8 +1116,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public android.os.Bundle getSkuDetails(int, java.lang.String, java.lang.String, android.os.Bundle); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1158,8 +1158,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.gamingservices.GamingServices -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1200,8 +1200,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.share.Share -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1242,8 +1242,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.login.Login -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1284,12 +1284,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.common.Common -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt -keep class com.davemorrissey.labs.subscaleview.** { *; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt # Copyright (C) 2018 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1313,13 +1313,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; ; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ad8f634cddb1c9104f3a3f36fe32f281\jetified-tweet-ui-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\39456c115dbecb18f0b217830530e5bd\jetified-tweet-ui-3.1.1\proguard.txt #Picasso Proguard Config https://github.com/square/picasso -dontwarn com.squareup.okhttp.** -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ad8f634cddb1c9104f3a3f36fe32f281\jetified-tweet-ui-3.1.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\39456c115dbecb18f0b217830530e5bd\jetified-tweet-ui-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt # Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1346,13 +1346,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; RuntimeVisibleParameterAnnotations, RuntimeVisibleTypeAnnotations -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt -keepclasseswithmembers class androidx.recyclerview.widget.RecyclerView$ViewHolder { public final android.view.View *; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9b8063c1780ec36ba25ee6c753bb4751\jetified-exoplayer-ui-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\77d1284f0a811fa75692d3a73d7624e1\jetified-exoplayer-ui-2.18.2\proguard.txt # Proguard rules specific to the UI module. # Constructor method accessed via reflection in StyledPlayerView @@ -1393,8 +1393,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotations.jvm.** -dontwarn javax.annotation.** -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9b8063c1780ec36ba25ee6c753bb4751\jetified-exoplayer-ui-2.18.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\77d1284f0a811fa75692d3a73d7624e1\jetified-exoplayer-ui-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1420,8 +1420,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public void suppressLayout(boolean); public boolean isLayoutSuppressed(); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\61b83ea2071468c8d54321f87bca7af3\jetified-utilcode-1.30.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1eb6557d28b7045606afcd1fd617957d\jetified-utilcode-1.30.0\proguard.txt # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified # in G:\Android_IDE\ADT\sdk/tools/proguard/proguard-android.txt @@ -1450,8 +1450,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep @com.blankj.utilcode.util.ApiUtils$Api class * -keepattributes *Annotation* -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\61b83ea2071468c8d54321f87bca7af3\jetified-utilcode-1.30.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1eb6557d28b7045606afcd1fd617957d\jetified-utilcode-1.30.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1492,8 +1492,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.applinks.AppLinks -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1538,8 +1538,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.messenger.Messenger -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt # Copyright (C) 2020 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1568,16 +1568,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; android.view.View findViewByAccessibilityIdTraversal(int); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt -assumenosideeffects public class androidx.compose.runtime.ComposerKt { void sourceInformation(androidx.compose.runtime.Composer,java.lang.String); void sourceInformationMarkerStart(androidx.compose.runtime.Composer,int,java.lang.String); void sourceInformationMarkerEnd(androidx.compose.runtime.Composer); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\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 @@ -1602,8 +1602,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; boolean getDEBUG() return false; boolean getRECOVER_STACK_TRACES() return false; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro # ServiceLoader support -keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {} -keepnames class kotlinx.coroutines.CoroutineExceptionHandler {} @@ -1625,8 +1625,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn java.lang.instrument.Instrumentation -dontwarn sun.misc.Signal -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt #GSON # Retain Annotations for model objects -keepattributes *Annotation* @@ -1650,8 +1650,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclasseswithmembers class * { @retrofit2.http.* ; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro # JSR 305 annotations are for embedding nullability information. -dontwarn javax.annotation.** @@ -1664,16 +1664,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # OkHttp platform used only on JVM and when Conscrypt dependency is available. -dontwarn okhttp3.internal.platform.ConscryptPlatform -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. -dontwarn org.codehaus.mojo.animal_sniffer.* -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt -keep class cn.rongcloud.xcrash.NativeHandler { native ; void crashCallback(...); @@ -1681,8 +1681,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; void traceCallbackBeforeDump(...); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the # proguardFiles setting in build.gradle. @@ -1709,8 +1709,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.faceunity.wrapper.faceunity {*;} -keep class com.faceunity.wrapper.faceunity$RotatedImage {*;} -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt # Proguard rules specific to the core module. # Constructors accessed via reflection in DefaultRenderersFactory @@ -1767,8 +1767,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\821fd496afea5d6471da0397b42b8c90\jetified-glide-transformations-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\27c438b71f991057020f81c8ff042a7a\jetified-glide-transformations-3.1.1\proguard.txt -dontwarn jp.co.cyberagent.android.gpuimage.** -keep public class * implements com.bumptech.glide.module.GlideModule @@ -1778,8 +1778,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public *; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\821fd496afea5d6471da0397b42b8c90\jetified-glide-transformations-3.1.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\27c438b71f991057020f81c8ff042a7a\jetified-glide-transformations-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt -keep public class * implements com.bumptech.glide.module.GlideModule -keep class * extends com.bumptech.glide.module.AppGlideModule { (...); @@ -1795,22 +1795,22 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # Uncomment for DexGuard only #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\73d21d10e7634d069f54d24ee3f610ba\jetified-roundedimageview-2.3.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2ea0abaf1e4fecb531332054a913e6f3\jetified-roundedimageview-2.3.0\proguard.txt # Proguard configuration. -dontwarn com.squareup.okhttp.** # References to Picasso are okay if the consuming app doesn't use it -dontwarn com.squareup.picasso.Transformation -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\73d21d10e7634d069f54d24ee3f610ba\jetified-roundedimageview-2.3.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2ea0abaf1e4fecb531332054a913e6f3\jetified-roundedimageview-2.3.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt -keep public class pl.droidsonroids.gif.GifIOException{(int, java.lang.String);} #Prevents warnings for consumers not using AndroidX -dontwarn androidx.annotation.** -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt #https://github.com/leolin310148/ShortcutBadger/issues/46 -keep class me.leolin.shortcutbadger.impl.AdwHomeBadger { (...); } -keep class me.leolin.shortcutbadger.impl.ApexHomeBadger { (...); } @@ -1821,8 +1821,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class me.leolin.shortcutbadger.impl.SolidHomeBadger { (...); } -keep class me.leolin.shortcutbadger.impl.SonyHomeBadger { (...); } -keep class me.leolin.shortcutbadger.impl.XiaomiHomeBadger { (...); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1880,8 +1880,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public ; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt # Add project specific ProGuard rules here. # You can control the filterSet of applied configuration files using the # proguardFiles setting in build.gradle. @@ -1919,8 +1919,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # 保持反射不被混淆 -keepattributes EnclosingMethod -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the # proguardFiles setting in build.gradle. @@ -1942,19 +1942,19 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt # 本库模块专用的混淆规则 -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt # 本库模块专用的混淆规则 -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt -keep class com.cocos.game.**{ *; } -keep class tech.sud.runtime.**{ *; } -keep class tech.sud.mgp.core.**{ *; } @@ -2106,8 +2106,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt -keep class com.microsoft.cognitiveservices.** { *; } -keep class tech.sud.mgp.asr.azure.** { *; } @@ -2122,8 +2122,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; *** *Callback(long); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt # Copyright (C) 2017 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2143,8 +2143,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; androidx.transition.ChangeBounds$ViewBounds mViewBounds; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\vectordrawable-animated-1.1.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\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"); @@ -2165,8 +2165,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; *** get*(); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\vectordrawable-animated-1.1.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\vectordrawable-animated-1.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt # b/35135904 Ensure that proguard will not strip the mResultGuardian. -keepclassmembers class com.google.android.gms.common.api.internal.BasePendingResult { com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian mResultGuardian; @@ -2174,18 +2174,18 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\af5131148627ab5e28665335d5a56fe0\jetified-firebase-common-20.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3eae88e861cf51b2ca4e2107f957c2b8\jetified-firebase-common-20.1.2\proguard.txt -dontwarn com.google.firebase.platforminfo.KotlinDetector -dontwarn com.google.auto.value.AutoValue -dontwarn com.google.auto.value.AutoValue$Builder -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\af5131148627ab5e28665335d5a56fe0\jetified-firebase-common-20.1.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3eae88e861cf51b2ca4e2107f957c2b8\jetified-firebase-common-20.1.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\df63dad9a2d0dc1f8f13fca689eade76\jetified-play-services-basement-18.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\35ab4ec49c756949a45b86e9681d0f3a\jetified-play-services-basement-18.1.0\proguard.txt # Needed when building against pre-Marshmallow SDK. -dontwarn android.security.NetworkSecurityPolicy @@ -2203,6 +2203,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # non-required dependencies. -dontwarn javax.annotation.** -dontwarn org.checkerframework.** +-dontwarn com.google.errorprone.annotations.** +-dontwarn org.jspecify.nullness.NullMarked # Proguard flags for consumers of the Google Play services SDK # https://developers.google.com/android/guides/setup#add_google_play_services_to_your_project @@ -2256,8 +2258,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\df63dad9a2d0dc1f8f13fca689eade76\jetified-play-services-basement-18.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\35ab4ec49c756949a45b86e9681d0f3a\jetified-play-services-basement-18.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt # Copyright (C) 2020 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2278,8 +2280,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public (); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt # Copyright (C) 2017 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2303,8 +2305,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class androidx.media.** implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -2340,8 +2342,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; java.lang.Object readResolve(); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt # Never inline methods, but allow shrinking and obfuscation. -keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.ViewCompat$Api* { ; @@ -2359,8 +2361,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; ; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt -keepattributes AnnotationDefault, RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations, @@ -2384,8 +2386,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # 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 D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { (androidx.lifecycle.SavedStateHandle); } @@ -2394,8 +2396,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (android.app.Application,androidx.lifecycle.SavedStateHandle); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt # Copyright (C) 2019 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2414,8 +2416,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt # Proguard rules specific to the DataSource module. # Constant folding for resource integers may mean that a resource passed to this method appears to be unused. Keep the method to prevent this from happening. @@ -2429,8 +2431,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt # Proguard rules specific to the extractor module. # Methods accessed via reflection in DefaultExtractorsFactory @@ -2448,8 +2450,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotations.jvm.** -dontwarn javax.annotation.** -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt # Proguard rules specific to the common module. # Don't warn about checkerframework and Kotlin annotations @@ -2473,20 +2475,20 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # This is needed for ProGuard but not R8. -keepclassmembernames class com.google.common.base.Function { *; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt -keep class * implements androidx.versionedparcelable.VersionedParcelable -keep public class android.support.**Parcelizer { *; } -keep public class androidx.**Parcelizer { *; } -keep public class androidx.versionedparcelable.ParcelImpl -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt -keep class * extends androidx.room.RoomDatabase -dontwarn androidx.room.paging.** -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt -keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { (); } @@ -2495,8 +2497,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (android.app.Application); } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\jetified-startup-runtime-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\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 { @@ -2506,28 +2508,29 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -assumenosideeffects class androidx.startup.StartupLogger -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\jetified-startup-runtime-1.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\adb0c63cc2ce549a6830a0e5b28878e2\jetified-transport-backend-cct-3.1.6\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\jetified-startup-runtime-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fec7c4591f7251aeb926648a6566c25e\jetified-transport-backend-cct-3.1.7\proguard.txt -dontwarn com.google.auto.value.AutoValue -dontwarn com.google.auto.value.AutoValue$Builder -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\adb0c63cc2ce549a6830a0e5b28878e2\jetified-transport-backend-cct-3.1.6\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fec7c4591f7251aeb926648a6566c25e\jetified-transport-backend-cct-3.1.7\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt -dontwarn com.google.auto.value.AutoValue -dontwarn com.google.auto.value.AutoValue$Builder -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\e4b6d495ef035fcda956b6afe6980ce0\jetified-firebase-components-17.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8aa6773415180ce53823a4e567cdab83\jetified-firebase-components-17.0.1\proguard.txt -dontwarn com.google.firebase.components.Component$Instantiation -dontwarn com.google.firebase.components.Component$ComponentType -keep class * implements com.google.firebase.components.ComponentRegistrar +-keep,allowshrinking interface com.google.firebase.components.ComponentRegistrar -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\e4b6d495ef035fcda956b6afe6980ce0\jetified-firebase-components-17.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8aa6773415180ce53823a4e567cdab83\jetified-firebase-components-17.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro -keep,allowobfuscation @interface androidx.annotation.Keep -keep @androidx.annotation.Keep class * {*;} @@ -2547,8 +2550,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; @androidx.annotation.DoNotInline ; } -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt # Copyright (C) 2020 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2573,8 +2576,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotation.Retention -dontwarn kotlin.annotation.Target -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt -# The proguard configuration file for the following section is D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt # Keep the AIDL interface -keep class com.android.vending.billing.** { *; } @@ -2583,7 +2586,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn com.google.android.apps.common.proguard.UsedByReflection -keepnames class com.android.billingclient.api.ProxyBillingActivity -# End of content from D:\Android\jdk-11.0.16.1+1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt # The proguard configuration file for the following section is -ignorewarnings # End of content from \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java index 30a155779..1d50209f5 100644 --- a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java @@ -47,7 +47,7 @@ public abstract class AbsViewHolder implements LifeCycleListener { public abstract void init(); - protected View findViewById(int res) { + protected T findViewById(int res) { return mContentView.findViewById(res); } diff --git a/config.gradle b/config.gradle index 9425ef0b0..753ecd6b0 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", + //serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : " https://ceshi.yaoulive.com", + serverHost : " https://ceshi.yaoulive.com", //百度语音识别 baiduAppId : "23774720", diff --git a/gradle.properties b/gradle.properties index 8c8ea2d1f..ca26b19ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,6 @@ android.enableJetifier=true systemProp.http.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1 -systemProp.https.proxyPort=10809 -systemProp.http.proxyPort=10809 +systemProp.https.proxyPort=7890 +systemProp.http.proxyPort=7890 #android.enableR8.fullMode=true \ No newline at end of file diff --git a/lib_google/src/test/java/com/shayu/lib_huawei/ExampleUnitTest.java b/lib_google/src/test/java/com/shayu/lib_huawei/ExampleUnitTest.java index 7e3402cf9..151186f42 100644 --- a/lib_google/src/test/java/com/shayu/lib_huawei/ExampleUnitTest.java +++ b/lib_google/src/test/java/com/shayu/lib_huawei/ExampleUnitTest.java @@ -1,8 +1,5 @@ package com.shayu.lib_huawei; -import org.junit.Test; - -import static org.junit.Assert.*; /** * Example local unit test, which will execute on the development machine (host). @@ -10,8 +7,8 @@ import static org.junit.Assert.*; * @see Testing documentation */ public class ExampleUnitTest { - @Test + //@Test public void addition_isCorrect() { - assertEquals(4, 2 + 2); + // assertEquals(4, 2 + 2); } } \ No newline at end of file diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml index 12f28f62e..88db68a94 100644 --- a/live/src/main/res/layout/rc_conversationlist_item.xml +++ b/live/src/main/res/layout/rc_conversationlist_item.xml @@ -1,219 +1,45 @@ - + android:layout_height="@dimen/rc_conversation_item_height"> - + android:layout_height="match_parent"> + android:id="@+id/rc_conversation_portrait_rl" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="@dimen/rc_margin_size_12" + android:layout_marginTop="@dimen/rc_margin_size_12" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true"> + android:src="@drawable/rc_unread_count_bg_normal" /> - + + + + + + + android:textSize="@dimen/rc_font_nav_or_date_size" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:src="@drawable/rc_no_disturb" /> + - + - \ No newline at end of file + \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java index a3ab023d3..9e973fd90 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java @@ -72,7 +72,9 @@ import io.rong.imkit.conversationlist.ConversationListFragment; /** * pdlive消息中心 + * 废弃的 */ +@Deprecated public class PDLiveConversationListActivity extends AbsActivity implements View.OnClickListener { //菜单 private TabButtonGroup mTabButtonGroup; diff --git a/main/src/main/java/com/yunbao/main/adapter/MainConversationListAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainConversationListAdapter.java new file mode 100644 index 000000000..c53479502 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/adapter/MainConversationListAdapter.java @@ -0,0 +1,123 @@ +package com.yunbao.main.adapter; + +import android.text.Html; +import android.text.Spanned; +import android.text.TextUtils; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; + +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; +import com.yunbao.main.R; + +import io.rong.imkit.conversationlist.ConversationListAdapter; +import io.rong.imkit.widget.adapter.ViewHolder; + +public class MainConversationListAdapter extends ConversationListAdapter { + public static final int TYPE_SEARCH_TITLE = 500; + public static final int TYPE_SEARCH_USER = 510; + public static final int TYPE_SEARCH_CHAT = 520; + + @NonNull + @Override + public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + ViewHolder holder = null; + if (viewType == TYPE_SEARCH_TITLE) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_msg_search_title, parent, false); + holder = ViewHolder.createViewHolder(parent.getContext(), view); + } else if (viewType == TYPE_SEARCH_USER) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_msg_search_user, parent, false); + holder = ViewHolder.createViewHolder(parent.getContext(), view); + } else if (viewType == TYPE_SEARCH_CHAT) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_msg_search_chat, parent, false); + holder = ViewHolder.createViewHolder(parent.getContext(), view); + } else { + holder = super.onCreateViewHolder(parent, viewType); + } + return holder; + } + + @Override + public int getItemViewType(int position) { + int type = super.getItemViewType(position); + if (mDataList.size() > position) { + String objectName = mDataList.get(position).mCore.getObjectName(); + if (!StringUtil.isEmpty(objectName) && objectName.startsWith("SEARCH_USER")) { + type = TYPE_SEARCH_USER; + } else if (!StringUtil.isEmpty(objectName) && objectName.equals("SEARCH_CHAT")) { + type = TYPE_SEARCH_CHAT; + } else if (!StringUtil.isEmpty(objectName) && objectName.startsWith("SEARCH_TITLE")) { + type = TYPE_SEARCH_TITLE; + } + } + return type; + } + + @Override + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + if (getItemViewType(position) == TYPE_SEARCH_USER) { + bindUser(holder, position); + } else if (getItemViewType(position) == TYPE_SEARCH_CHAT) { + bindChat(holder, position); + } else if (getItemViewType(position) == TYPE_SEARCH_TITLE) { + bindTitle(holder, position); + } else { + super.onBindViewHolder(holder, position); + } + } + + private void bindTitle(ViewHolder holder, int position) { + holder.setText(R.id.title, mDataList.get(position).mCore.getObjectName().replace("SEARCH_TITLE", "")); + } + + private void bindUser(ViewHolder holder, int position) { + ImgLoader.display(holder.getContext(), mDataList.get(position).mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait)); + String title = mDataList.get(position).mCore.getConversationTitle(); + String key = mDataList.get(position).mCore.getObjectName().replace("SEARCH_USER", ""); + title = title.replace(key, "" + key + ""); + Spanned spanned = Html.fromHtml(title); + ((TextView) holder.getView(R.id.rc_conversation_title)).setText(spanned); + int type = mDataList.get(position).mCore.getMentionedCount(); + holder.getView(R.id.itemDecorationTop).setVisibility(View.GONE); + holder.getView(R.id.itemDecorationBottom).setVisibility(View.GONE); + if (type == 1) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_top); + holder.getView(R.id.itemDecorationBottom).setVisibility(View.VISIBLE); + } else if (type == 2) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_bottom); + } else if (type == 3) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item); + } else { + holder.getView(R.id.itemDecorationBottom).setVisibility(View.VISIBLE); + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_centre); + } + } + + private void bindChat(ViewHolder holder, int position) { + ImgLoader.display(holder.getContext(), mDataList.get(position).mCore.getPortraitUrl(), holder.getView(R.id.rc_conversation_portrait)); + holder.setText(R.id.rc_conversation_title, mDataList.get(position).mCore.getConversationTitle()); + Spanned spanned = Html.fromHtml(WordUtil.getNewString(R.string.activity_msg_list_include) + "" + mDataList.get(position).mConversationContent + ""); + ((TextView) holder.getView(R.id.rc_conversation_content)).setText(spanned); + int type = mDataList.get(position).mCore.getMentionedCount(); + holder.getView(R.id.itemDecorationTop).setVisibility(View.GONE); + holder.getView(R.id.itemDecorationBottom).setVisibility(View.GONE); + if (type == 1) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_top); + holder.getView(R.id.itemDecorationBottom).setVisibility(View.VISIBLE); + } else if (type == 2) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_bottom); + } else if (type == 3) { + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item); + } else { + holder.getView(R.id.itemDecorationBottom).setVisibility(View.VISIBLE); + holder.itemView.setBackgroundResource(R.drawable.bg_msg_list_item_centre); + } + } +} diff --git a/main/src/main/java/com/yunbao/main/dialog/MsgChatClickDialog.java b/main/src/main/java/com/yunbao/main/dialog/MsgChatClickDialog.java new file mode 100644 index 000000000..4cb833513 --- /dev/null +++ b/main/src/main/java/com/yunbao/main/dialog/MsgChatClickDialog.java @@ -0,0 +1,86 @@ +package com.yunbao.main.dialog; + +import android.content.Context; +import android.graphics.Color; +import android.view.Gravity; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; + +import com.lxj.xpopup.core.AttachPopupView; +import com.yunbao.main.R; +import com.yunbao.common.interfaces.OnItemClickListener; + +import java.util.List; + +/** + * 聊天界面长按气泡菜单 + */ +public class MsgChatClickDialog extends AttachPopupView implements View.OnClickListener { + LinearLayout rootView; + List list; + OnItemClickListener onItemClickListener; + + public MsgChatClickDialog(@NonNull Context context) { + super(context); + } + + public MsgChatClickDialog setList(List list) { + this.list = list; + return this; + } + + public MsgChatClickDialog setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.onItemClickListener = onItemClickListener; + return this; + } + + @Override + protected int getImplLayoutId() { + return R.layout.dialog_msg_chat_click; + } + + @Override + protected boolean isShowUpToTarget() { + return true; + } + + @Override + protected void onCreate() { + super.onCreate(); + isShowUp = true; + rootView = findViewById(R.id.rootView); + rootView.setGravity(Gravity.CENTER); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT); + params.gravity = Gravity.CENTER; + for (int i = 0; i < list.size(); i++) { + String item = list.get(i); + TextView textView = new TextView(getContext()); + textView.setText(item); + textView.setGravity(Gravity.CENTER); + textView.setTag(i); + textView.setTextColor(Color.WHITE); + textView.setLayoutParams(params); + textView.setOnClickListener(this); + rootView.addView(textView,params); + + TextView tmp = new TextView(getContext()); + tmp.setLayoutParams(params); + tmp.setText(" | "); + tmp.setGravity(Gravity.CENTER); + tmp.setTextColor(Color.WHITE); + rootView.addView(tmp,params); + } + rootView.removeViewAt(rootView.getChildCount()-1); + } + + @Override + public void onClick(View v) { + if (onItemClickListener != null) { + onItemClickListener.onItemClick(((TextView) v).getText().toString(), (Integer) v.getTag()); + } + dismiss(); + } +} diff --git a/main/src/main/java/com/yunbao/main/fragment/MainMessageChatFragment.java b/main/src/main/java/com/yunbao/main/fragment/MainMessageChatFragment.java new file mode 100644 index 000000000..4c7cefa7f --- /dev/null +++ b/main/src/main/java/com/yunbao/main/fragment/MainMessageChatFragment.java @@ -0,0 +1,110 @@ +package com.yunbao.main.fragment; + +import android.graphics.Color; +import android.os.Bundle; +import android.text.SpannableString; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.yunbao.common.custom.ItemDecoration; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; +import com.yunbao.main.R; +import com.yunbao.main.adapter.MainConversationListAdapter; + +import java.util.ArrayList; +import java.util.List; + +import io.rong.imkit.conversationlist.ConversationListAdapter; +import io.rong.imkit.conversationlist.ConversationListFragment; +import io.rong.imkit.conversationlist.model.BaseUiConversation; +import io.rong.imkit.conversationlist.model.SingleConversation; +import io.rong.imlib.model.Conversation; + +public class MainMessageChatFragment extends ConversationListFragment { + + @Nullable + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.rc_conversationlist_fragment, container, false); + } + + public void setEmptyView(int viewLayoutMsgId) { + super.setEmptyView(viewLayoutMsgId); + } + + + public void search(String search) { + mAdapter.getData().clear(); + getContactsList(search); + } + + private void getContactsList(String search) { + List list = new ArrayList<>(); + List data = new ArrayList<>(); + BaseUiConversation conversation = new SingleConversation(getContext(), new Conversation()); + conversation.mCore.setObjectName("SEARCH_TITLE" + WordUtil.getNewString(R.string.activity_msg_list_title_contacts)); + conversation.mCore.setConversationType(Conversation.ConversationType.PRIVATE); + list.add(conversation); + for (int i = 0; i < 3; i++) { + conversation = new SingleConversation(getContext(), new Conversation()); + conversation.mCore.setObjectName("SEARCH_USER" + search); + conversation.mCore.setConversationTitle(search + "|" + i); + conversation.mCore.setConversationType(Conversation.ConversationType.PRIVATE); + conversation.mCore.setPortraitUrl("https://downs.yaoulive.com/girltwo.png"); + data.add(conversation); + } + if (data.size() == 1) { + data.get(0).mCore.setMentionedCount(3); + } else if (data.size() != 0) { + data.get(0).mCore.setMentionedCount(1); + data.get(data.size() - 1).mCore.setMentionedCount(2); + } else { + list.remove(list.size() - 1); + } + list.addAll(data); + getChatRecordList(list, search); + } + + private void getChatRecordList(List list, String search) { + BaseUiConversation conversation = new SingleConversation(getContext(), new Conversation()); + conversation.mCore.setObjectName("SEARCH_TITLE" + WordUtil.getNewString(R.string.activity_msg_list_title_chat_records)); + conversation.mCore.setConversationType(Conversation.ConversationType.PRIVATE); + list.add(conversation); + List data = new ArrayList<>(); + for (int i = 0; i < 3; i++) { + conversation = new SingleConversation(getContext(), new Conversation()); + conversation.mCore.setObjectName("SEARCH_CHAT"); + conversation.mCore.setConversationTitle(search + "|" + i); + conversation.mCore.setConversationType(Conversation.ConversationType.PRIVATE); + conversation.mConversationContent = new SpannableString(search); + conversation.mCore.setPortraitUrl("https://downs.yaoulive.com/defaultpink.png"); + data.add(conversation); + } + if (data.size() == 1) { + data.get(0).mCore.setMentionedCount(3); + } else if (data.size() != 0) { + data.get(0).mCore.setMentionedCount(1); + data.get(data.size() - 1).mCore.setMentionedCount(2); + } else { + list.remove(list.size() - 1); + } + list.addAll(data); + mAdapter.setDataCollection(list); + mAdapter.notifyDataSetChanged(); + } + + public void onChatList() { + mAdapter.getData().clear(); + subscribeUi(); + } + + @Override + protected ConversationListAdapter onResolveAdapter() { + this.mAdapter = new MainConversationListAdapter(); + return this.mAdapter; + } +} diff --git a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java index 83f22268f..a22078cdf 100644 --- a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java +++ b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java @@ -1,8 +1,13 @@ package com.yunbao.main.manager.imrongcloud; +import static android.content.Context.CLIPBOARD_SERVICE; + import android.app.Activity; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -13,24 +18,30 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.blankj.utilcode.util.GsonUtils; import com.google.gson.Gson; +import com.lxj.xpopup.XPopup; +import com.lxj.xpopup.interfaces.OnSelectListener; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.VipModel; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.manager.InstructorRemarkManager; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.live.activity.PDLIiveChatActivity; import com.yunbao.live.activity.PDLiveConversationActivity; import com.yunbao.live.bean.SearchUserBean; import com.yunbao.live.dialog.PDLIiveChatConversationFragment; import com.yunbao.main.activity.PDLiveConversationListActivity; import com.yunbao.main.dialog.ConversationPopuwWindow; +import com.yunbao.main.dialog.MsgChatClickDialog; import com.yunbao.main.utils.PDLiveCustomConversationProvider; import com.yunbao.main.utils.PDLiveMessageProcessor; import com.yunbao.main.utils.PDSightMessageItemProvider; +import java.util.Arrays; import java.util.List; import io.rong.imkit.IMCenter; @@ -41,6 +52,7 @@ import io.rong.imkit.conversation.extension.RongExtensionManager; import io.rong.imkit.conversation.messgelist.provider.SightMessageItemProvider; import io.rong.imkit.conversationlist.model.BaseUiConversation; import io.rong.imkit.conversationlist.provider.PrivateConversationProvider; +import io.rong.imkit.model.UiMessage; import io.rong.imkit.userinfo.RongUserInfoManager; import io.rong.imkit.utils.RouteUtils; import io.rong.imkit.widget.adapter.ProviderManager; @@ -48,7 +60,7 @@ import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; import io.rong.imlib.model.UserInfo; import io.rong.sight.SightExtensionModule; - +import com.yunbao.main.R; /** * 会话列表管理 */ @@ -269,12 +281,33 @@ public class ConversationIMListManager { public boolean onConversationLongClick(Context context, View view, BaseUiConversation baseUiConversation) { //非指导员都可以点击 UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(baseUiConversation.mCore.getTargetId()); + String[] list; + list = new String[]{WordUtil.getNewString(R.string.copy), WordUtil.getNewString(R.string.top)}; if (userInfo != null && !TextUtils.isEmpty(userInfo.getExtra())) { IMLoginModel model = new Gson().fromJson(userInfo.getExtra(), IMLoginModel.class); if (!TextUtils.equals(model.getIsAdmin(), "1")) { - new ConversationPopuwWindow((Activity) context) + /* new ConversationPopuwWindow((Activity) context) .setIsAdmin(baseUiConversation.mCore.getTargetId()) - .show(view); + .show(view);*/ + new XPopup.Builder(context) + .atView(view) + .hasShadowBg(false) + .positionByWindowCenter(true) + .isCenterHorizontal(true) + .asCustom(new MsgChatClickDialog(context) + .setList(Arrays.asList(list)) + .setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(String bean, int position) { + if (bean.equals(WordUtil.getNewString(R.string.top))) { + // copyText(baseUiConversation,context); + setConversationToTop(targetId); + } else if(bean.equals(WordUtil.getNewString(R.string.delete))){ + delete(baseUiConversation.mCore.getTargetId()); + } + } + })) + .show(); } } @@ -368,5 +401,23 @@ public class ConversationIMListManager { public String getTargetId() { return targetId; } + private void copyText(UiMessage uiMessage,Context context) { + ClipboardManager cm = (ClipboardManager) context.getSystemService(CLIPBOARD_SERVICE); + ClipData clipData = ClipData.newPlainText("text", uiMessage.getContentSpannable()); + cm.setPrimaryClip(clipData); + } + private void delete(String userId) { + IMCenter.getInstance().removeConversation(Conversation.ConversationType.PRIVATE, userId, new RongIMClient.ResultCallback() { + @Override + public void onSuccess(Boolean aBoolean) { + ToastUtil.show("删除成功"); + } + + @Override + public void onError(RongIMClient.ErrorCode errorCode) { + ToastUtil.show(errorCode.msg); + } + }); + } } diff --git a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java index 3696648ef..7887687eb 100644 --- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java +++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java @@ -1,5 +1,6 @@ package com.yunbao.main.utils; +import android.graphics.Color; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -16,7 +17,10 @@ import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.RouteUtil; import com.yunbao.main.R; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; +import java.util.Locale; import io.rong.imkit.config.RongConfigCenter; import io.rong.imkit.conversationlist.model.BaseUiConversation; @@ -61,68 +65,29 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider { if ((userInfo != null && !TextUtils.isEmpty(userInfo.getExtra()))) { IMLoginModel model = new Gson().fromJson(userInfo.getExtra(), IMLoginModel.class); //指导员对话逻辑 - if ((model != null && TextUtils.equals(model.getIsAdmin(), "1")) ) { - RelativeLayout conversationItem = holder.getView(R.id.rc_conversation_item); - RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) conversationItem.getLayoutParams(); - params.height = DpUtil.dp2px(110); - conversationItem.setLayoutParams(params); - holder.setOnClickListener(R.id.img_administrator, new View.OnClickListener() { - @Override - public void onClick(View v) { - RouteUtil.forwardUserHome(holder.getContext(), targetId, 0); - } - }); - holder.setBackgroundRes(R.id.administrator_layout, R.mipmap.img_news_instructor_bg); - holder.setBackgroundRes(R.id.rc_conversation_item, R.mipmap.white_bg); - holder.setVisible(R.id.rc_conversation_portrait_layout, false); - holder.setVisible(R.id.administrator_layout, true); - holder.setImageUri(R.id.img_administrator, userInfo.getPortraitUri()); - holder.setText(R.id.conversation_title, userInfo.getName()); - if (TextUtils.isEmpty(uiConversation.mConversationContent)){ - if (uiConversation.mCore.getLatestMessage() instanceof TextMessage) { - TextMessage message = (TextMessage) uiConversation.mCore.getLatestMessage(); - holder.setText(R.id.conversation_content, message.getContent()); - } - }else { - holder.setText(R.id.conversation_content,uiConversation.mConversationContent); - } - if (uiConversation.mCore.getUnreadMessageCount() == 0) { - holder.setVisible(R.id.conversation_unread, false); - } else { - holder.setVisible(R.id.conversation_unread, true); - holder.setText(R.id.conversation_unread_count, String.valueOf(uiConversation.mCore.getUnreadMessageCount())); - } - - holder.setText(R.id.conversation_date, RongDateUtils.getConversationListFormatDate(uiConversation.mCore.getSentTime(), holder.getContext())); - } else { - View conversationItem = holder.getConvertView(); - RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) conversationItem.getLayoutParams(); - params.height = DpUtil.dp2px(72); - conversationItem.setLayoutParams(params); - //非指导员按照原有视图展示 - holder.setVisible(R.id.rc_conversation_portrait_layout, true); - holder.setVisible(R.id.administrator_layout, false); - } - } - ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_read_receipt); - ImageView conversationUnread = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_unread_bg); - ImageView imgNew = holder.itemView.findViewById(com.yunbao.live.R.id.img_new); - if (conversationUnread != null) { - Glide.with(holder.getContext()).asDrawable().load(R.mipmap.rc_unread_count_bg_normal).into(conversationUnread); } - readReceipt.setVisibility(View.VISIBLE); if (RongConfigCenter.featureConfig().isReadReceiptConversationType(Conversation.ConversationType.PRIVATE) && uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) && uiConversation.mCore.getSentStatus().getValue() == Message.SentStatus.READ.getValue() && !(uiConversation.mCore.getLatestMessage() instanceof RecallNotificationMessage)) { - readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_read); + //TODO 已读 } else if (uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) && !(uiConversation.mCore.getLatestMessage() instanceof RecallNotificationMessage)) { - readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_unread); + //TODO 未读 + } else { holder.setVisible(R.id.rc_conversation_read_receipt, false); } + if (uiConversation.mCore.isTop()) { + holder.getConvertView().setBackgroundColor(holder.getContext().getResources().getColor(io.rong.imkit.R.color.rc_item_top_color)); + } else { + holder.getConvertView().setBackgroundColor(Color.parseColor("#00000000")); + } + + //设置时间 + String date =new SimpleDateFormat("HH:mm", Locale.getDefault()).format(new Date(uiConversation.mCore.getSentTime())); + holder.setText(R.id.rc_conversation_date, date); } } diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java index f71385345..24563cca7 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java @@ -3,11 +3,14 @@ package com.yunbao.main.views; import android.app.Activity; import android.content.Intent; import android.os.Handler; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.util.Log; import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; @@ -38,6 +41,8 @@ import com.yunbao.common.utils.DeviceUtils; import com.yunbao.common.utils.LiveRoomCheckLivePresenter; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; +import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.AbsMainViewHolder; import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.live.activity.SystemMessageActivity; @@ -47,6 +52,7 @@ import com.yunbao.live.http.ImHttpUtil; import com.yunbao.main.R; import com.yunbao.main.activity.MainActivity; import com.yunbao.main.adapter.SystemMessageAdapter; +import com.yunbao.main.fragment.MainMessageChatFragment; import com.yunbao.main.manager.imrongcloud.ConversationIMListManager; import org.greenrobot.eventbus.EventBus; @@ -57,14 +63,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import io.rong.imkit.conversationlist.ConversationListFragment; /** * 消息中心 */ public class MainMessageViewHolder extends AbsMainViewHolder { - private ConversationListFragment conversationListFragment; + private MainMessageChatFragment conversationListFragment; private FrameLayout container; private SystemMessageAdapter messageAdapter; private TextView textNewsNotice, textNewsInteraction, textNewsOnline, textSystemMessages; @@ -74,6 +79,8 @@ public class MainMessageViewHolder extends AbsMainViewHolder { private ImageView imgNewsNotice, imgNewsInteraction, imgNewsOnline, imgSystemMessages; private Handler netHandler; private MainActivity mContext; + private View contacts; + private EditText search; private String homeZdyPop; @@ -100,6 +107,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { public void onResume() { super.onResume(); initData(); + search.setText(""); } @Override @@ -117,6 +125,36 @@ public class MainMessageViewHolder extends AbsMainViewHolder { imgNewsInteraction = (ImageView) findViewById(R.id.img_news_interaction); imgSystemMessages = (ImageView) findViewById(R.id.img_system_messages); imgNewsOnline = (ImageView) findViewById(R.id.img_news_online); + contacts = findViewById(R.id.news_icon_contacts); + search = findViewById(R.id.search); + contacts.setOnClickListener(view -> { + //通讯录 + }); + search.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + /* if(StringUtil.isEmpty(charSequence.toString())){ + conversationListFragment.onChatList(); + }else { + conversationListFragment.search(charSequence.toString()); + }*/ + } + + @Override + public void afterTextChanged(Editable editable) { + if (conversationListFragment == null) return; + if (StringUtil.isEmpty(editable.toString())) { + conversationListFragment.onChatList(); + } else { + conversationListFragment.search(editable.toString()); + } + } + }); netHandler = new Handler(); } @@ -184,6 +222,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { @Override public void run() { netHandler.post(imUserInfoRunnable); + IMLoginManager.get(mContext).initChat("1"); if (IMLoginManager.get(mContext).hintChat()) { container.setVisibility(View.GONE); ltNodataMsg.setVisibility(View.VISIBLE); @@ -191,7 +230,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { container.setVisibility(View.VISIBLE); ltNodataMsg.setVisibility(View.GONE); //展示会话列表 - conversationListFragment = new ConversationListFragment(); + conversationListFragment = new MainMessageChatFragment(); FragmentManager manager = ((FragmentActivity) mContext).getSupportFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.container, conversationListFragment); @@ -240,7 +279,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { } } - ImgLoader.display(mContext, userBean.getNewImage(), imgNewsNotice); + //ImgLoader.display(mContext, userBean.getNewImage(), imgNewsNotice); ViewClicksAntiShake.clicksAntiShake(imgNewsNotice, () -> { MobclickAgent.onEvent(mContext, "information_official_notice", "官方通知"); type = userBean.getType(); @@ -267,7 +306,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { textNewsInteraction.setText(String.valueOf(numberInt)); } } - ImgLoader.display(mContext, userBean.getNewImage(), imgNewsInteraction); + // ImgLoader.display(mContext, userBean.getNewImage(), imgNewsInteraction); ViewClicksAntiShake.clicksAntiShake(imgNewsInteraction, () -> { MobclickAgent.onEvent(mContext, "information_system_interactive", "互動消息"); type = userBean.getType(); @@ -294,7 +333,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { textNewsOnline.setText(String.valueOf(numberInt)); } } - ImgLoader.display(mContext, userBean.getNewImage(), imgNewsOnline); + //ImgLoader.display(mContext, userBean.getNewImage(), imgNewsOnline); ViewClicksAntiShake.clicksAntiShake(imgNewsOnline, () -> { MobclickAgent.onEvent(mContext, "information_system_service", "在線客服"); type = userBean.getType(); @@ -327,7 +366,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder { textSystemMessages.setText(String.valueOf(numberInt)); } } - ImgLoader.display(mContext, userBean.getNewImage(), imgSystemMessages); + //ImgLoader.display(mContext, userBean.getNewImage(), imgSystemMessages); ViewClicksAntiShake.clicksAntiShake(imgSystemMessages, () -> { MobclickAgent.onEvent(mContext, "information_system_notice", "系统消息"); type = userBean.getType(); diff --git a/main/src/main/res/drawable/bg_msg_list_item.xml b/main/src/main/res/drawable/bg_msg_list_item.xml new file mode 100644 index 000000000..d2caa425d --- /dev/null +++ b/main/src/main/res/drawable/bg_msg_list_item.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/drawable/bg_msg_list_item_bottom.xml b/main/src/main/res/drawable/bg_msg_list_item_bottom.xml new file mode 100644 index 000000000..100833fdb --- /dev/null +++ b/main/src/main/res/drawable/bg_msg_list_item_bottom.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/drawable/bg_msg_list_item_centre.xml b/main/src/main/res/drawable/bg_msg_list_item_centre.xml new file mode 100644 index 000000000..6229c3b98 --- /dev/null +++ b/main/src/main/res/drawable/bg_msg_list_item_centre.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/drawable/bg_msg_list_item_top.xml b/main/src/main/res/drawable/bg_msg_list_item_top.xml new file mode 100644 index 000000000..cec9d9abd --- /dev/null +++ b/main/src/main/res/drawable/bg_msg_list_item_top.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/drawable/bg_msg_list_search.xml b/main/src/main/res/drawable/bg_msg_list_search.xml new file mode 100644 index 000000000..418027a5c --- /dev/null +++ b/main/src/main/res/drawable/bg_msg_list_search.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/dialog_msg_chat_click.xml b/main/src/main/res/layout/dialog_msg_chat_click.xml new file mode 100644 index 000000000..ae3529c54 --- /dev/null +++ b/main/src/main/res/layout/dialog_msg_chat_click.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/item_main_msg_search_chat.xml b/main/src/main/res/layout/item_main_msg_search_chat.xml new file mode 100644 index 000000000..ebe2b8129 --- /dev/null +++ b/main/src/main/res/layout/item_main_msg_search_chat.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/item_main_msg_search_title.xml b/main/src/main/res/layout/item_main_msg_search_title.xml new file mode 100644 index 000000000..b94f3a5fa --- /dev/null +++ b/main/src/main/res/layout/item_main_msg_search_title.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/item_main_msg_search_user.xml b/main/src/main/res/layout/item_main_msg_search_user.xml new file mode 100644 index 000000000..b9131ea09 --- /dev/null +++ b/main/src/main/res/layout/item_main_msg_search_user.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/rc_conversationlist_fragment.xml b/main/src/main/res/layout/rc_conversationlist_fragment.xml new file mode 100644 index 000000000..e532469e0 --- /dev/null +++ b/main/src/main/res/layout/rc_conversationlist_fragment.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml index a783924f1..f8c2a8358 100644 --- a/main/src/main/res/layout/view_main_message.xml +++ b/main/src/main/res/layout/view_main_message.xml @@ -2,10 +2,15 @@ - - + + @@ -13,22 +18,42 @@ android:id="@+id/top_noback" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="18dp" - android:text="@string/message" + android:layout_marginStart="18dp" + android:text="@string/activity_msg_title" android:textColor="#ff161616" android:textSize="24sp" - android:textStyle="bold" /> + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + - + android:src="@mipmap/ic_msg_contacts" + android:visibility="visible" /> + + android:layout_height="70dp" + android:layout_marginBottom="20dp" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" + android:layout_alignBottom="@+id/tv_news_notice" + android:src="@mipmap/ic_msg_notice" /> + + @@ -75,10 +121,28 @@ - + android:layout_height="70dp" + android:layout_marginBottom="20dp" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" + android:layout_alignBottom="@+id/tv_system_messages" + android:src="@mipmap/ic_msg_interaction" /> + - + android:layout_height="70dp" + android:layout_marginBottom="20dp" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" + android:layout_alignBottom="@+id/tv_news_interaction" + android:src="@mipmap/ic_msg_message" /> + + android:layout_height="70dp" + android:layout_marginBottom="20dp" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" + android:layout_alignBottom="@+id/tv_news_online" + android:src="@mipmap/ic_msg_service" /> + + + 未解鎖 暫未達到等級 領取成功 - + 置頂 + 刪除 + 消息 + 官方通知 + 系统通知 + 互動消息 + 在線客服 + 搜索昵稱或聊天記錄 + 包含: + 聯繫人 + 聊天記錄 \ No newline at end of file diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 14665cfbb..0c1ef6f3f 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -18,5 +18,15 @@ Unlocked Not yet reached level Successfully claimed - + 置頂 + 刪除 + Information + Activities + Chats + Messages + Service + Search + Include: + Contacts + Chat Records