升级融云sdk版本和APG版本

FaceUnity/build.gradle

@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
+//apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
+//apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'img-optimizer'
+}
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.yunbao.faceunity"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -48,8 +54,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {

FaceUnity/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yunbao.faceunity"
     >
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +10,9 @@
 
     <application
         android:icon="@mipmap/ico_home_animoji"
-        android:allowBackup="true">
+        android:allowBackup="true"
+        tools:replace="allowBackup"
+       >
 
     </application>
 

IAP6Helper/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.samsung.android.sdk.iap.lib"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     defaultConfig {
-        minSdkVersion minSdkVersion
+        minSdkVersion rootProject.ext.android.minSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-        versionCode versionCode
+        versionCode rootProject.ext.android.versionCode
-        versionName versionName
+        versionName rootProject.ext.android.versionName
-        targetSdkVersion targetSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
     }
 
     buildTypes {
@@ -18,7 +18,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+}
+repositories {
+    flatDir {
+        dirs 'libs', '../libs'
+    }
 }
-
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 }

IAP6Helper/src/main/AndroidManifest.xml

@@ -1,11 +1,12 @@
-<manifest
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
-    package="com.samsung.android.sdk.iap.lib"
     android:versionCode="601000004"
     android:versionName="6.1.0">
     <!-- version code [Major/Minor/Bug fix release/Build number ] : x xx xxx xxx -->
 
-    <application>
+    <application
+        android:allowBackup="true"
+        tools:replace="allowBackup">
         <!-- IAP 라이브러리 내 Activity 선언 시작-->
 
         <activity

Share/build.gradle

@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
+//apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
+//apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'img-optimizer'
+}
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.pdlive.shayu"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -48,8 +54,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {

Share/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="com.pdlive.shayu">
+    >
 
     <queries>
         <package android:name="com.pandoralive.shayu"/>
@@ -19,7 +19,7 @@
             tools:ignore="ExportedContentProvider" />
 
     </queries>
-    <application android:allowBackup="true">
+    <application>
         <activity
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"

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 {
               }
           }
       }*/
-
+    compileSdk rootProject.ext.android.compileSdkVersion
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -105,8 +101,11 @@ android {
 
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
     applicationVariants.all { variant ->
         println "清空build文件夹";

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"

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.** { *; }

baidu/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -42,8 +42,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

baidu/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.baidu"
     />
 
 

beauty/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -45,8 +45,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

beauty/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.beauty"/>
+          />

build.gradle

@@ -4,27 +4,28 @@ apply from: "dependencies.gradle"
 
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.8.22'
     repositories {
         maven { url "https://mvn.mob.com/android" }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.fabric.io/public' }
-        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
         maven { url 'https://repo1.maven.org/maven2/' }//埋点
         maven {url 'https://developer.huawei.com/repo/'}
+        maven { url "https://jitpack.io" }
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         //一键压缩png工具
         classpath 'com.chenenyu:img-optimizer:1.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
-        classpath "com.alibaba:arouter-register:1.0.2"
+        classpath "com.github.jadepeakpoet.ARouter:arouter-register:1.0.3"
         classpath 'com.huawei.agconnect:agcp:1.5.2.300'
     }
 
@@ -40,9 +41,9 @@ allprojects {
         maven { url "https://mvn.mob.com/android" }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
-        maven { url 'http://developer.huawei.com/repo'}//华为库
+        maven { url 'https://developer.huawei.com/repo'}//华为库
         maven { url 'https://maven.fabric.io/public' }
-        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
         maven { url "https://jitpack.io" }
         maven { url 'https://repo1.maven.org/maven2/' }//埋点
         google()  // Google's Maven repository

common/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.yunbao.common"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -59,8 +59,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {
@@ -165,14 +168,14 @@ dependencies {
     //腾讯im
     api 'com.tencent.imsdk:imsdk-plus:5.4.666'
     api 'com.google.code.gson:gson:2.8.8'
-    api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库
+    api 'cn.rongcloud.sdk:rtc_lib:5.6.9' // 音视频通话基础能力库
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_lib:5.2.0.2'
+    api 'cn.rongcloud.sdk:im_lib:5.6.10'
 
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件
+    api 'cn.rongcloud.sdk:im_kit:5.6.10' // 即时通讯 UI 基础组件
     //融云小视频模块
-    api 'cn.rongcloud.sdk:sight:5.2.5.4'
+    api 'cn.rongcloud.sdk:sight:5.6.10'
     api 'com.facebook.android:facebook-android-sdk:15.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
 

common/src/main/AndroidManifest.xml

@@ -1,11 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yunbao.common">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
     <!--    <uses-permission android:name="android.permission.INTERNET" />-->
     <!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
 
-    <application android:allowBackup="true">
+    <application
+        android:allowBackup="true"
+        tools:replace="allowBackup"
+        >
 
         <!--        <meta-data-->
         <!--            android:name="com.google.ar.core"-->

config.gradle

@@ -2,10 +2,11 @@ ext {
     android = [
             compileSdkVersion: 33,
             buildToolsVersion: "29.0.2",
-            minSdkVersion    : 21,
+            minSdkVersion    : 23,
             targetSdkVersion : 33,
             versionCode      : 510,
-            versionName      : "6.6.5"
+            versionName      : "6.6.5",
+            namespace        : "com.pandoralive.shayu"
     ]
     manifestPlaceholders = [
             //正式、

dependencies.gradle

@@ -27,8 +27,8 @@ ext {
             "magicIndicator"       : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器
             "banner"               : 'com.ms:banner:1.0.0',//轮播图
             "Luban"                : 'top.zibin:Luban:1.1.8',//鲁班压缩图片
-            "arouter"              : 'com.alibaba:arouter-api:1.5.2',//ARouter
+            "arouter"              : 'com.github.jadepeakpoet.ARouter:arouter-api:1.0.3',//ARouter
-            "arouter-compiler"     : 'com.alibaba:arouter-compiler:1.2.2',
+            "arouter-compiler"     : 'com.github.jadepeakpoet.ARouter:arouter-compiler:1.0.3',
             "leakcanary"       : 'com.squareup.leakcanary:leakcanary-android:2.9.1',
             "blank-utilcode"       : 'com.blankj:utilcode:1.30.0',
 

gradle.properties

@@ -13,13 +13,14 @@
 #Thu Feb 04 00:05:45 CST 2021
 android.injected.testOnly=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 
 android.useAndroidX=true
 android.enableJetifier=true
+android.nonTransitiveRClass=false
 
 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 

lib_country_code/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.sahooz.library"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -25,10 +25,10 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion minSdkVersion
+        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion targetSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode versionCode
+        versionCode rootProject.ext.android.versionCode
-        versionName versionName
+        versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,8 +42,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 

lib_country_code/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-    package="com.sahooz.library">
+   >
 
 </manifest>

lib_google/build.gradle

@@ -1,16 +1,16 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.shayu.lib_google"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     defaultConfig {
-        minSdkVersion minSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-        versionCode versionCode
+        minSdkVersion rootProject.ext.android.minSdkVersion
-        versionName versionName
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        targetSdkVersion targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
     }
 
     buildTypes {
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 

lib_google/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shayu.lib_google">
+   >
 
 </manifest>

lib_huawei/build.gradle

@@ -1,8 +1,9 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.shayu.lib_huawei"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
     defaultConfig {
         minSdkVersion minSdkVersion
 
@@ -20,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 

lib_huawei/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shayu.lib_huawei">
+    >
 
 </manifest>

live/build.gradle

@@ -1 +1 @@
-apply plugin: 'com.android.library'
apply plugin: 'img-optimizer'
apply plugin: 'kotlin-android'


android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
    buildToolsVersion rootProject.ext.android.buildToolsVersion
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
        pickFirst "lib/armeabi-v7a/libyuvutils.so"
        pickFirst "lib/armeabi/libyuvtools.so"
        pickFirst "lib/arm64-v8a/libyuvtools.so"
        pickFirst "lib/armeabi-v7a/libyuvtools.so"
        exclude "lib/arm64-v8a/libmmcv_api_handgesture.so"
        exclude "lib/arm64-v8a/libmmcv_api_express.so"
        exclude "lib/arm64-v8a/libMediaEncoder.so"
        exclude "lib/arm64-v8a/libarcore_sdk_c.so"
        exclude "lib/arm64-v8a/libmediadecoder.so"
        exclude "lib/arm64-v8a/libMediaMuxer.so"
        exclude "lib/arm64-v8a/libarcore_sdk_jni.so"
        exclude "lib/arm64-v8a/libMediaUtils.so"
        exclude "lib/arm64-v8a/libcosmosffmpeg.so"

    }

    defaultConfig {
        minSdkVersion rootProject.ext.android.minSdkVersion
        targetSdkVersion rootProject.ext.android.targetSdkVersion
        versionCode rootProject.ext.android.versionCode
        versionName rootProject.ext.android.versionName
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a"
        }
        javaCompileOptions {
            annotationProcessorOptions {
                arguments = [AROUTER_MODULE_NAME: project.getName()]
            }
        }
    }
    aaptOptions {
        cruncherEnabled = false
        useNewCruncher = false
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    kotlinOptions {
        allWarningsAsErrors = true
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
}

repositories {
    flatDir {
        dirs 'libs', '../libs'
    }
    mavenCentral()
}

dependencies {
    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'

    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
    implementation (name:'../libs/beautysdk-202202241203',ext:'aar')
    implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar')
    //socket.io
    implementation('io.socket:socket.io-client:1.0.0') {
        exclude group: 'org.json', module: 'json'
    }
    //common
    api project(path: ':common')
    api project(path:':FaceUnity')//新娱美颜
    api project(':Share')//分享
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    api rootProject.ext.dependencies["blank-utilcode"]
    implementation 'com.eightbitlab:blurview:1.6.6'

    implementation 'com.google.code.gson:gson:2.8.6'
    implementation "com.getkeepsafe.relinker:relinker:1.4.4"

    //ExoPlayer,腾讯的播放器不支持无缝切换
    implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'

}
+apply plugin: 'com.android.library'
apply plugin: 'img-optimizer'
apply plugin: 'kotlin-android'


android {
    namespace "com.yunbao.live"
    compileSdk rootProject.ext.android.compileSdkVersion
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
        pickFirst "lib/armeabi-v7a/libyuvutils.so"
        pickFirst "lib/armeabi/libyuvtools.so"
        pickFirst "lib/arm64-v8a/libyuvtools.so"
        pickFirst "lib/armeabi-v7a/libyuvtools.so"
        exclude "lib/arm64-v8a/libmmcv_api_handgesture.so"
        exclude "lib/arm64-v8a/libmmcv_api_express.so"
        exclude "lib/arm64-v8a/libMediaEncoder.so"
        exclude "lib/arm64-v8a/libarcore_sdk_c.so"
        exclude "lib/arm64-v8a/libmediadecoder.so"
        exclude "lib/arm64-v8a/libMediaMuxer.so"
        exclude "lib/arm64-v8a/libarcore_sdk_jni.so"
        exclude "lib/arm64-v8a/libMediaUtils.so"
        exclude "lib/arm64-v8a/libcosmosffmpeg.so"

    }

    defaultConfig {
        minSdkVersion rootProject.ext.android.minSdkVersion
        targetSdkVersion rootProject.ext.android.targetSdkVersion
        versionCode rootProject.ext.android.versionCode
        versionName rootProject.ext.android.versionName
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
        ndk {
            abiFilters "armeabi-v7a", "arm64-v8a"
        }
        javaCompileOptions {
            annotationProcessorOptions {
                arguments = [AROUTER_MODULE_NAME: project.getName()]
            }
        }
    }
    aaptOptions {
        cruncherEnabled = false
        useNewCruncher = false
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    kotlinOptions {
        allWarningsAsErrors = true
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_18
        targetCompatibility JavaVersion.VERSION_18
    }
}

repositories {
    flatDir {
        dirs 'libs', '../libs'
    }
    mavenCentral()
}

dependencies {
    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'

    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
    implementation (name:'../libs/beautysdk-202202241203',ext:'aar')
    implementation (name:'../libs/svgaplayer-release-v1.2.1',ext:'aar')
    //socket.io
    implementation('io.socket:socket.io-client:1.0.0') {
        exclude group: 'org.json', module: 'json'
    }
    //common
    api project(path: ':common')
    api project(path:':FaceUnity')//新娱美颜
    api project(':Share')//分享
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    api rootProject.ext.dependencies["blank-utilcode"]
    implementation 'com.eightbitlab:blurview:1.6.6'

    implementation 'com.google.code.gson:gson:2.8.6'
    implementation "com.getkeepsafe.relinker:relinker:1.4.4"

    //ExoPlayer,腾讯的播放器不支持无缝切换
    implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'

}

live/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="com.yunbao.live">
+   >
     <!--com.kugou.fanxing.allinone.watch.liveroominone.media.FALiveRoomInOneActivity"-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +11,7 @@
 
     <application
         android:allowBackup="true"
-
+        tools:replace="allowBackup"
         android:theme="@style/AppTheme">
         <activity android:name=".activity.LiveTRTCAnchorActivity" />
         <activity

main/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'img-optimizer'
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.yunbao.main"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -53,8 +53,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

main/src/main/AndroidManifest.xml

@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yunbao.main">
+    >
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:allowBackup="true"
         android:theme="@style/AppTheme">
-        <activity
-            android:name=".MsgSettActivity"
-            android:exported="false" />
         <activity android:name=".activity.OneLoginActivity" />
         <activity
             android:name=".activity.WeekWebViewActivity"

main/src/main/java/com/yunbao/main/utils/AudioRecordManager.java

@@ -239,9 +239,7 @@ public class AudioRecordManager implements Handler.Callback {
         return this.RECORD_INTERVAL;
     }
 
-    /**
+
-     * @deprecated
-     */
     public void setMaxVoiceDuration(int maxVoiceDuration) {
         this.RECORD_INTERVAL = maxVoiceDuration;
     }

pluginsForAnchor/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.pdlive.plugins"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -134,8 +134,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
     sourceSets {
         main {

pluginsForAnchor/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?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="com.pdlive.plugins"
     >
 
     <application

video/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    namespace "com.yunbao.video"
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -51,8 +51,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

video/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.video"
+    xmlns:tools="http://schemas.android.com/tools">
-    >
     <application
         android:allowBackup="true"
         android:theme="@style/AppTheme"
+        tools:replace="allowBackup"
         >
         <activity
             android:name="com.yunbao.video.activity.VideoPlayActivity"