升级融云sdk版本和APG版本

2024-03-26 13:43:13 +08:00
parent 4337f0bdd6
commit 460dfa87b3
36 changed files with 241 additions and 122 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,9 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.alibaba.arouter'
 android {
+    namespace "myname.pdlive.shayu"
    dexOptions {
        jumboMode = true
-    }
-    project.tasks.getByName("tasks").doFirst {
-
    }
    /*  applicationVariants.all { variant ->
          variant.mergeAssetsProvider.configure {
@@ -33,9 +31,7 @@ android {
              }
          }
      }*/
-
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -105,8 +101,11 @@ android {

    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
    }
    applicationVariants.all { variant ->
        println "清空build文件夹";
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="myname.pdlive.shayu">
+  >

    <uses-permission
        android:name="android.permission.CALL_PHONE"
--- a/app/tmp/full-r8-config.txt
+++ b/app/tmp/full-r8-config.txt
@@ -415,6 +415,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 # 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 { <init>(); }
 -keep class androidx.core.content.FileProvider { <init>(); }
+-keep class androidx.core.content.FileProvider4Utils { <init>(); }
 -keep class androidx.profileinstaller.ProfileInstallReceiver { <init>(); }
 -keep class androidx.room.MultiInstanceInvalidationService { <init>(); }
 -keep class androidx.startup.InitializationProvider { <init>(); }
@@ -460,6 +461,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.twitter.sdk.android.tweetcomposer.TweetUploadService { <init>(); }
 -keep class com.twitter.sdk.android.tweetui.GalleryActivity { <init>(); }
 -keep class com.twitter.sdk.android.tweetui.PlayerActivity { <init>(); }
+-keep class com.xuexiang.xui.XUIInitProvider { <init>(); }
+-keep class com.xuexiang.xui.widget.imageview.preview.ui.PreviewActivity { <init>(); }
+-keep class com.xuexiang.xui.widget.imageview.preview.ui.VideoPlayerActivity { <init>(); }
+-keep class com.xuexiang.xutil.system.PermissionUtils$PermissionActivity { <init>(); }
 -keep class com.yalantis.ucrop.UCropActivity { <init>(); }
 -keep class com.yunbao.common.activity.ErrorActivity { <init>(); }
 -keep class com.yunbao.common.activity.PreviewImageActivity { <init>(); }
@@ -488,7 +493,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.yunbao.live.activity.LiveTRTCAnchorActivity { <init>(); }
 -keep class com.yunbao.live.activity.MedalQuestionWebViewActivity { <init>(); }
 -keep class com.yunbao.live.activity.PDLIiveChatActivity { <init>(); }
-keep class com.yunbao.main.activity.PDLiveConversationActivity { <init>(); }
 -keep class com.yunbao.live.activity.RoomManageActivity { <init>(); }
 -keep class com.yunbao.live.activity.RoomManageDetailActivity { <init>(); }
 -keep class com.yunbao.live.activity.SudGameActivity { <init>(); }
@@ -503,11 +507,15 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.yunbao.main.activity.CashActivity { <init>(); }
 -keep class com.yunbao.main.activity.ChatActivity { <init>(); }
 -keep class com.yunbao.main.activity.ChatRoomActivity { <init>(); }
+-keep class com.yunbao.main.activity.CommunityDetailsActivity { <init>(); }
+-keep class com.yunbao.main.activity.CommunitySendActivity { <init>(); }
+-keep class com.yunbao.main.activity.CompleteUserInfoActivity { <init>(); }
 -keep class com.yunbao.main.activity.CustomerServiceWebViewActivity { <init>(); }
 -keep class com.yunbao.main.activity.EditNameActivity { <init>(); }
 -keep class com.yunbao.main.activity.EditProfileActivity { <init>(); }
 -keep class com.yunbao.main.activity.EditSexActivity { <init>(); }
 -keep class com.yunbao.main.activity.EditSignActivity { <init>(); }
+-keep class com.yunbao.main.activity.EditUserHobbyActivity { <init>(); }
 -keep class com.yunbao.main.activity.EntryActivity { <init>(); }
 -keep class com.yunbao.main.activity.FansActivity { <init>(); }
 -keep class com.yunbao.main.activity.FindPwdActivity { <init>(); }
@@ -519,7 +527,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.yunbao.main.activity.MainActivity { <init>(); }
 -keep class com.yunbao.main.activity.MainHomeCommunityActivity { <init>(); }
 -keep class com.yunbao.main.activity.MainListActivity { <init>(); }
+-keep class com.yunbao.main.activity.MessageHiConfigActivity { <init>(); }
+-keep class com.yunbao.main.activity.MessageHiConfigRecordActivity { <init>(); }
 -keep class com.yunbao.main.activity.ModifyPwdActivity { <init>(); }
+-keep class com.yunbao.main.activity.MsgAddressBookActivity { <init>(); }
 -keep class com.yunbao.main.activity.MsgSettActivity { <init>(); }
 -keep class com.yunbao.main.activity.MyCoinActivity { <init>(); }
 -keep class com.yunbao.main.activity.MyImpressActivity { <init>(); }
@@ -529,6 +540,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.yunbao.main.activity.MyWebViewActivity { <init>(); }
 -keep class com.yunbao.main.activity.MyWebViewActivity2 { <init>(); }
 -keep class com.yunbao.main.activity.OneLoginActivity { <init>(); }
+-keep class com.yunbao.main.activity.PDLiveConversationActivity { <init>(); }
 -keep class com.yunbao.main.activity.PDLiveConversationListActivity { <init>(); }
 -keep class com.yunbao.main.activity.RechargeActivity { <init>(); }
 -keep class com.yunbao.main.activity.RecommendActivity { <init>(); }
@@ -543,6 +555,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.yunbao.main.activity.ThreeDistributActivity { <init>(); }
 -keep class com.yunbao.main.activity.UserAvatarSelectActivity { <init>(); }
 -keep class com.yunbao.main.activity.UserHomeActivity { <init>(); }
+-keep class com.yunbao.main.activity.UserHomeActivityOld { <init>(); }
 -keep class com.yunbao.main.activity.WeekWebViewActivity { <init>(); }
 -keep class com.yunbao.main.activity.ZhuangBanActivity { <init>(); }
 -keep class com.yunbao.share.receiver.TwitterResultReceiver { <init>(); }
@@ -609,8 +622,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;

 -keep class androidx.appcompat.widget.AlertDialogLayout { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class androidx.appcompat.widget.AppCompatCheckBox { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class androidx.appcompat.widget.AppCompatEditText { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class androidx.appcompat.widget.AppCompatImageButton { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class androidx.appcompat.widget.AppCompatImageView { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class androidx.appcompat.widget.AppCompatRadioButton { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class androidx.appcompat.widget.AppCompatTextView { <init>(android.content.Context, android.util.AttributeSet); }

 -keep class androidx.appcompat.widget.ButtonBarLayout { <init>(android.content.Context, android.util.AttributeSet); }
@@ -659,6 +680,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;

 -keep class com.blankj.utilcode.util.ToastUtils$UtilsMaxWidthRelativeLayout { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class com.contrarywind.view.WheelView { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class com.github.gzuliyujiang.wheelview.widget.WheelView { <init>(android.content.Context, android.util.AttributeSet); }

 -keep class com.google.android.exoplayer2.ui.AspectRatioFrameLayout { <init>(android.content.Context, android.util.AttributeSet); }
@@ -787,6 +810,42 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;

 -keep class com.xj.marqueeview.MarqueeView { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class com.xuexiang.xui.widget.actionbar.TitleBar { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.alpha.XUIAlphaButton { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.alpha.XUIAlphaTextView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.banner.widget.banner.SimpleGuideBanner { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.dialog.bottomsheet.BottomSheetItemView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.dialog.materialdialog.internal.MDButton { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.dialog.materialdialog.internal.MDRootLayout { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.edittext.verify.PwdEditText { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.flowlayout.FlowTagLayout { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.imageview.crop.CropOverlayView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.imageview.preview.view.BezierBannerView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.imageview.preview.view.PhotoViewPager { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.imageview.preview.view.SmoothImageView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.picker.wheelview.WheelView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.progress.loading.ARCLoadingView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.progress.loading.MiniLoadingView { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.progress.materialprogressbar.MaterialProgressBar { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.xuexiang.xui.widget.textview.AutoMoveTextView { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class com.xw.repo.BubbleSeekBar { <init>(android.content.Context, android.util.AttributeSet); }

 -keep class com.yalantis.ucrop.view.GestureCropImageView { <init>(android.content.Context, android.util.AttributeSet); }
@@ -809,6 +868,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;

 -keep class com.yunbao.common.custom.CommonRefreshView { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class com.yunbao.common.custom.CommonRefreshWaterfallView { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class com.yunbao.common.custom.DrawableCheckBox { <init>(android.content.Context, android.util.AttributeSet); }

 -keep class com.yunbao.common.custom.DrawableRadioButton { <init>(android.content.Context, android.util.AttributeSet); }
@@ -853,6 +914,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;

 -keep class com.yunbao.common.views.FlowLayout { <init>(android.content.Context, android.util.AttributeSet); }

+-keep class com.yunbao.common.views.MyFrameLayout2 { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.yunbao.common.views.MyScrollview { <init>(android.content.Context, android.util.AttributeSet); }
+
+-keep class com.yunbao.common.views.NineGridLayout { <init>(android.content.Context, android.util.AttributeSet); }
+
 -keep class com.yunbao.common.views.weight.CircleProgress { <init>(android.content.Context, android.util.AttributeSet); }

 -keep class com.yunbao.common.views.weight.CircleProgress2 { <init>(android.content.Context, android.util.AttributeSet); }
@@ -2577,6 +2644,29 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -dontwarn kotlin.annotation.Target

 # 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\410ee7047c4b7502102a93fa8e774ce4\jetified-calligraphy3-3.1.1\proguard.txt
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Developer/android-sdk-osx/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+-keep class io.github.inflationx.calligraphy3.* { *; }
+-keep class io.github.inflationx.calligraphy3.*$* { *; }
+
+# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\410ee7047c4b7502102a93fa8e774ce4\jetified-calligraphy3-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\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt
 # Keep the AIDL interface
 -keep class com.android.vending.billing.** { *; }