diff --git a/FaceUnity/build.gradle b/FaceUnity/build.gradle index 6a51680ba..b3c1d111c 100644 --- a/FaceUnity/build.gradle +++ b/FaceUnity/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'kotlin-parcelize' apply from: "../package_config.gradle" android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.yunbao.faceunity" + 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 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 } } repositories { diff --git a/FaceUnity/src/main/AndroidManifest.xml b/FaceUnity/src/main/AndroidManifest.xml index 220544321..00f2e62ea 100644 --- a/FaceUnity/src/main/AndroidManifest.xml +++ b/FaceUnity/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/IAP6Helper/build.gradle b/IAP6Helper/build.gradle index 29919cb60..0f459a391 100644 --- a/IAP6Helper/build.gradle +++ b/IAP6Helper/build.gradle @@ -2,16 +2,16 @@ apply plugin: 'com.android.library' apply from: "../package_config.gradle" android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.samsung.android.sdk.iap.lib" + compileSdk rootProject.ext.android.compileSdkVersion defaultConfig { - minSdkVersion minSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - versionCode versionCode - versionName versionName - targetSdkVersion targetSdkVersion + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName + 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']) } \ No newline at end of file diff --git a/IAP6Helper/src/main/AndroidManifest.xml b/IAP6Helper/src/main/AndroidManifest.xml index b5f9f1046..5555ec35e 100644 --- a/IAP6Helper/src/main/AndroidManifest.xml +++ b/IAP6Helper/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java index 7e5ad8a55..a31cce9b8 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java +++ b/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 GetOwnedListTask mGetOwnedListTask = null; - private ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null; + private com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask mGetProductsDetailsTask = null; + private com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask mGetOwnedListTask = null; + private com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null; // ======================================================================== private ArrayList mServiceQueue = new ArrayList(); @@ -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, diff --git a/Share/build.gradle b/Share/build.gradle index 3bde860d5..15f70e9d7 100644 --- a/Share/build.gradle +++ b/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 { diff --git a/Share/src/main/AndroidManifest.xml b/Share/src/main/AndroidManifest.xml index 0f2b62f39..3d3b90c8a 100644 --- a/Share/src/main/AndroidManifest.xml +++ b/Share/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/build.gradle b/app/build.gradle index ba03faba9..5be59f995 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,8 @@ apply plugin: 'com.alibaba.arouter' apply from: "../package_config.gradle" android { - project.tasks.getByName("tasks").doFirst { - - } - - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "myname.pdlive.shayu" + compileSdk rootProject.ext.android.compileSdkVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" @@ -81,8 +77,11 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + targetCompatibility JavaVersion.VERSION_18 + } + buildFeatures { + buildConfig = true } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 10f4ffe34..1c250b06d 100644 --- a/app/proguard-rules.pro +++ b/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 ();} +-ignorewarnings diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index adc2c0efc..009b58ea4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> ();} +-ignorewarnings \ No newline at end of file diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index 5b9ff7982..f0de2499e 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/common/src/main/java/com/yunbao/common/bean/CheckLiveModel.java b/common/src/main/java/com/yunbao/common/bean/CheckLiveModel.java index 4b4f7ca30..2d7d00c3e 100644 --- a/common/src/main/java/com/yunbao/common/bean/CheckLiveModel.java +++ b/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 { diff --git a/common/src/main/java/com/yunbao/common/bean/ConfigBean.java b/common/src/main/java/com/yunbao/common/bean/ConfigBean.java index ec6d14242..497026ce5 100644 --- a/common/src/main/java/com/yunbao/common/bean/ConfigBean.java +++ b/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; diff --git a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java b/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java index d77d30acc..d4b4080e2 100644 --- a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java +++ b/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,9 +59,27 @@ 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); + } + + /** * 消耗指定商品 * diff --git a/common/src/main/java/com/yunbao/common/utils/AppManager.java b/common/src/main/java/com/yunbao/common/utils/AppManager.java index 33c5c65c4..45d95dd91 100644 --- a/common/src/main/java/com/yunbao/common/utils/AppManager.java +++ b/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; diff --git a/config.gradle b/config.gradle index c39514dfd..0446876e7 100644 --- a/config.gradle +++ b/config.gradle @@ -1,9 +1,9 @@ ext { android = [ - compileSdkVersion: 33, + compileSdkVersion: 34, buildToolsVersion: "29.0.2", - minSdkVersion : 21, - targetSdkVersion : 33, + minSdkVersion : 23, + targetSdkVersion : 34, versionCode : 690, versionName : "6.7.1" ] diff --git a/dependencies.gradle b/dependencies.gradle index 3a028a4df..fd32a5d29 100644 --- a/dependencies.gradle +++ b/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-compiler" : 'com.alibaba:arouter-compiler:1.2.2', + "arouter" : 'com.github.jadepeakpoet.ARouter:arouter-api:1.0.3',//ARouter + "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', diff --git a/gradle.properties b/gradle.properties index c781c87a7..6f233b2b9 100644 --- a/gradle.properties +++ b/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 \ No newline at end of file +android.enableR8.fullMode=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9276a5849..36be9d94f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/lib_country_code/build.gradle b/lib_country_code/build.gradle index 28d4b2620..3d969799f 100644 --- a/lib_country_code/build.gradle +++ b/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 { diff --git a/lib_country_code/src/main/AndroidManifest.xml b/lib_country_code/src/main/AndroidManifest.xml index 9de290553..d52e91bed 100644 --- a/lib_country_code/src/main/AndroidManifest.xml +++ b/lib_country_code/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ +> diff --git a/lib_faceunity/build.gradle b/lib_faceunity/build.gradle index 8d7859c91..e508cc23c 100644 --- a/lib_faceunity/build.gradle +++ b/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" diff --git a/lib_faceunity/src/main/AndroidManifest.xml b/lib_faceunity/src/main/AndroidManifest.xml index 0ec7a4108..b22474742 100644 --- a/lib_faceunity/src/main/AndroidManifest.xml +++ b/lib_faceunity/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java b/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java index 4271b4ec4..33c38ed43 100644 --- a/lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java +++ b/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; diff --git a/lib_google/build.gradle b/lib_google/build.gradle index 9670d94c4..d64f08f21 100644 --- a/lib_google/build.gradle +++ b/lib_google/build.gradle @@ -2,16 +2,16 @@ apply plugin: 'com.android.library' apply from: "../package_config.gradle" android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.shayu.lib_google" + compileSdk rootProject.ext.android.compileSdkVersion defaultConfig { - minSdkVersion minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" - versionCode versionCode - versionName versionName - targetSdkVersion targetSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName } buildTypes { @@ -21,8 +21,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + 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' diff --git a/lib_google/src/main/AndroidManifest.xml b/lib_google/src/main/AndroidManifest.xml index deeb96ae2..a5918e68a 100644 --- a/lib_google/src/main/AndroidManifest.xml +++ b/lib_google/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/lib_huawei/build.gradle b/lib_huawei/build.gradle index c6c84d2fc..20b93e0a2 100644 --- a/lib_huawei/build.gradle +++ b/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 { diff --git a/lib_huawei/src/main/AndroidManifest.xml b/lib_huawei/src/main/AndroidManifest.xml index b9b2617ac..12bbd5002 100644 --- a/lib_huawei/src/main/AndroidManifest.xml +++ b/lib_huawei/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + > \ No newline at end of file diff --git a/live/build.gradle b/live/build.gradle index 2fca16a93..6f52f3808 100644 --- a/live/build.gradle +++ b/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" } \ No newline at end of file +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" } \ No newline at end of file diff --git a/live/src/main/AndroidManifest.xml b/live/src/main/AndroidManifest.xml index 98ec3f02f..4603df43e 100644 --- a/live/src/main/AndroidManifest.xml +++ b/live/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + > diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index ee9bcad2a..272e72fe8 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/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); } } diff --git a/main/build.gradle b/main/build.gradle index 4d8833cfe..191708da3 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'img-optimizer' apply from: "../package_config.gradle" android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.yunbao.main" + 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 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_18 + 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' diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml index da4e5b304..dd1cd4331 100644 --- a/main/src/main/AndroidManifest.xml +++ b/main/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + > diff --git a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java index 6ec25fd5b..8fa0a3d02 100644 --- a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java +++ b/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 OnPaymentListener() { + SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() { @Override - public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) { - if (_purchaseVO != null) { - SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId()); - 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(); - } - } - }); - } - }); - } 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()); - } - } - }); - } + 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(); +// } +// } +// }); + } + }); + } + + @Override + public void onPaymentFailed(String errorVo) { + payHandler.post(new Runnable() { + @Override + public void run() { + ToastUtil.show(errorVo); + } + }); } }); } + 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(); } + } diff --git a/pluginsForAnchor/build.gradle b/pluginsForAnchor/build.gradle index dff9b69f7..cf887fa31 100644 --- a/pluginsForAnchor/build.gradle +++ b/pluginsForAnchor/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion + namespace "com.pdlive.plugins" + compileSdk rootProject.ext.android.compileSdkVersion packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" diff --git a/pluginsForAnchor/src/main/AndroidManifest.xml b/pluginsForAnchor/src/main/AndroidManifest.xml index 8b45ca164..ef9fe17a3 100644 --- a/pluginsForAnchor/src/main/AndroidManifest.xml +++ b/pluginsForAnchor/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@