升级34 grd8.0

FaceUnity/build.gradle

@@ -5,8 +5,8 @@ apply plugin: 'kotlin-parcelize'
 apply from: "../package_config.gradle"
 
 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 +48,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

FaceUnity/src/main/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    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" />
     <uses-permission android:name="android.permission.CAMERA" />

IAP6Helper/build.gradle

@@ -2,16 +2,16 @@ apply plugin: 'com.android.library'
 apply from: "../package_config.gradle"
 
 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 {
@@ -20,8 +20,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+}
+repositories {
+    flatDir {
+        dirs 'libs', '../libs'
+    }
 }
-
 dependencies {
-  //  api 'com.google.code.gson:gson:2.8.8'
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 }

IAP6Helper/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    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 -->

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java

@@ -14,6 +14,7 @@ import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
 import com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity;
 import com.samsung.android.sdk.iap.lib.activity.PaymentActivity;
+import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
 import com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask;
 import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask;
 import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask;
@@ -33,7 +34,6 @@ public class IapHelper extends HelperDefine {
     private static final String TAG = IapHelper.class.getSimpleName();
 
     /**
-     * When you release a application, this Mode must be set to {@link HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION}
      * Please double-check this mode before release.
      */
     private int mMode = HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION.getValue();
@@ -46,9 +46,9 @@ public class IapHelper extends HelperDefine {
 
     // AsyncTask for API
     // ========================================================================
-    private GetProductsDetailsTask mGetProductsDetailsTask = null;
+    private com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask mGetProductsDetailsTask = null;
-    private GetOwnedListTask mGetOwnedListTask = null;
+    private com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask mGetOwnedListTask = null;
-    private ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null;
+    private com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null;
     // ========================================================================
 
     private ArrayList<BaseService> mServiceQueue = new ArrayList<BaseService>();
@@ -267,7 +267,7 @@ public class IapHelper extends HelperDefine {
             if (mIapConnector == null || mContext == null) {
                 return false;
             } else {
-                mGetProductsDetailsTask = new GetProductsDetailsTask(_baseService,
+                mGetProductsDetailsTask = new com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask(_baseService,
                         mIapConnector,
                         mContext,
                         _productIDs,
@@ -344,7 +344,7 @@ public class IapHelper extends HelperDefine {
             if (mIapConnector == null || mContext == null) {
                 return false;
             } else {
-                mGetOwnedListTask = new GetOwnedListTask(_baseService,
+                mGetOwnedListTask = new com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask(_baseService,
                         mIapConnector,
                         mContext,
                         _productType,
@@ -417,7 +417,7 @@ public class IapHelper extends HelperDefine {
                 mConsumePurchasedItemsTask.cancel(true);
             }
 
-            mConsumePurchasedItemsTask = new ConsumePurchasedItemsTask(_baseService,
+            mConsumePurchasedItemsTask = new com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask(_baseService,
                     mIapConnector,
                     mContext,
                     _purchaseIds,

Share/build.gradle

@@ -5,6 +5,7 @@ apply plugin: 'kotlin-parcelize'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.pdlive.shayu"
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     packagingOptions {

Share/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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="com.pdlive.shayu">
 
     <queries>
         <package android:name="com.pdlive.shayu"/>

app/build.gradle

@@ -6,12 +6,8 @@ apply plugin: 'com.alibaba.arouter'
 apply from: "../package_config.gradle"
 
 android {
-    project.tasks.getByName("tasks").doFirst {
+    namespace "myname.pdlive.shayu"
-
+    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"
@@ -81,8 +77,11 @@ android {
 
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 
 

app/proguard-rules.pro

@@ -196,9 +196,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep public class com.alibaba.android.arouter.facade.**{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
 
-# If you use the byType method to obtain Service, add the following rules to protect the interface:
+# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
 -keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
 
+# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
+-keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+
 # If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation
 # -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
 
@@ -308,3 +311,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.shayu.lib_huawei.**{*;}
 
 -keep class io.agora.**{*;}
+
+-keep class com.qiniu.**{*;}
+-keep class com.qiniu.**{public <init>();}
+-ignorewarnings

app/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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="myname.pdlive.shayu">
 
     <uses-permission
         android:name="android.permission.CALL_PHONE"

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -74,6 +74,7 @@ import java.util.List;
 
 import myname.pdlive.shayu.R;
 
+
 /**
  * Created by cxf on 2018/9/17.
  */

build.gradle

@@ -4,27 +4,28 @@ apply from: "dependencies.gradle"
 apply from: "config.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:1.6.20"
+        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

@@ -2,10 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'img-optimizer'
 apply plugin: 'kotlin-android'
 apply from: "../package_config.gradle"
+
 android {
+    namespace "com.yunbao.common"
+    compileSdk rootProject.ext.android.compileSdkVersion
     publishNonDefault true
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
+
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -13,7 +15,18 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            // abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            } else {
+                abiFilters "armeabi-v7a", "arm64-v8a"
+            }
+        }
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
         }
     }
 
@@ -53,8 +66,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 {
@@ -64,7 +80,9 @@ repositories {
 }
 
 
+
 dependencies {
+    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     api files('libs/jcc-bate-0.7.3.jar')
     compileOnly fileTree(dir: '../libs', include: ['*.aar'])
@@ -158,14 +176,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.7.0' // 音视频通话基础能力库
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_lib:5.2.0.2'
+    api 'cn.rongcloud.sdk:im_lib:5.7.0'
 
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件
+    api 'cn.rongcloud.sdk:im_kit:5.7.0' // 即时通讯 UI 基础组件
     //融云小视频模块
-    api 'cn.rongcloud.sdk:sight:5.2.5.4'
+    api 'cn.rongcloud.sdk:sight:5.7.0'
     api 'com.facebook.android:facebook-android-sdk:15.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
 
@@ -210,31 +228,36 @@ dependencies {
     //侧滑删除
     api 'com.yanzhenjie.recyclerview:x:1.3.2'
 
-    huawei_onlineImplementation project(':lib_huawei')
+    //华为支付插件包
-    huawei_testImplementation project(':lib_huawei')
+    //api project(':lib_huawei')
 
-    samsung_onlineImplementation project(":lib_google")
+    //google插件包
-    samsung_testImplementation project(":lib_google")
+    api project(':lib_google')
-
-    google_onlineImplementation project(":lib_google")
-    google_testImplementation project(":lib_google")
-
-    link_onlineImplementation project(":lib_google")
-    link_testImplementation project(":lib_google")
 
     //samsung插件包
-    api project(':IAP6Helper')
+    //api project(':IAP6Helper')
 
+    //時間選擇器
+    api 'com.contrarywind:Android-PickerView:4.1.9'
+
+    //瀑布流
+    api 'com.wuxiaolong.pullloadmorerecyclerview:library:1.1.2'
+    //时间选择器
+    api 'com.contrarywind:Android-PickerView:4.1.9'
+    //UI框架
+    api 'com.github.xuexiangjys:XUI:1.1.6'
+    api 'com.github.xuexiangjys.XUtil:xutil-core:2.0.0'
+
+    //ExoPlayer,腾讯的播放器不支持无缝切换
+    api 'com.google.android.exoplayer:exoplayer:2.18.2'
+    api 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'
     //文字渐变色
     api 'com.github.FlyJingFish:GradientTextView:1.2.4'
     //轮播  一屏显示多个
     api 'com.github.xiaohaibin:XBanner:androidx_v1.2.6'
     //声网SDK
     //api 'io.agora.rtc:agora-special-full:4.2.6.245'
-
+    api 'com.xj.marqueeView:marqueeView:0.1.20'
-    //ExoPlayer,腾讯的播放器不支持无缝切换
-    api 'com.google.android.exoplayer:exoplayer:2.18.2'
-    api 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'
 
     api rootProject.ext.dependencies["blank-utilcode"]
 }

common/proguard-rules.pro

@@ -23,3 +23,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep class com.qiniu.**{*;}
+-keep class com.qiniu.**{public <init>();}
+-ignorewarnings

common/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.yunbao.common">
 
     <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
     <!--    <uses-permission android:name="android.permission.INTERNET" />-->

common/src/main/java/com/yunbao/common/bean/CheckLiveModel.java

@@ -2,7 +2,6 @@ package com.yunbao.common.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.BuildConfig;
 
 public class CheckLiveModel extends BaseModel {
 

common/src/main/java/com/yunbao/common/bean/ConfigBean.java

@@ -2,7 +2,6 @@ package com.yunbao.common.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.BuildConfig;
 import com.yunbao.common.utils.StringUtil;
 
 import java.util.Arrays;

common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java

@@ -3,7 +3,7 @@ package com.yunbao.common.pay.samsung;
 import android.content.Context;
 
 import com.google.gson.Gson;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib.constants.HelperDefine;
 import com.samsung.android.sdk.iap.lib.helper.IapHelper;
 import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener;
 import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener;
@@ -11,6 +11,8 @@ import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
 import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
 import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
 import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
+import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
+import com.yunbao.common.R;
 import com.yunbao.common.utils.L;
 
 import java.util.ArrayList;
@@ -57,8 +59,26 @@ public class SamsungUtil {
      */
     public void buy(String skuId, OnPaymentListener onPaymentListener) {
         //购买
-        iapHelper.startPayment(skuId, "", onPaymentListener);
+        iapHelper.startPayment(skuId, "", (errorVo, purchaseVo) -> {
+            if (purchaseVo != null) {
+                onPaymentListener.onPaymentSuccess(purchaseVo.getPurchaseId());
+            } else {
+                if (errorVo.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
+                    onPaymentListener.onPaymentFailed(mContext.getString(R.string.pay_cancel));
+                } else {
+                    onPaymentListener.onPaymentFailed(errorVo.getErrorString());
                 }
+            }
+
+        });
+    }
+
+    public interface OnPaymentListener {
+        void onPaymentSuccess(String purchaseVo);
+
+        void onPaymentFailed(String errorVo);
+    }
+
 
     /**
      * 消耗指定商品

common/src/main/java/com/yunbao/common/utils/AppManager.java

@@ -2,8 +2,8 @@ package com.yunbao.common.utils;
 
 import android.app.Activity;
 import android.util.Log;
-
 import com.yunbao.common.BuildConfig;
+
 import com.yunbao.common.manager.OpenAdManager;
 
 import java.util.Stack;

config.gradle

@@ -1,9 +1,9 @@
 ext {
     android = [
-            compileSdkVersion: 33,
+            compileSdkVersion: 34,
             buildToolsVersion: "29.0.2",
-            minSdkVersion    : 21,
+            minSdkVersion    : 23,
-            targetSdkVersion : 33,
+            targetSdkVersion : 34,
             versionCode      : 690,
             versionName      : "6.7.1"
     ]

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,17 +13,17 @@
 #Thu Feb 04 00:05:45 CST 2021
 android.injected.testOnly=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=4096m -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
 systemProp.https.proxyPort=10809
 systemProp.http.proxyPort=10809
-
+android.enableR8.fullMode=true
-#android.enableR8.fullMode=true

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,6 +3,7 @@ apply plugin: 'img-optimizer'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.sahooz.library"
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     packagingOptions {

lib_country_code/src/main/AndroidManifest.xml

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

lib_faceunity/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.yunbao.swfaceunity"
     compileSdkVersion 31
     buildToolsVersion "30.0.3"
 

lib_faceunity/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:tools="http://schemas.android.com/tools">
-    package="io.agora.beautyapi.faceunity">
     <uses-sdk tools:overrideLibrary="io.agora.beautyapi.faceunity" />
 </manifest>

lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java

@@ -37,7 +37,6 @@ import io.agora.beautyapi.faceunity.Config;
 import io.agora.beautyapi.faceunity.FaceUnityBeautyAPI;
 import io.agora.beautyapi.faceunity.FaceUnityBeautyAPIKt;
 import io.agora.beautyapi.faceunity.MirrorMode;
-import io.agora.beautyapi.faceunity.R;
 import io.agora.rtc2.ChannelMediaOptions;
 import io.agora.rtc2.Constants;
 import io.agora.rtc2.IRtcEngineEventHandler;

lib_google/build.gradle

@@ -2,16 +2,16 @@ apply plugin: 'com.android.library'
 apply from: "../package_config.gradle"
 
 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 {
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 
@@ -30,7 +30,7 @@ dependencies {
     implementation rootProject.ext.dependencies["appcompat-androidx"]
 
     //谷歌内购
-    api 'com.android.billingclient:billing:5.0.0'
+    api 'com.android.billingclient:billing:7.0.0'
     //谷歌登录
     api 'com.google.android.gms:play-services-auth:15.0.0'
     api 'com.google.android.gms:play-services-ads-identifier:15.0.1'
@@ -39,6 +39,7 @@ dependencies {
 
     implementation platform('com.google.firebase:firebase-bom:30.5.0')
     implementation 'com.google.firebase:firebase-crashlytics'
+    api 'com.google.firebase:firebase-analytics:21.1.0'
 
     //implementation platform('com.google.firebase:firebase-bom:30.5.0')
     //implementation 'com.google.firebase:firebase-crashlytics'

lib_google/src/main/AndroidManifest.xml

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

lib_huawei/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.yunbao.huawei"
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {

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'
apply from: "../package_config.gradle"

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","x86","x86_64"
        }
        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:':lib_faceunity')//声网-新娱美颜
    api project(path:':FaceUnity')//融云-新娱美颜
    api project(path:':common')//公共库
    api project(':Share')//分享
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    implementation 'com.eightbitlab:blurview:1.6.6'

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


}
+apply plugin: 'com.android.library'
apply plugin: 'img-optimizer'
apply plugin: 'kotlin-android'
apply from: "../package_config.gradle"

android {
    namespace "com.yunbao.live"
    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","x86","x86_64"
        }
        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:':lib_faceunity')//声网-新娱美颜
    api project(path:':FaceUnity')//融云-新娱美颜
    api project(path:':common')//公共库
    api project(':Share')//分享
    annotationProcessor rootProject.ext.dependencies["arouter-compiler"]


    //工具
    implementation 'com.eightbitlab:blurview:1.6.6'

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


}

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" />

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -235,7 +235,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     //丢包率
                     long lossRate = statusBean.packetLostRate;
                     //带宽
-                    String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
+//                    String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
 //                    Log.e("网速和内存", "获取视频：" + resolution + "    丢包率：" + lossRate + "     带宽：" + googAvailableSendBandwidth);
                 }
             }

main/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 apply from: "../package_config.gradle"
 
 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"
@@ -31,7 +31,12 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            //  abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            } else {
+                abiFilters "armeabi-v7a", "arm64-v8a"
+            }
         }
 
         javaCompileOptions {
@@ -54,8 +59,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {
@@ -82,7 +87,6 @@ dependencies {
     implementation project(path: ':lib_country_code')
     //抽屉菜单
     implementation 'com.justkiddingbaby:slidemenu:1.3.0'
-    implementation 'com.xj.marqueeView:marqueeView:0.1.20'
     //引导层
     implementation 'com.binioter:guideview:1.0.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'

main/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?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" />

main/src/main/java/com/yunbao/main/activity/SamsungFragment.java

@@ -1,8 +1,6 @@
 package com.yunbao.main.activity;
 
 
-import static com.yunbao.main.activity.MyWalletActivity.dis;
-
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
@@ -16,13 +14,6 @@ import android.webkit.WebView;
 
 import androidx.fragment.app.Fragment;
 
-import com.facebook.appevents.AppEventsConstants;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
-import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.pay.samsung.SamsungUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -104,41 +95,38 @@ public class SamsungFragment extends Fragment {
                 mProductId = ProductId;
                 mOrderid = OrderNumber;
                 MoneyUsds = MoneyUsd;
+                SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() {
+                    @Override
+                    public void onPaymentSuccess(String purchaseVo) {
+                        SamsungUtil.newInstance(getActivity()).consume(purchaseVo);
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+//                                    CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
+//                                        @Override
+//                                        public void onSuccess(int code, String msg, String[] info) {
+//                                            if (code == 0) {
+//                                                ToastUtil.show(getString(R.string.pay_suc));
+//                                                dis();
+//                                            }
+//                                        }
+//                                    });
+                            }
+                        });
+                    }
 
-                SamsungUtil.newInstance(getActivity()).buy(mProductId, new OnPaymentListener() {
                     @Override
-                    public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
+                    public void onPaymentFailed(String errorVo) {
-                        if (_purchaseVO != null) {
-                            SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId());
                         payHandler.post(new Runnable() {
                             @Override
                             public void run() {
-                                    CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
+                                ToastUtil.show(errorVo);
-                                        @Override
-                                        public void onSuccess(int code, String msg, String[] info) {
-                                            if (code == 0) {
-                                                ToastUtil.show(getString(R.string.pay_suc));
-                                                dis();
-                                            }
                             }
                         });
                     }
                 });
-                        } else {
-                            payHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    if (_errorVO.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
-                                        ToastUtil.show(getString(R.string.pay_cancel));
-                                    } else {
-                                        ToastUtil.show(_errorVO.getErrorString());
-                                    }
-                                }
-                            });
-                        }
-                    }
-                });
             }
+
             lastClickTime = currentTime;
 
             Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
@@ -154,6 +142,7 @@ public class SamsungFragment extends Fragment {
         public void androidGoBack() {
             getActivity().onBackPressed();
         }
+
     }
 
 

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"

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,6 +3,7 @@ apply plugin: 'img-optimizer'
 apply from: "../package_config.gradle"
 
 android {
+    namespace "com.yunbao.video"
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     packagingOptions {

video/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.video"
+
     >
     <application
         android:allowBackup="true"